From b153fe260e0147bf8f31347619f8625161de2ff7 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Wed, 13 Aug 2025 21:58:37 -0400 Subject: [PATCH 01/73] nixos/frigate: Add preCheckConfig Without this, many use cases will fail due to missing env vars for secrets. This is inspired by e.g. `networking.nftables.preCheckRuleset`. --- nixos/modules/services/video/frigate.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/modules/services/video/frigate.nix b/nixos/modules/services/video/frigate.nix index 08fc665cc2d7..fd63a82b3e8b 100644 --- a/nixos/modules/services/video/frigate.nix +++ b/nixos/modules/services/video/frigate.nix @@ -53,6 +53,7 @@ let cp ${configFileUnchecked} $out export CONFIG_FILE=$out export PYTHONPATH=${cfg.package.pythonPath} + ${cfg.preCheckConfig} ${cfg.package.python.interpreter} -m frigate --validate-config || error ''; configFile = if cfg.checkConfig then configFileChecked else configFileUnchecked; @@ -204,6 +205,16 @@ in ''; }; + preCheckConfig = mkOption { + type = types.lines; + default = ""; + description = '' + This script gets run before the config is checked. It can be used to, + e.g., set environment variables needed or transform the config + (available as `$out`) to make it checkable in the sandbox. + ''; + }; + settings = mkOption { type = submodule { freeformType = format.type; From 36aa1d3696c1b736d349379c26bb35f68fecb2e2 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Wed, 3 Sep 2025 01:21:11 +0100 Subject: [PATCH 02/73] hunspellDicts.en*: 2018.04.16 -> 2020.12.07 Update the English language word lists from version 2018.04.16 to 2020.12.07. Upstream Release: https://github.com/en-wl/wordlist/releases/tag/rel-2020.12.07 Mirror: https://sourceforge.net/projects/wordlist/files/speller/2020.12.07/ Closes: https://github.com/NixOS/nixpkgs/issues/302305. --- pkgs/by-name/hu/hunspell/dictionaries.nix | 38 +++++++++++------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/hu/hunspell/dictionaries.nix b/pkgs/by-name/hu/hunspell/dictionaries.nix index 63c24cabe9bb..e173ede54d7c 100644 --- a/pkgs/by-name/hu/hunspell/dictionaries.nix +++ b/pkgs/by-name/hu/hunspell/dictionaries.nix @@ -194,7 +194,7 @@ let }: mkDict rec { inherit src srcFileName dictFileName; - version = "2018.04.16"; + version = "2020.12.07"; pname = "hunspell-dict-${shortName}-wordlist"; srcReadmeFile = "README_" + srcFileName + ".txt"; readmeFile = "README_" + dictFileName + ".txt"; @@ -376,8 +376,8 @@ rec { srcFileName = "en_US"; dictFileName = "en_US"; src = fetchurl { - url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_US-2018.04.16.zip"; - sha256 = "18hbncvqnckzqarrmnzk58plymjqyi93k4qj98fac5mr71jbmzaf"; + url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_US-2020.12.07.zip"; + hash = "sha256-YWNIrWRacW2RyKZkUGXnEPFendo//vYM337IpOJ5da8="; }; }; @@ -388,8 +388,8 @@ rec { srcFileName = "en_US-large"; dictFileName = "en_US"; src = fetchurl { - url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_US-large-2018.04.16.zip"; - sha256 = "1xm9jgqbivp5cb78ykjxg47vzq1yqj82l7r4q5cjpivrv99s49qc"; + url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_US-large-2020.12.07.zip"; + hash = "sha256-WpNhcxL/t8zMVMj9ij5nEusOnNSmnx01i4LrTTUgcrc="; }; }; @@ -400,8 +400,8 @@ rec { srcFileName = "en_CA"; dictFileName = "en_CA"; src = fetchurl { - url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_CA-2018.04.16.zip"; - sha256 = "06yf3s7y1215jmikbs18cn4j8a13csp4763w3jfgah8zlim6vc47"; + url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_CA-2020.12.07.zip"; + hash = "sha256-/2uR5O12g0jGGufDJuhIBZgQ+kOl1gHfaz9FrZwO9b8="; }; }; @@ -412,8 +412,8 @@ rec { srcFileName = "en_CA-large"; dictFileName = "en_CA"; src = fetchurl { - url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_CA-large-2018.04.16.zip"; - sha256 = "1200xxyvv6ni8nk52v3059c367817vnrkm0cdh38rhiigb5flfha"; + url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_CA-large-2020.12.07.zip"; + hash = "sha256-RjRIkIb2QDeveqpLyo1s4X90QrZiYylW5d1MCU+Hvuo="; }; }; @@ -424,8 +424,8 @@ rec { srcFileName = "en_AU"; dictFileName = "en_AU"; src = fetchurl { - url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_AU-2018.04.16.zip"; - sha256 = "1kp06npl1kd05mm9r52cg2iwc13x02zwqgpibdw15b6x43agg6f5"; + url = "mirror://sourceforge/wordlist/speller/2020.12.07/hunspell-en_AU-2020.12.07.zip"; + hash = "sha256-3CBVfEiuGXl4Tnn65vll6ZnI2y6aD4RjSOcAV/znglQ="; }; }; @@ -436,8 +436,8 @@ rec { srcFileName = "en_AU-large"; dictFileName = "en_AU"; src = fetchurl { - url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_AU-large-2018.04.16.zip"; - sha256 = "14l1w4dpk0k1js2wwq5ilfil89ni8cigph95n1rh6xi4lzxj7h6g"; + url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_AU-large-2020.12.07.zip"; + hash = "sha256-SW5HeuewGMe+Ng5gqqL5jn8cl8eJLfk7JFcRJCTGHjE="; }; }; @@ -448,8 +448,8 @@ rec { srcFileName = "en_GB-ise"; dictFileName = "en_GB"; src = fetchurl { - url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_GB-ise-2018.04.16.zip"; - sha256 = "0ylg1zvfvsawamymcc9ivrqcb9qhlpgpnizm076xc56jz554xc2l"; + url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_GB-ise-2020.12.07.zip"; + hash = "sha256-LO1LLsnRiMO1QNu3W1FD9luZDa8XQ3dYcm/x+rXwGtM="; }; }; @@ -460,8 +460,8 @@ rec { srcFileName = "en_GB-ize"; dictFileName = "en_GB"; src = fetchurl { - url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_GB-ize-2018.04.16.zip"; - sha256 = "1rmwy6sxmd400cwjf58az6g14sq28p18f5mlq8ybg8y33q9m42ps"; + url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_GB-ize-2020.12.07.zip"; + hash = "sha256-hpt0nsmAW4fNBfQzB/IJmGUTMbWqWwRQZBOvDC3y8jE="; }; }; @@ -472,8 +472,8 @@ rec { srcFileName = "en_GB-large"; dictFileName = "en_GB"; src = fetchurl { - url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_GB-large-2018.04.16.zip"; - sha256 = "1y4d7x5vvi1qh1s3i09m0vvqrpdzzqhsdngr8nsh7hc5bnlm37mi"; + url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_GB-large-2020.12.07.zip"; + hash = "sha256-+GvrdyKMc3yMaUaP/E6gZ1EocieIabmKXT7BjxJRB70="; }; }; From 6e01edcab52d2ef0d5755f6c5d5350046a780cf4 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 4 Nov 2025 11:12:00 +0100 Subject: [PATCH 03/73] services.physlock: lock on suspend-then-hibernate fixes https://github.com/NixOS/nixpkgs/issues/178478 --- nixos/modules/services/security/physlock.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/security/physlock.nix b/nixos/modules/services/security/physlock.nix index a5674f75f1bf..04f86fbe0110 100644 --- a/nixos/modules/services/security/physlock.nix +++ b/nixos/modules/services/security/physlock.nix @@ -121,6 +121,7 @@ in wantedBy = lib.optional cfg.lockOn.suspend "suspend.target" ++ lib.optional cfg.lockOn.hibernate "hibernate.target" + ++ lib.optional (cfg.lockOn.hibernate || cfg.lockOn.suspend) "suspend-then-hibernate.target" ++ cfg.lockOn.extraTargets; before = lib.optional cfg.lockOn.suspend "systemd-suspend.service" From 156a7dd5342df2801bd03a80c63e825819a0e000 Mon Sep 17 00:00:00 2001 From: Daste Date: Wed, 5 Nov 2025 20:20:39 +0100 Subject: [PATCH 04/73] prisma,prisma-engines: 6.18.0 -> 6.19.0 --- pkgs/by-name/pr/prisma-engines/package.nix | 6 +++--- pkgs/by-name/pr/prisma/package.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/pr/prisma-engines/package.nix b/pkgs/by-name/pr/prisma-engines/package.nix index 94be72fc5897..c68e1c00e6fc 100644 --- a/pkgs/by-name/pr/prisma-engines/package.nix +++ b/pkgs/by-name/pr/prisma-engines/package.nix @@ -13,16 +13,16 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "6.18.0"; + version = "6.19.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - hash = "sha256-p198o8ON5mGPCxK+gE0mW+JVyQlNsCsqwa8D4MNBkpA="; + hash = "sha256-icFgoKIrr3fGSVmSczlMJiT5KSb746kVldtrk+Q0wW8="; }; - cargoHash = "sha256-bNl04GoxLX+B8dPgqWL/VarreBVebjwNDwQjtQcJnsg="; + cargoHash = "sha256-PgCfBcmK9RCA5BMacJ5oYEpo2DnBKx2xPbdLb79yCCY="; # Use system openssl. OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/pr/prisma/package.nix b/pkgs/by-name/pr/prisma/package.nix index f30a54c35336..a81103a276f1 100644 --- a/pkgs/by-name/pr/prisma/package.nix +++ b/pkgs/by-name/pr/prisma/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "prisma"; - version = "6.18.0"; + version = "6.19.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma"; rev = finalAttrs.version; - hash = "sha256-+WRWa59HlHN2CsYZfr/ptdW3iOuOPfDil8sLR5dWRA4="; + hash = "sha256-lFPAu296cQMDnEcLTReSHuLuOz13kd7n0GV+ifcX+lQ="; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-Et1UiZO2zyw9FHW0OuYK7AMfhIy5j7Q7GDQjaL6gjyg="; + hash = "sha256-9v30vhclD+sPcui/VG8dwaC8XGU6QFs/Gu8rjjoQy/w="; }; patchPhase = '' From 728441c0a7ea387e1861e907b43de880a1939972 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Nov 2025 10:13:37 +0000 Subject: [PATCH 05/73] apacheHttpdPackages.mod_python: 3.5.0.4 -> 3.5.0.5 --- pkgs/servers/http/apache-modules/mod_python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index e560cc75512c..87b328df0517 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mod_python"; - version = "3.5.0.4"; + version = "3.5.0.5"; src = fetchFromGitHub { owner = "grisha"; repo = "mod_python"; tag = finalAttrs.version; - hash = "sha256-bZ0w61+0If70KD3UW24JllY6vD0vQX2C7FssYG1YLPI="; + hash = "sha256-7nH0AwSaXoWvGMDgctx+HykC0Q87pU/nNSUammEj/wQ="; }; patches = [ ./install.patch ]; From 56bfba6dea5566822179994d54fca49f83912013 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 19 Nov 2025 15:38:04 -0500 Subject: [PATCH 06/73] vault: 1.20.4 -> 1.21.1 Diff: https://github.com/hashicorp/vault/compare/v1.20.4...v1.21.1 Changelog: https://github.com/hashicorp/vault/blob/v1.21.1/CHANGELOG.md --- pkgs/by-name/va/vault/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/va/vault/package.nix b/pkgs/by-name/va/vault/package.nix index 020054b5b8b8..e96b90849581 100644 --- a/pkgs/by-name/va/vault/package.nix +++ b/pkgs/by-name/va/vault/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "vault"; - version = "1.20.4"; + version = "1.21.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - hash = "sha256-GZ+/NzOjcKTYOq4HajKGD68RNxIdXxfLo/pAewaZ8F8="; + hash = "sha256-Vkn3l4blbUhT2D1ParNacVwwt/aDQlm12peoHvPNbk4="; }; - vendorHash = "sha256-mhT5s1nIdX/57TDEaWwbni0E7DX0W0WwwvrSr7L66hI="; + vendorHash = "sha256-8IK8M328dXWk+NHjK7d+Zj8ltLQqJOofvLDfDieDFnk="; proxyVendor = true; From 6c38ed9a633d486ad4a53cf92581656a5bc112a8 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 19 Nov 2025 16:03:31 -0500 Subject: [PATCH 07/73] vault-bin: 1.20.4 -> 1.21.1 --- pkgs/by-name/va/vault-bin/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/va/vault-bin/package.nix b/pkgs/by-name/va/vault-bin/package.nix index d9ea8d8c3d15..f4198f586f84 100644 --- a/pkgs/by-name/va/vault-bin/package.nix +++ b/pkgs/by-name/va/vault-bin/package.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "vault-bin"; - version = "1.20.4"; + version = "1.21.1"; src = let @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; hash = selectSystem { - x86_64-linux = "sha256-n687yeuM1+1m2TfgT3AaMBOfE8cqbbG0Gq9Imb9olno="; - aarch64-linux = "sha256-+MRuCMkskd29xaoAjj42Re1eRra3SKMiciUOG9HwsN4="; - i686-linux = "sha256-L1zYFc2nam/pFq/groxeWvyK+ujHOHqvUkR96hPC7jU="; - x86_64-darwin = "sha256-t0j3Wr6IrFfN6FcZ3ZF+9qYjR/K6R8o06ebLJohr54w="; - aarch64-darwin = "sha256-F/M9ULCkfArlBcLqfR8i1gVcspfe8XEag6etdFXQmqA="; + x86_64-linux = "sha256-k+dHuEXjaWDz5TMf0HLdVD0MbvA2Z9+/wSkUp5Yc8rc="; + aarch64-linux = "sha256-Ss07jlpVXeWyanXqTZK7uxmI6IYcuEfNKkw8t3oqM+o="; + i686-linux = "sha256-hfYJmYHna4LucvMIn/6lf1R2DabISF9TqBYlIcjkrxc="; + x86_64-darwin = "sha256-8FwwDMuer0TRobS0+/yECZfWydnt7AYOzpv2gIPLEuI="; + aarch64-darwin = "sha256-3K3TI2CzDqxxEC5jYFLejMDB08SzxScbqmIjjvU7kYQ="; }; in fetchzip { From 43fb5d07729fe093e3069a82fe0a73ba9e2fce50 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Thu, 27 Nov 2025 20:03:34 +0100 Subject: [PATCH 08/73] racket, racket-minimal: 8.18 -> 9.0 Changes: https://blog.racket-lang.org/2025/11/racket-v9-0.html --- pkgs/by-name/ra/racket/manifest.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ra/racket/manifest.json b/pkgs/by-name/ra/racket/manifest.json index 39447754c36f..28f29922de37 100644 --- a/pkgs/by-name/ra/racket/manifest.json +++ b/pkgs/by-name/ra/racket/manifest.json @@ -1,11 +1,11 @@ { - "version": "8.18", + "version": "9.0", "full": { - "filename": "racket-8.18-src.tgz", - "sha256": "65477c71ec1a978a6ee4db582b9b47b1a488029d7a42e358906de154a6e5905c" + "filename": "racket-9.0-src.tgz", + "sha256": "a05f54103789477da8e6facabb777049477c4c3998c5865c0d7ce285d3577411" }, "minimal": { - "filename": "racket-minimal-8.18-src.tgz", - "sha256": "24b9cf8365254b43bac308192c782edfbd86363df1322c4e063b797ed0f7db66" + "filename": "racket-minimal-9.0-src.tgz", + "sha256": "2c9dc012acbd980e10c60db5071e1e4597e6d12469832a80a44beab2b62ec3fe" } } From 89a608b53eb08972ee51545c12c0798d9e2f4ef9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Dec 2025 13:16:59 +0000 Subject: [PATCH 09/73] davinci-resolve: 20.2.3 -> 20.3 --- pkgs/by-name/da/davinci-resolve/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/da/davinci-resolve/package.nix b/pkgs/by-name/da/davinci-resolve/package.nix index 976d4ce7cdb9..0745cf933138 100644 --- a/pkgs/by-name/da/davinci-resolve/package.nix +++ b/pkgs/by-name/da/davinci-resolve/package.nix @@ -34,7 +34,7 @@ let davinci = ( stdenv.mkDerivation rec { pname = "davinci-resolve${lib.optionalString studioVariant "-studio"}"; - version = "20.2.3"; + version = "20.3"; nativeBuildInputs = [ appimageTools.appimage-exec @@ -56,9 +56,9 @@ let outputHashAlgo = "sha256"; outputHash = if studioVariant then - "sha256-5wt5bPJez3FiRzJrC8pzbfqa6BrYMsJJptXBC+ZwzlE=" + "sha256-NaWnlFna/NaYNb4aaO++598mlpMsPFGL6nlXREBSAlI=" else - "sha256-puw87PuynP2P5VfoJ+7aQATal07orQICPwx2oNgj1eQ="; + "sha256-hVliyg6BBkY83INF7ZbO8myXX+FjC4RwgipfOH5cFAs="; impureEnvVars = lib.fetchers.proxyImpureEnvVars; From cd9e9868bffca38280ae0534c1e5d9ea1f2a0b61 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Thu, 4 Dec 2025 13:31:12 +0200 Subject: [PATCH 10/73] hyprland: update env variables, add muparser dep --- pkgs/by-name/hy/hyprland/package.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index 4c0c200850e2..3fc9a173302d 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -27,6 +27,7 @@ libuuid, libxkbcommon, libgbm, + muparser, pango, pciutils, pkgconf, @@ -109,14 +110,16 @@ customStdenv.mkDerivation (finalAttrs: { sed -i "s#@PREFIX@/##g" hyprland.pc.in ''; - # variables used by generateVersion.sh script, and shown in `hyprctl version` - BRANCH = info.branch; - COMMITS = info.commit_hash; - DATE = info.date; - DIRTY = ""; - HASH = info.commit_hash; - MESSAGE = info.commit_message; - TAG = info.tag; + # variables used by CMake, and shown in `hyprctl version` + env = { + GIT_BRANCH = info.branch; + GIT_COMMITS = info.commit_hash; + GIT_COMMIT_DATE = info.date; + GIT_DIRTY = "clean"; + GIT_COMMIT_HASH = info.commit_hash; + GIT_COMMIT_MESSAGE = info.commit_message; + GIT_TAG = info.tag; + }; depsBuildBuild = [ # to find wayland-scanner when cross-compiling @@ -157,6 +160,7 @@ customStdenv.mkDerivation (finalAttrs: { libuuid libxkbcommon libgbm + muparser pango pciutils re2 From 8e06f2d4f87c844fb1609a9ba1e2c935c46359a7 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 5 Dec 2025 12:59:49 +0000 Subject: [PATCH 11/73] wasm-bindgen-cli_0_2_105: init at 0.2.105 --- .../wa/wasm-bindgen-cli_0_2_105/package.nix | 19 +++++++++++++++++++ pkgs/top-level/aliases.nix | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/wa/wasm-bindgen-cli_0_2_105/package.nix diff --git a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_105/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_105/package.nix new file mode 100644 index 000000000000..ade720b1726c --- /dev/null +++ b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_105/package.nix @@ -0,0 +1,19 @@ +{ + buildWasmBindgenCli, + fetchCrate, + rustPlatform, +}: + +buildWasmBindgenCli rec { + src = fetchCrate { + pname = "wasm-bindgen-cli"; + version = "0.2.105"; + hash = "sha256-zLPFFgnqAWq5R2KkaTGAYqVQswfBEYm9x3OPjx8DJRY="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + inherit (src) pname version; + hash = "sha256-a2X9bzwnMWNt0fTf30qAiJ4noal/ET1jEtf5fBFj5OU="; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8907b04285ff..bfccc170b781 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1658,7 +1658,7 @@ mapAliases { warmux = throw "'warmux' has been removed as it is unmaintained and broken"; # Added 2025-11-03 warsow = throw "'warsow' has been removed as it is unmaintained and is broken"; # Added 2025-10-09 warsow-engine = throw "'warsow-engine' has been removed as it is unmaintained and is broken"; # Added 2025-10-09 - wasm-bindgen-cli = wasm-bindgen-cli_0_2_104; + wasm-bindgen-cli = wasm-bindgen-cli_0_2_105; wasm-strip = throw "'wasm-strip' has been removed due to upstream deprecation. Use 'wabt' instead."; # Added 2025-11-06 wavebox = throw "'wavebox' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-24 wavm = throw "wavm has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10 From 4ce58f5726aad5c59cb57fa14179e7adc6402850 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 5 Dec 2025 13:00:19 +0000 Subject: [PATCH 12/73] tuliprox: fix bindgen cli version --- pkgs/by-name/tu/tuliprox/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tu/tuliprox/package.nix b/pkgs/by-name/tu/tuliprox/package.nix index 5a1f1e47c853..0b5cab8ec578 100644 --- a/pkgs/by-name/tu/tuliprox/package.nix +++ b/pkgs/by-name/tu/tuliprox/package.nix @@ -7,7 +7,7 @@ ffmpeg, which, rustc, - wasm-bindgen-cli_0_2_104, + wasm-bindgen-cli_0_2_105, trunk, binaryen, dart-sass, @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { pkg-config ffmpeg which - wasm-bindgen-cli_0_2_104 + wasm-bindgen-cli_0_2_105 trunk rustc.llvmPackages.lld binaryen From 87a3fc44a63b302fa1f2af12a3e97afbb1253586 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 6 Dec 2025 13:13:25 +0100 Subject: [PATCH 13/73] unicode-idna: 16.0.0 -> 17.0.0 --- pkgs/by-name/un/unicode-idna/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/un/unicode-idna/package.nix b/pkgs/by-name/un/unicode-idna/package.nix index a10c85849d5c..0f81cdfc380e 100644 --- a/pkgs/by-name/un/unicode-idna/package.nix +++ b/pkgs/by-name/un/unicode-idna/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "unicode-idna"; - version = "16.0.0"; + version = "17.0.0"; src = fetchurl { - url = "https://www.unicode.org/Public/idna/${finalAttrs.version}/IdnaMappingTable.txt"; - hash = "sha256-bbLvTtNfOz3nTrwuAEBKlgf3bUmfV2uNQEPPFPHtF1w="; + url = "https://www.unicode.org/Public/${finalAttrs.version}/idna/IdnaMappingTable.txt"; + hash = "sha256-h/BVBdwCb9sr/xYTK9xoqAFGdYNogqmisYRFQK0744I="; }; dontUnpack = true; From eb7fc22ff9337cadd1bcf3eaa5d65e82fc12c1d9 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Thu, 4 Dec 2025 13:35:56 +0200 Subject: [PATCH 14/73] hyprland: use cmake build --- pkgs/by-name/hy/hyprland/package.nix | 30 ++++++++++++---------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index 3fc9a173302d..d55c28a961e4 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -63,8 +63,7 @@ let inherit (lib.strings) makeBinPath optionalString - mesonBool - mesonEnable + cmakeBool ; inherit (lib.trivial) importJSON @@ -129,12 +128,13 @@ customStdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ hyprwayland-scanner makeWrapper + cmake + # meson + ninja are used to build the hyprland-protocols submodule meson ninja pkg-config wayland-scanner # for udis86 - cmake python3 ]; @@ -181,24 +181,20 @@ customStdenv.mkDerivation (finalAttrs: { (optionals withSystemd [ systemd ]) ]; - mesonBuildType = if debug then "debug" else "release"; + cmakeBuildType = if debug then "Debug" else "RelWithDebInfo"; dontStrip = debug; strictDeps = true; - mesonFlags = concatLists [ - (mapAttrsToList mesonEnable { - "xwayland" = enableXWayland; - "systemd" = withSystemd; - "uwsm" = false; - "hyprpm" = false; - }) - (mapAttrsToList mesonBool { - # PCH provides no benefits when building with Nix - "b_pch" = false; - "tracy_enable" = false; - }) - ]; + cmakeFlags = mapAttrsToList cmakeBool { + "NO_XWAYLAND" = !enableXWayland; + "NO_SYSTEMD" = !withSystemd; + "CMAKE_DISABLE_PRECOMPILE_HEADERS" = true; + "NO_UWSM" = true; + "NO_HYPRPM" = true; + "TRACY_ENABLE" = false; + "BUILD_HYPRTESTER" = true; + }; postInstall = '' ${optionalString wrapRuntimeDeps '' From 0762f6a0295798046da7e1798992f6d18e647cbc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Dec 2025 20:57:12 +0000 Subject: [PATCH 15/73] cargo-leptos: 0.2.42 -> 0.3.1 --- pkgs/by-name/ca/cargo-leptos/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-leptos/package.nix b/pkgs/by-name/ca/cargo-leptos/package.nix index f0abeac5e2fd..fc39e5873694 100644 --- a/pkgs/by-name/ca/cargo-leptos/package.nix +++ b/pkgs/by-name/ca/cargo-leptos/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage rec { pname = "cargo-leptos"; - version = "0.2.42"; + version = "0.3.1"; src = fetchFromGitHub { owner = "leptos-rs"; repo = "cargo-leptos"; rev = "v${version}"; - hash = "sha256-hNkCkHgIKn1/angH70DOeRxX5G1gUtoLVgmYfsLPD44="; + hash = "sha256-vQZpw0hnBQRXmt4KsThcVwLtRwSpbjaGfojCIgfOn7E="; }; - cargoHash = "sha256-hJND5X/Sn16OA7iHXqj6gNpg0JdykI8U3k6l4++qFb0="; + cargoHash = "sha256-WlzkTZHWDkE2rhH+fi8+aa/mkjBEVwQK8cTxd2JUuZ8="; nativeBuildInputs = [ pkg-config ]; From fa14524d43abbb1579a2824faa5e3724ac0f5fb9 Mon Sep 17 00:00:00 2001 From: aoli-al Date: Mon, 8 Dec 2025 16:10:00 -0500 Subject: [PATCH 16/73] jetbrains.jdk: 21.0.8b1148.57 -> 21.0.9b1163.86 --- pkgs/development/compilers/jetbrains-jdk/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 67e11e7082cf..62365c4485c2 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -45,27 +45,27 @@ let in jdk.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk" + lib.optionalString withJcef "-jcef"; - javaVersion = "21.0.8"; - build = "1148.57"; + javaVersion = "21.0.9"; + build = "1163.86"; # To get the new tag: # git clone https://github.com/jetbrains/jetbrainsruntime # cd jetbrainsruntime # git tag --points-at [revision] # Look for the line that starts with jbr- - openjdkTag = "jbr-release-21.0.8b1148.57"; + openjdkTag = "jbr-release-21.0.9b1163.86"; version = "${javaVersion}-b${build}"; src = fetchFromGitHub { owner = "JetBrains"; repo = "JetBrainsRuntime"; rev = "jb${version}"; - hash = "sha256-RgXwWNHAeFxmrFmyB+DP5dOif06iql2UvimEaARnQvg="; + hash = "sha256-P2boCbGB66X8LB4sZHGFO8lqHbv6F4kqGVMGBd9yKu0="; }; env = { BOOT_JDK = jdk.home; # run `git log -1 --pretty=%ct` in jdk repo for new value on update - SOURCE_DATE_EPOCH = 1759539679; + SOURCE_DATE_EPOCH = 1765114563; }; patches = [ ]; From 70bade1263c51b1f20bb4bffafd897cb1cded9d7 Mon Sep 17 00:00:00 2001 From: Theodor Tonum Date: Mon, 10 Nov 2025 08:48:22 +0100 Subject: [PATCH 17/73] playwright: 1.54.0 -> 1.55.0 --- pkgs/by-name/pl/playwright-mcp/package.nix | 11 ++++++----- .../python-modules/playwright/default.nix | 4 ++-- pkgs/development/web/playwright/browsers.json | 14 +++++++------- .../web/playwright/chromium-headless-shell.nix | 8 ++++---- pkgs/development/web/playwright/chromium.nix | 8 ++++---- pkgs/development/web/playwright/driver.nix | 8 ++++---- pkgs/development/web/playwright/firefox.nix | 8 ++++---- pkgs/development/web/playwright/webkit.nix | 8 ++++---- 8 files changed, 35 insertions(+), 34 deletions(-) diff --git a/pkgs/by-name/pl/playwright-mcp/package.nix b/pkgs/by-name/pl/playwright-mcp/package.nix index b9c6db1573cc..3a277c84b813 100644 --- a/pkgs/by-name/pl/playwright-mcp/package.nix +++ b/pkgs/by-name/pl/playwright-mcp/package.nix @@ -5,19 +5,18 @@ playwright-driver, playwright-test, }: - buildNpmPackage rec { pname = "playwright-mcp"; - version = "0.0.34"; + version = "0.0.35"; src = fetchFromGitHub { owner = "Microsoft"; repo = "playwright-mcp"; tag = "v${version}"; - hash = "sha256-SGSzX41D9nOTsGiU16tRFXgarWgePRsNWIcEnNGH0lQ="; + hash = "sha256-bF/F4dP2ri09AlQLItQwQxDAQybY2fXft4ccxSKijt8="; }; - npmDepsHash = "sha256-+6HmuR1Z5cJkoZq/vsFq6wNsYpZeDS42wwmh3hEgJhM="; + npmDepsHash = "sha256-xSQCs6rJlUrdS8c580mo1/VjpcDxwHor0pdstB9VQEo="; postInstall = '' rm -r $out/lib/node_modules/@playwright/mcp/node_modules/playwright @@ -26,7 +25,9 @@ buildNpmPackage rec { ln -s ${playwright-test}/lib/node_modules/playwright-core $out/lib/node_modules/@playwright/mcp/node_modules/playwright-core wrapProgram $out/bin/mcp-server-playwright \ - --set PLAYWRIGHT_BROWSERS_PATH ${playwright-driver.browsers} + --set PLAYWRIGHT_BROWSERS_PATH ${playwright-driver.browsers} \ + --set-default PLAYWRIGHT_MCP_BROWSER chromium \ + --run 'if [ -z "$PLAYWRIGHT_MCP_USER_DATA_DIR" ]; then PLAYWRIGHT_MCP_USER_DATA_DIR="$(mktemp -d -t mcp-pw-XXXXXX)"; export PLAYWRIGHT_MCP_USER_DATA_DIR; trap "rm -rf \"$PLAYWRIGHT_MCP_USER_DATA_DIR\"" EXIT; fi' ''; passthru = { diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index c232bf96b9e2..7f7bc08df921 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -22,7 +22,7 @@ in buildPythonPackage rec { pname = "playwright"; # run ./pkgs/development/python-modules/playwright/update.sh to update - version = "1.54.0"; + version = "1.55.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "playwright-python"; tag = "v${version}"; - hash = "sha256-xyuofDL0hWL8Gn4sYNLKte8q/4bMo+3aSbYaf5iWiBk="; + hash = "sha256-/q+Z4qKkAZpjPcp+WTNs03Ky/Zl5i2wOaogYTvpObec="; }; patches = [ diff --git a/pkgs/development/web/playwright/browsers.json b/pkgs/development/web/playwright/browsers.json index f7155ea875d3..c86f9c85a909 100644 --- a/pkgs/development/web/playwright/browsers.json +++ b/pkgs/development/web/playwright/browsers.json @@ -2,19 +2,19 @@ "comment": "This file is kept up to date via update.sh", "browsers": { "chromium": { - "revision": "1181", - "browserVersion": "139.0.7258.5" + "revision": "1187", + "browserVersion": "140.0.7339.16" }, "chromium-headless-shell": { - "revision": "1181", - "browserVersion": "139.0.7258.5" + "revision": "1187", + "browserVersion": "140.0.7339.16" }, "firefox": { - "revision": "1489", - "browserVersion": "140.0.2" + "revision": "1490", + "browserVersion": "141.0" }, "webkit": { - "revision": "2191", + "revision": "2203", "revisionOverrides": { "debian11-x64": "2105", "debian11-arm64": "2105", diff --git a/pkgs/development/web/playwright/chromium-headless-shell.nix b/pkgs/development/web/playwright/chromium-headless-shell.nix index 40a8ff2eb832..3c6a78cb105b 100644 --- a/pkgs/development/web/playwright/chromium-headless-shell.nix +++ b/pkgs/development/web/playwright/chromium-headless-shell.nix @@ -30,8 +30,8 @@ let stripRoot = false; hash = { - x86_64-linux = "sha256-AYh2urKZdjXCELimYaFihWp0FbDLf4uRrKLJZVxug5M="; - aarch64-linux = "sha256-diBiy0z51BxGK0PcfQOf1aryUcZesKu/UHBSZUjqwMk="; + x86_64-linux = "sha256-R4hBsfb6iS1xVNVDWQKCQUBYWVMwfdxLqqsR/gZiGiQ="; + aarch64-linux = "sha256-4QRCSqzvhnHUsSLWpaCUREq9pqW83Km6txqvjtFiN7E="; } .${system} or throwSystem; }; @@ -66,8 +66,8 @@ let stripRoot = false; hash = { - x86_64-darwin = "sha256-vIJuDjkasUYlMW0aCOyztyrlh5kvcwNR9GBaoa/yh/M="; - aarch64-darwin = "sha256-6Q6nz0H2749srdMF/puk/gnG1gQBEnWe9cQO3owL2OU="; + x86_64-darwin = "sha256-hs2SAoSL484IUs2u+BOz6lvlGPCPsQF2N2v+lnTI1v8="; + aarch64-darwin = "sha256-WL70Nt9J5zrwlJ5p5dBVT5TIocdtvOZrlAN0JEkii/g="; } .${system} or throwSystem; }; diff --git a/pkgs/development/web/playwright/chromium.nix b/pkgs/development/web/playwright/chromium.nix index c356023fd3fc..fdb26dd16b5a 100644 --- a/pkgs/development/web/playwright/chromium.nix +++ b/pkgs/development/web/playwright/chromium.nix @@ -41,8 +41,8 @@ let url = "https://playwright.azureedge.net/builds/chromium/${revision}/chromium-${suffix}.zip"; hash = { - x86_64-linux = "sha256-R7nMCVpUqgRwtB0syhfIK81maiTVWr8lYBLp4bR8VBg="; - aarch64-linux = "sha256-4fc4X7QwBigktmEeseuqIyEeV70Dy3eO/femXrftMd0="; + x86_64-linux = "sha256-8J7K4PE9BMuCnptHE+Nl7ED30cLdMDKqjGKY82I3OqQ="; + aarch64-linux = "sha256-8PZf2PYtBmFXEHhFLzNP/fkUXKQAviXCo8fy36Nb4OA="; } .${system} or throwSystem; }; @@ -109,8 +109,8 @@ let stripRoot = false; hash = { - x86_64-darwin = "sha256-0u1AStbUTX+qgUmg2DvL59B4b265WywDaBV+MdSuaNE="; - aarch64-darwin = "sha256-4pg4wmNTF8mw+APmdpvYlFxb9zc6OUh11oW5gCRKETY="; + x86_64-darwin = "sha256-Dj4Pf86gdXLKB/T9Qty+0w3N8Im0SRHlKCQgdt5/Mdc="; + aarch64-darwin = "sha256-lyJV3WJq6XmDgehsMwc/fW9Ieylz1mrQIXbKS4KHLiI="; } .${system} or throwSystem; }; diff --git a/pkgs/development/web/playwright/driver.nix b/pkgs/development/web/playwright/driver.nix index 36234e2b0dab..78cbf5d71e00 100644 --- a/pkgs/development/web/playwright/driver.nix +++ b/pkgs/development/web/playwright/driver.nix @@ -27,20 +27,20 @@ let } .${system} or throwSystem; - version = "1.54.1"; + version = "1.55.0"; src = fetchFromGitHub { owner = "Microsoft"; repo = "playwright"; rev = "v${version}"; - hash = "sha256-xwyREgelHLkpbUXOZTppKK7L6dE4jx0d/lbDWSKGzTY="; + hash = "sha256-J1Uys2TG9Ve++oMyEWpXgboEo0E7c5DjE8gqQwVPt+k="; }; babel-bundle = buildNpmPackage { pname = "babel-bundle"; inherit version src; sourceRoot = "${src.name}/packages/playwright/bundles/babel"; - npmDepsHash = "sha256-sdl+rMCmuOmY1f7oSfGuAAFCiPCFzqkQtFCncL4o5LQ="; + npmDepsHash = "sha256-ByCy4go8PM0ksDg+2DcJPyoKG7Z0uIqKM647ZQwYwAE="; dontNpmBuild = true; installPhase = '' cp -r . "$out" @@ -92,7 +92,7 @@ let inherit version src; sourceRoot = "${src.name}"; # update.sh depends on sourceRoot presence - npmDepsHash = "sha256-4bsX8Q8V3CBpIsyqMYTzfERQQPY5zlPf7CoqR6UkUHU="; + npmDepsHash = "sha256-HfNal3ksP6d/i06xKq0LwytV6PIeHcwshh+TmuQeSaw="; nativeBuildInputs = [ cacert diff --git a/pkgs/development/web/playwright/firefox.nix b/pkgs/development/web/playwright/firefox.nix index afc15e970ecc..50566f8d18d8 100644 --- a/pkgs/development/web/playwright/firefox.nix +++ b/pkgs/development/web/playwright/firefox.nix @@ -17,8 +17,8 @@ let }.zip"; hash = { - x86_64-linux = "sha256-j7gOuXMyftNQencgfpk8Y4ED2LuT7TAa30IPyzmir48="; - aarch64-linux = "sha256-deIUGKBrp56TsDr61cbNbRRSRcVpSoa6pdmMk4oB/Eg="; + x86_64-linux = "sha256-hGlG7Snw/YVgXDHWXK24Ci87JxpENEfhpve7fu+ol1E="; + aarch64-linux = "sha256-R5wl+oln2gFse+31NFfLaIsGQOOVrCRj8drOE9qmiwY="; } .${system} or throwSystem; }; @@ -41,8 +41,8 @@ let stripRoot = false; hash = { - x86_64-darwin = "sha256-ljgFoyqCg9kma2cDFodNjbkAeEylIzVdWkS1vU/9Rbg="; - aarch64-darwin = "sha256-W2J5APPWEkmoDgBEox6/ygg2xyWpOHZESXFG0tZbj1M="; + x86_64-darwin = "sha256-qov3gZspe95py/tHcKzGVvzvmcKWsOtGNMj76QPhFbE="; + aarch64-darwin = "sha256-8mfFZuNuOo04ZNwqrm2JQJoSkJC6ChdwPDgIDKse34s="; } .${system} or throwSystem; }; diff --git a/pkgs/development/web/playwright/webkit.nix b/pkgs/development/web/playwright/webkit.nix index 1254070e6f6f..888e29bffc65 100644 --- a/pkgs/development/web/playwright/webkit.nix +++ b/pkgs/development/web/playwright/webkit.nix @@ -137,8 +137,8 @@ let stripRoot = false; hash = { - x86_64-linux = "sha256-OSVHFGdcQrzmhLPdXF61tKmip/6/D+uaQgSBBQiOIZI="; - aarch64-linux = "sha256-b8XwVMCwSbujyqgkJKIPAVNX83Qmmsthprr2x9XSb10="; + x86_64-linux = "sha256-FndRfpPsBh+x15MIL2ybhxG1QskpvHLmIa7RhSw6GBQ="; + aarch64-linux = "sha256-frZLMVhMrokww1teSBb7VCM9vkCX6n3js0Pa1G51254="; } .${system} or throwSystem; }; @@ -218,8 +218,8 @@ let stripRoot = false; hash = { - x86_64-darwin = "sha256-shjhozJS2VbBjpjJVlM9hwBzGWwgva1qhfEUhY8t9Bk="; - aarch64-darwin = "sha256-ZRl86L/OOTNPWfZDl6JQfuXL41kI/Wir99/JIbf7T7M="; + x86_64-darwin = "sha256-4uvJFUEQ63mER+jjVOwYVgSfWRegujuuOXO7Sm6bGzU="; + aarch64-darwin = "sha256-+8LzvP2pNrb04S3N/JId4YimH9bfxAeLzpqYeKO5hb0="; } .${system} or throwSystem; }; From 45e0a68ef8b9404392f9fa727d76a30dc40b312a Mon Sep 17 00:00:00 2001 From: Theodor Tonum Date: Thu, 13 Nov 2025 19:54:08 +0100 Subject: [PATCH 18/73] playwright: 1.55.0 -> 1.56.1 --- pkgs/by-name/pl/playwright-mcp/package.nix | 8 +++++--- .../python-modules/playwright/default.nix | 4 ++-- pkgs/development/web/playwright/browsers.json | 14 +++++++------- .../web/playwright/chromium-headless-shell.nix | 8 ++++---- pkgs/development/web/playwright/chromium.nix | 8 ++++---- pkgs/development/web/playwright/driver.nix | 6 +++--- pkgs/development/web/playwright/firefox.nix | 8 ++++---- pkgs/development/web/playwright/webkit.nix | 8 ++++---- 8 files changed, 33 insertions(+), 31 deletions(-) diff --git a/pkgs/by-name/pl/playwright-mcp/package.nix b/pkgs/by-name/pl/playwright-mcp/package.nix index 3a277c84b813..6507edcf1297 100644 --- a/pkgs/by-name/pl/playwright-mcp/package.nix +++ b/pkgs/by-name/pl/playwright-mcp/package.nix @@ -7,16 +7,16 @@ }: buildNpmPackage rec { pname = "playwright-mcp"; - version = "0.0.35"; + version = "0.0.41"; src = fetchFromGitHub { owner = "Microsoft"; repo = "playwright-mcp"; tag = "v${version}"; - hash = "sha256-bF/F4dP2ri09AlQLItQwQxDAQybY2fXft4ccxSKijt8="; + hash = "sha256-OoTAYd1/hedR0k/3b83YOPaOviLWv1Y3pffNoeSf2g4="; }; - npmDepsHash = "sha256-xSQCs6rJlUrdS8c580mo1/VjpcDxwHor0pdstB9VQEo="; + npmDepsHash = "sha256-xgOPlCnlRXJZAZRM4xZ7SYSA5lsPglSewXxY19TbD/A="; postInstall = '' rm -r $out/lib/node_modules/@playwright/mcp/node_modules/playwright @@ -30,6 +30,8 @@ buildNpmPackage rec { --run 'if [ -z "$PLAYWRIGHT_MCP_USER_DATA_DIR" ]; then PLAYWRIGHT_MCP_USER_DATA_DIR="$(mktemp -d -t mcp-pw-XXXXXX)"; export PLAYWRIGHT_MCP_USER_DATA_DIR; trap "rm -rf \"$PLAYWRIGHT_MCP_USER_DATA_DIR\"" EXIT; fi' ''; + dontNpmBuild = true; + passthru = { # Package and playwright driver versions are tightly coupled. skipBulkUpdate = true; diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index 7f7bc08df921..7aaae7aa7460 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -22,7 +22,7 @@ in buildPythonPackage rec { pname = "playwright"; # run ./pkgs/development/python-modules/playwright/update.sh to update - version = "1.55.0"; + version = "1.56.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "playwright-python"; tag = "v${version}"; - hash = "sha256-/q+Z4qKkAZpjPcp+WTNs03Ky/Zl5i2wOaogYTvpObec="; + hash = "sha256-46+UxHimmmyQMTe+G2ootSbVX9pAzdfdyTO2qrWd9l8="; }; patches = [ diff --git a/pkgs/development/web/playwright/browsers.json b/pkgs/development/web/playwright/browsers.json index c86f9c85a909..632d85fc2177 100644 --- a/pkgs/development/web/playwright/browsers.json +++ b/pkgs/development/web/playwright/browsers.json @@ -2,19 +2,19 @@ "comment": "This file is kept up to date via update.sh", "browsers": { "chromium": { - "revision": "1187", - "browserVersion": "140.0.7339.16" + "revision": "1194", + "browserVersion": "141.0.7390.37" }, "chromium-headless-shell": { - "revision": "1187", - "browserVersion": "140.0.7339.16" + "revision": "1194", + "browserVersion": "141.0.7390.37" }, "firefox": { - "revision": "1490", - "browserVersion": "141.0" + "revision": "1495", + "browserVersion": "142.0.1" }, "webkit": { - "revision": "2203", + "revision": "2215", "revisionOverrides": { "debian11-x64": "2105", "debian11-arm64": "2105", diff --git a/pkgs/development/web/playwright/chromium-headless-shell.nix b/pkgs/development/web/playwright/chromium-headless-shell.nix index 3c6a78cb105b..0d02d454930a 100644 --- a/pkgs/development/web/playwright/chromium-headless-shell.nix +++ b/pkgs/development/web/playwright/chromium-headless-shell.nix @@ -30,8 +30,8 @@ let stripRoot = false; hash = { - x86_64-linux = "sha256-R4hBsfb6iS1xVNVDWQKCQUBYWVMwfdxLqqsR/gZiGiQ="; - aarch64-linux = "sha256-4QRCSqzvhnHUsSLWpaCUREq9pqW83Km6txqvjtFiN7E="; + x86_64-linux = "sha256-khYVM0jocno97lV8mRH71WHzopIjnq3eX/PD1kQuZnE="; + aarch64-linux = "sha256-1G0UAIFmBcij0EXq1VVxvku5iQmGGWvQxdBT+zRW0ZM="; } .${system} or throwSystem; }; @@ -66,8 +66,8 @@ let stripRoot = false; hash = { - x86_64-darwin = "sha256-hs2SAoSL484IUs2u+BOz6lvlGPCPsQF2N2v+lnTI1v8="; - aarch64-darwin = "sha256-WL70Nt9J5zrwlJ5p5dBVT5TIocdtvOZrlAN0JEkii/g="; + x86_64-darwin = "sha256-R4XdK3wD3eoNREydU34MkrvCkI2VqSxIiM7Zhf5EvjM="; + aarch64-darwin = "sha256-8CyMLQdtWhMUxwd6UWQ7vGtyi69mCxEA6WwXk2S82qA="; } .${system} or throwSystem; }; diff --git a/pkgs/development/web/playwright/chromium.nix b/pkgs/development/web/playwright/chromium.nix index fdb26dd16b5a..7985537f8297 100644 --- a/pkgs/development/web/playwright/chromium.nix +++ b/pkgs/development/web/playwright/chromium.nix @@ -41,8 +41,8 @@ let url = "https://playwright.azureedge.net/builds/chromium/${revision}/chromium-${suffix}.zip"; hash = { - x86_64-linux = "sha256-8J7K4PE9BMuCnptHE+Nl7ED30cLdMDKqjGKY82I3OqQ="; - aarch64-linux = "sha256-8PZf2PYtBmFXEHhFLzNP/fkUXKQAviXCo8fy36Nb4OA="; + x86_64-linux = "sha256-uf8FUMgUUyM1xw5eUuMUgUg9GIW8bDcNZz0mIfnoTLM="; + aarch64-linux = "sha256-j+j6w99EmfehV+qyqbLFK2H5HpB2qakq93GgdTMPibU="; } .${system} or throwSystem; }; @@ -109,8 +109,8 @@ let stripRoot = false; hash = { - x86_64-darwin = "sha256-Dj4Pf86gdXLKB/T9Qty+0w3N8Im0SRHlKCQgdt5/Mdc="; - aarch64-darwin = "sha256-lyJV3WJq6XmDgehsMwc/fW9Ieylz1mrQIXbKS4KHLiI="; + x86_64-darwin = "sha256-dsyw6fT/jfx2RC2wEFMgIkIpVYu+6TXaDpFLNHX5als="; + aarch64-darwin = "sha256-G7PlHJPlDQXQzO5MGuCuGQUxV9VqKY4yQebuoltVq6U="; } .${system} or throwSystem; }; diff --git a/pkgs/development/web/playwright/driver.nix b/pkgs/development/web/playwright/driver.nix index 78cbf5d71e00..8ce9ffdc6e35 100644 --- a/pkgs/development/web/playwright/driver.nix +++ b/pkgs/development/web/playwright/driver.nix @@ -27,13 +27,13 @@ let } .${system} or throwSystem; - version = "1.55.0"; + version = "1.56.1"; src = fetchFromGitHub { owner = "Microsoft"; repo = "playwright"; rev = "v${version}"; - hash = "sha256-J1Uys2TG9Ve++oMyEWpXgboEo0E7c5DjE8gqQwVPt+k="; + hash = "sha256-39s1fb2tZZWWpZrs4/MAw4TdHkzEWj8YVoK39sj2UPE="; }; babel-bundle = buildNpmPackage { @@ -92,7 +92,7 @@ let inherit version src; sourceRoot = "${src.name}"; # update.sh depends on sourceRoot presence - npmDepsHash = "sha256-HfNal3ksP6d/i06xKq0LwytV6PIeHcwshh+TmuQeSaw="; + npmDepsHash = "sha256-AOjiI6Db+WL4iTaY9XWH4tntBHM8SFP7/7S8RJZitlI="; nativeBuildInputs = [ cacert diff --git a/pkgs/development/web/playwright/firefox.nix b/pkgs/development/web/playwright/firefox.nix index 50566f8d18d8..6354bdfc349f 100644 --- a/pkgs/development/web/playwright/firefox.nix +++ b/pkgs/development/web/playwright/firefox.nix @@ -17,8 +17,8 @@ let }.zip"; hash = { - x86_64-linux = "sha256-hGlG7Snw/YVgXDHWXK24Ci87JxpENEfhpve7fu+ol1E="; - aarch64-linux = "sha256-R5wl+oln2gFse+31NFfLaIsGQOOVrCRj8drOE9qmiwY="; + x86_64-linux = "sha256-qdAlGPnpiOfa49zJZsbLvNtEqh4xnaPDH3TvX5fA+PA="; + aarch64-linux = "sha256-6880Y68m5uvD+e/ZLqJqoTQNPcmK8CUKgaR2wBdBxsw="; } .${system} or throwSystem; }; @@ -41,8 +41,8 @@ let stripRoot = false; hash = { - x86_64-darwin = "sha256-qov3gZspe95py/tHcKzGVvzvmcKWsOtGNMj76QPhFbE="; - aarch64-darwin = "sha256-8mfFZuNuOo04ZNwqrm2JQJoSkJC6ChdwPDgIDKse34s="; + x86_64-darwin = "sha256-3NEDS0Uw2k0W2hUuIIU4pO/xCnPEc5iowP88M5NNAuA="; + aarch64-darwin = "sha256-XXJf0nBdLQjHdes5ZAA4zhKK+E9caqD42CFqCQ92EKM="; } .${system} or throwSystem; }; diff --git a/pkgs/development/web/playwright/webkit.nix b/pkgs/development/web/playwright/webkit.nix index 888e29bffc65..2c51cc26579f 100644 --- a/pkgs/development/web/playwright/webkit.nix +++ b/pkgs/development/web/playwright/webkit.nix @@ -137,8 +137,8 @@ let stripRoot = false; hash = { - x86_64-linux = "sha256-FndRfpPsBh+x15MIL2ybhxG1QskpvHLmIa7RhSw6GBQ="; - aarch64-linux = "sha256-frZLMVhMrokww1teSBb7VCM9vkCX6n3js0Pa1G51254="; + x86_64-linux = "sha256-giXoY2uPjwLzc6sbADI+g/qLgE/O+FJbQok7xNNrsaQ="; + aarch64-linux = "sha256-TJIY7ZC3ez9F0iEH655JKEBNY36nj0SjYdt0E4oXySs="; } .${system} or throwSystem; }; @@ -218,8 +218,8 @@ let stripRoot = false; hash = { - x86_64-darwin = "sha256-4uvJFUEQ63mER+jjVOwYVgSfWRegujuuOXO7Sm6bGzU="; - aarch64-darwin = "sha256-+8LzvP2pNrb04S3N/JId4YimH9bfxAeLzpqYeKO5hb0="; + x86_64-darwin = "sha256-V/5dbXwtgITteYrSwL9qj3V0VChyG+rHTGLsYEpQRJw="; + aarch64-darwin = "sha256-1DaDFVn6RyyFevx2oUai5ZtWMRE5WiDEZfpOY1A+/oU="; } .${system} or throwSystem; }; From 503d559310bd484ac7032d80fc0e1c0049b852e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Tue, 9 Dec 2025 23:26:08 +0100 Subject: [PATCH 19/73] teamspeak6-client: fix update script, apply shellcheck --- pkgs/by-name/te/teamspeak6-client/package.nix | 2 +- pkgs/by-name/te/teamspeak6-client/update.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/teamspeak6-client/package.nix b/pkgs/by-name/te/teamspeak6-client/package.nix index 274a3dfc3280..e6fd7a3a62ab 100644 --- a/pkgs/by-name/te/teamspeak6-client/package.nix +++ b/pkgs/by-name/te/teamspeak6-client/package.nix @@ -114,7 +114,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - updateScript = ./update.sh; + passthru.updateScript = ./update.sh; meta = { description = "TeamSpeak voice communication tool (beta version)"; diff --git a/pkgs/by-name/te/teamspeak6-client/update.sh b/pkgs/by-name/te/teamspeak6-client/update.sh index 42cab86f9373..c163dfa09648 100755 --- a/pkgs/by-name/te/teamspeak6-client/update.sh +++ b/pkgs/by-name/te/teamspeak6-client/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell --pure -i bash -p bash curl cacert ripgrep nix nix-update +#!nix-shell --pure -i bash -p bash curl cacert ripgrep nix nix-update git set -euo pipefail latest_version=$( @@ -18,4 +18,4 @@ if [[ "$latest_version" == "$current_version" ]]; then exit 0 fi -nix-update teamspeak6-client --version $latest_version +nix-update teamspeak6-client --version "$latest_version" From 7ebfc639455e5621a7bd78aaacaf72d59f9bbc94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Tue, 9 Dec 2025 22:36:02 +0000 Subject: [PATCH 20/73] teamspeak6-client: 6.0.0-beta3.2 -> 6.0.0-beta3.3 --- pkgs/by-name/te/teamspeak6-client/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/teamspeak6-client/package.nix b/pkgs/by-name/te/teamspeak6-client/package.nix index e6fd7a3a62ab..c459c1b5595d 100644 --- a/pkgs/by-name/te/teamspeak6-client/package.nix +++ b/pkgs/by-name/te/teamspeak6-client/package.nix @@ -31,11 +31,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "teamspeak6-client"; - version = "6.0.0-beta3.2"; + version = "6.0.0-beta3.3"; src = fetchurl { url = "https://files.teamspeak-services.com/pre_releases/client/${finalAttrs.version}/teamspeak-client.tar.gz"; - hash = "sha256-sZrYGonBw3BgUSExovs8GW5E54vhr3i/VR9eH9/qjWM="; + hash = "sha256-ElPfy3A/wazuEkB1D2UuoijLMpKfQTmKc1FRfgWh8po="; }; sourceRoot = "."; From 5db44047fbb53e83d8e5fe7be0992202254f26a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Dec 2025 14:53:35 +0000 Subject: [PATCH 21/73] home-assistant-custom-components.home_connect_alt: 1.3.2 -> 1.3.4 --- .../custom-components/home_connect_alt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/home_connect_alt/package.nix b/pkgs/servers/home-assistant/custom-components/home_connect_alt/package.nix index ad47b44e5655..3a7c88bb12a0 100644 --- a/pkgs/servers/home-assistant/custom-components/home_connect_alt/package.nix +++ b/pkgs/servers/home-assistant/custom-components/home_connect_alt/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "ekutner"; domain = "home_connect_alt"; - version = "1.3.2"; + version = "1.3.4"; src = fetchFromGitHub { owner = "ekutner"; repo = "home-connect-hass"; tag = version; - hash = "sha256-t5Af58HgYVMZki/93t63X2JPXDJm7PPt84yGj7MJKkE="; + hash = "sha256-X6yRoEJAmBDQzEo8WeEOMFZHJ6OOpw+XUKi+iHHOgOw="; }; dependencies = [ home-connect-async ]; From 27d8f0ebb3b1cf9866b83b53109b08309d78d9ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Dec 2025 16:28:40 +0000 Subject: [PATCH 22/73] roon-server: 2.56.1582 -> 2.57.1598 --- pkgs/by-name/ro/roon-server/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ro/roon-server/package.nix b/pkgs/by-name/ro/roon-server/package.nix index efbbe77a34d8..8a593c270d49 100644 --- a/pkgs/by-name/ro/roon-server/package.nix +++ b/pkgs/by-name/ro/roon-server/package.nix @@ -16,7 +16,7 @@ stdenv, }: let - version = "2.56.1582"; + version = "2.57.1598"; urlVersion = builtins.replaceStrings [ "." ] [ "0" ] version; in stdenv.mkDerivation { @@ -25,7 +25,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-LKuno7SpOpxx3JpM36tYlOHjJWWRLRjPiA096Bv/QvQ="; + hash = "sha256-GfcVaZRE8QzjXpDEyLDdyvvgzsBKtumtq3QguoyBjkg="; }; dontConfigure = true; From be8ac3eb8106b7f1ae1e26ba25c830b88e6bf4b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Dec 2025 19:56:14 +0000 Subject: [PATCH 23/73] kodiPackages.youtube: 7.3.0 -> 7.3.0.1 --- pkgs/applications/video/kodi/addons/youtube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index 020fb59bad9a..56866e101bee 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -10,13 +10,13 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "7.3.0"; + version = "7.3.0.1"; src = fetchFromGitHub { owner = "anxdpanic"; repo = "plugin.video.youtube"; rev = "v${version}"; - hash = "sha256-JVlIe63oyA8Re8nqLte4y5kyRENzyNg8ZJKdn9wJFwg="; + hash = "sha256-e9V58R6hMaDGS0RKqtAU5IAjY9HED6bYMBz6hQJ606o="; }; propagatedBuildInputs = [ From 5f31413ad0b3c62ccde8606f72ea062942ec4afe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Dec 2025 05:53:10 +0000 Subject: [PATCH 24/73] phpExtensions.xdebug: 3.4.7 -> 3.5.0 --- pkgs/development/php-packages/xdebug/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix index 3f4a75990c44..096746005ca5 100644 --- a/pkgs/development/php-packages/xdebug/default.nix +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -5,7 +5,7 @@ }: let - version = "3.4.7"; + version = "3.5.0"; in buildPecl { inherit version; @@ -16,7 +16,7 @@ buildPecl { owner = "xdebug"; repo = "xdebug"; rev = version; - hash = "sha256-TxwEyXyUGq3rUWyLExyDopJZ29eAoh9QG1TC2+hImmc="; + hash = "sha256-RrT79o0eFKwGFq3gIfBWCUy5gFy6odj2AWfsfcGN2R4="; }; doCheck = true; From e33d3f16ebf3c19670057fd3b6a3870fe94afc25 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 11 Dec 2025 19:41:20 +0100 Subject: [PATCH 25/73] nixosTests.lomiri: Reduce flakiness Looking for the clock indicator's text has gotten too flaky. We have working launcher button customisation now, so look for its colour instead. --- nixos/tests/lomiri.nix | 93 +++++++++++++++++++++++++++++++----------- 1 file changed, 69 insertions(+), 24 deletions(-) diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix index f018cf269458..7364e6046c67 100644 --- a/nixos/tests/lomiri.nix +++ b/nixos/tests/lomiri.nix @@ -76,6 +76,71 @@ let }; sharedTestFunctions = '' + from collections.abc import Callable + import tempfile + import subprocess + + # Based on terminal-emulators.nix' check_for_pink + def check_for_color(color: str) -> Callable[[bool], bool]: + def check_for_color_retry(final=False) -> bool: + with tempfile.NamedTemporaryFile() as tmpin: + machine.send_monitor_command("screendump {}".format(tmpin.name)) + + cmd = 'convert {} -define histogram:unique-colors=true -format "%c" histogram:info:'.format( + tmpin.name + ) + ret = subprocess.run(cmd, shell=True, capture_output=True) + if ret.returncode != 0: + raise Exception( + "image analysis failed with exit code {}".format(ret.returncode) + ) + + text = ret.stdout.decode("utf-8") + return color in text + + return check_for_color_retry + + def check_for_color_continued_presence(color: str) -> Callable[[bool], bool]: + colorFunc: Callable[[bool], bool] = check_for_color(color) + def check_for_color_continued_presence_retry(final=False) -> bool: + colorPresent: bool = colorFunc(final) + + if final: + # If it fails now, retry handles the exception raising. + # Otherwise, we passed. + return colorPresent + else: + if colorPresent: + # We want retry to continue running us until the timeout, so signal failure. + return False + else: + # Color disappeared + raise Exception( + "color {} has disappeared from the screen!".format(color) + ) + return check_for_color_continued_presence_retry + + def ensure_lomiri_running(): + """ + Ensure that Lomiri has finished starting up. + """ + + # Process runs + machine.wait_until_succeeds("pgrep -u ${user} -f 'lomiri --mode=full-shell'") + + # Output rendering from Lomiri has started when it starts printing performance diagnostics + machine.wait_for_console_text("Last frame took") + + # One of the last UI elements that loads is the clock. In the past, we could OCR for AM/PM to ensure it's there. That is now flaky. + # The next best thing is to look for the launcher button, and ensure it stays around for awhile (DE doesn't crash). + launcherColor: str = "#5277C3" + with machine.nested("Waiting for the screen to have launcherColor {} on it:".format(launcherColor)): + retry(check_for_color(launcherColor)) + with machine.nested("Ensuring launcherColor {} stays present on the screen:".format(launcherColor)): + retry(fn=check_for_color_continued_presence(launcherColor), timeout=30) + + machine.screenshot("lomiri_launched") + def wait_for_text(text): """ Wait for on-screen text, and try to optimise retry count for slow hardware. @@ -179,12 +244,7 @@ let # The session should start, and not be stuck in i.e. a crash loop with subtest("lomiri starts"): - machine.wait_until_succeeds("pgrep -u ${user} -f 'lomiri --mode=full-shell'") - # Output rendering from Lomiri has started when it starts printing performance diagnostics - machine.wait_for_console_text("Last frame took") - # Look for datetime's clock, one of the last elements to load - wait_for_text(r"(AM|PM)") - machine.screenshot("lomiri_launched") + ensure_lomiri_running() # The ayatana indicators are an important part of the experience, and they hold the only graphical way of exiting the session. # There's a test app we could use that also displays their contents, but it's abit inconsistent. @@ -398,12 +458,7 @@ in # The session should start, and not be stuck in i.e. a crash loop with subtest("lomiri starts"): - machine.wait_until_succeeds("pgrep -u ${user} -f 'lomiri --mode=full-shell'") - # Output rendering from Lomiri has started when it starts printing performance diagnostics - machine.wait_for_console_text("Last frame took") - # Look for datetime's clock, one of the last elements to load - wait_for_text(r"(AM|PM)") - machine.screenshot("lomiri_launched") + ensure_lomiri_running() # Working terminal keybind is good with subtest("terminal keybind works"): @@ -550,12 +605,7 @@ in # The session should start, and not be stuck in i.e. a crash loop with subtest("lomiri starts"): - machine.wait_until_succeeds("pgrep -u ${user} -f 'lomiri --mode=full-shell'") - # Output rendering from Lomiri has started when it starts printing performance diagnostics - machine.wait_for_console_text("Last frame took") - # Look for datetime's clock, one of the last elements to load - wait_for_text(r"(AM|PM)") - machine.screenshot("lomiri_launched") + ensure_lomiri_running() # Working terminal keybind is good with subtest("terminal keybind works"): @@ -716,14 +766,9 @@ in # Login machine.send_chars("${pwInput}\n") - machine.wait_until_succeeds("pgrep -u ${user} -f 'lomiri --mode=full-shell'") - # Output rendering from Lomiri has started when it starts printing performance diagnostics - machine.wait_for_console_text("Last frame took") # And the desktop doesn't render the wallpaper anymore. Grumble grumble... - # Look for datetime's clock, one of the last elements to load - wait_for_text(r"(AM|PM)") - machine.screenshot("lomiri_launched") + ensure_lomiri_running() # Lomiri in desktop mode should use the correct keymap with subtest("lomiri session keymap works"): From f992d9085cef3e2fdd94670ce77b26264bb51b72 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 11 Dec 2025 19:46:14 +0100 Subject: [PATCH 26/73] nixosTests.lomiri: Add None return to functions that return nothing Stops the warning message: > By default the bodies of untyped functions are not checked, consider using --check-untyped-defs [annotation-unchecked] --- nixos/tests/lomiri.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix index 7364e6046c67..cb24a77618fe 100644 --- a/nixos/tests/lomiri.nix +++ b/nixos/tests/lomiri.nix @@ -120,7 +120,7 @@ let ) return check_for_color_continued_presence_retry - def ensure_lomiri_running(): + def ensure_lomiri_running() -> None: """ Ensure that Lomiri has finished starting up. """ @@ -141,7 +141,7 @@ let machine.screenshot("lomiri_launched") - def wait_for_text(text): + def wait_for_text(text) -> None: """ Wait for on-screen text, and try to optimise retry count for slow hardware. """ @@ -149,7 +149,7 @@ let machine.sleep(30) machine.wait_for_text(text) - def toggle_maximise(): + def toggle_maximise() -> None: """ Maximise the current window. """ @@ -163,7 +163,7 @@ let machine.send_key("esc") machine.sleep(5) - def mouse_click(xpos, ypos): + def mouse_click(xpos, ypos) -> None: """ Move the mouse to a screen location and hit left-click. """ @@ -176,7 +176,7 @@ let machine.execute("ydotool click 0xC0") machine.sleep(2) - def open_starter(): + def open_starter() -> None: """ Open the starter, and ensure it's opened. """ From 19abf6a0f84dd88a007b200c56d43f0944b8f769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Dec 2025 11:31:21 -0800 Subject: [PATCH 27/73] libdeltachat: 2.33.0 -> 2.34.0 Diff: https://github.com/chatmail/core/compare/v2.33.0...v2.34.0 Changelog: https://github.com/chatmail/core/blob/v2.34.0/CHANGELOG.md --- pkgs/by-name/li/libdeltachat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index 5454b1e9aae7..b01f2b8abdbc 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "2.33.0"; + version = "2.34.0"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${version}"; - hash = "sha256-4cnYTtm5bQ86BgMOOH5d881ahjuFFOxVuGffRp3Nbw4="; + hash = "sha256-t56P+rWtAYFa67hguPJVW5a+ZYcSYBclgONH89i7m5g="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { pname = "chatmail-core"; inherit version src; - hash = "sha256-TOGSvvFKsWshfMqGNEOtjhHcpTJ0FAiK6RigmlT4AFA="; + hash = "sha256-x8ykRn3BYdkjiaQzs/Dojz9CNZWKUfnNpV9F2HZqLDs="; }; nativeBuildInputs = [ From c1a0ea53de8d4bbdabd471b3560fcf17bdde659b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Dec 2025 20:02:36 +0000 Subject: [PATCH 28/73] glaze: 6.1.0 -> 6.2.0 --- pkgs/by-name/gl/glaze/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix index 57bdd59aaa1c..4dfd94c39534 100644 --- a/pkgs/by-name/gl/glaze/package.nix +++ b/pkgs/by-name/gl/glaze/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (final: { pname = "glaze"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "stephenberry"; repo = "glaze"; tag = "v${final.version}"; - hash = "sha256-H1paMc0LH743aMHCO/Ocp96SaaoXLcl/MDmmbtSJG+Q="; + hash = "sha256-gxSmCKzehnDfoexEm1V2cs91qDUzRJrtFjCsM1NHI9Y="; }; nativeBuildInputs = [ cmake ]; From 0518df0bdf45b9d5068aaf76368a41a40f8dd103 Mon Sep 17 00:00:00 2001 From: loner <2788892716@qq.com> Date: Fri, 12 Dec 2025 04:29:42 +0800 Subject: [PATCH 29/73] neowall: 0.4.2 -> 0.4.3 --- pkgs/by-name/ne/neowall/package.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ne/neowall/package.nix b/pkgs/by-name/ne/neowall/package.nix index 34d8f0b9c9b6..b5baa329fa86 100644 --- a/pkgs/by-name/ne/neowall/package.nix +++ b/pkgs/by-name/ne/neowall/package.nix @@ -5,22 +5,25 @@ lib, libglvnd, mesa, + libX11, + libXrandr, libpng, libjpeg, wayland, wayland-scanner, + wayland-protocols, versionCheckHook, }: -stdenv.mkDerivation (finallAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "neowall"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "1ay1"; repo = "neowall"; - tag = "v${finallAttrs.version}"; - hash = "sha256-q/M79ol4l4YIsewP50/6I2C5zKmF1Bc4mgIC896qxPY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Wt9sNuUO2IIXlQAanDsWNjbqAaUH/jCzPoQYokl36OU="; }; nativeBuildInputs = [ @@ -30,7 +33,10 @@ stdenv.mkDerivation (finallAttrs: { buildInputs = [ wayland + wayland-protocols mesa + libX11 + libXrandr libglvnd libpng libjpeg @@ -45,7 +51,7 @@ stdenv.mkDerivation (finallAttrs: { versionCheckProgramArg = "--version"; meta = { - changelog = "https://github.com/1ay1/neowall/releases/tag/${finallAttrs.src.tag}"; + changelog = "https://github.com/1ay1/neowall/releases/tag/${finalAttrs.src.tag}"; description = "GPU shader wallpapers for Wayland"; homepage = "https://github.com/1ay1/neowall"; license = lib.licenses.mit; From 319fac74eb2b09fa28d5b5fa7abd608852a7f794 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 10 Dec 2025 12:39:42 -0800 Subject: [PATCH 30/73] deltachat-desktop: 2.25.3 -> 2.33.0 Diff: https://github.com/deltachat/deltachat-desktop/compare/v2.25.3...v2.33.0 Changelog: https://github.com/deltachat/deltachat-desktop/blob/v2.33.0/CHANGELOG.md --- pkgs/by-name/de/deltachat-desktop/package.nix | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix index ea855cf6aabe..1eac6bdfa0f8 100644 --- a/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -3,6 +3,7 @@ copyDesktopItems, electron_37, fetchFromGitHub, + fetchpatch, deltachat-rpc-server, makeDesktopItem, makeWrapper, @@ -19,17 +20,17 @@ let deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec { - version = "2.25.0"; + version = "2.33.0"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${version}"; - hash = "sha256-pW1+9aljtnYJmlJOj+m0aQekYO5IsL0fduR7kIAPdN8="; + hash = "sha256-4cnYTtm5bQ86BgMOOH5d881ahjuFFOxVuGffRp3Nbw4="; }; cargoDeps = rustPlatform.fetchCargoVendor { pname = "chatmail-core"; inherit version src; - hash = "sha256-iIC9wE7P2SKeCMtc/hFTRaOGXD2F7kh1TptOoes/Qi0="; + hash = "sha256-TOGSvvFKsWshfMqGNEOtjhHcpTJ0FAiK6RigmlT4AFA="; }; }; electron = electron_37; @@ -37,19 +38,28 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "deltachat-desktop"; - version = "2.25.3"; + version = "2.33.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-xaeO1mHqJJwEMAuuzlKnFP9TiPYPygGAV+26QdXoAxk="; + hash = "sha256-PA2Faq1AmFxxizN1+NDYRB3uFI2bXdGshtyfHwY2btM="; }; + patches = [ + # https://github.com/deltachat/deltachat-desktop/pull/5854 + (fetchpatch { + name = "dont-load-env-file-in-production.patch"; + url = "https://github.com/deltachat/deltachat-desktop/commit/e0eca1672b2f0c951b96c1e921219d2a4a4dbcb0.patch"; + hash = "sha256-/Dc8VjdF10qJOrEa0dJeBib+R+8kb5yD4/iKt9/VnBA="; + }) + ]; + pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - fetcherVersion = 1; - hash = "sha256-aih6WusKV44Wu9eF8te5t/liEcPB1pnYRganlJSSnXg="; + fetcherVersion = 2; + hash = "sha256-4BAcCzPZbCjUfHTnJ98TzcfI5UnfMmGdbdvCFaQNNsk="; }; nativeBuildInputs = [ @@ -83,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { = ${lib.versions.major electron.version} \ || (echo 'error: electron version doesn not match package-lock.json' && exit 1) - pnpm -w build:electron + pnpm --filter=@deltachat-desktop/target-electron build4production pnpm --filter=@deltachat-desktop/target-electron pack:generate_config pnpm --filter=@deltachat-desktop/target-electron pack:patch-node-modules From f7d506b0aef57577ca343d42371bac8f1fc597da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Dec 2025 13:57:17 -0800 Subject: [PATCH 31/73] python3Packages.volkswagencarnet: 5.2.9 -> 5.3.2 Diff: https://github.com/robinostlund/volkswagencarnet/compare/v5.2.9...v5.3.2 Changelog: https://github.com/robinostlund/volkswagencarnet/releases/tag/v5.3.2 --- pkgs/development/python-modules/volkswagencarnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/volkswagencarnet/default.nix b/pkgs/development/python-modules/volkswagencarnet/default.nix index 73d534df1489..82669fb140fd 100644 --- a/pkgs/development/python-modules/volkswagencarnet/default.nix +++ b/pkgs/development/python-modules/volkswagencarnet/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "volkswagencarnet"; - version = "5.2.9"; + version = "5.3.2"; pyproject = true; src = fetchFromGitHub { owner = "robinostlund"; repo = "volkswagencarnet"; tag = "v${version}"; - hash = "sha256-rfWlb/R75vt4MNezHZLfFSfATr46Ek3srda0RMGLqko="; + hash = "sha256-e1QfD5/zB2iEmp7iTTZi8+beDSlC6xXjGRLxb9m65sA="; }; postPatch = '' From 121f9430f2ada0bfa196305e373c94a9861a0d62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Dec 2025 13:57:30 -0800 Subject: [PATCH 32/73] home-assistant-custom-components.volkswagencarnet: 5.2.9 -> 5.3.2 Diff: https://github.com/robinostlund/homeassistant-volkswagencarnet/compare/v5.2.9...v5.3.2 Changelog: https://github.com/robinostlund/homeassistant-volkswagencarnet/releases/tag/v5.3.2 --- .../custom-components/volkswagencarnet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix b/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix index b4f966575d42..00e0dd649254 100644 --- a/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix +++ b/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix @@ -10,13 +10,13 @@ buildHomeAssistantComponent rec { owner = "robinostlund"; domain = "volkswagencarnet"; - version = "5.2.9"; + version = "5.3.2"; src = fetchFromGitHub { owner = "robinostlund"; repo = "homeassistant-volkswagencarnet"; tag = "v${version}"; - hash = "sha256-yIP6sXV3aYFIFn+HkMuzIvbUX/11wC5DSVpEMOaRj3c="; + hash = "sha256-58PYLC7JoMLHN3ep2Fd0qXhzToZPcUgvJQDMX9swhjU="; }; postPatch = '' From cd42d815fec8c93286a9db7e52c83ef5b1a48ea0 Mon Sep 17 00:00:00 2001 From: Elliot Berman Date: Thu, 11 Dec 2025 16:36:13 -0800 Subject: [PATCH 33/73] python3Packages.textual: Use explicit tree-sitter language dependencies tree-sitter-languages is deprecated and broken on the latest version of tree-sitter. Thus, textual doesn't support syntax highlighting of any languages right now. tree-sitter-language-pack is a replacement fork for tree-sitter-languages, but isn't plug-and-play with textual. Add dependencies for all the currently Python-packaged tree-sitter languages, so that at least some languages work with textual. --- .../python-modules/textual/default.nix | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index 13d2672ae14a..fdfd847f639e 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -15,7 +15,16 @@ # optional-dependencies tree-sitter, - tree-sitter-languages, + tree-sitter-c-sharp, + tree-sitter-html, + tree-sitter-javascript, + tree-sitter-make, + tree-sitter-markdown, + tree-sitter-python, + tree-sitter-rust, + tree-sitter-sql, + tree-sitter-yaml, + tree-sitter-zeek, # tests jinja2, @@ -24,8 +33,6 @@ pytestCheckHook, syrupy, time-machine, - tree-sitter-markdown, - tree-sitter-python, }: buildPythonPackage rec { @@ -58,8 +65,17 @@ buildPythonPackage rec { optional-dependencies = { syntax = [ tree-sitter - ] - ++ lib.optionals (!tree-sitter-languages.meta.broken) [ tree-sitter-languages ]; + tree-sitter-c-sharp + tree-sitter-html + tree-sitter-javascript + tree-sitter-make + tree-sitter-markdown + tree-sitter-python + tree-sitter-rust + tree-sitter-sql + tree-sitter-yaml + tree-sitter-zeek + ]; }; nativeCheckInputs = [ From f7de7ae22b685de975f3b0bc9b43062b2de1984b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Dec 2025 04:03:01 +0000 Subject: [PATCH 34/73] _1password-gui: 8.11.20 -> 8.11.22 --- pkgs/by-name/_1/_1password-gui/sources.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json index d2b456dc2e16..402f39cdb390 100644 --- a/pkgs/by-name/_1/_1password-gui/sources.json +++ b/pkgs/by-name/_1/_1password-gui/sources.json @@ -1,28 +1,28 @@ { "stable": { "linux": { - "version": "8.11.20", + "version": "8.11.22", "sources": { "x86_64": { - "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.20.x64.tar.gz", - "hash": "sha256-3MqsHp6Kbqg6VjpNkwX1kYmFzLzJN5Ll00ZwQWDHoik=" + "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.22.x64.tar.gz", + "hash": "sha256-IYwCERJyL7l5qFFvTneTciKVT2PSkoeuzQsiMfdomV8=" }, "aarch64": { - "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.20.arm64.tar.gz", - "hash": "sha256-+wRkOHezTAxWgcgiJn23Wuz4v1lt3R7znfnVUm11fjs=" + "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.22.arm64.tar.gz", + "hash": "sha256-PpsKuFNRVt/eYWvlmZxo6tyMC/gUfLrIAWYPoKIntrU=" } } }, "darwin": { - "version": "8.11.20", + "version": "8.11.22", "sources": { "x86_64": { - "url": "https://downloads.1password.com/mac/1Password-8.11.20-x86_64.zip", - "hash": "sha256-QZcxmpc0UNbCkljkaP52tm3eR+bIpPOAGBJ7Q9lZlnA=" + "url": "https://downloads.1password.com/mac/1Password-8.11.22-x86_64.zip", + "hash": "sha256-jyaAUZkRJ6Rl5zd9ppVZ6AkpzAXaw11KvpLdpftC6bM=" }, "aarch64": { - "url": "https://downloads.1password.com/mac/1Password-8.11.20-aarch64.zip", - "hash": "sha256-8VoCNK6JwN6a5EUWZKQGDAY6mIN8bc4zBinEky7b0fM=" + "url": "https://downloads.1password.com/mac/1Password-8.11.22-aarch64.zip", + "hash": "sha256-SH3QIJrfqEgKV0GhrLCKkbLmSK9n9OyBRBaGCTm3FrI=" } } } From 0072ad32ecd847d7d86f253256d4902a058ff4c1 Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Fri, 12 Dec 2025 10:31:54 +0000 Subject: [PATCH 35/73] umami: 3.0.2 -> 3.0.3 --- pkgs/by-name/um/umami/package.nix | 6 +++--- pkgs/by-name/um/umami/sources.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/um/umami/package.nix b/pkgs/by-name/um/umami/package.nix index 9df179d015a1..9042e1e5d3d3 100644 --- a/pkgs/by-name/um/umami/package.nix +++ b/pkgs/by-name/um/umami/package.nix @@ -72,7 +72,7 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "umami"; - version = "3.0.2"; + version = "3.0.3"; nativeBuildInputs = [ makeWrapper @@ -84,7 +84,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "umami-software"; repo = "umami"; tag = "v${finalAttrs.version}"; - hash = "sha256-6ega3ShfZlEnoFuFSh420hB8sp2qoJuAYnzeoOdpODs="; + hash = "sha256-rkOD52suE6bihJqKvMdIvqHRIcWhSxXzUkCfmdNbC40="; }; # install dev dependencies as well, for rollup @@ -98,7 +98,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src ; fetcherVersion = 2; - hash = "sha256-zHpIqhxfvJ/so7bKvrGMqVGGnquJNnSI/0q3PE+VQ1Y="; + hash = "sha256-eXurT8kfVJcJoFunrt7h8LKuhsIhGrYDW6shvGA6GXY="; }; env.CYPRESS_INSTALL_BINARY = "0"; diff --git a/pkgs/by-name/um/umami/sources.json b/pkgs/by-name/um/umami/sources.json index 1f691d4d685b..48c653cabebc 100644 --- a/pkgs/by-name/um/umami/sources.json +++ b/pkgs/by-name/um/umami/sources.json @@ -1,7 +1,7 @@ { "geocities": { - "rev": "6ba4792cd60bfab42cab9ff0b0614106a6f98cb9", - "date": "2025-12-04", - "hash": "sha256-1NJbjXHk2jL18FTyN5CpWYIe1JO4bCqrgb/YTobDniY=" + "rev": "c311451d8c87eff88329f08a0fae5f84fc0303fe", + "date": "2025-12-11", + "hash": "sha256-tDK2p1VUmVfbzl0EhcGZbWP/1ao/U3f9vcK49f0MErc=" } } From 18d4826508002d316fa791f40eb3049b6d2ad568 Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Fri, 12 Dec 2025 11:44:41 +0000 Subject: [PATCH 36/73] umami: skip pnpmDeps from other platforms When fetching dependencies for all platforms (default for pnpm.fetchDeps) the pnpmDeps derivation size increases to over 4GiB, which is above the limit allowed by Hydra, failing the build there. This commit removes the `--force` flag when executing `pnpm install`, so only dependencies for the current platform are fetched and installed. --- pkgs/by-name/um/umami/package.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/um/umami/package.nix b/pkgs/by-name/um/umami/package.nix index 9042e1e5d3d3..e8c7c978287a 100644 --- a/pkgs/by-name/um/umami/package.nix +++ b/pkgs/by-name/um/umami/package.nix @@ -87,18 +87,24 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-rkOD52suE6bihJqKvMdIvqHRIcWhSxXzUkCfmdNbC40="; }; - # install dev dependencies as well, for rollup - pnpmInstallFlags = [ "--prod=false" ]; - pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname - pnpmInstallFlags version src ; + # prevent downloading dependencies for windows + # which bloat derivation size and fail to build on hydra + # https://github.com/NixOS/nixpkgs/pull/467820#issuecomment-3624054271 + pnpmInstallFlags = [ + "--force=false" + "--os=linux" + "--os=darwin" + "--cpu=x64" + "--cpu=arm64" + ]; fetcherVersion = 2; - hash = "sha256-eXurT8kfVJcJoFunrt7h8LKuhsIhGrYDW6shvGA6GXY="; + hash = "sha256-bqeJ0wzCtnuR6V67Qe1N9UcaHPLziuBhsn7eN8JVJbQ="; }; env.CYPRESS_INSTALL_BINARY = "0"; From e7d19ef88b7cc82b64affdb8fae734fbb825259f Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 5 Dec 2025 13:33:51 +0000 Subject: [PATCH 37/73] tuliprox: disable tests in 3.2.0 tests are broken in this version and will return an error no method named `is_ok` found for opaque type `impl futures::Future, std::io::Error>>` in the current scope Co-authored-by: Sandro --- pkgs/by-name/tu/tuliprox/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/tu/tuliprox/package.nix b/pkgs/by-name/tu/tuliprox/package.nix index 0b5cab8ec578..98b049f12be4 100644 --- a/pkgs/by-name/tu/tuliprox/package.nix +++ b/pkgs/by-name/tu/tuliprox/package.nix @@ -56,6 +56,9 @@ rustPlatform.buildRustPackage rec { popd ''; + # Tests don't compile in 3.2.0 + doCheck = lib.versionAtLeast version "3.2.1"; + checkFlags = [ "--skip=processing::parser::xmltv::tests::normalize" "--skip=processing::parser::xtream::tests::test_read_json_file_into_struct" From e231a32a7dec2927463a5d5ff387a01aae8f5734 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Fri, 12 Dec 2025 16:55:14 +0100 Subject: [PATCH 38/73] pgadmin: 9.10 -> 9.11 Signed-off-by: Florian Brandes --- pkgs/by-name/pg/pgadmin4/missing-hashes.json | 46 ++++++++++---------- pkgs/by-name/pg/pgadmin4/package.nix | 6 +-- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/pg/pgadmin4/missing-hashes.json b/pkgs/by-name/pg/pgadmin4/missing-hashes.json index bfe2a66960c2..fc795811cc52 100644 --- a/pkgs/by-name/pg/pgadmin4/missing-hashes.json +++ b/pkgs/by-name/pg/pgadmin4/missing-hashes.json @@ -1,26 +1,28 @@ { - "@img/sharp-darwin-arm64@npm:0.34.4": "43ac812bf5fb459f119f1a723166e914b0f285cf5a90c4d67bbe649b8f3028d6488fd2e3d1c253ab2fac41fdc50844fd525588ba0fc4513eab27b8f8a6c44b0d", - "@img/sharp-darwin-x64@npm:0.34.4": "e305f46134463844415f66d51940436a0017dbaea7f41b975f858d84d8d760d44c7c7418332c53ef2a199cc30268d3480cd03ae146d77b69355814f77984f1a9", - "@img/sharp-libvips-darwin-arm64@npm:1.2.3": "7d12bfb6a5a7d9a08b429996f9bcbe26b916abf383660e9f4a563eb4043cfd7c81bc2e098d392ef849469db784fbd2ec0f5cb77196f6751f754cc5e9c9dfe26b", - "@img/sharp-libvips-darwin-x64@npm:1.2.3": "72b155a5a84ea90c03f861ef0388038bd283c8884694a46620b284ca8daa91a2bf2170d352972bbd4238fa7ffe54f75f5305d960e74c2594a25040c73eaa8e3b", - "@img/sharp-libvips-linux-arm64@npm:1.2.3": "ad294d5736174b4e654ab1c0e2f4259828cafd5355ce48a66bbffe551b2d28ec36501a1f8756403e8b224c732bf2bf1ddde4879f595c7a71d24041064584c763", - "@img/sharp-libvips-linux-arm@npm:1.2.3": "e7d1b2fa70b92d1bfa5fc96a1caf44fb9148ff968614ef7c2580e7afc6b934f1959baa73c8b1d1928cd44d0e0f6ce80da53876ceea305178819149068614fc96", - "@img/sharp-libvips-linux-ppc64@npm:1.2.3": "d19699afba86ab6cbb341a94de26f42ed7a4fa49a63c04cde1a0b5083c763f6d44d3c776ce44418e23d2baf54fb938ee1cb9c801d08af983d953e374416a25cf", - "@img/sharp-libvips-linux-s390x@npm:1.2.3": "cac0cb0435dbe3a14f9a16e600ad578b6ec0eb31ea11e57bac1e2d04aa0cb48abe6784924fd93dd1f369d6b2066767666dfa16cc1d0f1b39f8cf3e04f8279391", - "@img/sharp-libvips-linux-x64@npm:1.2.3": "71b34ce6b907503350610be0a7bd6f6508af88e9c6580b9ade4e6e4e682d46777302f3dfa2dece87c1ebfb6dde35a90fa9cb8028f7beb4b74a6ece3a5e4bfeff", - "@img/sharp-libvips-linuxmusl-arm64@npm:1.2.3": "8d11423632b7ce6237604258609aa2bfcf0b1c13f3680260b37c5633a417ed9160c22b34e285a8bf34073ccd3d3a12ff2c1f3523eee45be2a7ff9ea6c77ccf05", - "@img/sharp-libvips-linuxmusl-x64@npm:1.2.3": "a71df40da0f563450ba15c5e1b32fa6ac648243aecf435dd2dd063d9d9b886eda38e33446465d5a600b98fcc6bac130e322d88504c16d1f452746c20a2910dbd", - "@img/sharp-linux-arm64@npm:0.34.4": "a2480a94b8b55c55f000e5d21d0d0413f4db16c9b7fbed431936f996d13a6f38214a4f04f016a89171c07fd995650483bc3ba0caaa204abddcd644bbf47d850f", - "@img/sharp-linux-arm@npm:0.34.4": "232ac951134af96d3c3a862db40639f174afe26b4d589fe97374d03d215237b99defbbfc7210af7a711893c881fc152032c32fd841afca05c493f127d0e6f7ca", - "@img/sharp-linux-ppc64@npm:0.34.4": "b872204fe0f3684a27a2931d3aef306837012f2a52225e057a1e28828c0c0668e21306e2dd1e459d2e91146ddac44b34ec59a10d446e4212ed667b859a424a43", - "@img/sharp-linux-s390x@npm:0.34.4": "f621a97fa238d54ad6db42ab14beba8605ee3335da06e1a72125bd2697dc363a66167c6191d9c0f2621cfed170528e131349992689ffcf6dd7ee387e16513c4a", - "@img/sharp-linux-x64@npm:0.34.4": "64dc5c8ee5432036428ade596b9daaa17ac343303d8b40f7e53e1253f9b598a55a1928b89b1d77ac54fc4a1cb871c472264d3bd36bdbc6828cc51b079a4d7080", - "@img/sharp-linuxmusl-arm64@npm:0.34.4": "8b555d30463f8312f44a15a528cbc9493a21925ee748519926cbf4157c752c5d4f23bed78d66fb4dbc3206e07fc0ce4a96d2aab709fd8fffe4568e89d3882706", - "@img/sharp-linuxmusl-x64@npm:0.34.4": "0bbcd14be148b629b483a38461d42276cf48b4f469bffa7319860abb636f12bb65a33d8e50590b659665293e1eff12bafd71256b36c137d78327422197b8dae9", - "@img/sharp-wasm32@npm:0.34.4": "e6b03a6339504592aaa645cc8a8471488e816672c255108c04ec0df802647a75b505fac229b72db3120beb6714ff763c49af6df26d2842d36a8a6a4731590024", - "@img/sharp-win32-arm64@npm:0.34.4": "e79bd3184c798d7623afb045ba49846e02355b8c589abf62f67c63cd341912e17cb799ba0f61bc59e3583f4c42e1f1ca860c97c6093d36d9be4be6a9dcaa8095", - "@img/sharp-win32-ia32@npm:0.34.4": "0d8cbd0419cf7671875491922ee0e3af11592ac234eb370688342e3f245cd98f54d029c323f9c48fee357f8b5de12c4155427805f28cebe2d87928006fb99b36", - "@img/sharp-win32-x64@npm:0.34.4": "6185e60fe69290d1a1c828f5540215e9b8f171f93623f3e7498c1dbb0c5d27a8bc989b57ade72a88eff1b7c48423fcc8a96b1680c2794b02fa3d157ffb49dcc8", + "@img/sharp-darwin-arm64@npm:0.34.5": "3298dfb02234e120d45476559f638b2843c13c1efe29559926ce91d7e2245fec4625e098b322a960b3c8cc8e682d4030934a12b3e21108be79c0e67b8e9cf688", + "@img/sharp-darwin-x64@npm:0.34.5": "fe4beb8013145491ed1f15eb58769d78c2cfaafcf76ee1acef25d27b27cad7dd1ea5f6cbd7dce2e55b9a4dd2d9cbc49cd02bf985e190c7b70406d40cc9807cbe", + "@img/sharp-libvips-darwin-arm64@npm:1.2.4": "7e2ad47b07dbf3966f706a2bc97f06422c0c07c8604cad25ea52426bc2f579cf9dffed90d5ef562f42dc48c5e8ba97cdc3ce7ce51c53e83a647222b7a2007b45", + "@img/sharp-libvips-darwin-x64@npm:1.2.4": "360d6c6b29aa07f0e74e45b7c748b0ab6cdb27eae67bb0d78b91824d724e3972709c98cc6189f6bbfa04b705d373ae3b3e53b4039dcf440bf8d8b62e4442abf3", + "@img/sharp-libvips-linux-arm64@npm:1.2.4": "ba975b5a40574829c7216fa788f8eb0f452d7d24477833363dd6208beffba7224d248d11d233a2264046259c65155c6194134918f490dc646de50197d34564d6", + "@img/sharp-libvips-linux-arm@npm:1.2.4": "0f562aa9aed62766208dbb0a05b69962679e64c7f93e5d6ab18d309864d61d5c4f09246f4be2d4ab0b7543adcc26cc7047e752cdcce3990b07de7586b2b842a3", + "@img/sharp-libvips-linux-ppc64@npm:1.2.4": "e40a9b8a2b235d0c4d4ff83ceb5e4cef7595b37696df88c1db8c23e910b92f13c803759469f9ddc51d9f9ab1750c41f05d7ceb78fa2e55bcd4475aeb6d427f54", + "@img/sharp-libvips-linux-riscv64@npm:1.2.4": "f06bfc1f51e1c57cb62cfbba91689f76cb30216c18e3d576109cb64b2c11e3f1da916e5da56a39c40775d80e70b6101ed060cd3f5170aaa13e7e1f487b3795ce", + "@img/sharp-libvips-linux-s390x@npm:1.2.4": "b500ec4bfa86b4abfcdfd449c4da13b3f85ced89772705be1332879f4eac9d5f0814ded19069a775df514dcfdbfbd3a3710d4e7e9a1f9a8d4a626a53ff91ce27", + "@img/sharp-libvips-linux-x64@npm:1.2.4": "ad9cbec6158b308893cd0fb38f6b5a7c74b8110c7e52ee7bf0f4442ffb05b9eb9c7e54e0f8ef1ee301b0b039a8937519845d2874b72916062309f15137b47d9a", + "@img/sharp-libvips-linuxmusl-arm64@npm:1.2.4": "254717ab22312e86939d803d4785f0c5df3d77d1fa4b776489d9cad595d5765db9ea9d1bd09c7adf84bc495ccc0ccee2fb503138254c01ee3d75a2258318f4f5", + "@img/sharp-libvips-linuxmusl-x64@npm:1.2.4": "71e80a6ffe4c8866e2e7265b1af210901d8a7c82c8fc55219c15ff9281a35785081e39f97fe5fca6b753c3ed430fe1f0554d91ba716455ea5831fcdc3773cb24", + "@img/sharp-linux-arm64@npm:0.34.5": "a7bf9b8127340ac9ae87a347a83643cfdb2302bb577e3a34aff952b3f9229432755921ea2262294385cdb6fef689711b58b11b77adc0be7de43f8e9d6ee7ea0e", + "@img/sharp-linux-arm@npm:0.34.5": "dff9a07d68f2203896fd038e2d20a1c5b21ee6939b51043f581e6929220abe65115acc8e7435f31e56fdbc097d0ff7f2160803630f341987697ebefa7306896c", + "@img/sharp-linux-ppc64@npm:0.34.5": "3b4989ad63f91b611169011bdf948a58c3ebb8c1e84b29a152bd72d40d7d080481897f46fa7b2c9fe2844f6040507fc1fd903573212a0667c20d8b156e044728", + "@img/sharp-linux-riscv64@npm:0.34.5": "88b8985bdd09a63ce440e24b75f56ce37292474f1a8788df95d673a61bb1ee55b02583ac87ba332b74cf89c448d174842a95922a3ad4109c7ae4d2a318f8f6f1", + "@img/sharp-linux-s390x@npm:0.34.5": "78a6624a75a2d6a193b29b3d12425b54206c7f4834ca58f103ae05027cfcfd6619b4977513791ca95aba8e2696d42529049d8e7dbc0775a19441a6cf7f113156", + "@img/sharp-linux-x64@npm:0.34.5": "eaeb7a303c973fc8de9ff17bb00328725b348ccf7ba110f35ecd663f51c565bf8379c917496b9d48a866caf0bef075f84e84271145d87e9e3ee7e34ae438b302", + "@img/sharp-linuxmusl-arm64@npm:0.34.5": "c943af12e150353ed39bac2240a22b37db586dcae79e838f0619648a8f640e41c850b92dbe0ce63321ffa77139cd2eacc45216d0c839b785929bc90f75d50f31", + "@img/sharp-linuxmusl-x64@npm:0.34.5": "86f8fcc84c6a7a4109a64b68690c6af0152c6227b0b47968761a939be2657e6f79f8d6f7a398c9eb891d874cfdb8adcb0a91f45a9e6a265d09904dcafb494a0c", + "@img/sharp-wasm32@npm:0.34.5": "68056480229e8cbd4a85e853179928ff5eddcc9da44ea8f4994bdd11335442cba3f263c25dfc4e9073439b0ef282ffd984c5ea2d46eb7ef2834eb3ef2816b101", + "@img/sharp-win32-arm64@npm:0.34.5": "887f699f440e8474f4680913ee06e8c7f9fe8f5500e8ef8310fd29594a1539c567c111043f643934c09089e6024785c153c40ea3a1401a6e6659b23058af68f2", + "@img/sharp-win32-ia32@npm:0.34.5": "1723fb245d946cb095e7337b17fef23d1f4903f2a4823a75d8eb489d738e18a19a2adfcefdb98a7d1b1b5ecc296c0b74858cd5d6f8af19895baa9b098b2bbd66", + "@img/sharp-win32-x64@npm:0.34.5": "2cc1c74b6749d79155752cf689410b22a3506f78e53090f880daf5c638a0cfd0e56f32fb8676c7c2c3c9b1c2811a70f08d95337deee2ff03c0af9272488300c2", "@unrs/resolver-binding-android-arm-eabi@npm:1.11.1": "04dd38b694c1680bfec192b499e188700398a414886a08a8a7c72815db56ac147df03d88c73ff6fff7ac3e0a01dc41978054b3622b49463e0d684c5168557fcc", "@unrs/resolver-binding-android-arm64@npm:1.11.1": "763626adc34dd2b4af677b5ced6493e7b2b1935351a5c9137f1c9561d11faf97b94015e6876e57e85c33ff563564314c92c0882a4780a57f2225cbbd779a695d", "@unrs/resolver-binding-darwin-arm64@npm:1.11.1": "03b477fdfec55dbabe488fe0962417bddaa38b028d2670053469f1d24163907b097aac15b565f6974449bee398a38d5e3e1525f2b515ce57e243149021b7aa2f", diff --git a/pkgs/by-name/pg/pgadmin4/package.nix b/pkgs/by-name/pg/pgadmin4/package.nix index f524e53119d2..91b26eb89a3e 100644 --- a/pkgs/by-name/pg/pgadmin4/package.nix +++ b/pkgs/by-name/pg/pgadmin4/package.nix @@ -20,14 +20,14 @@ let pname = "pgadmin"; - version = "9.10"; - yarnHash = "sha256-1xbQedxNDQaEiAT9GPNzz17cVD0v4CoxEn0SugJHaz0="; + version = "9.11"; + yarnHash = "sha256-x8EbZPQxCRBfeBXJGHW1tyN3tWzTqlMGvftizspfBRw="; src = fetchFromGitHub { owner = "pgadmin-org"; repo = "pgadmin4"; rev = "REL-${lib.versions.major version}_${lib.versions.minor version}"; - hash = "sha256-AUkxv7rmlb+KYhLe4vj9OvZkmBnN+TL+b/0Xf1+Wyy4="; + hash = "sha256-t+TdudbCq68fXJrcAzyESZTiA4qVkQgwF4efc4IJrl0="; }; # keep the scope, as it is used throughout the derivation and tests From 20b22ed50298dca96cf640fb87c514bb74e7f2ab Mon Sep 17 00:00:00 2001 From: famfo Date: Fri, 12 Dec 2025 21:49:44 +0100 Subject: [PATCH 39/73] swayfx-unwrapped: enable separateDebugInfo --- pkgs/by-name/sw/swayfx-unwrapped/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/sw/swayfx-unwrapped/package.nix b/pkgs/by-name/sw/swayfx-unwrapped/package.nix index 4f324d6988da..6192c86efad2 100644 --- a/pkgs/by-name/sw/swayfx-unwrapped/package.nix +++ b/pkgs/by-name/sw/swayfx-unwrapped/package.nix @@ -53,6 +53,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-TZNN5pQhH/10DfntCfGHL1kuAceLMYbxwa4RFq7OmrQ="; }; + separateDebugInfo = true; + patches = [ ./load-configuration-from-etc.patch From 6b6d099d4af2c579dd3bda45e54958117d9432d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Dec 2025 22:06:36 +0000 Subject: [PATCH 40/73] cloudlog: 2.8.1 -> 2.8.2 --- pkgs/by-name/cl/cloudlog/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/cloudlog/package.nix b/pkgs/by-name/cl/cloudlog/package.nix index f17431997279..90b80c77725e 100644 --- a/pkgs/by-name/cl/cloudlog/package.nix +++ b/pkgs/by-name/cl/cloudlog/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.8.1"; + version = "2.8.2"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - hash = "sha256-F8iEs7pQmdzQFajg+auA9cAvVzeL7fE1Zk/xXXO7xOQ="; + hash = "sha256-+NE8gu7PxaA+CrDgkMEA/jtnBbOQt8WbvxY4BHOhQQI="; }; postPatch = '' From b44ad3bd58950ef2159dad3c568454647dd151b2 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Sat, 13 Dec 2025 00:01:20 +0100 Subject: [PATCH 41/73] xf86-input-cmt: rename from xf86_input_cmt to fit package naming conventions --- nixos/modules/services/x11/hardware/cmt.nix | 2 +- pkgs/by-name/xf/{xf86_input_cmt => xf86-input-cmt}/package.nix | 0 pkgs/top-level/aliases.nix | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) rename pkgs/by-name/xf/{xf86_input_cmt => xf86-input-cmt}/package.nix (100%) diff --git a/nixos/modules/services/x11/hardware/cmt.nix b/nixos/modules/services/x11/hardware/cmt.nix index 23f07e5de06e..ca636fdb73fe 100644 --- a/nixos/modules/services/x11/hardware/cmt.nix +++ b/nixos/modules/services/x11/hardware/cmt.nix @@ -85,7 +85,7 @@ in config = mkIf cfg.enable { - services.xserver.modules = [ pkgs.xf86_input_cmt ]; + services.xserver.modules = [ pkgs.xf86-input-cmt ]; environment.etc = { "${etcPath}/40-touchpad-cmt.conf" = { diff --git a/pkgs/by-name/xf/xf86_input_cmt/package.nix b/pkgs/by-name/xf/xf86-input-cmt/package.nix similarity index 100% rename from pkgs/by-name/xf/xf86_input_cmt/package.nix rename to pkgs/by-name/xf/xf86-input-cmt/package.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 55ae9d9c4cbc..6889d161b128 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1696,6 +1696,7 @@ mapAliases { xbrightness = throw "'xbrightness' has been removed as it is unmaintained"; # Added 2025-08-28 xbursttools = throw "'xbursttools' has been removed as it is broken and unmaintained upstream."; # Added 2025-06-12 xdragon = throw "'xdragon' has been renamed to/replaced by 'dragon-drop'"; # Converted to throw 2025-10-27 + xf86_input_cmt = xf86-input-cmt; # Added 2025-12-12 xflux = throw "'xflux' has been removed as it was unmaintained"; # Added 2025-08-22 xflux-gui = throw "'xflux-gui' has been removed as it was unmaintained"; # Added 2025-08-22 xinput_calibrator = xinput-calibrator; # Added 2025-08-28 From 20956b3a27a1975f8faeb83c6497cb4c380ab877 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Sat, 13 Dec 2025 00:01:56 +0100 Subject: [PATCH 42/73] xf86-input-wacom: rename from xf86_input_wacom to fit package naming conventions --- nixos/modules/services/x11/hardware/wacom.nix | 8 ++++---- nixos/modules/services/x11/xserver.nix | 2 +- .../xf/{xf86_input_wacom => xf86-input-wacom}/package.nix | 0 pkgs/kde/plasma/wacomtablet/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + 5 files changed, 8 insertions(+), 7 deletions(-) rename pkgs/by-name/xf/{xf86_input_wacom => xf86-input-wacom}/package.nix (100%) diff --git a/nixos/modules/services/x11/hardware/wacom.nix b/nixos/modules/services/x11/hardware/wacom.nix index 3707b7f41575..56959f3334e6 100644 --- a/nixos/modules/services/x11/hardware/wacom.nix +++ b/nixos/modules/services/x11/hardware/wacom.nix @@ -39,14 +39,14 @@ in config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.xf86_input_wacom ]; # provides xsetwacom + environment.systemPackages = [ pkgs.xf86-input-wacom ]; # provides xsetwacom - services.xserver.modules = [ pkgs.xf86_input_wacom ]; + services.xserver.modules = [ pkgs.xf86-input-wacom ]; - services.udev.packages = [ pkgs.xf86_input_wacom ]; + services.udev.packages = [ pkgs.xf86-input-wacom ]; environment.etc."X11/xorg.conf.d/70-wacom.conf".source = - "${pkgs.xf86_input_wacom}/share/X11/xorg.conf.d/70-wacom.conf"; + "${pkgs.xf86-input-wacom}/share/X11/xorg.conf.d/70-wacom.conf"; }; diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 517305daab25..33343b5b54fd 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -365,7 +365,7 @@ in modules = mkOption { type = types.listOf types.path; default = [ ]; - example = literalExpression "[ pkgs.xf86_input_wacom ]"; + example = literalExpression "[ pkgs.xf86-input-wacom ]"; description = "Packages to be added to the module search path of the X server."; }; diff --git a/pkgs/by-name/xf/xf86_input_wacom/package.nix b/pkgs/by-name/xf/xf86-input-wacom/package.nix similarity index 100% rename from pkgs/by-name/xf/xf86_input_wacom/package.nix rename to pkgs/by-name/xf/xf86-input-wacom/package.nix diff --git a/pkgs/kde/plasma/wacomtablet/default.nix b/pkgs/kde/plasma/wacomtablet/default.nix index c4482a689606..59f9cfe04906 100644 --- a/pkgs/kde/plasma/wacomtablet/default.nix +++ b/pkgs/kde/plasma/wacomtablet/default.nix @@ -2,7 +2,7 @@ mkKdeDerivation, pkg-config, libwacom, - xf86_input_wacom, + xf86-input-wacom, }: mkKdeDerivation { pname = "wacomtablet"; @@ -10,7 +10,7 @@ mkKdeDerivation { extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ libwacom - xf86_input_wacom + xf86-input-wacom ]; meta.mainProgram = "kde_wacom_tabletfinder"; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6889d161b128..11fa22d1e4ec 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1697,6 +1697,7 @@ mapAliases { xbursttools = throw "'xbursttools' has been removed as it is broken and unmaintained upstream."; # Added 2025-06-12 xdragon = throw "'xdragon' has been renamed to/replaced by 'dragon-drop'"; # Converted to throw 2025-10-27 xf86_input_cmt = xf86-input-cmt; # Added 2025-12-12 + xf86_input_wacom = xf86-input-wacom; # Added 2025-12-12 xflux = throw "'xflux' has been removed as it was unmaintained"; # Added 2025-08-22 xflux-gui = throw "'xflux-gui' has been removed as it was unmaintained"; # Added 2025-08-22 xinput_calibrator = xinput-calibrator; # Added 2025-08-28 From af254e78b431995fdfb08441b7c632f9f37885ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 13 Dec 2025 01:08:45 +0100 Subject: [PATCH 43/73] nix-prefetch-scripts: use bash without readline We don't need that here and it reduces closure size. --- .../tools/package-management/nix-prefetch-scripts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index 579814a3bacf..4b78327c7091 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -3,7 +3,7 @@ stdenv, makeWrapper, buildEnv, - bash, + bashNonInteractive, breezy, cacert, coreutils, @@ -28,7 +28,7 @@ let strictDeps = true; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ bash ]; + buildInputs = [ bashNonInteractive ]; dontUnpack = true; From 17de5ae9991696bf6c12eb072b36bc2897b5f8b7 Mon Sep 17 00:00:00 2001 From: kyehn Date: Sat, 27 Sep 2025 16:01:44 +0800 Subject: [PATCH 44/73] serial-studio: 3.0.6 -> 3.1.10-unstable-2025-12-12 --- .../serial-studio/0001-CMake-Deploy-Fix.patch | 38 +++++-------------- .../0002-Connect-Button-Fix.patch | 16 -------- pkgs/by-name/se/serial-studio/package.nix | 27 +++++++------ 3 files changed, 24 insertions(+), 57 deletions(-) delete mode 100644 pkgs/by-name/se/serial-studio/0002-Connect-Button-Fix.patch diff --git a/pkgs/by-name/se/serial-studio/0001-CMake-Deploy-Fix.patch b/pkgs/by-name/se/serial-studio/0001-CMake-Deploy-Fix.patch index 705039b635bc..3ea75fbf5d43 100644 --- a/pkgs/by-name/se/serial-studio/0001-CMake-Deploy-Fix.patch +++ b/pkgs/by-name/se/serial-studio/0001-CMake-Deploy-Fix.patch @@ -2,37 +2,17 @@ diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index e69150cd..c4ce7975 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt -@@ -257,16 +257,16 @@ elseif(APPLE) - MACOSX_BUNDLE_INFO_PLIST ${INFO_MACOSX} - ) - elseif(UNIX) -- install(TARGETS ${PROJECT_EXECUTABLE} RUNTIME DESTINATION /usr/bin) -+ install(TARGETS ${PROJECT_EXECUTABLE} RUNTIME DESTINATION bin) - - install( - FILES ${CMAKE_CURRENT_SOURCE_DIR}/deploy/linux/serial-studio.png -- DESTINATION /usr/share/pixmaps -+ DESTINATION share/pixmaps - ) - - install( - FILES ${CMAKE_CURRENT_SOURCE_DIR}/deploy/linux/serial-studio.desktop -- DESTINATION /usr/share/applications -+ DESTINATION share/applications - ) +@@ -392,17 +392,6 @@ + set(deploy_tool_options_arg "-force-openssl --release --no-translations") endif() - -@@ -289,17 +289,6 @@ elseif(WIN32) - set(deploy_tool_options_arg --no-compiler-runtime -force-openssl --release) - endif() - + -qt_generate_deploy_qml_app_script( -- TARGET ${PROJECT_EXECUTABLE} -- OUTPUT_SCRIPT deploy_script -- MACOS_BUNDLE_POST_BUILD -- NO_UNSUPPORTED_PLATFORM_ERROR -- DEPLOY_USER_QML_MODULES_ON_UNSUPPORTED_PLATFORM -- DEPLOY_TOOL_OPTIONS ${deploy_tool_options_arg} +- TARGET ${PROJECT_EXECUTABLE} +- OUTPUT_SCRIPT deploy_script +- MACOS_BUNDLE_POST_BUILD +- NO_UNSUPPORTED_PLATFORM_ERROR +- DEPLOY_USER_QML_MODULES_ON_UNSUPPORTED_PLATFORM +- DEPLOY_TOOL_OPTIONS ${deploy_tool_options_arg} -) - -install(SCRIPT ${deploy_script}) diff --git a/pkgs/by-name/se/serial-studio/0002-Connect-Button-Fix.patch b/pkgs/by-name/se/serial-studio/0002-Connect-Button-Fix.patch deleted file mode 100644 index d1cbf622909f..000000000000 --- a/pkgs/by-name/se/serial-studio/0002-Connect-Button-Fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/app/qml/MainWindow/Panes/Toolbar.qml b/app/qml/MainWindow/Panes/Toolbar.qml -index 9b59c0c2..fa428a2f 100644 ---- a/app/qml/MainWindow/Panes/Toolbar.qml -+++ b/app/qml/MainWindow/Panes/Toolbar.qml -@@ -320,7 +320,7 @@ Rectangle { - font: Cpp_Misc_CommonFonts.boldUiFont - Layout.minimumWidth: metrics.width + 16 - Layout.maximumWidth: metrics.width + 16 -- enabled: Cpp_IO_Manager.configurationOk && !Cpp_CSV_Player.isOpen && !Cpp_MQTT_Client.isSubscribed -+ enabled: Cpp_IO_Manager.configurationOk && !Cpp_CSV_Player.isOpen - text: checked ? qsTr("Disconnect") : qsTr("Connect") - icon.source: checked ? "qrc:/rcc/icons/toolbar/connect.svg" : - "qrc:/rcc/icons/toolbar/disconnect.svg" --- -2.47.2 - diff --git a/pkgs/by-name/se/serial-studio/package.nix b/pkgs/by-name/se/serial-studio/package.nix index 2b2928eaaa04..1505a8941d8c 100644 --- a/pkgs/by-name/se/serial-studio/package.nix +++ b/pkgs/by-name/se/serial-studio/package.nix @@ -5,17 +5,18 @@ cmake, qt6, pkg-config, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "serial-studio"; - version = "3.0.6"; + version = "3.1.10-unstable-2025-12-12"; src = fetchFromGitHub { owner = "Serial-Studio"; repo = "Serial-Studio"; - tag = "v${version}"; - hash = "sha256-q3RWy3HRs5NG0skFb7PSv8jK5pI5rtbccP8j38l8kjM="; + rev = "b2e8b5430da59969dd697636677873f3f6c10c7c"; + hash = "sha256-O/KAYKpVGn2Q0CPaReh564P5l+ilHuQYRJ4w5aFKZmg="; fetchSubmodules = true; }; @@ -35,25 +36,27 @@ stdenv.mkDerivation rec { qt6.qttools qt6.qtserialport qt6.qtpositioning + qt6.qt5compat ]; - patches = [ - ./0001-CMake-Deploy-Fix.patch - ./0002-Connect-Button-Fix.patch - ]; + patches = [ ./0001-CMake-Deploy-Fix.patch ]; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} - mv $out/Serial-Studio.app $out/Applications - makeWrapper $out/Applications/Serial-Studio.app/Contents/MacOS/Serial-Studio $out/bin/serial-studio + mv $out/Serial-Studio-GPL3.app $out/Applications + ln --symbolic $out/Applications/Serial-Studio-GPL3.app/Contents/MacOS/Serial-Studio-GPL3 $out/bin/serial-studio ''; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + meta = { description = "Multi-purpose serial data visualization & processing program"; mainProgram = "serial-studio"; homepage = "https://serial-studio.github.io/"; - license = lib.licenses.mit; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ sikmir ]; platforms = lib.platforms.unix; }; -} +}) From 867e05e8352d7f58fecbfe61033d35fdaf324323 Mon Sep 17 00:00:00 2001 From: kyehn Date: Fri, 26 Sep 2025 10:42:04 +0800 Subject: [PATCH 45/73] sof-tools: 2.10 -> 2.14 --- pkgs/by-name/so/sof-tools/package.nix | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/so/sof-tools/package.nix b/pkgs/by-name/so/sof-tools/package.nix index 515025434022..0e62ccd5e348 100644 --- a/pkgs/by-name/so/sof-tools/package.nix +++ b/pkgs/by-name/so/sof-tools/package.nix @@ -4,22 +4,30 @@ fetchFromGitHub, cmake, alsa-lib, + python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sof-tools"; - version = "2.10"; + version = "2.14"; src = fetchFromGitHub { owner = "thesofproject"; repo = "sof"; - rev = "v${version}"; - hash = "sha256-VmP0z3q1P8LqQ+ELZGkI7lEXGiMYdAPvS8Lbwv6dUyk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Y3byJmoANVeilJpO82aljBZas/6u6VqfynYl0csW1as="; }; - nativeBuildInputs = [ cmake ]; + postPatch = '' + patchShebangs ../scripts/gen-uuid-reg.py + ''; + + nativeBuildInputs = [ + cmake + python3 + ]; buildInputs = [ alsa-lib ]; - sourceRoot = "${src.name}/tools"; + sourceRoot = "${finalAttrs.src.name}/tools"; meta = { description = "Tools to develop, test and debug SoF (Sund Open Firmware)"; @@ -29,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.johnazoidberg ]; mainProgram = "sof-ctl"; }; -} +}) From 1438ff7e5fc7d321262800b4cdc6d1fab02e28ce Mon Sep 17 00:00:00 2001 From: kyehn <228304369+kyehn@users.noreply.github.com> Date: Fri, 3 Oct 2025 20:54:42 +0800 Subject: [PATCH 46/73] scmccid: 5.0.11 -> 5.0.35 --- pkgs/by-name/sc/scmccid/package.nix | 31 +++++++++++++++++------------ 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/sc/scmccid/package.nix b/pkgs/by-name/sc/scmccid/package.nix index 684c8116fc72..6c9b0922318a 100644 --- a/pkgs/by-name/sc/scmccid/package.nix +++ b/pkgs/by-name/sc/scmccid/package.nix @@ -6,22 +6,20 @@ libusb-compat-0_1, }: -assert stdenv ? cc && stdenv.cc.libc != null; - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "scmccid"; - version = "5.0.11"; + version = "5.0.35"; src = if stdenv.hostPlatform.system == "i686-linux" then (fetchurl { - url = "http://www.scmmicro.com/support/download/scmccid_${version}_linux.tar.gz"; - sha256 = "1r5wkarhzl09ncgj55baizf573czw0nplh1pgddzx9xck66kh5bm"; + url = "https://scm-pc-card.de/file/driver/Readers_Writers/scmccid_${finalAttrs.version}_linux_rel.tar.gz"; + hash = "sha256-eRqAoe7uZUTTLh3K3bc4PmVmqJtvSpfOBWXdjydN72U="; }) else if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl { - url = "http://www.scmmicro.com/support/download/scmccid_${version}_linux_x64.tar.gz"; - sha256 = "0k9lzlk01sl4ycfqgrqqy3bildz0mcr1r0kkicgjz96l4s0jgz0i"; + url = "https://scm-pc-card.de/file/driver/Readers_Writers/scmccid_${finalAttrs.version}_linux_rel_64.tar.gz"; + hash = "sha256-SFf3QC+1hZCWIgIOEAfIHR68PHFXTW8amT4D5UMTMeQ="; }) else throw "Architecture not supported"; @@ -29,24 +27,31 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ patchelf ]; installPhase = '' - RPATH=${libusb-compat-0_1.out}/lib:${stdenv.cc.libc.out}/lib + runHook preInstall for a in proprietary/*/Contents/Linux/*.so*; do if ! test -L $a; then - patchelf --set-rpath $RPATH $a + patchelf --set-rpath ${ + lib.makeLibraryPath [ + libusb-compat-0_1 + stdenv.cc.libc + ] + } $a fi done mkdir -p $out/pcsc/drivers cp -R proprietary/* $out/pcsc/drivers + + runHook postInstall ''; meta = { - homepage = "http://www.scmmicro.com/support/pc-security-support/downloads.html"; + homepage = "http://support.identiv.com/products"; description = "PCSC drivers for linux, for the SCM SCR3310 v2.0 card and others"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ ]; - platforms = with lib.platforms; linux; + platforms = lib.platforms.linux; }; -} +}) From f1668c3ad6ab9471f59e40c5fed2e1a7ea2084ef Mon Sep 17 00:00:00 2001 From: kyehn Date: Sat, 27 Sep 2025 15:40:31 +0800 Subject: [PATCH 47/73] segger-ozone: 3.38c -> 3.40b --- pkgs/by-name/se/segger-ozone/package.nix | 75 +++++++++++++----------- 1 file changed, 42 insertions(+), 33 deletions(-) diff --git a/pkgs/by-name/se/segger-ozone/package.nix b/pkgs/by-name/se/segger-ozone/package.nix index cf64022a9df1..fe78af186c6d 100644 --- a/pkgs/by-name/se/segger-ozone/package.nix +++ b/pkgs/by-name/se/segger-ozone/package.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, autoPatchelfHook, + copyDesktopItems, fontconfig, freetype, libICE, @@ -12,35 +13,24 @@ libXfixes, libXrandr, libXrender, + makeDesktopItem, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "segger-ozone"; - version = - { - x86_64-linux = "3.38c"; - i686-linux = "3.36"; - } - .${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); + version = "3.40b"; - src = - { - x86_64-linux = fetchurl { - url = "https://www.segger.com/downloads/jlink/Ozone_Linux_V${ - builtins.replaceStrings [ "." ] [ "" ] version - }_x86_64.tgz"; - hash = "sha256-GYiFP3aK+dqpZuoJlTxJbTboYtWY9WACbxB11TctsQE="; - }; - i686-linux = fetchurl { - url = "https://www.segger.com/downloads/jlink/Ozone_Linux_V${ - builtins.replaceStrings [ "." ] [ "" ] version - }_i386.tgz"; - hash = "sha256-u2HGOsv46BRlmqiusZD9iakLx5T530DqauNDY3YTiDY="; - }; - } - .${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); + src = fetchurl { + url = "https://www.segger.com/downloads/jlink/Ozone_Linux_V${ + lib.replaceString "." "" finalAttrs.version + }_x86_64.tgz"; + hash = "sha256-5T/DSG43IaYEfjSI1KcL/+KBVkHdAapgS8H0Oln2Vrk="; + }; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ + autoPatchelfHook + copyDesktopItems + ]; buildInputs = [ fontconfig @@ -55,13 +45,35 @@ stdenv.mkDerivation rec { (lib.getLib stdenv.cc.cc) ]; + desktopItems = [ + (makeDesktopItem { + categories = [ + "Development" + "Debugger" + "X-MandrivaLinux-MoreApplications-Development" + ]; + comment = "SEGGER Ozone"; + desktopName = "Ozone"; + exec = "Ozone %%f"; + icon = "Ozone"; + keywords = [ + "ARM" + "Development" + "Embedded" + ]; + name = "segger-ozone"; + startupNotify = true; + terminal = false; + }) + ]; + installPhase = '' runHook preInstall - mkdir -p $out/bin - mv Lib lib - mv * $out - ln -s $out/Ozone $out/bin + mkdir -p $out/libexec $out/bin + cp --recursive . $out/libexec/segger-ozone + ln -s $out/libexec/segger-ozone/Ozone $out/bin/Ozone + install -D --mode=0644 Ozone.png $out/share/icons/hicolor/256x256/apps/Ozone.png runHook postInstall ''; @@ -92,9 +104,6 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.bmilanov ]; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; + platforms = [ "x86_64-linux" ]; }; -} +}) From ef4704a644c6ce2b5548829e57450129c07f4dd1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Dec 2025 01:51:54 +0000 Subject: [PATCH 48/73] rumdl: 0.0.185 -> 0.0.194 --- pkgs/by-name/ru/rumdl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/rumdl/package.nix b/pkgs/by-name/ru/rumdl/package.nix index 833c994a5ff1..a1c25a24061c 100644 --- a/pkgs/by-name/ru/rumdl/package.nix +++ b/pkgs/by-name/ru/rumdl/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rumdl"; - version = "0.0.185"; + version = "0.0.194"; src = fetchFromGitHub { owner = "rvben"; repo = "rumdl"; tag = "v${finalAttrs.version}"; - hash = "sha256-iIpNG8tTwSA6Kj7hQL/6NzSszGLX7lPHNmmXDl67bwo="; + hash = "sha256-4+JeAFS9ELfAq43fH/HYhjCZoNmlZ+fPf1RVJnWRRnQ="; }; - cargoHash = "sha256-CLH+5/ydhaYYSkTYNzTgROefPnC/FPutqDXziTmw7+k="; + cargoHash = "sha256-fUpwSFT/Sg+akzBLq07YFxqCaGwEH0b2LD3c/Eojwpw="; cargoBuildFlags = [ "--bin=rumdl" From 17295cc637285351f64fa58141d63b36d65fabd0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Dec 2025 02:26:34 +0000 Subject: [PATCH 49/73] timbl: 6.10 -> 6.11 --- pkgs/by-name/ti/timbl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ti/timbl/package.nix b/pkgs/by-name/ti/timbl/package.nix index e3147266c307..c61967494d49 100644 --- a/pkgs/by-name/ti/timbl/package.nix +++ b/pkgs/by-name/ti/timbl/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "timbl"; - version = "6.10"; + version = "6.11"; src = fetchFromGitHub { owner = "LanguageMachines"; repo = "timbl"; tag = "v${finalAttrs.version}"; - hash = "sha256-kAPYKAlgr9c4OU6ARTizOmWvQa1mrK0IoOWshJ4Ctjg="; + hash = "sha256-DzHVUb+inFQ4Z0zrAUuO1+4775ZLMp/gDyN8x7z8EKI="; }; nativeBuildInputs = [ From 74c05d77a8040687a1229667a69479eda2234a6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Dec 2025 03:07:43 +0000 Subject: [PATCH 50/73] lunatask: 2.1.16 -> 2.1.17 --- pkgs/by-name/lu/lunatask/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/lunatask/package.nix b/pkgs/by-name/lu/lunatask/package.nix index f0ecdca17f7a..cbde2d89fffb 100644 --- a/pkgs/by-name/lu/lunatask/package.nix +++ b/pkgs/by-name/lu/lunatask/package.nix @@ -6,12 +6,12 @@ }: let - version = "2.1.16"; + version = "2.1.17"; pname = "lunatask"; src = fetchurl { url = "https://github.com/lunatask/lunatask/releases/download/v${version}/Lunatask-${version}.AppImage"; - hash = "sha256-+CjnVJGFR+UXnW6Cc+S8vVli9hECDrogOdraMRkHgqM="; + hash = "sha256-gRtlyPqnQg1WqwrWbMSsdNnIAK6Zwg/xInvYlpbhAoU="; }; appimageContents = appimageTools.extract { From f5d87c57fc7909487b40632d7c23a46850ff5c99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Sat, 13 Dec 2025 12:35:10 +0700 Subject: [PATCH 51/73] nix-prefetch-scripts: drop gnused as a hard dependency --- .../nix-prefetch-scripts/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index 579814a3bacf..1dade613d9a5 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -35,15 +35,7 @@ let installPhase = '' install -vD ${src} $out/bin/$name; wrapProgram $out/bin/$name \ - --prefix PATH : ${ - lib.makeBinPath ( - deps - ++ [ - coreutils - gnused - ] - ) - } \ + --prefix PATH : ${lib.makeBinPath ( deps ++ [ coreutils ])} \ --set HOME /homeless-shelter ''; @@ -63,6 +55,7 @@ rec { # we expect people to have a Nix implementation available ambiently. nix-prefetch-bzr = mkPrefetchScript "bzr" ../../../build-support/fetchbzr/nix-prefetch-bzr [ breezy + gnused ]; nix-prefetch-cvs = mkPrefetchScript "cvs" ../../../build-support/fetchcvs/nix-prefetch-cvs [ cvs ]; nix-prefetch-darcs = mkPrefetchScript "darcs" ../../../build-support/fetchdarcs/nix-prefetch-darcs [ @@ -76,11 +69,13 @@ rec { gawk gitMinimal git-lfs + gnused ]; nix-prefetch-hg = mkPrefetchScript "hg" ../../../build-support/fetchhg/nix-prefetch-hg [ mercurial ]; nix-prefetch-svn = mkPrefetchScript "svn" ../../../build-support/fetchsvn/nix-prefetch-svn [ + gnused subversion ]; nix-prefetch-pijul = mkPrefetchScript "pijul" ../../../build-support/fetchpijul/nix-prefetch-pijul [ From 9338b5aa3e78919906889d720eb8c3c4c10259f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Sat, 13 Dec 2025 12:36:20 +0700 Subject: [PATCH 52/73] nix-prefetch-svn: add missing gnugrep input --- .../tools/package-management/nix-prefetch-scripts/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index 1dade613d9a5..8982dbc7539c 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -13,6 +13,7 @@ gawk, gitMinimal, git-lfs, + gnugrep, gnused, jq, mercurial, @@ -35,7 +36,7 @@ let installPhase = '' install -vD ${src} $out/bin/$name; wrapProgram $out/bin/$name \ - --prefix PATH : ${lib.makeBinPath ( deps ++ [ coreutils ])} \ + --prefix PATH : ${lib.makeBinPath (deps ++ [ coreutils ])} \ --set HOME /homeless-shelter ''; @@ -75,6 +76,7 @@ rec { mercurial ]; nix-prefetch-svn = mkPrefetchScript "svn" ../../../build-support/fetchsvn/nix-prefetch-svn [ + gnugrep gnused subversion ]; From 5db7d2686b494b7f52386163755b91b3f8255246 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Dec 2025 08:32:36 +0000 Subject: [PATCH 53/73] fcitx5-pinyin-moegirl: 20251109 -> 20251210 --- pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix index c127ad6d1e88..3f456d26ded3 100644 --- a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix +++ b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "fcitx5-pinyin-moegirl"; - version = "20251109"; + version = "20251210"; src = fetchurl { url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict"; - hash = "sha256-BqioFALa1ZjMVCWgT9PdTHK0/YqipOFiNhn+Pn+TQc4="; + hash = "sha256-nOVFcV7kIQXrz5vKzbMaJPRIk20x8+pOxCOgYCiiOak="; }; dontUnpack = true; From d290cd0e8313fdd07541b508490d5eb61834b89d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Dec 2025 08:54:03 +0000 Subject: [PATCH 54/73] smtp4dev: 3.11.0 -> 3.12.0 --- pkgs/by-name/sm/smtp4dev/deps.json | 33 ++++++++++++++++------------ pkgs/by-name/sm/smtp4dev/package.nix | 6 ++--- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/sm/smtp4dev/deps.json b/pkgs/by-name/sm/smtp4dev/deps.json index 40de6f06d71f..9b2004233e86 100644 --- a/pkgs/by-name/sm/smtp4dev/deps.json +++ b/pkgs/by-name/sm/smtp4dev/deps.json @@ -51,13 +51,13 @@ }, { "pname": "FSharp.Core", - "version": "8.0.200", - "hash": "sha256-wjYiedFiqOTKaM4mF6uT9kc/yKDJ78mqfw9qLoBFHOw=" + "version": "8.0.301", + "hash": "sha256-LyP+zHxXFNksSQ/ExQ9CGkQYGvld8W6JNmxMg6lTRCs=" }, { "pname": "Html2Markdown", - "version": "6.1.0.2", - "hash": "sha256-r8tXLN6rkOCW+Tae+etAgP3MGkW8mQFQetR1ual6trM=" + "version": "6.2.5.7", + "hash": "sha256-9uoXng20APzOMAE1iuJ/I4mb3YE5IDhWTv1eMAMVeRE=" }, { "pname": "HtmlAgilityPack", @@ -69,6 +69,11 @@ "version": "2.14.1", "hash": "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o=" }, + { + "pname": "JetBrains.Annotations", + "version": "2024.2.0", + "hash": "sha256-OgtW4wIqo5d3q6NSiYrUm4KkUdUHEWFyvlbtoQJjDwU=" + }, { "pname": "Jint", "version": "3.0.1", @@ -76,8 +81,8 @@ }, { "pname": "Linq.Expression.Optimizer", - "version": "1.0.29", - "hash": "sha256-F0ZvZ6hbdnjkuNuSoFzSjYUgG/hEHuG7o8wExDS1LLo=" + "version": "1.0.34", + "hash": "sha256-CrDmtcpwFDZ/mAj/urtLWXM1ZDTr/msjZPT48YZGleI=" }, { "pname": "LinqKit", @@ -1046,8 +1051,8 @@ }, { "pname": "Serilog.Sinks.Console", - "version": "6.0.0", - "hash": "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro=" + "version": "6.1.1", + "hash": "sha256-CfIg4Us4kSMQAn6rU2rsAeE22g6MpFiZdhoZWySpZeY=" }, { "pname": "Serilog.Sinks.Debug", @@ -1061,8 +1066,8 @@ }, { "pname": "Serilog.Sinks.File", - "version": "6.0.0", - "hash": "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow=" + "version": "7.0.0", + "hash": "sha256-LxZYUoUPkCjIIVarJilnXnqQiMrFNJtoRilmzTNtUjo=" }, { "pname": "SQLitePCLRaw.bundle_e_sqlite3", @@ -1421,8 +1426,8 @@ }, { "pname": "System.Linq.Dynamic.Core", - "version": "1.6.4", - "hash": "sha256-Mpp+3UYARo+Hnh3ybtHtdN0LI5HQV07CBZP7jRnVk10=" + "version": "1.7.1", + "hash": "sha256-IOBL8cg9TektJlinbpb9w4scifbFcNiZ7D66NDXthxw=" }, { "pname": "System.Linq.Expressions", @@ -1496,8 +1501,8 @@ }, { "pname": "System.Reactive", - "version": "6.0.1", - "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q=" + "version": "6.1.0", + "hash": "sha256-zACYoZmKxHo0qKY8FOVa7jIsw7dN7WjdXdRRV95qY2Y=" }, { "pname": "System.Reflection", diff --git a/pkgs/by-name/sm/smtp4dev/package.nix b/pkgs/by-name/sm/smtp4dev/package.nix index fae45b8cb86d..5a5242481e10 100644 --- a/pkgs/by-name/sm/smtp4dev/package.nix +++ b/pkgs/by-name/sm/smtp4dev/package.nix @@ -11,13 +11,13 @@ buildDotnetModule (finalAttrs: { pname = "smtp4dev"; - version = "3.11.0"; + version = "3.12.0"; src = fetchFromGitHub { owner = "rnwood"; repo = "smtp4dev"; tag = finalAttrs.version; - hash = "sha256-+6UIfttIjBbsxptc1uI7K8golGwl+Fw6f5kCl89NPDA="; + hash = "sha256-1dzK0IHdjEppV62tE4Ywqs8WihLJUY4bhzJPQ1A/Eog="; }; patches = [ ./smtp4dev-npm-packages.patch ]; @@ -33,7 +33,7 @@ buildDotnetModule (finalAttrs: { npmDeps = fetchNpmDeps { inherit (finalAttrs) src patches; - hash = "sha256-+rKqiGiIQAYCY/3z1m9cQI0WgtdX8UTr70v7nTtgkt0="; + hash = "sha256-lJyjoTTgum67j1qPtkLFGYO2sTpvN7ug0Q1jJw/Se/c="; postPatch = "cd ${finalAttrs.npmRoot}"; }; From cb2743d2070ce0568b72eb0388f7cc50ca580564 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Mon, 1 Dec 2025 07:12:09 +1100 Subject: [PATCH 55/73] fittrackee: fix build and tests --- pkgs/by-name/fi/fittrackee/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/fi/fittrackee/package.nix b/pkgs/by-name/fi/fittrackee/package.nix index f285a78a6a35..cb04227827ad 100644 --- a/pkgs/by-name/fi/fittrackee/package.nix +++ b/pkgs/by-name/fi/fittrackee/package.nix @@ -22,6 +22,15 @@ python3Packages.buildPythonApplication rec { python3Packages.poetry-core ]; + # The upstream project changed the behavior of the CLI when --set-admin and --set-role are used together. + # Previously, it would raise an error, but now it issues a deprecation warning. + # This patch updates the test assertion to expect the new deprecation warning message. + # See upstream commit 6eda1b6119b3e41bdf8896e74b4a07d3c9e97609. + postPatch = '' + substituteInPlace fittrackee/tests/users/test_users_commands.py \ + --replace '"--set-admin and --set-role can not be used together."' '"WARNING: --set-admin is deprecated. Please use --set-role option instead."' + ''; + pythonRelaxDeps = [ "authlib" "fitdecode" @@ -33,6 +42,7 @@ python3Packages.buildPythonApplication rec { "pyopenssl" "pytz" "sqlalchemy" + "xmltodict" ]; dependencies = From a92a65f9e8d86db47e9d2a8ed16ffec80ccb4f4f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Dec 2025 11:34:36 +0000 Subject: [PATCH 56/73] zigpy-cli: 1.2.0 -> 1.2.1 --- pkgs/by-name/zi/zigpy-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zi/zigpy-cli/package.nix b/pkgs/by-name/zi/zigpy-cli/package.nix index e9933ffc398b..56003b5841bc 100644 --- a/pkgs/by-name/zi/zigpy-cli/package.nix +++ b/pkgs/by-name/zi/zigpy-cli/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "zigpy-cli"; - version = "1.2.0"; + version = "1.2.1"; pyproject = true; src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy-cli"; tag = "v${version}"; - hash = "sha256-IwL69fZLbCvoliYB7Ne6nhe9QVoy9Wu55Mwca+mbucc="; + hash = "sha256-vY6mv5R7A4kVg4Z4nWdm5hgQv6fewyIbOrvhDUuiXa0="; }; postPatch = '' From 5291782aca8a6b1dd21389526394f78de5965fb3 Mon Sep 17 00:00:00 2001 From: utopiatopia <98685984+utopiatopia@users.noreply.github.com> Date: Sat, 13 Dec 2025 03:30:57 -0800 Subject: [PATCH 57/73] stats: 2.11.58 -> 2.11.62 --- pkgs/by-name/st/stats/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index 1a9fb908e342..73d64c7610b9 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "stats"; - version = "2.11.58"; + version = "2.11.62"; src = fetchurl { url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg"; - hash = "sha256-2q9gPXrJ8elek+NuQq7RkdRnfnUc5Rw3Jopp6Q3R+UI="; + hash = "sha256-23xTP1NbJ43eWISELAUu7aZuIW2cr5O8jV2nRppi9Yw="; }; sourceRoot = "."; @@ -31,6 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { + changelog = "https://github.com/exelban/stats/releases/tag/v${finalAttrs.version}"; description = "macOS system monitor in your menu bar"; homepage = "https://github.com/exelban/stats"; license = lib.licenses.mit; From a9c349e93414ed7706b8ed6b8f197e14efbf6e6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Dec 2025 12:36:21 +0000 Subject: [PATCH 58/73] python3Packages.optimum-onnx: 0.0.2 -> 0.0.3 --- pkgs/development/python-modules/optimum-onnx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/optimum-onnx/default.nix b/pkgs/development/python-modules/optimum-onnx/default.nix index f596ed96e0c2..bfe9f27c387b 100644 --- a/pkgs/development/python-modules/optimum-onnx/default.nix +++ b/pkgs/development/python-modules/optimum-onnx/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "optimum-onnx"; - version = "0.0.2"; + version = "0.0.3"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "optimum-onnx"; tag = "v${version}"; - hash = "sha256-wT3yqS64LMuq76Yxs6V6nHfD8vgSfPoJm3hbW7E2zpk="; + hash = "sha256-IFXtKkJwmrcdjfXE2YccbRylU723fTG70Z6c9fIL5mE="; }; build-system = [ From 036b6bcfb0e623d21b8e771301fd56a707cf4dc5 Mon Sep 17 00:00:00 2001 From: Hendrik Sokolowski Date: Mon, 19 May 2025 01:47:11 +0200 Subject: [PATCH 59/73] solidtime-desktop: init at 0.0.42 Co-authored-by: Aleksana Co-authored-by: Angel J <78835633+Iamanaws@users.noreply.github.com> Co-authored-by: Jhonas Wernery --- pkgs/by-name/so/solidtime-desktop/package.nix | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 pkgs/by-name/so/solidtime-desktop/package.nix diff --git a/pkgs/by-name/so/solidtime-desktop/package.nix b/pkgs/by-name/so/solidtime-desktop/package.nix new file mode 100644 index 000000000000..5871d7ad6373 --- /dev/null +++ b/pkgs/by-name/so/solidtime-desktop/package.nix @@ -0,0 +1,67 @@ +{ + lib, + stdenv, + buildNpmPackage, + fetchFromGitHub, + copyDesktopItems, + makeDesktopItem, + makeWrapper, + electron, +}: + +buildNpmPackage (finalAttrs: { + pname = "solidtime-desktop"; + version = "0.0.42"; + + src = fetchFromGitHub { + owner = "solidtime-io"; + repo = "solidtime-desktop"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Ve8hT+Gja2HawJ9G6aELxserOfTK7dRNnfdHpY3WUDU="; + }; + + nativeBuildInputs = [ + makeWrapper + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + copyDesktopItems + ]; + + npmDepsHash = "sha256-y4bO2Rcr+JXkS+q1EbSjg3nNd3GCrB8A+t9ePJsE2L4="; + + makeCacheWritable = true; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; + + postInstall = '' + mkdir -p $out/share/icons/hicolor/1024x1024 + cp -a build/icon.png $out/share/icons/hicolor/1024x1024/solidtime-desktop.png + cp -a . $out/share/solidtime-desktop + + makeWrapper ${lib.getExe electron} $out/bin/solidtime-desktop \ + --add-flags $out/share/solidtime-desktop + ''; + + desktopItems = [ + (makeDesktopItem { + name = "solidtime-desktop"; + exec = "solidtime-desktop %U"; + icon = "solidtime-desktop"; + desktopName = "Solidtime Desktop"; + comment = finalAttrs.meta.description; + categories = [ "Utility" ]; + mimeTypes = [ "x-scheme-handler/solidtime" ]; + terminal = false; + }) + ]; + + meta = { + description = "Modern open-source time-tracking app"; + homepage = "https://github.com/solidtime-io/solidtime-desktop"; + changelog = "https://github.com/solidtime-io/solidtime-desktop/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.agpl3Only; + mainProgram = "solidtime-desktop"; + maintainers = with lib.maintainers; [ hensoko ]; + platforms = lib.platforms.linux; + }; +}) From d7eb37f40340becfb088819429c1be6a9b043075 Mon Sep 17 00:00:00 2001 From: Samuel Rounce Date: Sat, 13 Dec 2025 12:39:17 +0000 Subject: [PATCH 60/73] freecad: fix PYTHONPATH patch header attribution In the course of updating this patch to apply cleanly I'd accidentally erased evidence of Andreas Rammhold's earlier work. Updating the patch header and formatting to amend this error. Co-authored-by: Andreas Rammhold --- .../0001-NIXOS-don-t-ignore-PYTHONPATH.patch | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/fr/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch b/pkgs/by-name/fr/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch index 185d6effa25e..da4facbd5d2b 100644 --- a/pkgs/by-name/fr/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch +++ b/pkgs/by-name/fr/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch @@ -1,21 +1,20 @@ commit c534a831c2f7186ebabe4e17f1e1df6d11ebff89 -Author: Samuel Rounce +From: Andreas Rammhold Date: Thu Sep 5 22:17:21 2024 +0100 +Subject: [PATCH] NIXOS: don't ignore PYTHONPATH - [PATCH] NIXOS: don't ignore PYTHONPATH - - On NixOS or rather within nixpkgs we provide the runtime Python - packages via the PYTHONPATH environment variable. FreeCAD tries its - best to ignore Python environment variables that are being inherited - from the environment. For Python versions >=3.11 it also tries to - initialize the interpreter config without any environmental data. We - have to initialize the configuration *with* the information from the - environment for our packaging to work. - - Upstream has purposely isolated the environments AFAIK and thus - shouldn't accept this patch (as is). What they might accept (once - support for older Python versions has been dropped) is removing the - PYTHONPATH specific putenv calls. +On NixOS or rather within nixpkgs we provide the runtime Python +packages via the PYTHONPATH environment variable. FreeCAD tries its +best to ignore Python environment variables that are being inherited +from the environment. For Python versions >=3.11 it also tries to +initialize the interpreter config without any environmental data. We +have to initialize the configuration *with* the information from the +environment for our packaging to work. + +Upstream has purposely isolated the environments AFAIK and thus +shouldn't accept this patch (as is). What they might accept (once +support for older Python versions has been dropped) is removing the +PYTHONPATH specific putenv calls. --- src/Base/Interpreter.cpp | 1 + src/Main/MainGui.cpp | 3 --- From 28694af609a35d400e25c53e1c69cf986aebc0b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Dec 2025 12:39:37 +0000 Subject: [PATCH 61/73] _1password-gui-beta: 8.11.22-25.BETA -> 8.11.22-26.BETA --- pkgs/by-name/_1/_1password-gui/sources.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json index d2b456dc2e16..904e63c57476 100644 --- a/pkgs/by-name/_1/_1password-gui/sources.json +++ b/pkgs/by-name/_1/_1password-gui/sources.json @@ -29,15 +29,15 @@ }, "beta": { "linux": { - "version": "8.11.22-25.BETA", + "version": "8.11.22-26.BETA", "sources": { "x86_64": { - "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.22-25.BETA.x64.tar.gz", - "hash": "sha256-ysIeDVE84PvNSgHliNQLo7v1qSmTd2HT6qZCS9FZFMA=" + "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.22-26.BETA.x64.tar.gz", + "hash": "sha256-lkQypBqr1VX/+8yz5PhUULKG9ZpuXjeS/ZNLL1Qzdcs=" }, "aarch64": { - "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.22-25.BETA.arm64.tar.gz", - "hash": "sha256-+AmPecbADQ7lUW4Od58mty/S+7xH3aFt9TstX7BE5g8=" + "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.22-26.BETA.arm64.tar.gz", + "hash": "sha256-1PrkmOWBenPvQIiHlq4RAKzItYLVj5DkGD38eGFDlHM=" } } }, From 9a235f28d7e57f246d7bf2f2487d125cc115cabc Mon Sep 17 00:00:00 2001 From: Nico Felbinger Date: Fri, 12 Dec 2025 21:41:44 +0100 Subject: [PATCH 62/73] various: move packages and modules to secshell maintainer --- nixos/modules/services/networking/suricata/default.nix | 2 +- nixos/modules/services/web-apps/part-db.nix | 2 +- nixos/tests/suricata.nix | 2 +- pkgs/by-name/od/odhcp6c/package.nix | 2 +- pkgs/by-name/pa/part-db/package.nix | 2 +- pkgs/development/python-modules/napalm/ros.nix | 2 +- pkgs/development/python-modules/netbox-attachments/default.nix | 2 +- pkgs/development/python-modules/netbox-bgp/default.nix | 2 +- pkgs/development/python-modules/netbox-contextmenus/default.nix | 2 +- pkgs/development/python-modules/netbox-contract/default.nix | 2 +- pkgs/development/python-modules/netbox-dns/default.nix | 2 +- .../python-modules/netbox-interface-synchronization/default.nix | 2 +- .../development/python-modules/netbox-napalm-plugin/default.nix | 2 +- pkgs/development/python-modules/netbox-qrcode/default.nix | 2 +- .../python-modules/netbox-topology-views/default.nix | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/networking/suricata/default.nix b/nixos/modules/services/networking/suricata/default.nix index 5473fc913ebc..8c14b84e3f84 100644 --- a/nixos/modules/services/networking/suricata/default.nix +++ b/nixos/modules/services/networking/suricata/default.nix @@ -22,7 +22,7 @@ let ; in { - meta.maintainers = with lib.maintainers; [ felbinger ]; + meta.maintainers = lib.teams.secshell.members; options.services.suricata = { enable = mkEnableOption "Suricata"; diff --git a/nixos/modules/services/web-apps/part-db.nix b/nixos/modules/services/web-apps/part-db.nix index 086cf8b31213..1956a26bb417 100644 --- a/nixos/modules/services/web-apps/part-db.nix +++ b/nixos/modules/services/web-apps/part-db.nix @@ -17,7 +17,7 @@ let ; in { - meta.maintainers = with lib.maintainers; [ felbinger ]; + meta.maintainers = lib.teams.secshell.members; options.services.part-db = { enable = mkEnableOption "PartDB"; diff --git a/nixos/tests/suricata.nix b/nixos/tests/suricata.nix index c79d0799551b..52d6f4bf5633 100644 --- a/nixos/tests/suricata.nix +++ b/nixos/tests/suricata.nix @@ -1,7 +1,7 @@ { lib, pkgs, ... }: { name = "suricata"; - meta.maintainers = with lib.maintainers; [ felbinger ]; + meta.maintainers = lib.teams.secshell.members; nodes = { ids = { diff --git a/pkgs/by-name/od/odhcp6c/package.nix b/pkgs/by-name/od/odhcp6c/package.nix index fa6b0f113122..cad1d13e681b 100644 --- a/pkgs/by-name/od/odhcp6c/package.nix +++ b/pkgs/by-name/od/odhcp6c/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { description = "Embedded DHCPv6-client for OpenWrt"; homepage = "https://openwrt.org/packages/pkgdata/odhcp6c"; license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ felbinger ]; + teams = with lib.teams; [ secshell ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/pa/part-db/package.nix b/pkgs/by-name/pa/part-db/package.nix index 67fe7e1b0e08..b4df737644e3 100644 --- a/pkgs/by-name/pa/part-db/package.nix +++ b/pkgs/by-name/pa/part-db/package.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://docs.part-db.de/"; changelog = "https://github.com/Part-DB/Part-DB-server/releases/tag/v${version}"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ felbinger ]; + teams = with lib.teams; [ secshell ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/development/python-modules/napalm/ros.nix b/pkgs/development/python-modules/napalm/ros.nix index 080766099cf6..a2f22776505c 100644 --- a/pkgs/development/python-modules/napalm/ros.nix +++ b/pkgs/development/python-modules/napalm/ros.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { changelog = "https://github.com/napalm-automation-community/napalm-ros/releases/tag/${src.tag}"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ felbinger ]; + teams = with lib.teams; [ secshell ]; }; } diff --git a/pkgs/development/python-modules/netbox-attachments/default.nix b/pkgs/development/python-modules/netbox-attachments/default.nix index f784719f2177..cc9348843d12 100644 --- a/pkgs/development/python-modules/netbox-attachments/default.nix +++ b/pkgs/development/python-modules/netbox-attachments/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { changelog = "https://github.com/Kani999/netbox-attachments/releases/tag/${src.tag}"; license = lib.licenses.asl20; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ felbinger ]; + teams = with lib.teams; [ secshell ]; }; } diff --git a/pkgs/development/python-modules/netbox-bgp/default.nix b/pkgs/development/python-modules/netbox-bgp/default.nix index a5b89ce17477..2639f4a17b3d 100644 --- a/pkgs/development/python-modules/netbox-bgp/default.nix +++ b/pkgs/development/python-modules/netbox-bgp/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/netbox-community/netbox-bgp"; changelog = "https://github.com/netbox-community/netbox-bgp/releases/tag/${src.tag}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ felbinger ]; + teams = with lib.teams; [ secshell ]; }; } diff --git a/pkgs/development/python-modules/netbox-contextmenus/default.nix b/pkgs/development/python-modules/netbox-contextmenus/default.nix index 83ac474527ce..9928b717f3c5 100644 --- a/pkgs/development/python-modules/netbox-contextmenus/default.nix +++ b/pkgs/development/python-modules/netbox-contextmenus/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { homepage = "https://github.com/PieterL75/netbox_contextmenus/"; changelog = "https://github.com/PieterL75/netbox_contextmenus/releases/tag/${src.tag}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ felbinger ]; + teams = with lib.teams; [ secshell ]; }; } diff --git a/pkgs/development/python-modules/netbox-contract/default.nix b/pkgs/development/python-modules/netbox-contract/default.nix index 8f40a1d28bf0..03863acaaa2a 100644 --- a/pkgs/development/python-modules/netbox-contract/default.nix +++ b/pkgs/development/python-modules/netbox-contract/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { changelog = "https://github.com/mlebreuil/netbox-contract/releases/tag/${src.tag}"; license = lib.licenses.mit; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ felbinger ]; + teams = with lib.teams; [ secshell ]; }; } diff --git a/pkgs/development/python-modules/netbox-dns/default.nix b/pkgs/development/python-modules/netbox-dns/default.nix index 425e35b1e9d5..f251638f3d6a 100644 --- a/pkgs/development/python-modules/netbox-dns/default.nix +++ b/pkgs/development/python-modules/netbox-dns/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { changelog = "https://github.com/peteeckel/netbox-plugin-dns/releases/tag/${src.tag}"; license = lib.licenses.mit; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ felbinger ]; + teams = with lib.teams; [ secshell ]; }; } diff --git a/pkgs/development/python-modules/netbox-interface-synchronization/default.nix b/pkgs/development/python-modules/netbox-interface-synchronization/default.nix index 1ed00a95154a..06381d1d754a 100644 --- a/pkgs/development/python-modules/netbox-interface-synchronization/default.nix +++ b/pkgs/development/python-modules/netbox-interface-synchronization/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { changelog = "https://github.com/NetTech2001/netbox-interface-synchronization/releases/tag/${src.tag}"; license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ felbinger ]; + teams = with lib.teams; [ secshell ]; }; } diff --git a/pkgs/development/python-modules/netbox-napalm-plugin/default.nix b/pkgs/development/python-modules/netbox-napalm-plugin/default.nix index 59f659f20540..94d956ccf397 100644 --- a/pkgs/development/python-modules/netbox-napalm-plugin/default.nix +++ b/pkgs/development/python-modules/netbox-napalm-plugin/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { changelog = "https://github.com/netbox-community/netbox-napalm-plugin/releases/tag/${src.tag}"; license = lib.licenses.asl20; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ felbinger ]; + teams = with lib.teams; [ secshell ]; }; } diff --git a/pkgs/development/python-modules/netbox-qrcode/default.nix b/pkgs/development/python-modules/netbox-qrcode/default.nix index f3153a0ca32f..97ad6c29b7d4 100644 --- a/pkgs/development/python-modules/netbox-qrcode/default.nix +++ b/pkgs/development/python-modules/netbox-qrcode/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { changelog = "https://github.com/netbox-community/netbox-qrcode/releases/tag/${src.tag}"; license = lib.licenses.asl20; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ felbinger ]; + teams = with lib.teams; [ secshell ]; }; } diff --git a/pkgs/development/python-modules/netbox-topology-views/default.nix b/pkgs/development/python-modules/netbox-topology-views/default.nix index 5ec93614badc..6a394d2b2a2e 100644 --- a/pkgs/development/python-modules/netbox-topology-views/default.nix +++ b/pkgs/development/python-modules/netbox-topology-views/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { changelog = "https://github.com/netbox-community/netbox-topology-views/releases/tag/${src.tag}"; license = lib.licenses.asl20; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ felbinger ]; + teams = with lib.teams; [ secshell ]; }; } From 33dde706316889c430952306b06cd3598e057415 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sun, 21 Sep 2025 11:48:10 +0200 Subject: [PATCH 63/73] python313Packages.nocasedict: fetch src from GitHub --- .../python-modules/nocasedict/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/nocasedict/default.nix b/pkgs/development/python-modules/nocasedict/default.nix index 29f623b6da7d..795cccae5539 100644 --- a/pkgs/development/python-modules/nocasedict/default.nix +++ b/pkgs/development/python-modules/nocasedict/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pytestCheckHook, setuptools, setuptools-scm, @@ -12,9 +12,11 @@ buildPythonPackage rec { version = "2.1.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-tWPVhRy7DgsQ+7YYm6h+BhLSLlpvOgBKRXOrWziqqn0="; + src = fetchFromGitHub { + owner = "pywbem"; + repo = "nocasedict"; + tag = version; + hash = "sha256-6n0id4WBdrD+rYX9tFuynA6bV1n1LjVy5dj/TgXNkPw="; }; build-system = [ @@ -29,7 +31,7 @@ buildPythonPackage rec { meta = { description = "Case-insensitive ordered dictionary for Python"; homepage = "https://github.com/pywbem/nocasedict"; - changelog = "https://github.com/pywbem/nocasedict/blob/${version}/docs/changes.rst"; + changelog = "https://github.com/pywbem/nocasedict/blob/${src.tag}/docs/changes.rst"; license = lib.licenses.lgpl21Plus; maintainers = [ ]; }; From 2ed97ba4eb2d2e2d0bd4c92bc019f52862856805 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 29 Nov 2025 18:32:56 +0100 Subject: [PATCH 64/73] airwin2rack: 2.13.0-unstable-2025-09-14 -> 2.13.0-unstable-2025-12-07 --- pkgs/by-name/ai/airwin2rack/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ai/airwin2rack/package.nix b/pkgs/by-name/ai/airwin2rack/package.nix index ad870d41515e..90cb13f3287d 100644 --- a/pkgs/by-name/ai/airwin2rack/package.nix +++ b/pkgs/by-name/ai/airwin2rack/package.nix @@ -56,7 +56,7 @@ let vcvRackSdk = srcOnly vcv-rack; pname = "airwin2rack"; - version = "2.13.0-unstable-2025-09-14"; + version = "2.13.0-unstable-2025-12-07"; in stdenv.mkDerivation { inherit pname; @@ -65,8 +65,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "baconpaul"; repo = "airwin2rack"; - rev = "fc75563323bd9d8e46b1d58d89830e0bf760f0e8"; - hash = "sha256-7jCDNbGMfJBo2xvRsDYdlEKSpAiRDNm6N4jTYCu+kKs="; + rev = "a797d6c7a453006c6a08db32d7bb373ecccb572b"; + hash = "sha256-+xGLVp4eR7Xb2dSEyfyHfAcoZGRSzL49l/U89N2VX+w="; fetchSubmodules = true; }; From 19b0e3afd9f3c797a8f16702a63d3374808a2b10 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Thu, 27 Nov 2025 18:25:44 +0100 Subject: [PATCH 65/73] python313Packages.vxi11: drop This package is broken [1] and its last release was in 2017 [2]. [1] https://hydra.nixos.org/build/314267474 [2] https://github.com/python-ivi/python-vxi11/tags --- .../python-modules/vxi11/default.nix | 47 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 pkgs/development/python-modules/vxi11/default.nix diff --git a/pkgs/development/python-modules/vxi11/default.nix b/pkgs/development/python-modules/vxi11/default.nix deleted file mode 100644 index 42da810a5902..000000000000 --- a/pkgs/development/python-modules/vxi11/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - pytestCheckHook, - fetchpatch2, -}: - -buildPythonPackage rec { - pname = "python-vxi11"; - version = "0.9"; - format = "setuptools"; - - # no tests in PyPI tarball - src = fetchFromGitHub { - owner = "python-ivi"; - repo = "python-vxi11"; - rev = "v${version}"; - sha256 = "1xv7chp7rm0vrvbz6q57fpwhlgjz461h08q9zgmkcl2l0w96hmsn"; - }; - - patches = [ - # set of patches from python-ivi/python-vxi11#47 - - # Fix deprecation warning - (fetchpatch2 { - url = "https://github.com/python-ivi/python-vxi11/commit/00722b1b8810ac38bfb47e8c49437055b600dfff.patch?full_index=1"; - hash = "sha256-fZDhg578UY/Q/2li1EmL5WTPx1OUfyebzvvBVK/IyDU="; - }) - - # Removes nose dependency - (fetchpatch2 { - url = "https://github.com/python-ivi/python-vxi11/commit/a8ad324d645d6f7215f207f2cc2988dc49859698.patch?full_index=1"; - hash = "sha256-nkH6ww4jBypEmZeatEb8fpFTB7x/AMppeEmuH9a4v6I="; - }) - ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - meta = { - description = "VXI-11 driver for controlling instruments over Ethernet"; - mainProgram = "vxi11-cli"; - homepage = "https://github.com/python-ivi/python-vxi11"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ bgamari ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 44d1093b1bc6..6b9f2d3d2532 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -497,6 +497,7 @@ mapAliases { vega_datasets = throw "'vega_datasets' has been renamed to/replaced by 'vega-datasets'"; # Converted to throw 2025-10-29 ViennaRNA = throw "'ViennaRNA' has been renamed to/replaced by 'viennarna'"; # Converted to throw 2025-10-29 vulcan-api = throw "vulcan-api has been removed. Their API has changed and they don't allow access from unofficial software anymore."; # added 2025-09-05 + vxi11 = throw "'vxi11' has been removed as it was broken and unmaintained upstream"; # Added 2025-11-27 Wand = throw "'Wand' has been renamed to/replaced by 'wand'"; # Converted to throw 2025-10-29 WazeRouteCalculator = throw "'WazeRouteCalculator' has been renamed to/replaced by 'wazeroutecalculator'"; # Converted to throw 2025-10-29 websocket_client = throw "'websocket_client' has been renamed to/replaced by 'websocket-client'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b091bd7ce673..16eb91fa6f3f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20264,8 +20264,6 @@ self: super: with self; { vulture = callPackage ../development/python-modules/vulture { }; - vxi11 = callPackage ../development/python-modules/vxi11 { }; - vyper = callPackage ../development/compilers/vyper { }; w1thermsensor = callPackage ../development/python-modules/w1thermsensor { }; From 60e32e2021a68b86de9416a0b4e78615226d002c Mon Sep 17 00:00:00 2001 From: Shivashis Padhi Date: Sat, 13 Dec 2025 15:15:25 +0100 Subject: [PATCH 66/73] Change NixOS version 25.05 -> 25.11, to match the command afterwards --- nixos/doc/manual/installation/upgrading.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/installation/upgrading.chapter.md b/nixos/doc/manual/installation/upgrading.chapter.md index 9bb391f0d26e..52bfd8ecd886 100644 --- a/nixos/doc/manual/installation/upgrading.chapter.md +++ b/nixos/doc/manual/installation/upgrading.chapter.md @@ -56,7 +56,7 @@ To switch to a different NixOS channel, do ``` (Be sure to include the `nixos` parameter at the end.) For instance, to -use the NixOS 25.05 stable channel: +use the NixOS 25.11 stable channel: ```ShellSession # nix-channel --add https://channels.nixos.org/nixos-25.11 nixos From 698fc2c901523ef2710b3d9dffdb3a2bfd2ef85f Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 9 Dec 2025 00:28:57 +0100 Subject: [PATCH 67/73] ctagdrc: 0.1.1 -> 1.1.0 Diff: https://github.com/BillyDM/CTAGDRC/compare/0.1.1...v1.1.0 Changelog: https://github.com/BillyDM/CTAGDRC/releases/tag/v1.1.0 --- pkgs/by-name/ct/ctagdrc/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ct/ctagdrc/package.nix b/pkgs/by-name/ct/ctagdrc/package.nix index 44a0feea8879..c9cca85c6382 100644 --- a/pkgs/by-name/ct/ctagdrc/package.nix +++ b/pkgs/by-name/ct/ctagdrc/package.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "ctagdrc"; - version = "0.1.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "BillyDM"; repo = "CTAGDRC"; - tag = finalAttrs.version; - hash = "sha256-szBI8ESJz1B/JuGcZD8D53c1yJeUW1uK4GewQExtD9Q="; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; + hash = "sha256-dJAmcoDhGoVG8h1T84qYhzEuvGdBVYQUuQC8mJkD4To="; }; nativeBuildInputs = [ @@ -87,6 +87,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Audio compressor plugin created with JUCE"; homepage = "https://github.com/BillyDM/CTAGDRC"; + changelog = "https://github.com/BillyDM/CTAGDRC/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ magnetophon ]; mainProgram = "CTAGDRC"; From 6f04372d188c3aec4cb5b985edaa66ecd8cefa61 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 13 Dec 2025 15:38:45 +0100 Subject: [PATCH 68/73] home-assistant-custom-components.calendar_export: 0.1.0 -> 0.1.0-unstable-2025-12-13 https://github.com/JosephAbbey/ha_calendar_export/compare/v0.1.0...abe73d46a42aaec11aca19fed7913ceb525ca784 --- .../custom-components/calendar_export/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/calendar_export/package.nix b/pkgs/servers/home-assistant/custom-components/calendar_export/package.nix index b63dee9ad998..7e090b453eea 100644 --- a/pkgs/servers/home-assistant/custom-components/calendar_export/package.nix +++ b/pkgs/servers/home-assistant/custom-components/calendar_export/package.nix @@ -5,16 +5,16 @@ icalendar, }: -buildHomeAssistantComponent rec { +buildHomeAssistantComponent { owner = "JosephAbbey"; domain = "calendar_export"; - version = "0.1.0"; + version = "0.1.0-unstable-2025-12-13"; src = fetchFromGitHub { owner = "JosephAbbey"; repo = "ha_calendar_export"; - tag = "v${version}"; - hash = "sha256-ULnkjnBc0oR1CwA+Mz1RnVamEXOKpgd60xryZMkCQwg="; + rev = "abe73d46a42aaec11aca19fed7913ceb525ca784"; + hash = "sha256-x1UXjpFXKU06FDPLbpPx39nwr1o3ZuluWuSNKomS8SU="; }; dependencies = [ icalendar ]; From 282a2ddfbc13ee72166e40e5d7577b988a04d96f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Dec 2025 14:51:32 +0000 Subject: [PATCH 69/73] restate: 1.5.5 -> 1.5.6 --- pkgs/by-name/re/restate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/restate/package.nix b/pkgs/by-name/re/restate/package.nix index 529ff12263b6..1dc235668dd6 100644 --- a/pkgs/by-name/re/restate/package.nix +++ b/pkgs/by-name/re/restate/package.nix @@ -25,16 +25,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "restate"; - version = "1.5.5"; + version = "1.5.6"; src = fetchFromGitHub { owner = "restatedev"; repo = "restate"; tag = "v${finalAttrs.version}"; - hash = "sha256-xx/gge8A3jathSoHXOJ9DoIJG07uw/UTHh7uuHkOPl0="; + hash = "sha256-N27cKlJxQtE+/fMnaTlWyM3QeOIkt5M79t9PzB69eqw="; }; - cargoHash = "sha256-yWxy+mLrg0VtWhrpRum1DufQCeB2HkbDRiscWOJOth8="; + cargoHash = "sha256-JnlqKESW2VBv902/qZqEr5rEDSLhnpQ/nZdYHU6tBMI="; env = { PROTOC = lib.getExe protobuf; From 547af75e157d9ee3d5a28700e85eacaa06b74a10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Dec 2025 15:14:06 +0000 Subject: [PATCH 70/73] wavelog: 2.1.2 -> 2.2.1 --- pkgs/by-name/wa/wavelog/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/wavelog/package.nix b/pkgs/by-name/wa/wavelog/package.nix index 58306a79ec34..c1bbf0d0b45a 100644 --- a/pkgs/by-name/wa/wavelog/package.nix +++ b/pkgs/by-name/wa/wavelog/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "wavelog"; - version = "2.1.2"; + version = "2.2.1"; src = fetchFromGitHub { owner = "wavelog"; repo = "wavelog"; tag = finalAttrs.version; - hash = "sha256-NXQY9ICU6YVVTnXb19pFqOx4VyTfxzk1RA03RqpEOeA="; + hash = "sha256-9lrEWhGnGq4BWl57qaJ9eqWqRYfzjlATXZvP0TafJxw="; }; installPhase = '' From c6351f35222ecfd8a7faa1dab15805569949ed5a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Dec 2025 15:50:28 +0000 Subject: [PATCH 71/73] ty: 0.0.1-alpha.32 -> 0.0.1-alpha.34 --- pkgs/by-name/ty/ty/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index 9d24a6668db6..92eccf048ede 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ty"; - version = "0.0.1-alpha.32"; + version = "0.0.1-alpha.34"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ty"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-Kc5jxDpQv7bm4J7EdejkrUv/lz7hRc01riUIEdv+wmY="; + hash = "sha256-sRr11P9m/dTAlQ2+B5fY02B8nX7Vzk7gp1iqEh/fuMI="; }; # For Darwin platforms, remove the integration test for file notifications, @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--package=ty" ]; - cargoHash = "sha256-GEf/gU2DXz+u7kPHAB1NRqkmn0f7NV3M5U9u17adtkI="; + cargoHash = "sha256-db45h6I5tCcPMbPGa/dV3eJ9CxCwnGShmHdg92AUhv0="; nativeBuildInputs = [ installShellFiles ]; From 81a7d5e7a9a4ac4575ae3fdbb4cd3d306add418a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Dec 2025 15:56:19 +0000 Subject: [PATCH 72/73] python3Packages.jupyterhub: 5.4.2 -> 5.4.3 --- pkgs/development/python-modules/jupyterhub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index b111ab1d01a5..b703b620eae2 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -51,14 +51,14 @@ buildPythonPackage rec { pname = "jupyterhub"; - version = "5.4.2"; + version = "5.4.3"; pyproject = true; src = fetchFromGitHub { owner = "jupyterhub"; repo = "jupyterhub"; tag = version; - hash = "sha256-eSYoLoPWHQ/HHAFW6X262hrIrmUxDxrYEzVFiwGVqCs="; + hash = "sha256-2LxbLwkEXpMBE5Fy7+3vQGO+CEKM50Ou5vATT6JtA8s="; }; npmDeps = fetchNpmDeps { From b5b7dd6165067d8826bbc089b75b907c6bae6c71 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 30 Sep 2025 11:14:59 +0200 Subject: [PATCH 73/73] faust: 2.79.3 -> 2.81.10 --- pkgs/by-name/fa/faust2/package.nix | 33 ++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/fa/faust2/package.nix b/pkgs/by-name/fa/faust2/package.nix index 179b8b2507a9..ade2b062a30e 100644 --- a/pkgs/by-name/fa/faust2/package.nix +++ b/pkgs/by-name/fa/faust2/package.nix @@ -13,6 +13,7 @@ libmicrohttpd, gnutls, libtasn1, + libtool, libxml2, p11-kit, vim, @@ -23,13 +24,13 @@ let - version = "2.79.3"; + version = "2.81.10"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; tag = version; - hash = "sha256-Rn+Cjpk4vttxARrkDSnpKdBdSRtgElsit8zu1BA8Jd4="; + hash = "sha256-xmaZY1jFIZQjWlQkJ+uHC4tY4pFPLJ+fKSbktIZkBFI="; fetchSubmodules = true; }; @@ -59,6 +60,7 @@ let makeWrapper pkg-config cmake + libtool vim which ]; @@ -81,12 +83,27 @@ let # include llvm-config in path export PATH="${lib.getDev llvm_18}/bin:$PATH" cd build + + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + # Darwin cannot use 'libtool -static' + echo "Disabling static LLVM build on Darwin" + # Replace the whole static target with a no-op + printf 'all:\n\t@echo "Static LLVM build disabled on Darwin"\n' > Make.llvm.static + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace Make.llvm.static \ - --replace 'mkdir -p $@ && cd $@ && ar -x ../../$<' 'mkdir -p $@ && cd $@ && ar -x ../source/build/lib/libfaust.a && cd ../source/build/' + --replace-fail 'mkdir -p $@ && cd $@ && ar -x ../../$<' \ + 'mkdir -p $@ && cd $@ && ar -x ../source/build/lib/libfaust.a && cd ../source/build/' substituteInPlace Make.llvm.static \ - --replace 'rm -rf $(TMP)' ' ' \ - --replace-fail "ar" "${stdenv.cc.targetPrefix}ar" - sed -i 's@LIBNCURSES_PATH ?= .*@LIBNCURSES_PATH ?= ${ncurses_static}/lib/libncurses.a@' Make.llvm.static + --replace-fail 'rm -rf $(TMP)' ' ' \ + --replace-fail " ar " " ${stdenv.cc.targetPrefix}ar " + sed -i \ + 's@LIBNCURSES_PATH ?= .*@LIBNCURSES_PATH ?= ${ncurses_static}/lib/libncurses.a@' \ + Make.llvm.static + '' + + '' + cd .. shopt -s globstar for f in **/Makefile **/Makefile.library **/CMakeLists.txt build/Make.llvm.static embedded/faustjava/faust2engine architecture/autodiff/autodiff.sh source/tools/faust2appls/* **/llvm.cmake tools/benchmark/faust2object; do @@ -116,7 +133,7 @@ let # not used as an executable, so patch 'uname' usage directly # rather than use makeWrapper. substituteInPlace "$out"/bin/faustoptflags \ - --replace uname "${coreutils}/bin/uname" + --replace-fail uname "${coreutils}/bin/uname" # wrapper for scripts that don't need faust.wrap* for script in "$out"/bin/faust2*; do @@ -180,7 +197,7 @@ let # 'faustoptflags' to absolute paths. for script in "$out"/bin/*; do substituteInPlace "$script" \ - --replace " error " "echo" + --replace-quiet " error " "echo" done '';