From e1e75e691ef2699139d309edcac88aaca48eec30 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 3 Nov 2024 22:36:32 +0000 Subject: [PATCH 01/45] python312Packages.cassandra-driver: 3.29.1 -> 3.29.2 --- .../cassandra-driver/default.nix | 27 ++----------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index b72fd7d8a525..f6069e3475e0 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -6,7 +6,6 @@ cython, eventlet, fetchFromGitHub, - fetchpatch2, geomet, gevent, gremlinpython, @@ -26,38 +25,16 @@ buildPythonPackage rec { pname = "cassandra-driver"; - version = "3.29.1"; + version = "3.29.2"; pyproject = true; src = fetchFromGitHub { owner = "datastax"; repo = "python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-pnNm5Pd5k4bt+s3GrUUDWRpSdqNSM89GiX8DZKYzW1E="; + hash = "sha256-RX9GLk2admzRasmP7LCwIfsJIt8TC/9rWhIcoTqS0qc="; }; - patches = [ - # https://github.com/datastax/python-driver/pull/1201 - # Also needed for below patch to apply - (fetchpatch2 { - name = "remove-mock-dependency.patch"; - url = "https://github.com/datastax/python-driver/commit/9aca00be33d96559f0eabc1c8a26bb439dcebbd7.patch"; - hash = "sha256-ZN95V8ebbjahzqBat2oKBJLfu0fqbWMvAu0DzfVGw8I="; - }) - # https://github.com/datastax/python-driver/pull/1215 - (fetchpatch2 { - name = "convert-to-pytest.patch"; - url = "https://github.com/datastax/python-driver/commit/9952e2ab22c7e034b96cc89330791d73c221546b.patch"; - hash = "sha256-xa2aV6drBcgkQT05kt44vwupg3oMHLbcbZSQ7EHKnko="; - }) - # https://github.com/datastax/python-driver/pull/1195 - (fetchpatch2 { - name = "remove-assertRaisesRegexp.patch"; - url = "https://github.com/datastax/python-driver/commit/622523b83971e8a181eb4853b7d877420c0351ef.patch"; - hash = "sha256-Q8pRhHBLKyenMfrITf8kDv3BbsSCDAmVisTr4jSAIvA="; - }) - ]; - pythonRelaxDeps = [ "geomet" ]; build-system = [ From 8ec0981318b393e644f6967db0be5f5e7765a90f Mon Sep 17 00:00:00 2001 From: RatCornu Date: Tue, 5 Nov 2024 23:38:07 +0100 Subject: [PATCH 02/45] pingvin-share: 1.1.3 -> 1.2.4 --- pkgs/servers/pingvin-share/backend.nix | 2 +- pkgs/servers/pingvin-share/default.nix | 4 ++-- pkgs/servers/pingvin-share/frontend.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/pingvin-share/backend.nix b/pkgs/servers/pingvin-share/backend.nix index 17046f1fd9f5..baefe0370d27 100644 --- a/pkgs/servers/pingvin-share/backend.nix +++ b/pkgs/servers/pingvin-share/backend.nix @@ -31,7 +31,7 @@ buildNpmPackage { prisma ]; - npmDepsHash = "sha256-F+pYEsaU4Rsiq1z3rwGeKznZqpITF+AoFgswhTFeXf8="; + npmDepsHash = "sha256-RedMH3zWXTNOu/15UDeATP+gWBfDvt4vhKVahL/sEKM="; makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; diff --git a/pkgs/servers/pingvin-share/default.nix b/pkgs/servers/pingvin-share/default.nix index eaf7392ab4d2..03e986f74034 100644 --- a/pkgs/servers/pingvin-share/default.nix +++ b/pkgs/servers/pingvin-share/default.nix @@ -5,12 +5,12 @@ }: let - version = "1.1.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "stonith404"; repo = "pingvin-share"; rev = "v${version}"; - hash = "sha256-n3EwmS8uKrhEuNOh55eAkEtibAerAy6AduszW4leJuI="; + hash = "sha256-hGM7xTgB+XTytnNdGNKQYd7YLAIMbBczxsrcNE3EXkc="; }; in diff --git a/pkgs/servers/pingvin-share/frontend.nix b/pkgs/servers/pingvin-share/frontend.nix index 84092c174810..aa6ccda5afd1 100644 --- a/pkgs/servers/pingvin-share/frontend.nix +++ b/pkgs/servers/pingvin-share/frontend.nix @@ -23,7 +23,7 @@ buildNpmPackage { buildInputs = [ vips ]; nativeBuildInputs = [ pkg-config ]; - npmDepsHash = "sha256-laVAVwx/A/6TunCmmZYQKAuYqv1xTG3e1DIonj2S9IU="; + npmDepsHash = "sha256-aTarzVt+9Sn0xvAfPyoXFoHqPVjKDGv/OfLO8/RdkQw="; makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; From ad6564b0c33fda65c92544f18e67e3c8da25147d Mon Sep 17 00:00:00 2001 From: RatCornu Date: Thu, 7 Nov 2024 00:19:01 +0100 Subject: [PATCH 03/45] nixos/pingvin-share: update env variable name --- nixos/modules/services/web-apps/pingvin-share.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/pingvin-share.nix b/nixos/modules/services/web-apps/pingvin-share.nix index 2d637a82ba8e..6b2ddf4e9c02 100644 --- a/nixos/modules/services/web-apps/pingvin-share.nix +++ b/nixos/modules/services/web-apps/pingvin-share.nix @@ -145,7 +145,7 @@ in PRISMA_QUERY_ENGINE_LIBRARY = "${pkgs.prisma-engines}/lib/libquery_engine.node"; PRISMA_INTROSPECTION_ENGINE_BINARY = "${pkgs.prisma-engines}/bin/introspection-engine"; PRISMA_FMT_BINARY = "${pkgs.prisma-engines}/bin/prisma-fmt"; - PORT = toString cfg.backend.port; + BACKEND_PORT = toString cfg.backend.port; DATABASE_URL = "file:${cfg.dataDir}/pingvin-share.db?connection_limit=1"; DATA_DIRECTORY = cfg.dataDir; }; From b79f5f98fc3e3c698012ed4ccedf9a6bc4fcb777 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Thu, 7 Nov 2024 02:22:48 -0500 Subject: [PATCH 04/45] yabridge: 5.1.0 -> 5.1.1 --- pkgs/tools/audio/yabridge/default.nix | 4 ++-- pkgs/tools/audio/yabridge/hardcode-dependencies.patch | 6 +++--- .../audio/yabridge/libyabridge-from-nix-profiles.patch | 2 +- pkgs/tools/audio/yabridgectl/Cargo.lock | 2 +- .../audio/yabridgectl/chainloader-from-nix-profiles.patch | 4 ++-- .../audio/yabridgectl/remove-dependency-verification.patch | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index c356f17cb43b..540ffb8eaff3 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -72,14 +72,14 @@ let in multiStdenv.mkDerivation (finalAttrs: { pname = "yabridge"; - version = "5.1.0"; + version = "5.1.1"; # NOTE: Also update yabridgectl's cargoHash when this is updated src = fetchFromGitHub { owner = "robbert-vdh"; repo = "yabridge"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-vnSdGedpiit8nym26i1QFiNnATk0Bymm7e5Ha2H41/M="; + hash = "sha256-4eA3vQFklIWkhtbd3Nw39bnJT6gPcni79ZyQVqU4+GQ="; }; # Unpack subproject sources diff --git a/pkgs/tools/audio/yabridge/hardcode-dependencies.patch b/pkgs/tools/audio/yabridge/hardcode-dependencies.patch index d33bdf30eed2..e5ab00293858 100644 --- a/pkgs/tools/audio/yabridge/hardcode-dependencies.patch +++ b/pkgs/tools/audio/yabridge/hardcode-dependencies.patch @@ -1,5 +1,5 @@ diff --git a/meson.build b/meson.build -index c602c5ad..a52e20a1 100644 +index 9e69128d..8c53ac88 100644 --- a/meson.build +++ b/meson.build @@ -226,7 +226,7 @@ if is_64bit_system @@ -12,7 +12,7 @@ index c602c5ad..a52e20a1 100644 # These are all headers-only libraries, and thus won't require separate 32-bit diff --git a/src/common/notifications.cpp b/src/common/notifications.cpp -index 66e08527..685c54af 100644 +index 654b6c83..78ba2fe7 100644 --- a/src/common/notifications.cpp +++ b/src/common/notifications.cpp @@ -29,8 +29,8 @@ @@ -27,7 +27,7 @@ index 66e08527..685c54af 100644 std::atomic libdbus_handle = nullptr; std::mutex libdbus_mutex; diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp -index 82db99a5..491f005d 100644 +index 441345c6..f3e51cff 100644 --- a/src/plugin/utils.cpp +++ b/src/plugin/utils.cpp @@ -103,7 +103,7 @@ std::string PluginInfo::wine_version() const { diff --git a/pkgs/tools/audio/yabridge/libyabridge-from-nix-profiles.patch b/pkgs/tools/audio/yabridge/libyabridge-from-nix-profiles.patch index 54125551e315..bcc55d48f0aa 100644 --- a/pkgs/tools/audio/yabridge/libyabridge-from-nix-profiles.patch +++ b/pkgs/tools/audio/yabridge/libyabridge-from-nix-profiles.patch @@ -1,5 +1,5 @@ diff --git a/src/chainloader/utils.cpp b/src/chainloader/utils.cpp -index c43e5693..b8352adf 100644 +index fa90b8f7..bd44d0ea 100644 --- a/src/chainloader/utils.cpp +++ b/src/chainloader/utils.cpp @@ -29,8 +29,10 @@ diff --git a/pkgs/tools/audio/yabridgectl/Cargo.lock b/pkgs/tools/audio/yabridgectl/Cargo.lock index 451b0ae0141c..1bdd1ede22af 100644 --- a/pkgs/tools/audio/yabridgectl/Cargo.lock +++ b/pkgs/tools/audio/yabridgectl/Cargo.lock @@ -914,7 +914,7 @@ checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" [[package]] name = "yabridgectl" -version = "5.1.0" +version = "5.1.1" dependencies = [ "anyhow", "clap", diff --git a/pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch b/pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch index 35193c919f63..763b4a67a3b6 100644 --- a/pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch +++ b/pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch @@ -1,5 +1,5 @@ diff --git a/tools/yabridgectl/src/config.rs b/tools/yabridgectl/src/config.rs -index da5f4ff5..c220d62d 100644 +index d948beff..9b3f9ffb 100644 --- a/tools/yabridgectl/src/config.rs +++ b/tools/yabridgectl/src/config.rs @@ -22,6 +22,7 @@ use serde_derive::{Deserialize, Serialize}; @@ -58,7 +58,7 @@ index da5f4ff5..c220d62d 100644 )); } diff --git a/tools/yabridgectl/src/main.rs b/tools/yabridgectl/src/main.rs -index 0a29d431..479eaef0 100644 +index e66ef0da..bfe9c8bf 100644 --- a/tools/yabridgectl/src/main.rs +++ b/tools/yabridgectl/src/main.rs @@ -134,7 +134,7 @@ fn main() -> Result<()> { diff --git a/pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch b/pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch index a1494a490384..d320e489eec6 100644 --- a/pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch +++ b/pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch @@ -1,5 +1,5 @@ diff --git a/tools/yabridgectl/src/actions.rs b/tools/yabridgectl/src/actions.rs -index a0d9b98e..2819f017 100644 +index 6a8be858..5ce5e460 100644 --- a/tools/yabridgectl/src/actions.rs +++ b/tools/yabridgectl/src/actions.rs @@ -847,14 +847,6 @@ pub fn do_sync(config: &mut Config, options: &SyncOptions) -> Result<()> { From a4a636d1237f3e9e9ee263917da950b757972836 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Thu, 7 Nov 2024 21:14:53 +0100 Subject: [PATCH 05/45] python312Packages.oddsprout: 0.1.0 -> 0.1.1 --- .../python-modules/oddsprout/default.nix | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/oddsprout/default.nix b/pkgs/development/python-modules/oddsprout/default.nix index 9aca78d9e063..00ae30c7eba0 100644 --- a/pkgs/development/python-modules/oddsprout/default.nix +++ b/pkgs/development/python-modules/oddsprout/default.nix @@ -3,24 +3,37 @@ buildPythonPackage, fetchFromGitHub, poetry-core, + pytestCheckHook, + pythonOlder, dahlia, - ixia + ixia, }: buildPythonPackage rec { pname = "oddsprout"; - version = "0.1.0"; + version = "0.1.1"; pyproject = true; + disabled = pythonOlder "3.9"; + src = fetchFromGitHub { owner = "trag1c"; repo = "oddsprout"; rev = "refs/tags/v${version}"; - hash = "sha256-k5/mBoW4PxGUbkwaZyHgS3MGI4533V/nNoGqEg+VXpM="; + hash = "sha256-BOUYq4yny3ScgzCzx2cpeK4e7nxxwTj8mJ42nr59mFA="; }; build-system = [ poetry-core ]; - dependencies = [ dahlia ixia ]; + + dependencies = [ + dahlia + ixia + ]; + + # has one test `test_main_recursion_error` + # that has a very low (~1%) but nonzero chance to fail, + # this is known upstream (https://github.com/trag1c/oddsprout/issues/5) + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "oddsprout" ]; From 61098d62851ffd0155dfac173802c269feac75ec Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Sat, 9 Nov 2024 00:17:13 +0100 Subject: [PATCH 06/45] python312Packages.oddsprout: add itepastra to maintainer --- pkgs/development/python-modules/oddsprout/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/oddsprout/default.nix b/pkgs/development/python-modules/oddsprout/default.nix index 00ae30c7eba0..4f948f8dec59 100644 --- a/pkgs/development/python-modules/oddsprout/default.nix +++ b/pkgs/development/python-modules/oddsprout/default.nix @@ -42,6 +42,9 @@ buildPythonPackage rec { description = "Generate random JSON with no schemas involved"; license = licenses.mit; homepage = "https://trag1c.github.io/oddsprout"; - maintainers = with maintainers; [ sigmanificient ]; + maintainers = with maintainers; [ + itepastra + sigmanificient + ]; }; } From 113f56a42130941612fe7f56246d7ff3da27dbe1 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Sun, 10 Nov 2024 07:50:23 -0600 Subject: [PATCH 07/45] sonarr: 4.0.9.2244 -> 4.0.10.2544 --- pkgs/by-name/so/sonarr/deps.nix | 1 + pkgs/by-name/so/sonarr/package.nix | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/so/sonarr/deps.nix b/pkgs/by-name/so/sonarr/deps.nix index d668314809f9..4122acc38649 100644 --- a/pkgs/by-name/so/sonarr/deps.nix +++ b/pkgs/by-name/so/sonarr/deps.nix @@ -17,6 +17,7 @@ (fetchNuGet { pname = "Ical.Net"; version = "4.2.0"; hash = "sha256-OcUvqj2nIyZ93MUYvRN+752xPkbtE/Uoi6T+W51eDKc="; }) (fetchNuGet { pname = "ImpromptuInterface"; version = "7.0.1"; hash = "sha256-61KY5H3W/sGX12y0oREPX7W22VJokL9U3VJpOHW50s8="; }) (fetchNuGet { pname = "Instances"; version = "1.6.1"; hash = "sha256-ge49RXumBAUKHld/5EhxydEVTKc8Lqz7MNgH4Y4ca9E="; }) + (fetchNuGet { pname = "IPAddressRange"; version = "6.0.0"; hash = "sha256-3qa0BOBto1+SzJjepSWrvjRryw8RBaKOlPFXtVTvyjo="; }) (fetchNuGet { pname = "Lib.Harmony"; version = "2.0.1"; hash = "sha256-mmzIoIUDbByhbGIA87aVHlyMpFBZnpJPZiD1Gja2MVU="; }) (fetchNuGet { pname = "MailKit"; version = "3.6.0"; hash = "sha256-ECpS2Bt7e3h/uJ5Twng2/lw3j20C3UZgiivcW+KW7sQ="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.Internal"; version = "6.0.21"; hash = "sha256-YMveWdyikWEfczNSMSh0LlBS87gsMxMto1RW8Unjnro="; }) diff --git a/pkgs/by-name/so/sonarr/package.nix b/pkgs/by-name/so/sonarr/package.nix index 915599971ba4..b3902340fb2e 100644 --- a/pkgs/by-name/so/sonarr/package.nix +++ b/pkgs/by-name/so/sonarr/package.nix @@ -18,12 +18,12 @@ , prefetch-yarn-deps }: let - version = "4.0.9.2244"; + version = "4.0.10.2544"; src = fetchFromGitHub { owner = "Sonarr"; repo = "Sonarr"; rev = "v${version}"; - hash = "sha256-RDhJUf8P2STTug69EGozW0q87qDE40jf5G7n7pezWeY="; + hash = "sha256-5mP+fleZDYL/XU23r+dGDeAbNfFz7eVrvYW+vJ6KVV8="; }; rid = dotnetCorePackages.systemToDotnetRid stdenvNoCC.hostPlatform.system; in @@ -40,7 +40,7 @@ buildDotnetModule { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-qL8vNKf0XqpO/TUfKMXbfrmRVAqnvKLREAjcsAYDqeE="; + hash = "sha256-7jHx7TW/oLQuYVmjd4rPMqW2sZbC/AiEUqeEd19LoWk="; }; ffprobe = lib.optionalDrvAttr withFFmpeg (lib.getExe' ffmpeg "ffprobe"); From c7f9bcf3f312cc07ea8e4205de471b3684624e6f Mon Sep 17 00:00:00 2001 From: penalty1083 <121009904+penalty1083@users.noreply.github.com> Date: Mon, 11 Nov 2024 08:29:44 +0000 Subject: [PATCH 08/45] geph: 4.99.2 -> 4.99.16 --- pkgs/applications/networking/geph/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/geph/default.nix b/pkgs/applications/networking/geph/default.nix index 1a8fa7d547ab..a3b1cbb52d29 100644 --- a/pkgs/applications/networking/geph/default.nix +++ b/pkgs/applications/networking/geph/default.nix @@ -18,7 +18,7 @@ }: let - version = "4.99.2"; + version = "4.99.16"; geph-meta = with lib; { description = "Modular Internet censorship circumvention system designed specifically to deal with national filtering"; homepage = "https://geph.io"; @@ -35,10 +35,10 @@ in owner = "geph-official"; repo = pname; rev = "v${version}"; - hash = "sha256-aZFm4+oUQungCPbxs7j1J8hLcCYoIodIEQEiQfjoLUw="; + hash = "sha256-6YWPsSRIZpvVCIGZ1z7srobDvVzLr0o2jBcB/7kbK7I="; }; - cargoHash = "sha256-ypnjVoscGqVifkjzFh2KE+3EVFWIiyahTNTil3nu/+s="; + cargoHash = "sha256-c9Sq3mdotvB/oNIiOLTrAAUnUdkaye7y1l+29Uwjfm8="; nativeBuildInputs = [ perl ]; @@ -54,8 +54,8 @@ in src = fetchFromGitHub { owner = "geph-official"; repo = "gephgui-pkg"; - rev = "3b045e21b8c587c26f9d5f0f2b4bdf0a34bfee80"; - hash = "sha256-p+AxAOznUsG45Ibm1kczapfmbK+aeex2js463eqZ8gY="; + rev = "9f0d5c689c2cae67a4750a68295676f449724a98"; + hash = "sha256-/aHd1EDrFp1kXen5xRCCl8LVlMVH0pY8buILZri81II="; fetchSubmodules = true; }; From d1b042e2fa06ff6055deb13ac09c5ac0db6eab6c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 12 Nov 2024 21:59:40 +0100 Subject: [PATCH 09/45] music-assistant: 2.2.7 -> 2.3.2 https://github.com/music-assistant/server/releases/tag/2.3.0 https://github.com/music-assistant/server/releases/tag/2.3.1 https://github.com/music-assistant/server/releases/tag/2.3.2 --- pkgs/by-name/mu/music-assistant/package.nix | 4 ++-- pkgs/by-name/mu/music-assistant/providers.nix | 16 +++++++++++----- .../mu/music-assistant/update-providers.py | 6 +++++- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index 65f46c184a42..accdd06710cc 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -24,14 +24,14 @@ in python.pkgs.buildPythonApplication rec { pname = "music-assistant"; - version = "2.2.7"; + version = "2.3.2"; pyproject = true; src = fetchFromGitHub { owner = "music-assistant"; repo = "server"; rev = "refs/tags/${version}"; - hash = "sha256-GMjeNX8C027F+Wl/HfluWap9pDOeQwlM9qOs0Sp5tTI="; + hash = "sha256-q71LczFsJAvZaWCQg4Lgzg2XX4XDFvA3x255Re00D9Q="; }; patches = [ diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix index d085e4f1e89e..793dc672f0b6 100644 --- a/pkgs/by-name/mu/music-assistant/providers.nix +++ b/pkgs/by-name/mu/music-assistant/providers.nix @@ -1,12 +1,15 @@ # Do not edit manually, run ./update-providers.py { - version = "2.2.6"; + version = "2.3.2"; providers = { airplay = ps: [ ]; apple_music = ps: [ ]; # missing pywidevine + bluesound = ps: with ps; [ + pyblu + ]; builtin = ps: [ ]; chromecast = ps: with ps; [ @@ -40,6 +43,8 @@ opensubsonic = ps: with ps; [ py-opensonic ]; + player_group = ps: [ + ]; plex = ps: with ps; [ plexapi ]; @@ -48,6 +53,8 @@ radiobrowser = ps: with ps; [ radios ]; + siriusxm = ps: [ + ]; # missing sxm slimproto = ps: with ps; [ aioslimproto ]; @@ -55,10 +62,11 @@ bidict snapcast ]; - sonos = ps: with ps; [ + sonos = ps: [ + ]; # missing aiosonos + sonos_s1 = ps: with ps; [ defusedxml soco - sonos-websocket ]; soundcloud = ps: [ ]; # missing soundcloudpy @@ -76,8 +84,6 @@ ]; tunein = ps: [ ]; - ugp = ps: [ - ]; ytmusic = ps: with ps; [ yt-dlp ytmusicapi diff --git a/pkgs/by-name/mu/music-assistant/update-providers.py b/pkgs/by-name/mu/music-assistant/update-providers.py index cb2683120b14..5016f918deba 100755 --- a/pkgs/by-name/mu/music-assistant/update-providers.py +++ b/pkgs/by-name/mu/music-assistant/update-providers.py @@ -16,6 +16,7 @@ from typing import Dict, Final, List, Optional, Set, Union, cast from urllib.request import urlopen from jinja2 import Environment +from mashumaro.exceptions import MissingField from packaging.requirements import Requirement TEMPLATE = """# Do not edit manually, run ./update-providers.py @@ -113,7 +114,10 @@ async def get_provider_manifests(version: str = "master") -> List: from music_assistant.common.models.provider import ProviderManifest # type: ignore for fn in basedir.glob("**/manifest.json"): - manifests.append(await ProviderManifest.parse(fn)) + try: + manifests.append(await ProviderManifest.parse(fn)) + except MissingField as ex: + print(f"Error parsing {fn}", ex) return manifests From a05f1b8b10de4517bf646438a58b8f4edcf17d1f Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Tue, 12 Nov 2024 15:42:39 -0700 Subject: [PATCH 10/45] cinny-{unwrapped,desktop}: 4.2.2 -> 4.2.3 --- pkgs/by-name/ci/cinny-desktop/package.nix | 6 +++--- pkgs/by-name/ci/cinny-unwrapped/package.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix index 48bbe1fe8427..47e60f7d720b 100644 --- a/pkgs/by-name/ci/cinny-desktop/package.nix +++ b/pkgs/by-name/ci/cinny-desktop/package.nix @@ -20,18 +20,18 @@ rustPlatform.buildRustPackage rec { pname = "cinny-desktop"; # We have to be using the same version as cinny-web or this isn't going to work. - version = "4.2.2"; + version = "4.2.3"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny-desktop"; rev = "refs/tags/v${version}"; - hash = "sha256-W8WSnfUqWTtyb6x0Kmej5sAxsi1Kh/uDkIx6SZhgSvw="; + hash = "sha256-yNGzgkZXz/VroGGnZFqo5n2v3cE6/tvpQv5U4p27row="; }; sourceRoot = "${src.name}/src-tauri"; - cargoHash = "sha256-rg4NdxyJfnEPmFjb2wKJcF7ga7t5WNX/LB0haOvGbXU="; + cargoHash = "sha256-0EIKozFwy7XihFRpjLZ3Am7h1wOU7ZGcHSoTnFnYzTU="; postPatch = let diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix index b4eda88f64a7..58b9e26d7890 100644 --- a/pkgs/by-name/ci/cinny-unwrapped/package.nix +++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix @@ -14,16 +14,16 @@ buildNpmPackage rec { pname = "cinny-unwrapped"; - version = "4.2.2"; + version = "4.2.3"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny"; rev = "v${version}"; - hash = "sha256-S8vOydjQLL2JK5g8B/PBaDRd+Er3JEKrsYSkDrOdi2k="; + hash = "sha256-BoUQURCfEu5kocMm8T25cVl8hgZGxcxrMzQZOl2fAbY="; }; - npmDepsHash = "sha256-W3XXrhg7BblS0w4jI6oQDNggt7G56AzHQKC9tD0TrvU="; + npmDepsHash = "sha256-fDoia6evCmXZgeIKL0coRo3yunX1dfud31ROgmop2Sc="; # Fix error: no member named 'aligned_alloc' in the global namespace env.NIX_CFLAGS_COMPILE = lib.optionalString ( From c255dffa53e8e35eed5f55d9b121126320303cab Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Tue, 12 Nov 2024 17:15:33 -0800 Subject: [PATCH 11/45] anyrun: format rfc style --- pkgs/by-name/an/anyrun/package.nix | 58 +++++++++++++++--------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/pkgs/by-name/an/anyrun/package.nix b/pkgs/by-name/an/anyrun/package.nix index 50d02d6a963f..27e5e1074c2f 100644 --- a/pkgs/by-name/an/anyrun/package.nix +++ b/pkgs/by-name/an/anyrun/package.nix @@ -1,19 +1,20 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, wrapGAppsHook3 -, atk -, cairo -, gdk-pixbuf -, glib -, gtk3 -, pango -, stdenv -, darwin -, wayland -, gtk-layer-shell -, unstableGitUpdater +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + wrapGAppsHook3, + atk, + cairo, + gdk-pixbuf, + glib, + gtk3, + pango, + stdenv, + darwin, + wayland, + gtk-layer-shell, + unstableGitUpdater, }: rustPlatform.buildRustPackage rec { @@ -38,19 +39,18 @@ rustPlatform.buildRustPackage rec { wrapGAppsHook3 ]; - buildInputs = [ - atk - cairo - gdk-pixbuf - glib - gtk3 - gtk-layer-shell - pango - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - wayland - ]; + buildInputs = + [ + atk + cairo + gdk-pixbuf + glib + gtk3 + gtk-layer-shell + pango + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland ]; preFixup = '' gappsWrapperArgs+=( From 15e42a222f50cc8da20fa558bd5d6ca4a369293a Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 12 Nov 2024 22:50:43 -0800 Subject: [PATCH 12/45] git-credential-keepassxc: use new Darwin SDK pattern --- .../version-management/git-credential-keepassxc/default.nix | 5 ----- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/applications/version-management/git-credential-keepassxc/default.nix b/pkgs/applications/version-management/git-credential-keepassxc/default.nix index 3a85cff455b8..f327c8a1e537 100644 --- a/pkgs/applications/version-management/git-credential-keepassxc/default.nix +++ b/pkgs/applications/version-management/git-credential-keepassxc/default.nix @@ -1,9 +1,6 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub -, DiskArbitration -, Foundation , withNotification ? false , withYubikey ? false , withStrictCaller ? false @@ -23,8 +20,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-jBUp0jes4wtr8cmqceEBb6noqGkJUHbIfYgWOw5KMF4="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ DiskArbitration Foundation ]; - buildFeatures = [] ++ lib.optional withNotification "notification" ++ lib.optional withYubikey "yubikey" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f3e57b21703..bdf7c09823b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1231,9 +1231,7 @@ with pkgs; git-cliff = callPackage ../applications/version-management/git-cliff { }; - git-credential-keepassxc = darwin.apple_sdk_11_0.callPackage ../applications/version-management/git-credential-keepassxc { - inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation; - }; + git-credential-keepassxc = callPackage ../applications/version-management/git-credential-keepassxc { }; git-credential-manager = callPackage ../applications/version-management/git-credential-manager { }; From f1dbe9cd97e246e95accf9c9ef56572037e4aaa4 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 13 Nov 2024 21:06:46 +0800 Subject: [PATCH 13/45] python3Packages.clarifai-grpc: fix build --- .../python-modules/clarifai-grpc/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index 9751552d04c2..39c789f822be 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -33,16 +33,20 @@ buildPythonPackage rec { requests ]; + pythonRelaxDeps = [ + "grpcio" + ]; + # almost all tests require network access doCheck = false; pythonImportsCheck = [ "clarifai_grpc" ]; - meta = with lib; { + meta = { description = "Clarifai gRPC API Client"; homepage = "https://github.com/Clarifai/clarifai-python-grpc"; changelog = "https://github.com/Clarifai/clarifai-python-grpc/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ natsukium ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ natsukium ]; }; } From d84508c0d43c781e7d686d00a9a8fbc0e34abe5c Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Wed, 13 Nov 2024 08:09:19 -0700 Subject: [PATCH 14/45] cinny-{unwrapped,desktop}: fix darwin Co-authored-by: Sefa Eyeoglu --- pkgs/by-name/ci/cinny-unwrapped/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix index 58b9e26d7890..515638274145 100644 --- a/pkgs/by-name/ci/cinny-unwrapped/package.nix +++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix @@ -2,13 +2,13 @@ lib, buildNpmPackage, fetchFromGitHub, + giflib, python3, pkg-config, pixman, cairo, pango, stdenv, - darwin, olm, }: @@ -39,7 +39,7 @@ buildNpmPackage rec { pixman cairo pango - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreText ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ giflib ]; installPhase = '' runHook preInstall From a3e7f107c91c5bc6fbe694c878e265640ce0bed4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Nov 2024 15:40:49 +0000 Subject: [PATCH 15/45] rivalcfg: 4.13.0 -> 4.14.0 --- pkgs/by-name/ri/rivalcfg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ri/rivalcfg/package.nix b/pkgs/by-name/ri/rivalcfg/package.nix index 04efbcd26aec..5a56aa478cad 100644 --- a/pkgs/by-name/ri/rivalcfg/package.nix +++ b/pkgs/by-name/ri/rivalcfg/package.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "rivalcfg"; - version = "4.13.0"; + version = "4.14.0"; src = fetchFromGitHub { owner = "flozz"; repo = "rivalcfg"; rev = "refs/tags/v${version}"; - sha256 = "sha256-zZQkfi84NE3mpGv7+Z6AnUXEj0y9SoBmbbtRiTDPS/8="; + sha256 = "sha256-LQpEHcKXkepfsgG7tGYsmM43FkUSBgm1Cn5C1RmTggI="; }; propagatedBuildInputs = with python3Packages; [ hidapi setuptools ]; From 143be24f0d566909dd0a9c8daec6a2815e0013f3 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Wed, 13 Nov 2024 21:39:45 +0100 Subject: [PATCH 16/45] wmii: format using nixfmt --- pkgs/by-name/wm/wmii/package.nix | 35 ++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/wm/wmii/package.nix b/pkgs/by-name/wm/wmii/package.nix index b5a94ed955dc..a06ba8cad5fb 100644 --- a/pkgs/by-name/wm/wmii/package.nix +++ b/pkgs/by-name/wm/wmii/package.nix @@ -1,17 +1,19 @@ -{ lib, stdenv -, fetchFromGitHub -, dash -, libX11 -, libXext -, libXft -, libXinerama -, libXrandr -, libXrender -, libixp -, pkg-config -, txt2tags -, unzip -, which +{ + lib, + stdenv, + fetchFromGitHub, + dash, + libX11, + libXext, + libXft, + libXinerama, + libXrandr, + libXrender, + libixp, + pkg-config, + txt2tags, + unzip, + which, }: stdenv.mkDerivation rec { @@ -48,7 +50,10 @@ stdenv.mkDerivation rec { rm -rf $out/lib/python* $out/etc/wmii-hg/python ''; - nativeBuildInputs = [ pkg-config unzip ]; + nativeBuildInputs = [ + pkg-config + unzip + ]; buildInputs = [ dash libX11 From 1d9a56234fe6da8d56bab1db6b8dc42c0931adac Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Wed, 13 Nov 2024 21:53:04 +0100 Subject: [PATCH 17/45] wmii: fix build by disabling python building --- .../wm/wmii/001-disable-python2-build.patch | 14 ++++++++++++++ pkgs/by-name/wm/wmii/package.nix | 15 ++++++++------- 2 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 pkgs/by-name/wm/wmii/001-disable-python2-build.patch diff --git a/pkgs/by-name/wm/wmii/001-disable-python2-build.patch b/pkgs/by-name/wm/wmii/001-disable-python2-build.patch new file mode 100644 index 000000000000..4bb00ca988d9 --- /dev/null +++ b/pkgs/by-name/wm/wmii/001-disable-python2-build.patch @@ -0,0 +1,14 @@ +diff --git a/alternative_wmiircs/Makefile b/alternative_wmiircs/Makefile +index 3b9c3709..3ce46169 100644 +--- a/alternative_wmiircs/Makefile ++++ b/alternative_wmiircs/Makefile +@@ -3,8 +3,7 @@ include $(ROOT)/mk/hdr.mk + include $(ROOT)/mk/wmii.mk + + BIN = $(GLOBALCONF) +-DIRS = python \ +- plan9port \ ++DIRS = plan9port \ + ruby + + DOCS = README diff --git a/pkgs/by-name/wm/wmii/package.nix b/pkgs/by-name/wm/wmii/package.nix index a06ba8cad5fb..4cdb8371e12b 100644 --- a/pkgs/by-name/wm/wmii/package.nix +++ b/pkgs/by-name/wm/wmii/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "wmii"; - version = "unstable-2022-04-04"; + version = "0-unstable-2023-09-30"; src = fetchFromGitHub { owner = "0intro"; repo = "wmii"; - rev = "ff120c7fee6e1b3a30a4a800074394327fb1da9d"; - hash = "sha256-KEmWnobpT/5TdgT2HGPCpG1duz9Q6Z6PFSEBs2Ce+7g="; + rev = "26848c93457606b350f57d6d313112a745a0cf3d"; + hash = "sha256-5l2aYAoThbA0Aq8M2vPTzaocQO1AvrnWqgXhmBLADVk="; }; # for dlopen-ing @@ -45,10 +45,11 @@ stdenv.mkDerivation rec { EOF ''; - # Remove optional python2 functionality - postInstall = '' - rm -rf $out/lib/python* $out/etc/wmii-hg/python - ''; + patches = [ + # the python alternative wmiirc was not building due to errors with pyxp + # this patch disables building it altogether + ./001-disable-python2-build.patch + ]; nativeBuildInputs = [ pkg-config From d5bab48a3a4b9626fa2291c340a15331bfa7dcd6 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 13 Nov 2024 16:59:08 +0800 Subject: [PATCH 18/45] fx-cast-bridge: nixfmt --- pkgs/by-name/fx/fx-cast-bridge/package.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fx/fx-cast-bridge/package.nix b/pkgs/by-name/fx/fx-cast-bridge/package.nix index 8ea1c785b01b..a915cdd360fe 100644 --- a/pkgs/by-name/fx/fx-cast-bridge/package.nix +++ b/pkgs/by-name/fx/fx-cast-bridge/package.nix @@ -1,4 +1,11 @@ -{ lib, buildNpmPackage, fetchFromGitHub, avahi-compat, nodejs_18, python3 }: +{ + lib, + buildNpmPackage, + fetchFromGitHub, + avahi-compat, + nodejs_18, + python3, +}: buildNpmPackage rec { pname = "fx-cast-bridge"; From e1e70bdd0bb231cfdcf3536295b1773759ed2fb5 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 13 Nov 2024 17:01:26 +0800 Subject: [PATCH 19/45] fx-cast-bridge: disable on aarch64-linux --- pkgs/by-name/fx/fx-cast-bridge/package.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fx/fx-cast-bridge/package.nix b/pkgs/by-name/fx/fx-cast-bridge/package.nix index a915cdd360fe..99e7e80a9431 100644 --- a/pkgs/by-name/fx/fx-cast-bridge/package.nix +++ b/pkgs/by-name/fx/fx-cast-bridge/package.nix @@ -5,6 +5,7 @@ avahi-compat, nodejs_18, python3, + stdenv, }: buildNpmPackage rec { @@ -55,11 +56,17 @@ buildNpmPackage rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Implementation of the Chrome Sender API (Chromecast) within Firefox"; homepage = "https://hensm.github.io/fx_cast/"; - license = licenses.mit; - maintainers = [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + platforms = [ + "x86_64-linux" + "aarch64-darwin" + "x86_64-darwin" + ]; # aarch64-linux wasn't support in upstream according to README + broken = stdenv.hostPlatform.isDarwin; mainProgram = "fx_cast_bridge"; }; } From 0be43c908e5b9db97c97948fce73a5af98724f29 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 14 Nov 2024 03:27:46 +0100 Subject: [PATCH 20/45] libcangjie: 1.4_rev_a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d -> 1.4.0 --- pkgs/by-name/li/libcangjie/package.nix | 45 +++++++++++++++----------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/li/libcangjie/package.nix b/pkgs/by-name/li/libcangjie/package.nix index ab562d9c1999..b9e40ee59d65 100644 --- a/pkgs/by-name/li/libcangjie/package.nix +++ b/pkgs/by-name/li/libcangjie/package.nix @@ -1,36 +1,45 @@ -{ lib, stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkg-config, sqlite }: +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + pkg-config, + sqlite, + cppcheck, +}: stdenv.mkDerivation rec { pname = "libcangjie"; - version = "1.4_rev_${rev}"; - rev = "a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d"; + version = "1.4.0"; - # fetchFromGitLab isn't working for some reason - src = fetchurl { - url = "https://gitlab.freedesktop.org/cangjie/libcangjie/-/archive/a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d/libcangjie-a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d.tar.gz"; - sha256 = "sha256-j5IQ0hBefoF8p966YrfZgYCw7ht5twJhYi4l0NneukQ="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "cangjie"; + repo = "libcangjie"; + rev = "v${version}"; + hash = "sha256-LZRU2hbAC8xftPAIHDKCa2SfFLuH/PVqvjZmOSoUQwc="; }; - nativeBuildInputs = [ pkg-config autoconf automake ]; - buildInputs = [ libtool m4 sqlite ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + ]; - configureScript = "./autogen.sh"; - - preConfigure = '' - find . -name '*.sh' -exec sed -e 's@#!/bin/bash@${bash}/bin/bash@' -i '{}' ';' - ''; + buildInputs = [ + sqlite + cppcheck + ]; doCheck = true; meta = { description = "C library implementing the Cangjie input method"; - longDescription = '' - libcangjie is a library implementing the Cangjie input method. - ''; homepage = "https://gitlab.freedesktop.org/cangjie/libcangjie"; license = lib.licenses.lgpl3Plus; - maintainers = [ lib.maintainers.linquize ]; platforms = lib.platforms.all; + mainProgram = "libcangjie-cli"; }; } From ebae8b830983653644d0d7ab577ce60721c9997c Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 14 Nov 2024 03:28:31 +0100 Subject: [PATCH 21/45] python312Packages.pycangjie: unstable-2015-05-03 -> 1.5.0 and enable tests --- .../python-modules/pycangjie/default.nix | 49 +++++++++++-------- pkgs/top-level/python-packages.nix | 4 +- 2 files changed, 32 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix index 65768bdc806f..d35d0b40943f 100644 --- a/pkgs/development/python-modules/pycangjie/default.nix +++ b/pkgs/development/python-modules/pycangjie/default.nix @@ -1,47 +1,56 @@ { lib, - fetchFromGitHub, - bash, - autoconf, - automake, - libtool, + fetchFromGitLab, pkg-config, libcangjie, sqlite, buildPythonPackage, cython, + meson, + ninja, + cmake, }: -buildPythonPackage { +buildPythonPackage rec { pname = "pycangjie"; - version = "unstable-2015-05-03"; + version = "1.5.0"; + format = "other"; - src = fetchFromGitHub { - owner = "Cangjians"; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "cangjie"; repo = "pycangjie"; - rev = "361bb413203fd43bab624d98edf6f7d20ce6bfd3"; - hash = "sha256-sS0Demzm89WtEIN4Efz0OTsUQ/c3gIX+/koekQGOca4="; + rev = version; + hash = "sha256-REWX6u3Rc72+e5lIImBwV5uFoBBUTMM5BOfYdKIFL4k="; }; + preConfigure = '' + ( + cd subprojects + set -x + cp -R --no-preserve=mode,ownership ${libcangjie.src} libcangjie + ) + ''; + nativeBuildInputs = [ pkg-config - libtool - autoconf - automake + meson + ninja cython + cmake ]; + buildInputs = [ - libcangjie sqlite ]; - preConfigure = '' - find . -name '*.sh' -exec sed -e 's@#!/bin/bash@${bash}/bin/bash@' -i '{}' ';' - sed -i 's@/usr@${libcangjie}@' tests/__init__.py - ''; + pythonImportCheck = [ "cangjie" ]; - configureScript = "./autogen.sh"; + # `buildPythonApplication` skips checkPhase + postInstallCheck = '' + mesonCheckPhase + ''; meta = with lib; { description = "Python wrapper to libcangjie"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0390abd70eb4..b1871a7bfc32 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11198,7 +11198,9 @@ self: super: with self; { py = callPackage ../development/python-modules/py { }; - pycangjie = callPackage ../development/python-modules/pycangjie { }; + pycangjie = callPackage ../development/python-modules/pycangjie { + inherit (pkgs.buildPackages) meson; + }; pycapnp = callPackage ../development/python-modules/pycapnp { }; From 028a22bd342f4e7883dd6d8fd049f6482906506b Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 14 Nov 2024 04:07:54 +0100 Subject: [PATCH 22/45] python312Packages.viewstate: unbreak, switch to pyproject, run checks --- .../python-modules/viewstate/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/viewstate/default.nix b/pkgs/development/python-modules/viewstate/default.nix index d3824b2c36a3..523480b3a4a4 100644 --- a/pkgs/development/python-modules/viewstate/default.nix +++ b/pkgs/development/python-modules/viewstate/default.nix @@ -1,16 +1,15 @@ { + lib, buildPythonPackage, fetchFromGitHub, - isPy3k, - lib, - pytest, + poetry-core, + pytestCheckHook, }: buildPythonPackage rec { pname = "viewstate"; version = "0.6.0"; - format = "setuptools"; - disabled = !isPy3k; + pyproject = true; src = fetchFromGitHub { owner = "yuvadm"; @@ -19,11 +18,11 @@ buildPythonPackage rec { sha256 = "sha256-cXT5niE3rNdqmNqnITWy9c9/MF0gZ6LU2i1uzfOzkUI="; }; - nativeCheckInputs = [ pytest ]; + build-system = [ poetry-core ]; - checkPhase = '' - pytest - ''; + nativeCheckInputs = [ + pytestCheckHook + ]; meta = { description = ".NET viewstate decoder"; From 736cd65982c09c88229b82996f985a3078517987 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 14 Nov 2024 04:14:42 +0100 Subject: [PATCH 23/45] isponsorblocktv: relax rich, unbreak --- pkgs/by-name/is/isponsorblocktv/pypackage.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/is/isponsorblocktv/pypackage.nix b/pkgs/by-name/is/isponsorblocktv/pypackage.nix index 949895763e11..788f52221b63 100644 --- a/pkgs/by-name/is/isponsorblocktv/pypackage.nix +++ b/pkgs/by-name/is/isponsorblocktv/pypackage.nix @@ -56,6 +56,7 @@ buildPythonApplication rec { "pyytlounge" "textual-slider" "textual" + "rich" ]; meta = { From 0343e9308d0f0ebd6b6d182b0207150461eacd6c Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 14 Nov 2024 04:31:12 +0100 Subject: [PATCH 24/45] python312Packages.celery-redbeat: drop path, unbreak --- .../python-modules/celery-redbeat/default.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/python-modules/celery-redbeat/default.nix b/pkgs/development/python-modules/celery-redbeat/default.nix index 2635818a9b37..7483b6d3d91c 100644 --- a/pkgs/development/python-modules/celery-redbeat/default.nix +++ b/pkgs/development/python-modules/celery-redbeat/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, python-dateutil, celery, redis, @@ -25,14 +24,6 @@ buildPythonPackage rec { hash = "sha256-lAEbhRTp0jYrCgHaTvPrl+lW1NRezmmTqAnUmLdpVwY="; }; - patches = [ - (fetchpatch { - # celery 5.3.0 support - url = "https://github.com/sibson/redbeat/commit/4240e17172a4d9d2744d5c4da3cfca0e0a024e2e.patch"; - hash = "sha256-quEfSFhv0sIpsKHX1CpFhbMC8LYXA8NASWYU8MMYPSk="; - }) - ]; - propagatedBuildInputs = [ celery python-dateutil From 7c3ed1b62e7a3c81a8a84fca648d12bb443fb05e Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Thu, 14 Nov 2024 11:47:45 +0800 Subject: [PATCH 25/45] python3Packages.essentials-openapi: fix build --- .../python-modules/essentials-openapi/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/essentials-openapi/default.nix b/pkgs/development/python-modules/essentials-openapi/default.nix index b6cc24262073..89eb9eff42e6 100644 --- a/pkgs/development/python-modules/essentials-openapi/default.nix +++ b/pkgs/development/python-modules/essentials-openapi/default.nix @@ -53,14 +53,18 @@ buildPythonPackage rec { ]; }; + pythonRelaxDeps = [ + "markupsafe" + ]; + pythonImportsCheck = [ "openapidocs" ]; - meta = with lib; { + meta = { homepage = "https://github.com/Neoteroi/essentials-openapi"; description = "Functions to handle OpenAPI Documentation"; changelog = "https://github.com/Neoteroi/essentials-openapi/releases/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aldoborrero zimbatm ]; From a691d6f94445bba9711b8b3e1da4c530b451b1b6 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 14 Nov 2024 04:57:39 +0100 Subject: [PATCH 26/45] python312Packages.tensorflow-metadata: update patch, umbreak --- .../python-modules/tensorflow-metadata/build.patch | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-metadata/build.patch b/pkgs/development/python-modules/tensorflow-metadata/build.patch index 5b570bf72062..75a774535947 100644 --- a/pkgs/development/python-modules/tensorflow-metadata/build.patch +++ b/pkgs/development/python-modules/tensorflow-metadata/build.patch @@ -2,14 +2,12 @@ diff --git a/setup.py b/setup.py index 7a09b2f..94c5aa6 100644 --- a/setup.py +++ b/setup.py -@@ -137,8 +137,5 @@ setup( - long_description_content_type='text/markdown', +@@ -141,8 +141,4 @@ setup( keywords='tensorflow metadata tfx', download_url='https://github.com/tensorflow/metadata/tags', -- requires=[], + requires=[], - cmdclass={ - 'build': _BuildCommand, - 'bazel_build': _BazelBuildCommand, -- }) -+ requires=[] -+ ) +- }, + ) From 64b1772df83a03f88e6f4471e8bd901058899b04 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 14 Nov 2024 05:04:59 +0100 Subject: [PATCH 27/45] python312Packages.pymoo: drop patch, fix tests, unbreak --- .../python-modules/pymoo/default.nix | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pymoo/default.nix b/pkgs/development/python-modules/pymoo/default.nix index 86eb3e81b294..4456319b4349 100644 --- a/pkgs/development/python-modules/pymoo/default.nix +++ b/pkgs/development/python-modules/pymoo/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, setuptools, pytestCheckHook, writeText, @@ -38,14 +37,6 @@ buildPythonPackage rec { hash = "sha256-iGWPepZw3kJzw5HKV09CvemVvkvFQ38GVP+BAryBSs0="; }; - patches = [ - # https://github.com/anyoptimization/pymoo/pull/407 - (fetchpatch { - url = "https://github.com/anyoptimization/pymoo/commit/be57ece64275469daece1e8ef12b2b6ee05362c9.diff"; - hash = "sha256-BLPrUqNbAsAecfYahESEJF6LD+kehUYmkTvl/nvyqII="; - }) - ]; - pythonRelaxDeps = [ "cma" ]; pythonRemoveDeps = [ "alive-progress" ]; @@ -74,6 +65,10 @@ buildPythonPackage rec { substituteInPlace pymoo/config.py \ --replace-fail "https://raw.githubusercontent.com/anyoptimization/pymoo-data/main/" \ "file://$pymoo_data/" + + # Some tests require a grad backend to be configured, this is a hacky way to do so. + # The choice must be either "jax.numpy" or "autograd.numpy" + echo 'from pymoo.gradient import activate; activate("autograd.numpy")' >> tests/conftest.py ''; nativeCheckInputs = [ pytestCheckHook @@ -87,6 +82,14 @@ buildPythonPackage rec { # ModuleNotFoundError: No module named 'pymoo.cython.non_dominated_sorting' "test_fast_non_dominated_sorting" "test_efficient_non_dominated_sort" + "test_dominance_degree_non_dominated_sort" + + # sensitive to float precision + "test_cd_and_pcd" + ]; + disabledTestPaths = [ + # sensitive to float precision + "tests/algorithms/test_no_modfication.py" ]; # Avoid crashing sandboxed build on macOS MATPLOTLIBRC = writeText "" '' From e52b835f253529ad2766c714fab3b955583c5fc1 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Tue, 12 Nov 2024 17:17:58 -0800 Subject: [PATCH 28/45] anyrun: drop Apple support --- pkgs/by-name/an/anyrun/package.nix | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/an/anyrun/package.nix b/pkgs/by-name/an/anyrun/package.nix index 27e5e1074c2f..3a134182d29b 100644 --- a/pkgs/by-name/an/anyrun/package.nix +++ b/pkgs/by-name/an/anyrun/package.nix @@ -11,7 +11,6 @@ gtk3, pango, stdenv, - darwin, wayland, gtk-layer-shell, unstableGitUpdater, @@ -39,18 +38,16 @@ rustPlatform.buildRustPackage rec { wrapGAppsHook3 ]; - buildInputs = - [ - atk - cairo - gdk-pixbuf - glib - gtk3 - gtk-layer-shell - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland ]; + buildInputs = [ + atk + cairo + gdk-pixbuf + glib + gtk3 + gtk-layer-shell + pango + wayland + ]; preFixup = '' gappsWrapperArgs+=( @@ -73,5 +70,6 @@ rustPlatform.buildRustPackage rec { NotAShelf ]; mainProgram = "anyrun"; + platforms = lib.platforms.linux; }; } From c6398cbf92f04ae9303f4b5566682d48b4378fe8 Mon Sep 17 00:00:00 2001 From: Philip White Date: Sun, 10 Nov 2024 21:10:05 -0800 Subject: [PATCH 29/45] b2sdk: 2.5.1 -> 2.6.0 --- pkgs/development/python-modules/b2sdk/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index df3a868e2e85..1be6be4e9f13 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -10,7 +10,7 @@ packaging, pdm-backend, pyfakefs, - pytest-lazy-fixture, + pytest-lazy-fixtures, pytest-mock, pytestCheckHook, pythonOlder, @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "b2sdk"; - version = "2.5.1"; + version = "2.6.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,14 +30,11 @@ buildPythonPackage rec { owner = "Backblaze"; repo = "b2-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-oS037l5pQW/z4GX5+hb/mCUA219cGHE7lyiG8aos21k="; + hash = "sha256-nYsbcRRNh6WEelur/GvzE800Yg0h51FDhxJwBryVs4w="; }; build-system = [ pdm-backend ]; - - pythonRemoveDeps = [ "setuptools" ]; - dependencies = [ annotated-types @@ -49,8 +46,7 @@ buildPythonPackage rec { ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ]; nativeCheckInputs = [ - pyfakefs - pytest-lazy-fixture + pytest-lazy-fixtures pytest-mock pytestCheckHook tqdm From 98d7b852a55b5632fd6aead013ffe795d0a25060 Mon Sep 17 00:00:00 2001 From: Philip White Date: Wed, 13 Nov 2024 22:11:44 -0800 Subject: [PATCH 30/45] b2sdk: add maintainer pmw --- pkgs/development/python-modules/b2sdk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index 1be6be4e9f13..7ae608bd72fb 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -77,6 +77,6 @@ buildPythonPackage rec { homepage = "https://github.com/Backblaze/b2-sdk-python"; changelog = "https://github.com/Backblaze/b2-sdk-python/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ pmw ]; }; } From 51928bb6e03dd85509f66bc17ecfa507beb9256a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Nov 2024 06:31:14 +0000 Subject: [PATCH 31/45] skopeo: 1.16.1 -> 1.17.0 --- pkgs/by-name/sk/skopeo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sk/skopeo/package.nix b/pkgs/by-name/sk/skopeo/package.nix index facfb6e7c56a..953b4338f2ca 100644 --- a/pkgs/by-name/sk/skopeo/package.nix +++ b/pkgs/by-name/sk/skopeo/package.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.16.1"; + version = "1.17.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - hash = "sha256-RsFfShru4ujB+x0hju8Xju43JJk/+PAevIPjjDC5YbQ="; + hash = "sha256-IoYeCGiGOjz+8HPzYPXUWsHADtrWHvJm9YhKeMJJf0k="; }; outputs = [ "out" "man" ]; From d90f9e07a8929631144c25a67a0e6e1f1fcf3813 Mon Sep 17 00:00:00 2001 From: Nicholas Hassan Date: Thu, 14 Nov 2024 17:45:32 +1030 Subject: [PATCH 32/45] hoppscotch: 24.8.1-0 -> 24.10.2-0 --- pkgs/by-name/ho/hoppscotch/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ho/hoppscotch/package.nix b/pkgs/by-name/ho/hoppscotch/package.nix index 1484afa5a55e..e9fee197015e 100644 --- a/pkgs/by-name/ho/hoppscotch/package.nix +++ b/pkgs/by-name/ho/hoppscotch/package.nix @@ -8,22 +8,22 @@ let pname = "hoppscotch"; - version = "24.8.1-0"; + version = "24.10.2-0"; src = fetchurl { aarch64-darwin = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg"; - hash = "sha256-Tc6lQbMZHX4Wl0R3fGClRr27fFTrYTxMtAkSPCw8mrw="; + hash = "sha256-f0Wg3HHVX5NIW7Rfke52/knaGfPeZLpZb5KZkzah4GU="; }; x86_64-darwin = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg"; - hash = "sha256-c3UHntrLRoXfmz8LL3Xu8mjBtyf952/tYMFqbTyECR0="; + hash = "sha256-rSZ6F4ERWj5ElfWAXnD0vVrA2JmMKZdBeMWsr15hbGc="; }; x86_64-linux = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage"; - hash = "sha256-Aegc4kiLPtY+hlQtfYR3uztqs8Gj9fbUcAZ1XB8i1Pw="; + hash = "sha256-G4oul2nP6KaPuMs8bS9ilbipczd20fClA7hl3HqaxeQ="; }; } .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); From 643493f00fb4dc8d8fb60c5a4602aba743e729b6 Mon Sep 17 00:00:00 2001 From: aleksana Date: Thu, 14 Nov 2024 15:42:49 +0800 Subject: [PATCH 33/45] openvi: move to pkgs/by-name --- .../openvi/default.nix => by-name/op/openvi/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/editors/openvi/default.nix => by-name/op/openvi/package.nix} (100%) diff --git a/pkgs/applications/editors/openvi/default.nix b/pkgs/by-name/op/openvi/package.nix similarity index 100% rename from pkgs/applications/editors/openvi/default.nix rename to pkgs/by-name/op/openvi/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec4442b22ebe..bcc7649a6ff5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15379,8 +15379,6 @@ with pkgs; opentx = libsForQt5.callPackage ../applications/misc/opentx { }; - openvi = darwin.apple_sdk_11_0.callPackage ../applications/editors/openvi { }; - organicmaps = qt6Packages.callPackage ../applications/misc/organicmaps { }; owofetch = callPackage ../tools/misc/owofetch { From 20627e3d68570baf528f93979a32540dd832dcde Mon Sep 17 00:00:00 2001 From: aleksana Date: Thu, 14 Nov 2024 15:45:18 +0800 Subject: [PATCH 34/45] openvi: refactor; use new apple sdk pattern --- pkgs/by-name/op/openvi/package.nix | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/op/openvi/package.nix b/pkgs/by-name/op/openvi/package.nix index e361e8b4628c..59592c707546 100644 --- a/pkgs/by-name/op/openvi/package.nix +++ b/pkgs/by-name/op/openvi/package.nix @@ -1,8 +1,10 @@ -{ lib -, stdenv -, fetchFromGitHub -, ncurses -, perl +{ + lib, + stdenv, + fetchFromGitHub, + ncurses, + perl, + apple-sdk_11, }: stdenv.mkDerivation rec { @@ -16,7 +18,10 @@ stdenv.mkDerivation rec { hash = "sha256-P4w/PM9UmHmTzS9+WDK3x3MyZ7OoY2yO/Rx0vRMJuLI="; }; - buildInputs = [ ncurses perl ]; + buildInputs = [ + ncurses + perl + ] ++ lib.optionals stdenv.isDarwin [ apple-sdk_11 ]; makeFlags = [ "PREFIX=$(out)" @@ -28,12 +33,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://github.com/johnsonjh/OpenVi"; description = "Portable OpenBSD vi for UNIX systems"; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ aleksana ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ aleksana ]; mainProgram = "ovi"; }; } From f5e0032255f88592a73bfad6e4dcd43f67da16a0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 14 Nov 2024 09:54:24 +0100 Subject: [PATCH 35/45] python312Packages.lcn-frontend: 0.2.1 -> 0.2.2 Changelog: https://github.com/alengwenus/lcn-frontend/releases/tag/0.2.2 --- pkgs/development/python-modules/lcn-frontend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lcn-frontend/default.nix b/pkgs/development/python-modules/lcn-frontend/default.nix index 206f6720f634..a29c8dc712c5 100644 --- a/pkgs/development/python-modules/lcn-frontend/default.nix +++ b/pkgs/development/python-modules/lcn-frontend/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "lcn-frontend"; - version = "0.2.1"; + version = "0.2.2"; pyproject = true; src = fetchPypi { pname = "lcn_frontend"; inherit version; - hash = "sha256-GParXVKAbYI8zjBWjf7+uBCpMzLszp2nMxXhJkf4Ln4="; + hash = "sha256-D6rwFLThOCEbKYhUpuA8K+0iLYt3pqU4GHzJcr3LaAM="; }; postPatch = '' From fade592271ec71bdb79d6c7bf8f6297ba6f9714b Mon Sep 17 00:00:00 2001 From: r-vdp Date: Thu, 14 Nov 2024 09:39:05 +0000 Subject: [PATCH 36/45] niri: 0.1.10 -> 0.1.10.1 --- pkgs/by-name/ni/niri/Cargo.lock | 8 ++++---- pkgs/by-name/ni/niri/package.nix | 15 +++------------ 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/ni/niri/Cargo.lock b/pkgs/by-name/ni/niri/Cargo.lock index 3534b4e95a06..fd237aeaa6fd 100644 --- a/pkgs/by-name/ni/niri/Cargo.lock +++ b/pkgs/by-name/ni/niri/Cargo.lock @@ -2390,7 +2390,7 @@ dependencies = [ [[package]] name = "niri" -version = "0.1.10" +version = "0.1.10-1" dependencies = [ "anyhow", "approx 0.5.1", @@ -2444,7 +2444,7 @@ dependencies = [ [[package]] name = "niri-config" -version = "0.1.10" +version = "0.1.10-1" dependencies = [ "bitflags 2.6.0", "csscolorparser", @@ -2461,7 +2461,7 @@ dependencies = [ [[package]] name = "niri-ipc" -version = "0.1.10" +version = "0.1.10-1" dependencies = [ "clap", "schemars", @@ -2471,7 +2471,7 @@ dependencies = [ [[package]] name = "niri-visual-tests" -version = "0.1.10" +version = "0.1.10-1" dependencies = [ "anyhow", "gtk4", diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix index f60719785801..cf4a7c6b1433 100644 --- a/pkgs/by-name/ni/niri/package.nix +++ b/pkgs/by-name/ni/niri/package.nix @@ -4,7 +4,6 @@ dbus, eudev, fetchFromGitHub, - fetchpatch, libdisplay-info, libglvnd, libinput, @@ -26,23 +25,15 @@ rustPlatform.buildRustPackage rec { pname = "niri"; - version = "0.1.10"; + version = "0.1.10.1"; src = fetchFromGitHub { owner = "YaLTeR"; repo = "niri"; rev = "refs/tags/v${version}"; - hash = "sha256-ea15x8+AAm90aeU1zNWXzX7ZfenzQRUgORyjOdn4Uoc="; + hash = "sha256-Qjf7alRbPPERfiZsM9EMKX+HwjESky1tieh5PJIkLwE="; }; - patches = [ - # Fix scrolling not working with missing mouse config - (fetchpatch { - url = "https://github.com/YaLTeR/niri/commit/1951d2a9f262196a706f2645efb18dac3c4d6839.patch"; - hash = "sha256-P/0LMYZ4HD0iG264BMnK4sLNNLmtbefF230GyC+t6qg="; - }) - ]; - postPatch = '' patchShebangs resources/niri-session substituteInPlace resources/niri.service \ @@ -52,8 +43,8 @@ rustPlatform.buildRustPackage rec { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "smithay-0.3.0" = "sha256-nSM7LukWHO2n2eWz5ipFNkTCYDvx/VvPXnKVngJFU0U="; "libspa-0.8.0" = "sha256-kp5x5QhmgEqCrt7xDRfMFGoTK5IXOuvW2yOW02B8Ftk="; + "smithay-0.3.0" = "sha256-nSM7LukWHO2n2eWz5ipFNkTCYDvx/VvPXnKVngJFU0U="; }; }; From fbae27508f9b179f05fc88bae1f68b5c50acbb12 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 14 Nov 2024 19:10:04 +0100 Subject: [PATCH 37/45] postgresql_12: 12.20 -> 12.21 Release Notes: https://www.postgresql.org/about/news/postgresql-171-165-159-1414-1317-and-1221-released-2955/ --- pkgs/servers/sql/postgresql/12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/12.nix b/pkgs/servers/sql/postgresql/12.nix index 72e3c88301df..3b40e5cca47e 100644 --- a/pkgs/servers/sql/postgresql/12.nix +++ b/pkgs/servers/sql/postgresql/12.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "12.20"; - hash = "sha256-LVQ68wCf7H/VrzX3pwyVCF0+72tQjlF6qUk+mbFenqk="; + version = "12.21"; + hash = "sha256-bHEVUKwcx4KIZeWCPZ9Ffjva1vQyAXcWn5DkGb4MJ/I="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/testing/postgresql12/dont-use-locale-a-on-musl.patch?id=d5227c91adda59d4e7f55f13468f0314e8869174"; From b1a05d9399c3a0fea9c108ca2569d5c37a868c0c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 14 Nov 2024 19:20:16 +0100 Subject: [PATCH 38/45] postgresql_13: 13.16 -> 13.17 Release Notes: https://www.postgresql.org/about/news/postgresql-171-165-159-1414-1317-and-1221-released-2955/ --- pkgs/servers/sql/postgresql/13.nix | 4 ++-- pkgs/servers/sql/postgresql/generic.nix | 16 +++------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/sql/postgresql/13.nix b/pkgs/servers/sql/postgresql/13.nix index 1f4483ccc631..56db6b090804 100644 --- a/pkgs/servers/sql/postgresql/13.nix +++ b/pkgs/servers/sql/postgresql/13.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "13.16"; - hash = "sha256-ycu7YSnwIyggSCgGa7N4XACoXIyo/TKcKopTwfXNiGU="; + version = "13.17"; + hash = "sha256-AisKbnvDdKd37s4zcIiV17YMrgfUkrKGspaknXOV14s="; muslPatches = { disable-test-collate-icu-utf8 = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b"; diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 2562105b2411..b7564d1d7221 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -171,23 +171,13 @@ let url = "https://github.com/postgres/postgres/commit/0a883a067bd78f0ff0607afb18c4f783ac764504.patch"; hash = "sha256-F3zCaar6w6bwQDno7Tkg7ZbPJ+rhgi8/2NSvFakzQek="; })) - ] ++ lib.optionals (olderThan "17") [ + ] ++ lib.optionals (olderThan "17" && atLeast "14") [ # TODO: Remove this with the next set of minor releases - (fetchpatch ( - if atLeast "14" then { + (fetchpatch ({ url = "https://github.com/postgres/postgres/commit/b27622c90869aab63cfe22159a459c57768b0fa4.patch"; hash = "sha256-7G+BkJULhyx6nlMEjClcr2PJg6awgymZHr2JgGhXanA="; excludes = [ "doc/*" ]; - } else if atLeast "13" then { - url = "https://github.com/postgres/postgres/commit/b28b9b19bbe3410da4a805ef775e0383a66af314.patch"; - hash = "sha256-meFFskNWlcc/rv4BWo6fNR/tTFgQRgXGqTkJkoX7lHU="; - excludes = [ "doc/*" ]; - } else { - url = "https://github.com/postgres/postgres/commit/205813da4c264d80db3c3215db199cc119e18369.patch"; - hash = "sha256-L8/ns/fxTh2ayfDQXtBIKaArFhMd+v86UxVFWQdmzUw="; - excludes = [ "doc/*" ]; - }) - ) + })) ] ++ lib.optionals stdenv'.hostPlatform.isMusl ( # Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141 map fetchurl (lib.attrValues muslPatches) From cf1f7e720107fee55bf56fa7ea1c14727b0db9ac Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 14 Nov 2024 19:23:47 +0100 Subject: [PATCH 39/45] postgresql_14: 14.13 -> 14.14 Release Notes: https://www.postgresql.org/about/news/postgresql-171-165-159-1414-1317-and-1221-released-2955/ --- pkgs/servers/sql/postgresql/14.nix | 4 ++-- pkgs/servers/sql/postgresql/generic.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/14.nix b/pkgs/servers/sql/postgresql/14.nix index ed6661a474ac..02292b9a18fb 100644 --- a/pkgs/servers/sql/postgresql/14.nix +++ b/pkgs/servers/sql/postgresql/14.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "14.13"; - hash = "sha256-Wao8S0lasmqexp860KAijFHw/m+s82NN+tTRGX1hOlY="; + version = "14.14"; + hash = "sha256-hHJ/vM29Hv4B2N5kvBszCV23c60kV8787cLYJY68CdY="; muslPatches = { disable-test-collate-icu-utf8 = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index b7564d1d7221..5f1c41f26281 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -171,7 +171,7 @@ let url = "https://github.com/postgres/postgres/commit/0a883a067bd78f0ff0607afb18c4f783ac764504.patch"; hash = "sha256-F3zCaar6w6bwQDno7Tkg7ZbPJ+rhgi8/2NSvFakzQek="; })) - ] ++ lib.optionals (olderThan "17" && atLeast "14") [ + ] ++ lib.optionals (olderThan "17" && atLeast "15") [ # TODO: Remove this with the next set of minor releases (fetchpatch ({ url = "https://github.com/postgres/postgres/commit/b27622c90869aab63cfe22159a459c57768b0fa4.patch"; From 9dc6733018133e469254ad4f76e76f4360bf56f1 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 14 Nov 2024 19:26:41 +0100 Subject: [PATCH 40/45] postgresql_15: 15.8 -> 15.9 Release Notes: https://www.postgresql.org/about/news/postgresql-171-165-159-1414-1317-and-1221-released-2955/ --- pkgs/servers/sql/postgresql/15.nix | 4 ++-- pkgs/servers/sql/postgresql/generic.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/15.nix b/pkgs/servers/sql/postgresql/15.nix index 5ede047dc2b0..85a128fbfb13 100644 --- a/pkgs/servers/sql/postgresql/15.nix +++ b/pkgs/servers/sql/postgresql/15.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "15.8"; - hash = "sha256-RANRX5pp7rPv68mPMLjGlhIr/fiV6Ss7I/W452nty2o="; + version = "15.9"; + hash = "sha256-dPLUVlA18M9ynssFmUn6rxECy9k3WbNZgi+Y+CGYx4M="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql15/dont-use-locale-a-on-musl.patch?id=f424e934e6d076c4ae065ce45e734aa283eecb9c"; diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 5f1c41f26281..6f53fa9031e0 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -171,7 +171,7 @@ let url = "https://github.com/postgres/postgres/commit/0a883a067bd78f0ff0607afb18c4f783ac764504.patch"; hash = "sha256-F3zCaar6w6bwQDno7Tkg7ZbPJ+rhgi8/2NSvFakzQek="; })) - ] ++ lib.optionals (olderThan "17" && atLeast "15") [ + ] ++ lib.optionals (olderThan "17" && atLeast "16") [ # TODO: Remove this with the next set of minor releases (fetchpatch ({ url = "https://github.com/postgres/postgres/commit/b27622c90869aab63cfe22159a459c57768b0fa4.patch"; From 69b07f5afee6309d224679ed6d9b4c968c8c26ad Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Thu, 14 Nov 2024 19:54:14 +0100 Subject: [PATCH 41/45] discord: various updates (#355721) * discord-ptb: 0.0.114 -> 0.0.115 Signed-off-by: Sefa Eyeoglu * discord-canary: 0.0.511 -> 0.0.518 Signed-off-by: Sefa Eyeoglu * discord-development: 0.0.42 -> 0.0.45 Signed-off-by: Sefa Eyeoglu * discord: 0.0.324 -> 0.0.325 Signed-off-by: Sefa Eyeoglu * discord-ptb: 0.0.144 -> 0.0.145 Signed-off-by: Sefa Eyeoglu * discord-canary: 0.0.620 -> 0.0.627 Signed-off-by: Sefa Eyeoglu * discord-development: 0.0.63 -> 0.0.64 Signed-off-by: Sefa Eyeoglu --------- Signed-off-by: Sefa Eyeoglu --- .../instant-messengers/discord/default.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 9d1772a0b731..b02357ccca0d 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -10,16 +10,16 @@ let if stdenv.hostPlatform.isLinux then { stable = "0.0.74"; - ptb = "0.0.114"; - canary = "0.0.511"; - development = "0.0.42"; + ptb = "0.0.115"; + canary = "0.0.518"; + development = "0.0.45"; } else { - stable = "0.0.324"; - ptb = "0.0.144"; - canary = "0.0.620"; - development = "0.0.63"; + stable = "0.0.325"; + ptb = "0.0.145"; + canary = "0.0.627"; + development = "0.0.64"; }; version = versions.${branch}; srcs = rec { @@ -30,33 +30,33 @@ let }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-fdpG9V4EJaARSJA9XmW+Zq6exPaFMJ/FWhzwgarDIpI="; + hash = "sha256-N8h6z5z9txCha8P/d0ekSsYufPXswFa+5Pra3/p8Bng="; }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-srjYJFVM1UVpkB+koqrZfwgRAWpa7s8Arq2DnAFuaKs="; + hash = "sha256-yjyYU15f6rIWYhTL8qXlIO8XN1ClK2QuFujM1DEHH+I="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-HZdodWwczgxaGgal5gfr6NQlquf4ZO//QMVcebxQG7s="; + hash = "sha256-N5vlw6p+kvb2nYuIUF3YJyKgi072Uo1q1UEddIh/d9c="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-Q/PWTBTnmdNeZV+InLQ3nSpETYF3rzTq9nxEh9HEOWY="; + hash = "sha256-e5e9hSDDr88W18fQBxXASOTIfrhcsfjS+E9V2GgoZ38="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-Xv8TPzfK1gOLG57F9gtt4PvwkCqjDQjYJmKfyNIkEZY="; + hash = "sha256-11eIKV3DCmsbyqwQcisWDaLJoGK3f+apO6Q+UA9g1/M="; }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-6rBDZPVYxS3q328d2T9LOs0DUirPbMg2GKDacCSsOG4="; + hash = "sha256-aLvTEtfFvKHWTFvz2Q8Qy8K7Z7Ic9YLKJ4nDD+PG0Ec="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-E1qQUnwemS6SIHeO1BBifrCu706ldZH18isR7+nGNRU="; + hash = "sha256-2yiTjpx+OEkxLHy8M3cSqdMD+UHm8B5/KHCp7KvSlc0="; }; }; aarch64-darwin = x86_64-darwin; From 8e48064d55aacea8ce03b1c9e705c700d783f5d4 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 14 Nov 2024 19:31:37 +0100 Subject: [PATCH 42/45] postgresql_17: 17.0 -> 17.1 Release Notes: https://www.postgresql.org/about/news/postgresql-171-165-159-1414-1317-and-1221-released-2955/ --- pkgs/servers/sql/postgresql/17.nix | 12 ++++++++---- pkgs/servers/sql/postgresql/generic.nix | 12 ------------ 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/pkgs/servers/sql/postgresql/17.nix b/pkgs/servers/sql/postgresql/17.nix index 5d8d8cd693c2..07335b44570b 100644 --- a/pkgs/servers/sql/postgresql/17.nix +++ b/pkgs/servers/sql/postgresql/17.nix @@ -1,6 +1,10 @@ import ./generic.nix { - version = "17.0"; - hash = "sha256-fidhMcD91rYliNutmzuyS4w0mNUAkyjbpZrxboGRCd4="; - # TODO: Add dont-use-locale-a-on-musl.patch once Alpine Linux has PostgreSQL 17. - # MR in: https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/72853 + version = "17.1"; + hash = "sha256-eEnbdO9qhVXQcj+H6BU5MBQi+pyOnyHM5h/cFOkZnc0="; + muslPatches = { + dont-use-locale-a = { + url = "https://git.alpinelinux.org/aports/plain/main/postgresql17/dont-use-locale-a-on-musl.patch?id=d69ead2c87230118ae7f72cef7d761e761e1f37e"; + hash = "sha256-6zjz3OpMx4qTETdezwZxSJPPdOvhCNu9nXvAaU9SwH8="; + }; + }; } diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 6f53fa9031e0..546dbf1e284c 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -165,12 +165,6 @@ let src = ./patches/locale-binary-path.patch; locale = "${if stdenv.hostPlatform.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale"; }) - ] ++ lib.optionals (stdenv'.hostPlatform.isDarwin && atLeast "17") [ - # TODO: Remove this with the next set of minor releases - (fetchpatch ({ - url = "https://github.com/postgres/postgres/commit/0a883a067bd78f0ff0607afb18c4f783ac764504.patch"; - hash = "sha256-F3zCaar6w6bwQDno7Tkg7ZbPJ+rhgi8/2NSvFakzQek="; - })) ] ++ lib.optionals (olderThan "17" && atLeast "16") [ # TODO: Remove this with the next set of minor releases (fetchpatch ({ @@ -185,12 +179,6 @@ let (if atLeast "13" then ./patches/socketdir-in-run-13+.patch else ./patches/socketdir-in-run.patch) ] ++ lib.optionals (stdenv'.hostPlatform.isDarwin && olderThan "16") [ ./patches/export-dynamic-darwin-15-.patch - ] ++ lib.optionals (atLeast "17") [ - # Fix flaky test, https://www.postgresql.org/message-id/ba8e1bc0-8a99-45b7-8397-3f2e94415e03@suse.de - (fetchpatch { - url = "https://github.com/postgres/postgres/commit/a358019159de68d4f045cbb5d89c8c8c2e96e483.patch"; - hash = "sha256-9joQZo93oUTp6CrcGnhj7o+Mrbj/KCWwwGUc9KAst+s="; - }) ]; installTargets = [ "install-world" ]; From 2a79402b1e5be29cf2548229911ad3bdf1aa982d Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Mon, 11 Nov 2024 17:00:40 +0100 Subject: [PATCH 43/45] nixos/k3s: use same k3s package in multi-node test The test previously violated the Kubernetes version skew policy by deploying a kubelet of hte most recent version in a cluster with an older apiserver. --- nixos/tests/k3s/multi-node.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/k3s/multi-node.nix b/nixos/tests/k3s/multi-node.nix index 58b98b2a1853..ff9774b15f15 100644 --- a/nixos/tests/k3s/multi-node.nix +++ b/nixos/tests/k3s/multi-node.nix @@ -116,6 +116,7 @@ import ../make-test-python.nix ( services.k3s = { inherit tokenFile; enable = true; + package = k3s; serverAddr = "https://192.168.1.1:6443"; clusterInit = false; extraFlags = builtins.toString [ @@ -161,6 +162,7 @@ import ../make-test-python.nix ( inherit tokenFile; enable = true; role = "agent"; + package = k3s; serverAddr = "https://192.168.1.3:6443"; extraFlags = lib.concatStringsSep " " [ "--pause-image" From 19933008229a9371df3234842ac855e5db8a186f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 14 Nov 2024 06:22:56 +0000 Subject: [PATCH 44/45] warzone2100: 4.5.4 -> 4.5.5 Changes: https://github.com/Warzone2100/warzone2100/blob/4.5.5/ChangeLog --- pkgs/by-name/wa/warzone2100/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/warzone2100/package.nix b/pkgs/by-name/wa/warzone2100/package.nix index e7377243ab3d..8f860afcb344 100644 --- a/pkgs/by-name/wa/warzone2100/package.nix +++ b/pkgs/by-name/wa/warzone2100/package.nix @@ -46,11 +46,11 @@ in stdenv.mkDerivation (finalAttrs: { inherit pname; - version = "4.5.4"; + version = "4.5.5"; src = fetchurl { url = "mirror://sourceforge/project/warzone2100/releases/${finalAttrs.version}/warzone2100_src.tar.xz"; - hash = "sha256-v7Odn5UJwNxdr6Pm959VgtdkFJYpN6e9f30bVXqIr8I="; + hash = "sha256-B/YbrnIWh+3rYtpId+hQMKA6BTpZPWRRlPxld44EgP8="; }; buildInputs = [ From 362f26d024667da9a6ec97b0d33974b7a905a1b6 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 14 Nov 2024 23:29:38 +0100 Subject: [PATCH 45/45] firefox{,-beta,-devedition,-esr-128}-unwrapped: fix location of update script --- .../networking/browsers/firefox/packages/firefox-beta.nix | 2 +- .../networking/browsers/firefox/packages/firefox-devedition.nix | 2 +- .../networking/browsers/firefox/packages/firefox-esr-128.nix | 2 +- .../networking/browsers/firefox/packages/firefox.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix index a2226073fe21..fdf8ac09f98d 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix @@ -33,7 +33,7 @@ buildMozillaMach rec { tests = { inherit (nixosTests) firefox-beta; }; - updateScript = callPackage ./update.nix { + updateScript = callPackage ../update.nix { attrPath = "firefox-beta-unwrapped"; versionSuffix = "b[0-9]*"; }; diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix index 0497854f56b4..a8781e765841 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix @@ -35,7 +35,7 @@ buildMozillaMach rec { tests = { inherit (nixosTests) firefox-devedition; }; - updateScript = callPackage ./update.nix { + updateScript = callPackage ../update.nix { attrPath = "firefox-devedition-unwrapped"; versionSuffix = "b[0-9]*"; baseUrl = "https://archive.mozilla.org/pub/devedition/releases/"; diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix index 3fa5c6afc375..2fec0fa28714 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix @@ -32,7 +32,7 @@ buildMozillaMach rec { tests = { inherit (nixosTests) firefox-esr-128; }; - updateScript = callPackage ./update.nix { + updateScript = callPackage ../update.nix { attrPath = "firefox-esr-128-unwrapped"; versionPrefix = "128"; versionSuffix = "esr"; diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix index 41da0ebdfce1..b37e1737e779 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix @@ -35,7 +35,7 @@ buildMozillaMach rec { tests = { inherit (nixosTests) firefox; }; - updateScript = callPackage ./update.nix { + updateScript = callPackage ../update.nix { attrPath = "firefox-unwrapped"; }; }