diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-06-12 12:01:10 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-12 12:01:10 +0000 |
commit | fddadbd2340aeff204b094f2c7a30205dff08389 (patch) | |
tree | febdfd1a9582f745ce4e87d9347ae8045d6e86dd /pkgs/by-name/li | |
parent | 898d05911ae3f6c95d838dd965b445b1a75b5291 (diff) | |
parent | db4332c1eb7214a359dbd21fc7ca4bc1040182e8 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/by-name/li')
-rw-r--r-- | pkgs/by-name/li/libopus/package.nix | 83 | ||||
-rw-r--r-- | pkgs/by-name/li/libopus/test-timeout.patch | 9 | ||||
-rw-r--r-- | pkgs/by-name/li/lint-staged/package.nix | 6 |
3 files changed, 95 insertions, 3 deletions
diff --git a/pkgs/by-name/li/libopus/package.nix b/pkgs/by-name/li/libopus/package.nix new file mode 100644 index 0000000000000..cdf00a244ba4b --- /dev/null +++ b/pkgs/by-name/li/libopus/package.nix @@ -0,0 +1,83 @@ +{ + lib, + stdenv, + fetchurl, + gitUpdater, + meson, + python3, + ninja, + fixedPoint ? false, + withCustomModes ? true, + withIntrinsics ? stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isx86, + withAsm ? false, + + # tests + ffmpeg-headless, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libopus"; + version = "1.5.2"; + + src = fetchurl { + url = "https://downloads.xiph.org/releases/opus/opus-${finalAttrs.version}.tar.gz"; + hash = "sha256-ZcHS94ufL7IAgsOMvkfJUa1YOTRYduRpQWEu6H+afOE="; + }; + + patches = [ + # Some tests time out easily on slower machines + ./test-timeout.patch + ]; + + postPatch = '' + patchShebangs meson/ + ''; + + outputs = [ + "out" + "dev" + ]; + + nativeBuildInputs = [ + meson + python3 + ninja + ]; + + mesonFlags = [ + (lib.mesonBool "fixed-point" fixedPoint) + (lib.mesonBool "custom-modes" withCustomModes) + (lib.mesonEnable "intrinsics" withIntrinsics) + (lib.mesonEnable "rtcd" (withIntrinsics || withAsm)) + (lib.mesonEnable "asm" withAsm) + (lib.mesonEnable "docs" false) + ]; + + doCheck = !stdenv.isi686 && !stdenv.isAarch32; # test_unit_LPC_inv_pred_gain fails + + passthru = { + updateScript = gitUpdater { + url = "https://gitlab.xiph.org/xiph/opus.git"; + rev-prefix = "v"; + }; + + tests = { + inherit ffmpeg-headless; + + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + moduleNames = [ "opus" ]; + }; + }; + }; + + meta = { + description = "Open, royalty-free, highly versatile audio codec"; + homepage = "https://opus-codec.org/"; + changelog = "https://gitlab.xiph.org/xiph/opus/-/releases/v${finalAttrs.version}"; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ getchoo jopejoe1 ]; + }; +}) diff --git a/pkgs/by-name/li/libopus/test-timeout.patch b/pkgs/by-name/li/libopus/test-timeout.patch new file mode 100644 index 0000000000000..76025e648d8f5 --- /dev/null +++ b/pkgs/by-name/li/libopus/test-timeout.patch @@ -0,0 +1,9 @@ +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -1,6 +1,5 @@ + # Tests that link to libopus + opus_tests = [ +- ['test_opus_api'], + ['test_opus_decode', [], 120], + ['test_opus_encode', 'opus_encode_regressions.c', 240], + ['test_opus_extensions', [], 120], diff --git a/pkgs/by-name/li/lint-staged/package.nix b/pkgs/by-name/li/lint-staged/package.nix index 82a8de430623d..0fa6179dca687 100644 --- a/pkgs/by-name/li/lint-staged/package.nix +++ b/pkgs/by-name/li/lint-staged/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "lint-staged"; - version = "15.2.5"; + version = "15.2.6"; src = fetchFromGitHub { owner = "okonet"; repo = "lint-staged"; rev = "v${version}"; - hash = "sha256-Mr8Gtm5kXv+ZcLAMCe8JadJwlTRjD29xojN6Tyzdfb8="; + hash = "sha256-Jn6KGfgL4Si48hdg4glACe6AO5QzPgnasYhHMivzMGk="; }; - npmDepsHash = "sha256-BAVxloOuHodxPLoN5iMQcL04rdmkIEL6UYPnp2HbTe0="; + npmDepsHash = "sha256-6BKx06h+laYSMNm36R992oXYwCDS90F+nh21MnHA998="; dontNpmBuild = true; |