From 76f6cf67eee50374b015439de94797ac7954592d Mon Sep 17 00:00:00 2001 From: Dom Rodriguez Date: Mon, 25 Aug 2025 22:47:54 +0100 Subject: [PATCH 01/64] pyroaring: Override Cython version for tests/build - `pyroaring` upstream have a constraint against `cython` v3.1.x, which means we need to stick to `cython` v3.0.12. - This is due to a few tests failing with newer `cython` versions. - It affects `buildstream` and `python3Packages.buildstream-plugins` in Nixpkgs, which is why I have implemented this quick workaround to make `pyroaring` use a older version of `cython`. --- pkgs/development/python-modules/pyroaring/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyroaring/default.nix b/pkgs/development/python-modules/pyroaring/default.nix index cf7186e34ab9..a0d690946fb8 100644 --- a/pkgs/development/python-modules/pyroaring/default.nix +++ b/pkgs/development/python-modules/pyroaring/default.nix @@ -21,7 +21,16 @@ buildPythonPackage rec { }; build-system = [ - cython + (cython.overrideAttrs (rec { + name = "cython"; + version = "3.0.12"; + src = fetchFromGitHub { + owner = "cython"; + repo = "cython"; + tag = version; + hash = "sha256-clJXjQb6rVECirKRUGX0vD5a6LILzPwNo7+6KKYs2pI="; + }; + })) setuptools ]; From 95c9215d2e19b1cc4069294fb46d116ae90ade60 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 02:33:53 +0000 Subject: [PATCH 02/64] opa-envoy-plugin: 1.7.1-envoy -> 1.8.0-envoy --- pkgs/by-name/op/opa-envoy-plugin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/opa-envoy-plugin/package.nix b/pkgs/by-name/op/opa-envoy-plugin/package.nix index efa934195f52..faac23a3b05e 100644 --- a/pkgs/by-name/op/opa-envoy-plugin/package.nix +++ b/pkgs/by-name/op/opa-envoy-plugin/package.nix @@ -14,13 +14,13 @@ assert buildGoModule rec { pname = "opa-envoy-plugin"; - version = "1.7.1-envoy"; + version = "1.8.0-envoy"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa-envoy-plugin"; tag = "v${version}"; - hash = "sha256-q4Cs5/QtGTWj8Ljr1R7BD6GWge6+/hUDAF/M2N/tgWE="; + hash = "sha256-tPPF/zCwPShejBZZO1Kw7+jd4BpTU81DeIUxxz9b0RY="; }; vendorHash = null; From 5cd8d9c3b2dd386679fc249426d6a5954179f7b4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 3 Sep 2025 16:06:24 +0200 Subject: [PATCH 03/64] python3Packages.cv2-enumerate-cameras: init at 1.2.2 --- .../cv2-enumerate-cameras/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/cv2-enumerate-cameras/default.nix diff --git a/pkgs/development/python-modules/cv2-enumerate-cameras/default.nix b/pkgs/development/python-modules/cv2-enumerate-cameras/default.nix new file mode 100644 index 000000000000..cbefe0f98994 --- /dev/null +++ b/pkgs/development/python-modules/cv2-enumerate-cameras/default.nix @@ -0,0 +1,33 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + stdenv, +}: + +buildPythonPackage rec { + pname = "cv2_enumerate_cameras"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "lukehugh"; + repo = "cv2_enumerate_cameras"; + tag = "v${version}"; + hash = "sha256-BInGgnsvRrfTaofqZzf5LawM/Lbr0vdgU/l7j/VQi1o="; + }; + + pyproject = true; + build-system = [ setuptools ]; + + pythonImportsCheck = [ "cv2_enumerate_cameras" ]; + + meta = { + homepage = "https://github.com/lukehugh/cv2_enumerate_cameras"; + description = "Retrieve the connected camera's name, VID, PID, and the corresponding OpenCV index"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.qyliss ]; + # Needs pyobjc-framework-avfoundation; not currently packaged. + broken = stdenv.hostPlatform.isDarwin; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ed489ffb2e3..c7f45d4945aa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3194,6 +3194,8 @@ self: super: with self; { cut-cross-entropy = callPackage ../development/python-modules/cut-cross-entropy { }; + cv2-enumerate-cameras = callPackage ../development/python-modules/cv2-enumerate-cameras { }; + cvelib = callPackage ../development/python-modules/cvelib { }; cvss = callPackage ../development/python-modules/cvss { }; From 45193d5a8ce23ab4c1ae75f0cd13d79c309a7ae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Wed, 10 Sep 2025 23:22:12 -0400 Subject: [PATCH 04/64] nixos/nixpkgs: correct some option defaults --- nixos/modules/misc/nixpkgs.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index e1c705eef3b5..07845a4ece8e 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -202,7 +202,6 @@ in # Make sure that the final value has all fields for sake of other modules # referring to this. TODO make `lib.systems` itself use the module system. apply = lib.systems.elaborate; - defaultText = lib.literalExpression ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform''; description = '' Specifies the platform where the NixOS configuration will run. @@ -253,7 +252,7 @@ in # Make sure that the final value has all fields for sake of other modules # referring to this. TODO make `lib.systems` itself use the module system. apply = lib.systems.elaborate; - defaultText = lib.literalExpression ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform''; + defaultText = lib.literalExpression ''config.nixpkgs.system''; description = '' Systems with a recently generated `hardware-configuration.nix` do not need to specify this option, unless cross-compiling, in which case From 50343562c84a2ba00561f5b5a3161ebd16d5bed4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 12 Sep 2025 19:49:41 +0200 Subject: [PATCH 05/64] php: move $out/lib/build used by phpize to dev output --- pkgs/development/interpreters/php/generic.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index bafb3dc90a5e..34ace067ea6c 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -332,11 +332,15 @@ let ''; postFixup = '' - mkdir -p $dev/bin $dev/share/man/man1 + mkdir -p $dev/bin $dev/lib $dev/share/man/man1 mv $out/bin/phpize $out/bin/php-config $dev/bin/ + mv $out/lib/build $dev/lib/ mv $out/share/man/man1/phpize.1.gz \ $out/share/man/man1/php-config.1.gz \ $dev/share/man/man1/ + + substituteInPlace $dev/bin/phpize \ + --replace-fail "$out/lib" "$dev/lib" ''; src = if phpSrc == null then defaultPhpSrc else phpSrc; From 12e1455d3412ac14c8ea7134469b3c1e333441bd Mon Sep 17 00:00:00 2001 From: Yifei Sun Date: Sat, 13 Sep 2025 13:54:35 +0200 Subject: [PATCH 06/64] gpsd: fix ubxtool failed to import pyserial --- pkgs/by-name/gp/gpsd/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gp/gpsd/package.nix b/pkgs/by-name/gp/gpsd/package.nix index 4b9ce26531fc..da79ea9da304 100644 --- a/pkgs/by-name/gp/gpsd/package.nix +++ b/pkgs/by-name/gp/gpsd/package.nix @@ -74,7 +74,10 @@ stdenv.mkDerivation rec { pango ]; - pythonPath = lib.optionals guiSupport [ + pythonPath = [ + python3Packages.pyserial + ] + ++ lib.optionals guiSupport [ python3Packages.pygobject3 python3Packages.pycairo ]; From 34f8ebc70db557b0b3bf2f53000d5d2898b88069 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Sep 2025 08:35:46 +0000 Subject: [PATCH 07/64] metabase: 0.54.1 -> 0.56.5 --- pkgs/by-name/me/metabase/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/metabase/package.nix b/pkgs/by-name/me/metabase/package.nix index 1a7af0ffce8f..fa6ee7aefb2f 100644 --- a/pkgs/by-name/me/metabase/package.nix +++ b/pkgs/by-name/me/metabase/package.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "metabase"; - version = "0.54.1"; + version = "0.56.5"; src = fetchurl { url = "https://downloads.metabase.com/v${finalAttrs.version}/metabase.jar"; - hash = "sha256-gHLugoL3wCvlCzN2fNJtCt+1iSW+kKPzWPpqqHAn/D0="; + hash = "sha256-oCTlxHhBdjoDywlYlsRvk/W5EZC41Eve86KGWw8pP5I="; }; nativeBuildInputs = [ makeWrapper ]; From a4122c1104e2c23b5be9130cf2e0c1a58a3eedf7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Sep 2025 00:15:35 +0000 Subject: [PATCH 08/64] sgt-puzzles: 20250730.a7c7826 -> 20250904.2376227 --- pkgs/games/sgt-puzzles/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index ea194ebedc76..93adc5def23d 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "sgt-puzzles"; - version = "20250730.a7c7826"; + version = "20250904.2376227"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - hash = "sha256-oGk0HOXqXNxEVWixS6rptEF0bZYIkJeJzYhL3TSVhic="; + hash = "sha256-FF+RSJqGMhmV5QSaNOBpVeIgS5jAcQJfkW0MvdVxnPI="; }; sgt-puzzles-menu = fetchurl { From e66f3eb102d323592025727c959de9845a007e71 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 15 Sep 2025 10:49:07 +0200 Subject: [PATCH 09/64] mago: use `finalAttrs` pattern --- pkgs/by-name/ma/mago/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix index e3ae5a1b4ce6..d0d1057edcec 100644 --- a/pkgs/by-name/ma/mago/package.nix +++ b/pkgs/by-name/ma/mago/package.nix @@ -8,15 +8,15 @@ mago, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "mago"; version = "0.26.1"; src = fetchFromGitHub { owner = "carthage-software"; repo = "mago"; - tag = version; hash = "sha256-9WrSHjs1EdDqTXuB0HbIzQCQWp4okkdy3jTVl4J2wUg="; + tag = finalAttrs.version; }; cargoHash = "sha256-7/kbuWcy1IwAL7m87WPgyhwPidLL9K65u6ybpj0Ryl0="; @@ -39,11 +39,11 @@ rustPlatform.buildRustPackage rec { }; meta = { - changelog = "https://github.com/carthage-software/mago/releases/tag/${version}"; + changelog = "https://github.com/carthage-software/mago/releases/tag/${finalAttrs.version}"; description = "Toolchain for PHP that aims to provide a set of tools to help developers write better code"; homepage = "https://github.com/carthage-software/mago"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ gaelreyrol ]; mainProgram = "mago"; }; -} +}) From 14789e1eace6b86f11e7c229bf08da1fbabd00c4 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 15 Sep 2025 11:03:41 +0200 Subject: [PATCH 10/64] mago: use `versionCheckHook` --- pkgs/by-name/ma/mago/package.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix index d0d1057edcec..a90e4f75dc56 100644 --- a/pkgs/by-name/ma/mago/package.nix +++ b/pkgs/by-name/ma/mago/package.nix @@ -4,8 +4,7 @@ fetchFromGitHub, pkg-config, openssl, - testers, - mago, + versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -30,13 +29,9 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ openssl ]; - passthru = { - tests.version = testers.testVersion { - package = mago; - command = "mago --version"; - version = "mago ${version}"; - }; - }; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/carthage-software/mago/releases/tag/${finalAttrs.version}"; From 3fa4584a965bc364e7e1badf10bdc8394a706c91 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 15 Sep 2025 11:04:28 +0200 Subject: [PATCH 11/64] mago: 0.26.1 -> 1.0.0-beta.14 --- pkgs/by-name/ma/mago/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix index a90e4f75dc56..315685e76a36 100644 --- a/pkgs/by-name/ma/mago/package.nix +++ b/pkgs/by-name/ma/mago/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mago"; - version = "0.26.1"; + version = "1.0.0-beta.14"; src = fetchFromGitHub { owner = "carthage-software"; repo = "mago"; - hash = "sha256-9WrSHjs1EdDqTXuB0HbIzQCQWp4okkdy3jTVl4J2wUg="; tag = finalAttrs.version; + hash = "sha256-UKoq4RkFcLS47DZHPY/MhrRuLQoWYLoOzO2BeeJZoQw="; }; - cargoHash = "sha256-7/kbuWcy1IwAL7m87WPgyhwPidLL9K65u6ybpj0Ryl0="; + cargoHash = "sha256-/THZFU3lJbgJGA4lxWt6fyiHqIgQ539vj57iKoQfXZo="; env = { # Get openssl-sys to use pkg-config From 0d1865a9a4366880281402b02ca4536a5cf14983 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Sep 2025 18:25:54 +0000 Subject: [PATCH 12/64] ipopt: 3.14.18 -> 3.14.19 --- pkgs/by-name/ip/ipopt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ip/ipopt/package.nix b/pkgs/by-name/ip/ipopt/package.nix index e97d3d11192a..6b41b970902f 100644 --- a/pkgs/by-name/ip/ipopt/package.nix +++ b/pkgs/by-name/ip/ipopt/package.nix @@ -19,13 +19,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "ipopt"; - version = "3.14.18"; + version = "3.14.19"; src = fetchFromGitHub { owner = "coin-or"; repo = "Ipopt"; rev = "releases/${version}"; - sha256 = "sha256-Tifw0awNLiJrWhMF61O2VW85I3eVxDChkod5avAV6zA="; + sha256 = "sha256-85fUBMwQtG+RWQYk9YzdZYK3CYcDKgWroo4blhVWBzE="; }; CXXDEFS = [ From 462b07e6bebe844d8263e3d7047616f11e5c17c8 Mon Sep 17 00:00:00 2001 From: Defelo Date: Mon, 15 Sep 2025 18:26:06 +0000 Subject: [PATCH 13/64] smtp4dev: 3.9.0 -> 3.10.1 Diff: https://github.com/rnwood/smtp4dev/compare/3.9.0...3.10.1 --- pkgs/by-name/sm/smtp4dev/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sm/smtp4dev/package.nix b/pkgs/by-name/sm/smtp4dev/package.nix index d59f12863677..b36cf4518a5b 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.9.0"; + version = "3.10.1"; src = fetchFromGitHub { owner = "rnwood"; repo = "smtp4dev"; tag = finalAttrs.version; - hash = "sha256-LGhx+i4PIExC6GbBwDOLi/g1TxNoMFMZomdnbtc/wNc="; + hash = "sha256-bhS2/YO7jejw6+qx6EdLH98SnxeqMWajSz8i7ocNVX8="; }; patches = [ ./smtp4dev-npm-packages.patch ]; @@ -33,7 +33,7 @@ buildDotnetModule (finalAttrs: { npmDeps = fetchNpmDeps { inherit (finalAttrs) src patches; - hash = "sha256-Xjx3V5FH72D+CXBRZgmlkbp5evnp6F4zaHMWQB5o61w="; + hash = "sha256-c0/6kbMv5CmLxS0S/p3+oZvZsuHP9gt4X43uvGQFjTw="; postPatch = "cd ${finalAttrs.npmRoot}"; }; @@ -51,7 +51,7 @@ buildDotnetModule (finalAttrs: { installCheckPhase = '' runHook preInstallCheck - $out/bin/smtp4dev --help | head -1 | grep -F "smtp4dev version ${finalAttrs.version}" + $out/bin/smtp4dev --help > /dev/null runHook postInstallCheck ''; From 92bf71414e35fe40a2be79692baf67063df5357e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Sep 2025 00:37:39 +0000 Subject: [PATCH 14/64] freeipmi: 1.6.15 -> 1.6.16 --- pkgs/by-name/fr/freeipmi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fr/freeipmi/package.nix b/pkgs/by-name/fr/freeipmi/package.nix index b97bda12b45d..122aa61f986c 100644 --- a/pkgs/by-name/fr/freeipmi/package.nix +++ b/pkgs/by-name/fr/freeipmi/package.nix @@ -9,12 +9,12 @@ }: stdenv.mkDerivation rec { - version = "1.6.15"; + version = "1.6.16"; pname = "freeipmi"; src = fetchurl { url = "mirror://gnu/freeipmi/${pname}-${version}.tar.gz"; - sha256 = "sha256-1pKcNUY59c51tbGJfos2brY2JcI+XEWQp66gNP4rjK8="; + sha256 = "sha256-W872u562gOSbSjYjV5kwrOeJn1OSWyBF/p+RrWkEER0="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From cb449562c881b7e43f7b6a7d85b213f1bc4615bf Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Tue, 16 Sep 2025 09:34:09 +0200 Subject: [PATCH 15/64] avogadrolibs: 1.100.0 -> 1.101.0 --- .../science/chemistry/avogadrolibs/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix index e30e14e4b031..236f7d5594d4 100644 --- a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix +++ b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix @@ -29,32 +29,32 @@ let moleculesRepo = fetchFromGitHub { owner = "OpenChemistry"; repo = "molecules"; - rev = "1.0.0"; - sha256 = "guY6osnpv7Oqt+HE1BpIqL10POp+x8GAci2kY0bLmqg="; + tag = "1.101.0"; + hash = "sha256-hMLf0gYYnQpjSGKcPy4tihNbmpRR7UxnXF/hyhforgI="; }; crystalsRepo = fetchFromGitHub { owner = "OpenChemistry"; repo = "crystals"; - rev = "1.0.1"; - sha256 = "sH/WuvLaYu6akOc3ssAKhnxD8KNoDxuafDSozHqJZC4="; + tag = "1.101.0"; + hash = "sha256-WhzFldaOt/wJy1kk+ypOkw1OYFT3hqD7j5qGdq9g+IY="; }; fragmentsRepo = fetchFromGitHub { owner = "OpenChemistry"; repo = "fragments"; - rev = "8dc711a59d016604b3e9b6d59dec178b8e6ccd36"; - hash = "sha256-Valc5zwlaZ//eDupFouCfWCeID7/4ObU1SDLFJ/mo/g="; + tag = "1.101.0"; + hash = "sha256-x10jGl3lAEfm8OxUZJnjXRJCQg8RLQZTstjwnt5B2bw="; }; in stdenv.mkDerivation rec { pname = "avogadrolibs"; - version = "1.100.0"; + version = "1.101.0"; src = fetchFromGitHub { owner = "OpenChemistry"; repo = pname; - rev = version; - hash = "sha256-zDn5cgMBJYM27mfQHujxhIf4ZTljFxvFrKl7pNa4K9E="; + tag = version; + hash = "sha256-0DJU40Etse90rdX8xByjQeUiBsJtEQozZQQsWsc4vxk="; }; postUnpack = '' From 34c88a43509a46b58146cf55755a952353de8fc4 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Tue, 16 Sep 2025 09:34:24 +0200 Subject: [PATCH 16/64] avogadro2: 1.100.0 -> 1.101.0 --- pkgs/applications/science/chemistry/avogadro2/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/chemistry/avogadro2/default.nix b/pkgs/applications/science/chemistry/avogadro2/default.nix index 601e8053b6b6..24f967cb7d0f 100644 --- a/pkgs/applications/science/chemistry/avogadro2/default.nix +++ b/pkgs/applications/science/chemistry/avogadro2/default.nix @@ -17,20 +17,20 @@ let avogadroI18N = fetchFromGitHub { owner = "OpenChemistry"; repo = "avogadro-i18n"; - rev = "7eef0b83ded6221a3ddb85c0118cc26f9a35375c"; - hash = "sha256-AR/y70zeYR9xBzWDB5JXjJdDM+NLOX6yxCQte2lYN/U="; + tag = "1.101.0"; + hash = "sha256-3qFx/rc5xqfrLq3Kr5b/Rid2LR/gfP6uqhhATyQL6Y8="; }; in stdenv.mkDerivation rec { pname = "avogadro2"; - version = "1.100.0"; + version = "1.101.0"; src = fetchFromGitHub { owner = "OpenChemistry"; repo = "avogadroapp"; rev = version; - hash = "sha256-NSozi6oElNTIFTdRW32ZcNm8Ae311xk6kN1wtrEqjaU="; + hash = "sha256-F8to1DyeyyhsivkXDB/KH10/7teVnsoSU/ZHIsNISqc="; }; postUnpack = '' From c6418cf7733c142d2a61b6a117370b77f07dc50d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 16 Sep 2025 11:50:57 +0200 Subject: [PATCH 17/64] gopass: use `finalAttrs` pattern --- pkgs/tools/security/gopass/default.nix | 33 ++++++++++++++------------ 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 275904122505..6b960ce503b2 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -16,7 +16,19 @@ gopass, }: -buildGoModule rec { +let + wrapperPath = lib.makeBinPath ( + [ + git + gnupg + xclip + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + wl-clipboard + ] + ); +in +buildGoModule (finalAttrs: { pname = "gopass"; version = "1.15.16"; @@ -33,7 +45,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "gopasspw"; repo = "gopass"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-oZeik172VBSxuO3DfD5t8cKPl3AYjlyEw5x4/7g9h6o="; }; @@ -44,19 +56,10 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X main.version=${version}" - "-X main.commit=${src.rev}" + "-X main.version=${finalAttrs.version}" + "-X main.commit=${finalAttrs.src.rev}" ]; - wrapperPath = lib.makeBinPath ( - [ - git - gnupg - xclip - ] - ++ lib.optional stdenv.hostPlatform.isLinux wl-clipboard - ); - postInstall = '' installManPage gopass.1 installShellCompletion --cmd gopass \ @@ -91,7 +94,7 @@ buildGoModule rec { rvolosatovs sikmir ]; - changelog = "https://github.com/gopasspw/gopass/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/gopasspw/gopass/blob/v${finalAttrs.version}/CHANGELOG.md"; longDescription = '' gopass is a rewrite of the pass password manager in Go with the aim of @@ -104,4 +107,4 @@ buildGoModule rec { ''; mainProgram = "gopass"; }; -} +}) From a6176933ec66d47cd8bbfd628662d2329a9876d7 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 16 Sep 2025 11:52:23 +0200 Subject: [PATCH 18/64] gopass: use `makeBinaryWrapper` --- pkgs/tools/security/gopass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 6b960ce503b2..5c99f84eb0c9 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, - makeWrapper, + makeBinaryWrapper, buildGoModule, fetchFromGitHub, installShellFiles, @@ -34,7 +34,7 @@ buildGoModule (finalAttrs: { nativeBuildInputs = [ installShellFiles - makeWrapper + makeBinaryWrapper ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ From 1040a6d1090a296e4562a9c1757701681bae2eea Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 16 Sep 2025 11:52:43 +0200 Subject: [PATCH 19/64] gopass: remove `with lib;` from `meta` --- pkgs/tools/security/gopass/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 5c99f84eb0c9..3feb953133e1 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -86,11 +86,11 @@ buildGoModule (finalAttrs: { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Slightly more awesome Standard Unix Password Manager for Teams. Written in Go"; homepage = "https://www.gopass.pw/"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ rvolosatovs sikmir ]; From a7d2a1ea5d9bcb2b5b12fb54b3bb0b2e74c9ffcd Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 16 Sep 2025 11:53:11 +0200 Subject: [PATCH 20/64] gopass: use `src.tag` --- pkgs/tools/security/gopass/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 3feb953133e1..1865a388b7af 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -45,7 +45,7 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "gopasspw"; repo = "gopass"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-oZeik172VBSxuO3DfD5t8cKPl3AYjlyEw5x4/7g9h6o="; }; From e421400448515a3c2712a7fb4e93b51afaf9dc23 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 16 Sep 2025 11:54:06 +0200 Subject: [PATCH 21/64] gopass: use `gitMinimal` --- pkgs/tools/security/gopass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 1865a388b7af..98584bfef154 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -5,7 +5,7 @@ buildGoModule, fetchFromGitHub, installShellFiles, - git, + gitMinimal, gnupg, xclip, wl-clipboard, @@ -19,7 +19,7 @@ let wrapperPath = lib.makeBinPath ( [ - git + gitMinimal gnupg xclip ] From eff6746848638fabf556ea2904f2eff8a062fe02 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 16 Sep 2025 11:54:45 +0200 Subject: [PATCH 22/64] gopass: use `versionCheckHook` --- pkgs/tools/security/gopass/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 98584bfef154..0c8553a18132 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -11,9 +11,8 @@ wl-clipboard, passAlias ? false, apple-sdk_14, - testers, nix-update-script, - gopass, + versionCheckHook, }: let @@ -76,13 +75,14 @@ buildGoModule (finalAttrs: { --prefix PATH : "${wrapperPath}" \ --set GOPASS_NO_REMINDER true ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + passthru = { inherit wrapperPath; - tests.version = testers.testVersion { - package = gopass; - }; - updateScript = nix-update-script { }; }; From 0c4f71d37d5366b27dcbee1763ca8c67a3e3f141 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Sep 2025 12:47:20 +0000 Subject: [PATCH 23/64] trdl-client: 0.11.0 -> 0.11.1 --- pkgs/by-name/tr/trdl-client/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trdl-client/package.nix b/pkgs/by-name/tr/trdl-client/package.nix index 693b47cb2250..af666b429166 100644 --- a/pkgs/by-name/tr/trdl-client/package.nix +++ b/pkgs/by-name/tr/trdl-client/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "trdl-client"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "werf"; repo = "trdl"; tag = "v${finalAttrs.version}"; - hash = "sha256-QqAVcATpxfjKEaluurVN9EylEGKNKWlBkE8KepIpjfo="; + hash = "sha256-/rhRsKlkRYQwN5IrFcOXiU12nEQMN75o2DPku5YPFe0="; }; sourceRoot = "${finalAttrs.src.name}/client"; From 74bcd02646fd569eddaec5d312a966de00a3deff Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Tue, 16 Sep 2025 08:34:41 -0400 Subject: [PATCH 24/64] garage: remove 0.9 and minor versions for 1.2 and 2.0 --- pkgs/tools/filesystems/garage/default.nix | 17 ----------------- pkgs/top-level/aliases.nix | 4 ++++ pkgs/top-level/all-packages.nix | 6 ------ 3 files changed, 4 insertions(+), 23 deletions(-) diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index 36bb29194912..f28fb6b9cf9d 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, rustPlatform, fetchFromGitea, openssl, @@ -59,9 +58,6 @@ let buildFeatures = [ "kubernetes-discovery" "bundled-libs" - ] - ++ lib.optional (lib.versionOlder version "1.0") "sled" - ++ [ "metrics" "k2v" "telemetry-otlp" @@ -77,9 +73,6 @@ let "k2v" "kubernetes-discovery" "bundled-libs" - ] - ++ lib.optional (lib.versionOlder version "1.0") "sled" - ++ [ "lmdb" "sqlite" ]; @@ -111,14 +104,6 @@ let }; in rec { - garage_0_9_4 = generic { - version = "0.9.4"; - hash = "sha256-2ZaxenwaVGYYUjUJaGgnGpZNQprQV9+Jns2sXM6cowk="; - cargoHash = "sha256-ittesFz1GUGipQecsmMA+GEaVoUY+C9DtEvsO0HFNCc="; - cargoPatches = [ ./update-time.patch ]; - eol = true; - }; - garage_1_2_0 = generic { version = "1.2.0"; hash = "sha256-JoOwCbChSL7mjegnLHOH2Abfmsnw9BwNsjFj7nqBN6o="; @@ -131,8 +116,6 @@ rec { cargoHash = "sha256-6VM/EesrUIaQOeDGqzb0kOqMz4hW7zBJUnaRQ9C3cqc="; }; - garage_0_9 = garage_0_9_4; - garage_1 = garage_1_2_0; garage_2 = garage_2_0_0; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2a0713973f0e..663793162bb7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -946,7 +946,11 @@ mapAliases { gamin = throw "'gamin' has been removed as it is unmaintained upstream"; # Added 2024-04-19 garage_0_8 = throw "'garage_0_8' has been removed as it is unmaintained upstream"; # Added 2025-06-23 garage_0_8_7 = throw "'garage_0_8_7' has been removed as it is unmaintained upstream"; # Added 2025-06-23 + garage_0_9 = throw "'garage_0_9' has been removed as it is unmaintained upstream"; # Added 2025-09-16 + garage_0_9_4 = throw "'garage_0_9_4' has been removed as it is unmaintained upstream"; # Added 2025-09-16 + garage_1_2_0 = throw "'garage_1_2_0' has been removed. Use 'garage_1' instead."; # Added 2025-09-16 garage_1_x = lib.warnOnInstantiate "'garage_1_x' has been renamed to 'garage_1'" garage_1; # Added 2025-06-23 + garage_2_0_0 = throw "'garage_2_0_0' has been removed. Use 'garage_2' instead."; # Added 2025-09-16 gbl = throw "'gbl' has been removed because the upstream repository no longer exists"; # Added 2025-01-26 gcc48 = throw "gcc48 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-10 gcc49 = throw "gcc49 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1bfacedd9336..27d9527d8172 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2881,13 +2881,7 @@ with pkgs; inherit (callPackages ../tools/filesystems/garage { }) garage - garage_0_9 - garage_0_9_4 - - garage_1_2_0 garage_1 - - garage_2_0_0 garage_2 ; From 911f08c84b81a97ad3bbcb749a9ee2aef646848f Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Tue, 16 Sep 2025 08:39:05 -0400 Subject: [PATCH 25/64] garage_1: 1.2.0 -> 1.3.0 https://git.deuxfleurs.fr/Deuxfleurs/garage/releases/tag/v1.3.0 --- pkgs/tools/filesystems/garage/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index f28fb6b9cf9d..a8bbd3dc224a 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -82,9 +82,7 @@ let "k2v::poll::test_poll_item" ]; - passthru.tests = - lib.optionalAttrs (lib.versionAtLeast version "1") - nixosTests."garage_${lib.versions.major version}"; + passthru.tests = nixosTests."garage_${lib.versions.major version}"; meta = { description = "S3-compatible object store for small self-hosted geo-distributed deployments"; @@ -104,10 +102,10 @@ let }; in rec { - garage_1_2_0 = generic { - version = "1.2.0"; - hash = "sha256-JoOwCbChSL7mjegnLHOH2Abfmsnw9BwNsjFj7nqBN6o="; - cargoHash = "sha256-vcvD0Fn/etnAuXrM3+rj16cqpEmW2nzRmrjXsftKTFE="; + garage_1 = generic { + version = "1.3.0"; + hash = "sha256-6w+jun0UmQHmoXcokGpPM95BbQyOKefTeAelAFKxNCM="; + cargoHash = "sha256-mWLsOTWxzMdDfzEDu+WHJ12SVscEVfBVuOTVFbfnk0g="; }; garage_2_0_0 = generic { @@ -116,8 +114,6 @@ rec { cargoHash = "sha256-6VM/EesrUIaQOeDGqzb0kOqMz4hW7zBJUnaRQ9C3cqc="; }; - garage_1 = garage_1_2_0; - garage_2 = garage_2_0_0; garage = garage_1; From 703829ee20895a9f2c6f4669ea38d0ab9d0ec11e Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Tue, 16 Sep 2025 08:41:46 -0400 Subject: [PATCH 26/64] garage_2: 2.0.0 -> 2.1.0 https://git.deuxfleurs.fr/Deuxfleurs/garage/releases/tag/v2.1.0 --- pkgs/tools/filesystems/garage/default.nix | 41 ++++++----------------- 1 file changed, 10 insertions(+), 31 deletions(-) diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index a8bbd3dc224a..afca90bbf4ed 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -30,12 +30,6 @@ let inherit hash; }; - postPatch = '' - # Starting in 0.9.x series, Garage is using mold in local development - # and this leaks in this packaging, we remove it to use the default linker. - rm .cargo/config.toml || true - ''; - inherit cargoHash cargoPatches; nativeBuildInputs = [ @@ -53,33 +47,20 @@ let OPENSSL_NO_VENDOR = true; - # See https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v0.8.2/nix/compile.nix#L192-L198 + # See https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v2.1.0/nix/compile.nix#L71-L78 # on version changes for checking if changes are required here buildFeatures = [ - "kubernetes-discovery" "bundled-libs" - "metrics" - "k2v" - "telemetry-otlp" - "lmdb" - "sqlite" "consul-discovery" - ]; - - # To make integration tests pass, we include the optional k2v feature here, - # but in buildFeatures only for version 0.8+, where it's enabled by default. - # See: https://garagehq.deuxfleurs.fr/documentation/reference-manual/k2v/ - checkFeatures = [ + "fjall" + "journald" "k2v" "kubernetes-discovery" - "bundled-libs" "lmdb" + "metrics" "sqlite" - ]; - - disabledTests = [ - # Upstream told us this test is flakey. - "k2v::poll::test_poll_item" + "syslog" + "telemetry-otlp" ]; passthru.tests = nixosTests."garage_${lib.versions.major version}"; @@ -108,13 +89,11 @@ rec { cargoHash = "sha256-mWLsOTWxzMdDfzEDu+WHJ12SVscEVfBVuOTVFbfnk0g="; }; - garage_2_0_0 = generic { - version = "2.0.0"; - hash = "sha256-dn7FoouF+5qmW6fcC20bKQSc6D2G9yrWdBK3uN3bF58="; - cargoHash = "sha256-6VM/EesrUIaQOeDGqzb0kOqMz4hW7zBJUnaRQ9C3cqc="; + garage_2 = generic { + version = "2.1.0"; + hash = "sha256-GGwF6kVIJ7MPvO6VRj2ebquJEjJQBwpW18P6L2sGVDs="; + cargoHash = "sha256-0pT2fqseN1numJZdC0FFg1JXbDq1YmlmBPQVbOpxtkw="; }; - garage_2 = garage_2_0_0; - garage = garage_1; } From 2a3cfd6d20eb2e591f8b72470c8fb90f1a1dda17 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Sep 2025 14:08:36 +0000 Subject: [PATCH 27/64] libretro.play: 0-unstable-2025-08-25 -> 0-unstable-2025-09-12 --- pkgs/applications/emulators/libretro/cores/play.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix index 59c700913f2b..8a47ca54ecd4 100644 --- a/pkgs/applications/emulators/libretro/cores/play.nix +++ b/pkgs/applications/emulators/libretro/cores/play.nix @@ -14,13 +14,13 @@ }: mkLibretroCore { core = "play"; - version = "0-unstable-2025-08-25"; + version = "0-unstable-2025-09-12"; src = fetchFromGitHub { owner = "jpd002"; repo = "Play-"; - rev = "fe54d0a413f8e7268bc8a321e691a562edd6b257"; - hash = "sha256-d+bVkM8BsZ9eiHaSNCC4b156EjOqyQn93lOyy6FLbks="; + rev = "19b3995e6d09d9cbd4de9871ad94ea183ca53a6e"; + hash = "sha256-6oZIZFnB2S7u4xxrOAfDPiql0biiXRMGD1iiPhFgCWc="; fetchSubmodules = true; }; From 86eb7043e8276d346827e7f3fb250a763e0cb0b4 Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Tue, 16 Sep 2025 16:16:11 +0200 Subject: [PATCH 28/64] mautrix-whatsapp: 0.12.4 -> 0.12.5 --- pkgs/by-name/ma/mautrix-whatsapp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mautrix-whatsapp/package.nix b/pkgs/by-name/ma/mautrix-whatsapp/package.nix index f2c1a8ce8a57..380dff790da5 100644 --- a/pkgs/by-name/ma/mautrix-whatsapp/package.nix +++ b/pkgs/by-name/ma/mautrix-whatsapp/package.nix @@ -14,19 +14,19 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.12.4"; + version = "0.12.5"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-FduZKeWApGR/SmjiZsVDC0KJZq8XRtfCFQUZhxlVswM="; + hash = "sha256-FywU4nT/EjEqiC+67FWi3Ni63NI8nqJka6bPdfq1c30="; }; buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; - vendorHash = "sha256-Ujk/bJWo4tU7wQxyF7VP1JLqNh+VuNy5n31x9AWyEZA="; + vendorHash = "sha256-LjlI5zqM1GS+7Sx1mqiwZHM4mPifX7MyLbqEckb90Jo="; doCheck = false; From 1f574bfe950401507554551e6f26249a50718d55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 16 Sep 2025 17:33:54 +0200 Subject: [PATCH 29/64] python313Packages.django-guardian: 3.1.3 -> 3.2.0 Diff: https://github.com/django-guardian/django-guardian/compare/3.1.3...3.2.0 --- pkgs/development/python-modules/django-guardian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-guardian/default.nix b/pkgs/development/python-modules/django-guardian/default.nix index 314f541497f4..36023fb0645d 100644 --- a/pkgs/development/python-modules/django-guardian/default.nix +++ b/pkgs/development/python-modules/django-guardian/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "django-guardian"; - version = "3.1.3"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "django-guardian"; repo = "django-guardian"; tag = version; - hash = "sha256-cQw4bFcblq80ss64rQpg1VyS7rKiheEBJvmRRPyAn9Y="; + hash = "sha256-imisHa5DOIQrQCEPWC/0EqPjDq12tR3xr0Dl1VifJoI="; }; build-system = [ setuptools ]; From 2dcb411f6b26eaef51ae7a20d0e2e5a59b020fa1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Sep 2025 17:06:29 +0000 Subject: [PATCH 30/64] postgresqlPackages.omnigres: 0-unstable-2025-09-05 -> 0-unstable-2025-09-15 --- pkgs/servers/sql/postgresql/ext/omnigres.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/omnigres.nix b/pkgs/servers/sql/postgresql/ext/omnigres.nix index e6531b1f303e..b42885f42948 100644 --- a/pkgs/servers/sql/postgresql/ext/omnigres.nix +++ b/pkgs/servers/sql/postgresql/ext/omnigres.nix @@ -21,13 +21,13 @@ let in postgresqlBuildExtension (finalAttrs: { pname = "omnigres"; - version = "0-unstable-2025-09-05"; + version = "0-unstable-2025-09-15"; src = fetchFromGitHub { owner = "omnigres"; repo = "omnigres"; - rev = "f9ec95c59a786835f38629a2e04a4784a460fba1"; - hash = "sha256-F1vG+iAlixdWwW3LIovzwnuL75QTCDlF40QOUD5dNZk="; + rev = "5535ce27d6c80b3e0cf891d93e3ee07af492346c"; + hash = "sha256-Ha5orh/6tvaNhGWmFpC/+ZV7WcD+nqkjwf3grhKUPys="; }; # This matches postInstall of PostgreSQL's generic.nix, which does this for the PGXS Makefile. From 4fc98dff6bf7de96b60d878630828e00dd9bac70 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 16 Sep 2025 18:59:16 +0200 Subject: [PATCH 31/64] nixos/wpa_supplicant: add option to pass additional configuration files to wpa_supplicant --- .../services/networking/wpa_supplicant.nix | 19 +- nixos/tests/wpa_supplicant.nix | 21 +++ .../linux/wpa_supplicant/default.nix | 1 + .../wpa_supplicant/multiple-configs.patch | 163 ++++++++++++++++++ 4 files changed, 200 insertions(+), 4 deletions(-) create mode 100644 pkgs/os-specific/linux/wpa_supplicant/multiple-configs.patch diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 8564295551a5..79bba0314d84 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -112,10 +112,13 @@ let iface != null ) "sys-subsystem-net-devices-${utils.escapeSystemdPath iface}.device"; configStr = - if cfg.allowAuxiliaryImperativeNetworks then - "-c /etc/wpa_supplicant.conf -I ${configFile}" - else - "-c ${configFile}"; + ( + if cfg.allowAuxiliaryImperativeNetworks then + "-c /etc/wpa_supplicant.conf -I ${configFile}" + else + "-c ${configFile}" + ) + + lib.concatMapStrings (p: " -I " + p) cfg.extraConfigFiles; in { description = "WPA Supplicant instance" + optionalString (iface != null) " for interface ${iface}"; @@ -544,6 +547,14 @@ in for available options. ''; }; + + extraConfigFiles = mkOption { + type = types.listOf types.path; + default = [ ]; + description = '' + Extra wpa_supplicant configuration files to load. + ''; + }; }; }; diff --git a/nixos/tests/wpa_supplicant.nix b/nixos/tests/wpa_supplicant.nix index f2a0c13de47c..d7aaaf8a1429 100644 --- a/nixos/tests/wpa_supplicant.nix +++ b/nixos/tests/wpa_supplicant.nix @@ -171,6 +171,23 @@ in psk = "password"; }; }; + + extraConfigFiles = [ + (pkgs.writeText "test1.conf" '' + network={ + ssid="test1" + key_mgmt=WPA-PSK + psk="password1" + } + '') + (pkgs.writeText "test2.conf" '' + network={ + ssid="test2" + key_mgmt=WPA-PSK + psk="password2" + } + '') + ]; }; }; @@ -195,6 +212,10 @@ in assert int(machine.succeed(f"grep -c bssid=00:00:00:00:00:01 {config_file}")) == 2 assert int(machine.succeed(f"grep -c bssid=00:00:00:00:00:02 {config_file}")) == 2 + with subtest("Extra config files have been loaded"): + machine.wait_until_succeeds("wpa_cli -i wlan0 list_networks | grep -q test1") + machine.succeed("wpa_cli -i wlan0 list_networks | grep -q test2") + # save file for manual inspection machine.copy_from_vm(config_file) ''; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 3819f40b85ff..04d63bfbc883 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { revert = true; }) ./unsurprising-ext-password.patch + ./multiple-configs.patch (fetchpatch { name = "suppress-ctrl-event-signal-change.patch"; url = "https://w1.fi/cgit/hostap/patch/?id=c330b5820eefa8e703dbce7278c2a62d9c69166a"; diff --git a/pkgs/os-specific/linux/wpa_supplicant/multiple-configs.patch b/pkgs/os-specific/linux/wpa_supplicant/multiple-configs.patch new file mode 100644 index 000000000000..f7d88c9cbe93 --- /dev/null +++ b/pkgs/os-specific/linux/wpa_supplicant/multiple-configs.patch @@ -0,0 +1,163 @@ +commit ca4bcfbd9d2233c90080b9ad400bf576db221781 +Author: rnhmjoj +Date: Sat Sep 13 13:54:00 2025 +0200 + + wpa_supplicant: allow multiple config files with -I + + This change allows to load multiple addition configuration files in + wpa_supplicant by repeating the -I option. + + Signed-off-by: Michele Guerini Rocco + +diff --git a/wpa_supplicant/doc/docbook/wpa_supplicant.sgml b/wpa_supplicant/doc/docbook/wpa_supplicant.sgml +index df538e332..71195d0d3 100644 +--- a/wpa_supplicant/doc/docbook/wpa_supplicant.sgml ++++ b/wpa_supplicant/doc/docbook/wpa_supplicant.sgml +@@ -358,7 +358,8 @@ + + -I filename + +- Path to additional configuration file. ++ Path to additional configuration file ++ (can be repeat to add multiple files). + + + +diff --git a/wpa_supplicant/main.c b/wpa_supplicant/main.c +index 9229eb51f..ff877f3b9 100644 +--- a/wpa_supplicant/main.c ++++ b/wpa_supplicant/main.c +@@ -76,7 +76,7 @@ static void usage(void) + " -G = global ctrl_interface group\n" + " -h = show this help text\n" + " -i = interface name\n" +- " -I = additional configuration file\n" ++ " -I = additional configuration file (can be repeated)\n" + " -K = include keys (passwords, etc.) in debug output\n" + " -L = show license (BSD)\n" + #ifdef CONFIG_P2P +@@ -183,7 +183,8 @@ int main(int argc, char *argv[]) + { + int c, i; + struct wpa_interface *ifaces, *iface; +- int iface_count, exitcode = -1; ++ int iface_count, conf_count = 0, exitcode = -1; ++ size_t path_size; + struct wpa_params params; + struct wpa_global *global; + +@@ -253,7 +254,15 @@ int main(int argc, char *argv[]) + iface->ifname = optarg; + break; + case 'I': +- iface->confanother = optarg; ++ if (conf_count >= 15) { ++ wpa_printf(MSG_ERROR, ++ "too many additional configuration files"); ++ goto out; ++ } ++ path_size = 1 + os_strlen(optarg); ++ iface->confanother[conf_count] = os_malloc(path_size); ++ os_memcpy(iface->confanother[conf_count], optarg, path_size); ++ conf_count++; + break; + case 'K': + params.wpa_debug_show_keys++; +diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c +index d45002fd9..af5836ef5 100644 +--- a/wpa_supplicant/wpa_supplicant.c ++++ b/wpa_supplicant/wpa_supplicant.c +@@ -675,8 +675,10 @@ static void wpa_supplicant_cleanup(struct wpa_supplicant *wpa_s) + os_free(wpa_s->confname); + wpa_s->confname = NULL; + +- os_free(wpa_s->confanother); +- wpa_s->confanother = NULL; ++ for (i = 0; wpa_s->confanother[i] != NULL; i++) { ++ os_free(wpa_s->confanother[i]); ++ wpa_s->confanother[i] = NULL; ++ } + + os_free(wpa_s->last_con_fail_realm); + wpa_s->last_con_fail_realm = NULL; +@@ -1404,6 +1406,7 @@ int wpa_supplicant_reload_configuration(struct wpa_supplicant *wpa_s) + struct wpa_config *conf; + int reconf_ctrl; + int old_ap_scan; ++ int i; + + if (wpa_s->confname == NULL) + return -1; +@@ -1413,12 +1416,14 @@ int wpa_supplicant_reload_configuration(struct wpa_supplicant *wpa_s) + "file '%s' - exiting", wpa_s->confname); + return -1; + } +- if (wpa_s->confanother && +- !wpa_config_read(wpa_s->confanother, conf, true)) { +- wpa_msg(wpa_s, MSG_ERROR, +- "Failed to parse the configuration file '%s' - exiting", +- wpa_s->confanother); +- return -1; ++ ++ for (i = 0; wpa_s->confanother[i] != NULL; i++) { ++ if (!wpa_config_read(wpa_s->confanother[i], conf, true)) { ++ wpa_msg(wpa_s, MSG_ERROR, ++ "Failed to parse the configuration file '%s' - exiting", ++ wpa_s->confanother[i]); ++ return -1; ++ } + } + + conf->changed_parameters = (unsigned int) -1; +@@ -7658,13 +7663,16 @@ static int wpa_supplicant_init_iface(struct wpa_supplicant *wpa_s, + "configuration '%s'.", wpa_s->confname); + return -1; + } +- wpa_s->confanother = os_rel2abs_path(iface->confanother); +- if (wpa_s->confanother && +- !wpa_config_read(wpa_s->confanother, wpa_s->conf, true)) { +- wpa_printf(MSG_ERROR, +- "Failed to read or parse configuration '%s'.", +- wpa_s->confanother); +- return -1; ++ ++ for (int i = 0; iface->confanother[i] != NULL; i++) { ++ wpa_s->confanother[i] = os_rel2abs_path(iface->confanother[i]); ++ if (wpa_s->confanother[i] && ++ !wpa_config_read(wpa_s->confanother[i], wpa_s->conf, true)) { ++ wpa_printf(MSG_ERROR, ++ "Failed to read or parse configuration '%s'.", ++ wpa_s->confanother[i]); ++ return -1; ++ } + } + + /* +diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h +index 2f77413d5..84c009e78 100644 +--- a/wpa_supplicant/wpa_supplicant_i.h ++++ b/wpa_supplicant/wpa_supplicant_i.h +@@ -66,12 +66,12 @@ struct wpa_interface { + const char *confname; + + /** +- * confanother - Additional configuration name (file or profile) name ++ * confanother - Additional configuration names (file or profile) name + * + * This can also be %NULL when the additional configuration file is not + * used. + */ +- const char *confanother; ++ char *confanother[16]; + + /** + * ctrl_interface - Control interface parameter +@@ -713,7 +713,7 @@ struct wpa_supplicant { + char bridge_ifname[16]; + + char *confname; +- char *confanother; ++ char *confanother[16]; + + struct wpa_config *conf; + int countermeasures; From 74dfd79077ba5a753c76cd4ef23a9aaa074dbd8a Mon Sep 17 00:00:00 2001 From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com> Date: Tue, 16 Sep 2025 21:05:03 +0300 Subject: [PATCH 32/64] aldente: 1.34.1 -> 1.35.1 --- pkgs/by-name/al/aldente/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/aldente/package.nix b/pkgs/by-name/al/aldente/package.nix index eca10db31173..73d5447f7d54 100644 --- a/pkgs/by-name/al/aldente/package.nix +++ b/pkgs/by-name/al/aldente/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "aldente"; - version = "1.34.1"; + version = "1.35.1"; src = fetchurl { url = "https://github.com/AppHouseKitchen/AlDente-Battery_Care_and_Monitoring/releases/download/${finalAttrs.version}/AlDente.dmg"; - hash = "sha256-hwlIYnd+ZYx+6+OQ1IPSzXKRaKDsKVJyeQCUhvhFMPU="; + hash = "sha256-OjajT9goWbK3dKmkvt/qbcjlytg/xOPxNEZWE7h24Uc="; }; dontBuild = true; From dc1486ee1a87efc25af768ae0b046d1da10ddac3 Mon Sep 17 00:00:00 2001 From: maxicode2 <65052855+maxicode2@users.noreply.github.com> Date: Sun, 7 Sep 2025 10:48:04 -0700 Subject: [PATCH 33/64] maintainers: add maxicode --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 255a24508f59..f0836d67d9d8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16140,6 +16140,12 @@ githubId = 4708337; name = "Marcelo A. de L. Santos"; }; + maxicode = { + email = "ride-mullets-tidal@duck.com"; + github = "maxicode2"; + githubId = 65052855; + name = "maxicode"; + }; maximsmol = { email = "maximsmol@gmail.com"; github = "maximsmol"; From 966d5ad75a4e79dc81edae64933f4900dca3a537 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Tue, 16 Sep 2025 15:19:19 +0200 Subject: [PATCH 34/64] godot_4_5: init at 4.5-stable https://godotengine.org/releases/4.5/ Co-authored-by: David McFarland --- pkgs/development/tools/godot/4.5/default.nix | 11 + pkgs/development/tools/godot/4.5/deps.json | 1317 +++++++++++++++++ pkgs/development/tools/godot/common.nix | 22 +- pkgs/development/tools/godot/default.nix | 4 + .../tools/godot/fix-freetype-link-error.patch | 16 + pkgs/top-level/all-packages.nix | 4 + 6 files changed, 1364 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/tools/godot/4.5/default.nix create mode 100644 pkgs/development/tools/godot/4.5/deps.json create mode 100644 pkgs/development/tools/godot/fix-freetype-link-error.patch diff --git a/pkgs/development/tools/godot/4.5/default.nix b/pkgs/development/tools/godot/4.5/default.nix new file mode 100644 index 000000000000..0db38e4de8b3 --- /dev/null +++ b/pkgs/development/tools/godot/4.5/default.nix @@ -0,0 +1,11 @@ +{ + version = "4.5-stable"; + hash = "sha256-ENDgZBM/bgL+Wlvy6GhE8a5Lyj44OqH7nOF3y74Bf/8="; + default = { + exportTemplatesHash = "sha256-N12DtmF5T5F0bS3sm1aamdTST4WnDE7ABoqvsYtVHVM="; + }; + mono = { + exportTemplatesHash = "sha256-rRGCBdiuMEurhPqTdZC9G0OpVnu3+CvneGeMiRzoWLs="; + nugetDeps = ./deps.json; + }; +} diff --git a/pkgs/development/tools/godot/4.5/deps.json b/pkgs/development/tools/godot/4.5/deps.json new file mode 100644 index 000000000000..03469e7111de --- /dev/null +++ b/pkgs/development/tools/godot/4.5/deps.json @@ -0,0 +1,1317 @@ +[ + { + "pname": "coverlet.collector", + "version": "3.2.0", + "hash": "sha256-2aM3pKX5toQQRLKpH5ArzND2Rgq1fSpMsLxcEDbat+M=" + }, + { + "pname": "DiffPlex", + "version": "1.5.0", + "hash": "sha256-6HwA6ZyCn++NAXy6ep9ywSF/Ss+e/nmMhjyeIft9fQw=" + }, + { + "pname": "Humanizer.Core", + "version": "2.14.1", + "hash": "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o=" + }, + { + "pname": "Humanizer.Core", + "version": "2.2.0", + "hash": "sha256-5Q6oRaV8wHPONHreKvB74VjV2FW36mwC3n+05It5vyI=" + }, + { + "pname": "JetBrains.Annotations", + "version": "2019.1.3", + "hash": "sha256-gn2Z7yANT+2tnK+qbOA2PviRf1M1VtvamABGajgGC6E=" + }, + { + "pname": "JetBrains.Lifetimes", + "version": "2024.3.0", + "hash": "sha256-EkSiuJuLJSip+zw9RHdHSLRFOZuCWWWn2zUY3aIqV1s=" + }, + { + "pname": "JetBrains.RdFramework", + "version": "2024.3.0", + "hash": "sha256-JtaT4VWDEqMcZ2Sy3yBTCmBalJ5+Qy9Mf84ns7PE2WE=" + }, + { + "pname": "JetBrains.Rider.PathLocator", + "version": "1.0.12", + "hash": "sha256-4VmTLbDa+KzFCE/pywgzMijLvgwqt9/nSXvLGg4w17g=" + }, + { + "pname": "Microsoft.AspNetCore.App.Ref", + "version": "6.0.36", + "hash": "sha256-9jDkWbjw/nd8yqdzVTagCuqr6owJ/DUMi4BlUZT4hWU=" + }, + { + "pname": "Microsoft.Bcl.AsyncInterfaces", + "version": "1.1.1", + "hash": "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig=" + }, + { + "pname": "Microsoft.Bcl.AsyncInterfaces", + "version": "5.0.0", + "hash": "sha256-bpJjcJSUSZH0GeOXoZI12xUQOf2SRtxG7sZV0dWS5TI=" + }, + { + "pname": "Microsoft.Bcl.AsyncInterfaces", + "version": "7.0.0", + "hash": "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE=" + }, + { + "pname": "Microsoft.Build", + "version": "15.1.548", + "hash": "sha256-v6rTGfytT6QwXkp97T6vQurVi8oDzZmIOn3/cHYuC6s=" + }, + { + "pname": "Microsoft.Build.Framework", + "version": "15.1.548", + "hash": "sha256-0U6XANGftKOS9Owx1x8hOe5GOdqx2uwQwuAsVHw297g=" + }, + { + "pname": "Microsoft.Build.Locator", + "version": "1.2.6", + "hash": "sha256-Z5wzSnsGbbJe3nvj6kAAv6KhYMK1H3Mktn4ugflpzuY=" + }, + { + "pname": "Microsoft.Build.NoTargets", + "version": "2.0.1", + "hash": "sha256-5Gqi/OQayuQiQNEcoaFue0glNvcF4nmGneW07Hs9prg=" + }, + { + "pname": "Microsoft.CodeAnalysis.Analyzer.Testing", + "version": "1.1.1", + "hash": "sha256-3w7g0KhG16ZH8rYK9FxP15qbd+hTgwRDpDJEKpDMHu8=" + }, + { + "pname": "Microsoft.CodeAnalysis.Analyzers", + "version": "2.6.1", + "hash": "sha256-1+FV3KvwerZsknecHZhdDACsPKaWrbQQeN27BAcZk94=" + }, + { + "pname": "Microsoft.CodeAnalysis.Analyzers", + "version": "3.3.2", + "hash": "sha256-pDeaMqX7a01Hp1Qd9P/y/B2rEGAv2eIY0Ld/klBZW5g=" + }, + { + "pname": "Microsoft.CodeAnalysis.Analyzers", + "version": "3.3.4", + "hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE=" + }, + { + "pname": "Microsoft.CodeAnalysis.CodeFix.Testing", + "version": "1.1.1", + "hash": "sha256-NXEGr/+rzt4ENdTWPlgW7upyjofPP841xzwU78lReio=" + }, + { + "pname": "Microsoft.CodeAnalysis.Common", + "version": "1.0.1", + "hash": "sha256-jjWtdrHSISgBF1m94P0DsVbQa4YxKnf2CWRWYHQLTG8=" + }, + { + "pname": "Microsoft.CodeAnalysis.Common", + "version": "3.11.0", + "hash": "sha256-lOW5q1kAAk+Wpweb9TaZ1LztWzAODt9yZKe6SN5rkV8=" + }, + { + "pname": "Microsoft.CodeAnalysis.Common", + "version": "3.8.0", + "hash": "sha256-3G9vSc/gHH7FWgOySLTut1+eEaf3H66qcPOvNPLOx4o=" + }, + { + "pname": "Microsoft.CodeAnalysis.Common", + "version": "4.8.0", + "hash": "sha256-3IEinVTZq6/aajMVA8XTRO3LTIEt0PuhGyITGJLtqz4=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp", + "version": "3.11.0", + "hash": "sha256-AVFv1c6eMi5Jc6GXyL2P3WSs9YTOs3hPO7iGq9tZJsA=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp", + "version": "4.8.0", + "hash": "sha256-MmOnXJvd/ezs5UPcqyGLnbZz5m+VedpRfB+kFZeeqkU=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp.Analyzer.Testing", + "version": "1.1.1", + "hash": "sha256-uZf99S701CcUoR8XHn+PusRXdDeeWylFiqdMjR9R6TY=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit", + "version": "1.1.1", + "hash": "sha256-Fs+ygXsCxoJGcaatBc1v8ZXTVSsid+Y60O4/JLiMD18=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp.CodeFix.Testing", + "version": "1.1.1", + "hash": "sha256-g1AkqFBndpl4ySk1w5IMAN+EibO9OsLiWCLjMggImDo=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit", + "version": "1.1.1", + "hash": "sha256-3z6ELEBETjKlCyGQ5PzyQWS6Ud982BQMNvLdJnOdlWw=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing", + "version": "1.1.1", + "hash": "sha256-nX4GSfovb8K4cD9xFEKXcRXVDNmXyWOaAAVQ/XfvAFk=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit", + "version": "1.1.1", + "hash": "sha256-QAQ87pM9sr+8uqwDSXR39x3wtx82jVGcdTJPmwDSB2Y=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp.Workspaces", + "version": "3.11.0", + "hash": "sha256-4WQgwOdmKbCMfT2c4K+5ZkErU3zkRboJO0ORHhnUvpo=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp.Workspaces", + "version": "4.8.0", + "hash": "sha256-WNzc+6mKqzPviOI0WMdhKyrWs8u32bfGj2XwmfL7bwE=" + }, + { + "pname": "Microsoft.CodeAnalysis.SourceGenerators.Testing", + "version": "1.1.1", + "hash": "sha256-d4zoBTjX9DAwIZfGAa9as5vE/BIshKIov4GepT9l1vg=" + }, + { + "pname": "Microsoft.CodeAnalysis.Testing.Verifiers.XUnit", + "version": "1.1.1", + "hash": "sha256-WOo0pITkG6CZwJ9MiLaCMSbjbBOxn7+tlpjJGn//gnc=" + }, + { + "pname": "Microsoft.CodeAnalysis.Workspaces.Common", + "version": "1.0.1", + "hash": "sha256-/SYPkq5LhOoEWi+rcBZDyQL2U0cQk2YrykNJODrRLVs=" + }, + { + "pname": "Microsoft.CodeAnalysis.Workspaces.Common", + "version": "3.11.0", + "hash": "sha256-mkJ/pkf7x7kQ2NngYl8yOlEwJIEjphL84KyUC5vEKh4=" + }, + { + "pname": "Microsoft.CodeAnalysis.Workspaces.Common", + "version": "3.8.0", + "hash": "sha256-3D7xV3V1WsUU9OMMEOj+z9GouCDKXSBC4Z/Szs/OcWE=" + }, + { + "pname": "Microsoft.CodeAnalysis.Workspaces.Common", + "version": "4.8.0", + "hash": "sha256-X8R4SpWVO/gpip5erVZf5jCCx8EX3VzIRtNrQiLDIoM=" + }, + { + "pname": "Microsoft.CodeCoverage", + "version": "17.7.1", + "hash": "sha256-MePYLGy7Y4DuPZccxIbRTjq4GB554jBwT4noLiAZJKs=" + }, + { + "pname": "Microsoft.Composition", + "version": "1.0.27", + "hash": "sha256-G/3p3zxOWC8HqLt7Ll5cqN7507F6N/G6G/HzKazQRdE=" + }, + { + "pname": "Microsoft.CSharp", + "version": "4.0.1", + "hash": "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8=" + }, + { + "pname": "Microsoft.NET.Test.Sdk", + "version": "17.7.1", + "hash": "sha256-ySyNpRodd6R6qKnGrgwLYaiHZga2GL0fQARrYGIFa6k=" + }, + { + "pname": "Microsoft.NETCore.App.Ref", + "version": "6.0.36", + "hash": "sha256-9LZgVoIFF8qNyUu8kdJrYGLutMF/cL2K82HN2ywwlx8=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.0.1", + "hash": "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.0", + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "2.0.0", + "hash": "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "2.1.2", + "hash": "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "5.0.0", + "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.0.1", + "hash": "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.1.0", + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" + }, + { + "pname": "Microsoft.NETFramework.ReferenceAssemblies", + "version": "1.0.0", + "hash": "sha256-6faPQ4jaFY3OGGVk3lZKW+DEZaIOBZ/wHqbiDTsRR1k=" + }, + { + "pname": "Microsoft.NETFramework.ReferenceAssemblies.net461", + "version": "1.0.0", + "hash": "sha256-oS7sUMzKBkLmhggqbI6eBqb1OPAipH0TDTaDaBixcwM=" + }, + { + "pname": "Microsoft.TestPlatform.ObjectModel", + "version": "17.7.1", + "hash": "sha256-KfqM1E0jhAg07QfpjfEcjQ+HX13XZfdvveT5qxm89Sk=" + }, + { + "pname": "Microsoft.TestPlatform.TestHost", + "version": "17.7.1", + "hash": "sha256-MMrdBDByByYDpO/xaRCl9Cb27zIfcjPJqld/649e8Mw=" + }, + { + "pname": "Microsoft.VisualBasic", + "version": "10.0.1", + "hash": "sha256-7HHzZcWLVTTQ1K1rCIyoB+UxLHMvOIz+O5av6XDa22A=" + }, + { + "pname": "Microsoft.VisualStudio.Composition", + "version": "16.1.8", + "hash": "sha256-yFT4t3Uk31R5EPdAxxsTAmRuiv58MlYoYL4JT1ywlHQ=" + }, + { + "pname": "Microsoft.VisualStudio.Composition.NetFxAttributes", + "version": "16.1.8", + "hash": "sha256-FFemIG+m8RWUPo5W+kCHPh5Yn4fGS+tpjGiQTcT0sAE=" + }, + { + "pname": "Microsoft.VisualStudio.Validation", + "version": "15.0.82", + "hash": "sha256-7JFaA/HZHVjsEtTh/iHDRLi5RcuA39KKvvCkuI4JQFc=" + }, + { + "pname": "Microsoft.Win32.Primitives", + "version": "4.0.1", + "hash": "sha256-B4t5El/ViBdxALMcpZulewc4j/3SIXf71HhJWhm4Ctk=" + }, + { + "pname": "Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" + }, + { + "pname": "Microsoft.Win32.Registry", + "version": "4.0.0", + "hash": "sha256-M/06F/Z2wTHCh4pZOgtCjUGLD1FJXEJKCmzOeFMl7uo=" + }, + { + "pname": "Microsoft.Win32.Registry", + "version": "4.3.0", + "hash": "sha256-50XwFbyRfZkTD/bBn76WV/NIpOy/mzXD3MMEVFX/vr8=" + }, + { + "pname": "Microsoft.Win32.Registry", + "version": "5.0.0", + "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=" + }, + { + "pname": "NETStandard.Library", + "version": "1.6.1", + "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw=" + }, + { + "pname": "NETStandard.Library", + "version": "2.0.3", + "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=" + }, + { + "pname": "Newtonsoft.Json", + "version": "13.0.1", + "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=" + }, + { + "pname": "Newtonsoft.Json", + "version": "9.0.1", + "hash": "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU=" + }, + { + "pname": "NuGet.Common", + "version": "5.6.0", + "hash": "sha256-uc/gCpcfugMjulqDVpS0ryfcaVBtmKyho07g3M8o//g=" + }, + { + "pname": "NuGet.Configuration", + "version": "5.6.0", + "hash": "sha256-K5A66u9WPz8PZYIl+DDyCAodYGUJfLdNNix6f5F7adI=" + }, + { + "pname": "NuGet.Frameworks", + "version": "5.6.0", + "hash": "sha256-iMacMTcuvemRQ4p3gv/3MioC/OEDOju8rnmZioWq9bc=" + }, + { + "pname": "NuGet.Frameworks", + "version": "6.12.1", + "hash": "sha256-GGpkbas+PNLx35vvr3nyAVz5lY/aeoMx6qjmT368Lpg=" + }, + { + "pname": "NuGet.Frameworks", + "version": "6.5.0", + "hash": "sha256-ElqfN4CcKxT3hP2qvxxObb4mnBlYG89IMxO0Sm5oZ2g=" + }, + { + "pname": "NuGet.Packaging", + "version": "5.6.0", + "hash": "sha256-bl/A1QbIJAu/GpzKOKjGwe7NrTXlYH5s3ppJ6mYAoQk=" + }, + { + "pname": "NuGet.Protocol", + "version": "5.6.0", + "hash": "sha256-faY3xEk4g9xQFRT7DspGmlVLRGH1r4Vvr5VLT9sLUf8=" + }, + { + "pname": "NuGet.Resolver", + "version": "5.6.0", + "hash": "sha256-wAiARlBJtCjP482a0jnZKpZBbHRl3voXYMTz3WEox04=" + }, + { + "pname": "NuGet.Versioning", + "version": "5.6.0", + "hash": "sha256-3HKwW3hhTuwkZM5n02VFe8yDZbCLgqNE8gI+pqFTToI=" + }, + { + "pname": "ReflectionAnalyzers", + "version": "0.1.22-dev", + "hash": "sha256-NA/pyCCzzIewVr6IfZtFQjR5lOBnBdSzYj5SzgsBFvw=" + }, + { + "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=" + }, + { + "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=" + }, + { + "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" + }, + { + "pname": "runtime.native.System", + "version": "4.0.0", + "hash": "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894=" + }, + { + "pname": "runtime.native.System", + "version": "4.3.0", + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" + }, + { + "pname": "runtime.native.System.IO.Compression", + "version": "4.1.0", + "hash": "sha256-085JrZxNEwIHdBWKKKFsh1JzpF0AblvrUsz5T8kH4jQ=" + }, + { + "pname": "runtime.native.System.IO.Compression", + "version": "4.3.0", + "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8=" + }, + { + "pname": "runtime.native.System.Net.Http", + "version": "4.3.0", + "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.0", + "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" + }, + { + "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=" + }, + { + "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.0", + "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=" + }, + { + "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=" + }, + { + "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=" + }, + { + "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=" + }, + { + "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" + }, + { + "pname": "System.AppContext", + "version": "4.1.0", + "hash": "sha256-v6YfyfrKmhww+EYHUq6cwYUMj00MQ6SOfJtcGVRlYzs=" + }, + { + "pname": "System.AppContext", + "version": "4.3.0", + "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg=" + }, + { + "pname": "System.Buffers", + "version": "4.3.0", + "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" + }, + { + "pname": "System.Buffers", + "version": "4.5.1", + "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" + }, + { + "pname": "System.Collections", + "version": "4.0.11", + "hash": "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0=" + }, + { + "pname": "System.Collections", + "version": "4.3.0", + "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" + }, + { + "pname": "System.Collections.Concurrent", + "version": "4.0.12", + "hash": "sha256-zIEM7AB4SyE9u6G8+o+gCLLwkgi6+3rHQVPdn/dEwB8=" + }, + { + "pname": "System.Collections.Concurrent", + "version": "4.3.0", + "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" + }, + { + "pname": "System.Collections.Immutable", + "version": "1.1.36", + "hash": "sha256-x/UyLEyveCYI+JAWo9xallSPbl78dIVuW2pGqgTY/C0=" + }, + { + "pname": "System.Collections.Immutable", + "version": "1.2.0", + "hash": "sha256-FQ3l+ulbLSPhQ0JcQCC4D4SzjTnHsRqcOj56Ywy7pMo=" + }, + { + "pname": "System.Collections.Immutable", + "version": "5.0.0", + "hash": "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8=" + }, + { + "pname": "System.Collections.Immutable", + "version": "7.0.0", + "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk=" + }, + { + "pname": "System.Collections.NonGeneric", + "version": "4.0.1", + "hash": "sha256-jdCVXmGOsJ+2F0xAagCkiMZ91SGAm9iOhO2u4ksmKaU=" + }, + { + "pname": "System.ComponentModel.Composition", + "version": "4.5.0", + "hash": "sha256-xxeZs1zIkhl2ZXU8CaOtCkMX1N290IK7bbHYeEKD0aQ=" + }, + { + "pname": "System.Composition", + "version": "1.0.31", + "hash": "sha256-wcQEG6MCRa1S03s3Yb3E3tfsIBZid99M7WDhcb48Qik=" + }, + { + "pname": "System.Composition", + "version": "7.0.0", + "hash": "sha256-YjhxuzuVdAzRBHNQy9y/1ES+ll3QtLcd2o+o8wIyMao=" + }, + { + "pname": "System.Composition.AttributedModel", + "version": "1.0.31", + "hash": "sha256-u+XnXfj6LQ3OXwrb9KqHRW4a/a9yHzLrJOXwDQ1a/sY=" + }, + { + "pname": "System.Composition.AttributedModel", + "version": "7.0.0", + "hash": "sha256-3s52Dyk2J66v/B4LLYFBMyXl0I8DFDshjE+sMjW4ubM=" + }, + { + "pname": "System.Composition.Convention", + "version": "1.0.31", + "hash": "sha256-GQWo1YDyQ3r2OMcKW+GbR3BbZNIAdwK79XAfinNj+AE=" + }, + { + "pname": "System.Composition.Convention", + "version": "7.0.0", + "hash": "sha256-N4MkkBXSQkcFKsEdcSe6zmyFyMmFOHmI2BNo3wWxftk=" + }, + { + "pname": "System.Composition.Hosting", + "version": "1.0.31", + "hash": "sha256-fg9BIY+zWtiEBIJefYP2lKHDYa4r/vtPTr3ZI8e0K7g=" + }, + { + "pname": "System.Composition.Hosting", + "version": "7.0.0", + "hash": "sha256-7liQGMaVKNZU1iWTIXvqf0SG8zPobRoLsW7q916XC3M=" + }, + { + "pname": "System.Composition.Runtime", + "version": "1.0.31", + "hash": "sha256-mqfxjAnVyE1YCgXMOcV34IWhYFnvXVKjMo9Y/d3yDuo=" + }, + { + "pname": "System.Composition.Runtime", + "version": "7.0.0", + "hash": "sha256-Oo1BxSGLETmdNcYvnkGdgm7JYAnQmv1jY0gL0j++Pd0=" + }, + { + "pname": "System.Composition.TypedParts", + "version": "1.0.31", + "hash": "sha256-w9ApcUJr7jYP4Vf5+efIIqoWmr5v9R56W4uC0n8KktQ=" + }, + { + "pname": "System.Composition.TypedParts", + "version": "7.0.0", + "hash": "sha256-6ZzNdk35qQG3ttiAi4OXrihla7LVP+y2fL3bx40/32s=" + }, + { + "pname": "System.Console", + "version": "4.0.0", + "hash": "sha256-jtZfT/TpJtLisV/y5Mk3IfCpE79zwhBYXtyGP9jC3Xo=" + }, + { + "pname": "System.Console", + "version": "4.3.0", + "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo=" + }, + { + "pname": "System.Diagnostics.Contracts", + "version": "4.0.1", + "hash": "sha256-Mq2MU+80m+zqhe92JazEIDi4rsgk8MHg3yjNYlObzXg=" + }, + { + "pname": "System.Diagnostics.Debug", + "version": "4.0.11", + "hash": "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4=" + }, + { + "pname": "System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" + }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "4.3.0", + "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" + }, + { + "pname": "System.Diagnostics.FileVersionInfo", + "version": "4.0.0", + "hash": "sha256-Yy94jPhDXF2QHOF7qTmqKkn1048K9xkKryuBeDzsu+g=" + }, + { + "pname": "System.Diagnostics.Process", + "version": "4.1.0", + "hash": "sha256-OgW6ogQ+oYADYS0PHmwXdhrOKQJpqXlwzSvmfjTLNBg=" + }, + { + "pname": "System.Diagnostics.Process", + "version": "4.3.0", + "hash": "sha256-Rzo24qXhuJDDgrGNHr2eQRHhwLmsYmWDqAg/P5fOlzw=" + }, + { + "pname": "System.Diagnostics.Tools", + "version": "4.0.1", + "hash": "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U=" + }, + { + "pname": "System.Diagnostics.Tools", + "version": "4.3.0", + "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y=" + }, + { + "pname": "System.Diagnostics.TraceSource", + "version": "4.0.0", + "hash": "sha256-cCjdPU7ow91HGf1hBIOLJMQGO6pNmF+N+5/Z38XJh9U=" + }, + { + "pname": "System.Diagnostics.Tracing", + "version": "4.1.0", + "hash": "sha256-JA0jJcLbU3zh52ub3zweob2EVHvxOqiC6SCYHrY5WbQ=" + }, + { + "pname": "System.Diagnostics.Tracing", + "version": "4.3.0", + "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" + }, + { + "pname": "System.Dynamic.Runtime", + "version": "4.0.11", + "hash": "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4=" + }, + { + "pname": "System.Dynamic.Runtime", + "version": "4.3.0", + "hash": "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU=" + }, + { + "pname": "System.Globalization", + "version": "4.0.11", + "hash": "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw=" + }, + { + "pname": "System.Globalization", + "version": "4.3.0", + "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" + }, + { + "pname": "System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=" + }, + { + "pname": "System.Globalization.Extensions", + "version": "4.3.0", + "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=" + }, + { + "pname": "System.IO", + "version": "4.1.0", + "hash": "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw=" + }, + { + "pname": "System.IO", + "version": "4.3.0", + "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" + }, + { + "pname": "System.IO.Compression", + "version": "4.1.0", + "hash": "sha256-UT4KEfJNZOk7b4X0AqLFUsqfHu6myVH/BhbRKYc+1Uc=" + }, + { + "pname": "System.IO.Compression", + "version": "4.3.0", + "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA=" + }, + { + "pname": "System.IO.Compression.ZipFile", + "version": "4.3.0", + "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=" + }, + { + "pname": "System.IO.FileSystem", + "version": "4.0.1", + "hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0=" + }, + { + "pname": "System.IO.FileSystem", + "version": "4.3.0", + "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" + }, + { + "pname": "System.IO.FileSystem.Primitives", + "version": "4.0.1", + "hash": "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg=" + }, + { + "pname": "System.IO.FileSystem.Primitives", + "version": "4.3.0", + "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=" + }, + { + "pname": "System.IO.Pipelines", + "version": "5.0.1", + "hash": "sha256-2zT5uBiyYm+jLIoJppIKJttTtpcMNKxd7Li0QEVjbv8=" + }, + { + "pname": "System.IO.Pipelines", + "version": "7.0.0", + "hash": "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY=" + }, + { + "pname": "System.IO.Pipes", + "version": "4.0.0", + "hash": "sha256-6qMAD6DCZ5c1wswLWi1msqwu8GwI8un1RzjpUhzbrjs=" + }, + { + "pname": "System.Linq", + "version": "4.1.0", + "hash": "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794=" + }, + { + "pname": "System.Linq", + "version": "4.3.0", + "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" + }, + { + "pname": "System.Linq.Expressions", + "version": "4.1.0", + "hash": "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4=" + }, + { + "pname": "System.Linq.Expressions", + "version": "4.3.0", + "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8=" + }, + { + "pname": "System.Linq.Parallel", + "version": "4.0.1", + "hash": "sha256-TV1F3KYFipPmPnWFjX6hOZQNFsG2m729EdgPSFzqY0Q=" + }, + { + "pname": "System.Memory", + "version": "4.5.4", + "hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E=" + }, + { + "pname": "System.Memory", + "version": "4.5.5", + "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" + }, + { + "pname": "System.Net.Http", + "version": "4.3.0", + "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q=" + }, + { + "pname": "System.Net.Primitives", + "version": "4.0.11", + "hash": "sha256-2YSijNhCdw/ZU2yfH7vE+ReA8pgxRCXPnWr+ab36v4M=" + }, + { + "pname": "System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=" + }, + { + "pname": "System.Net.Sockets", + "version": "4.1.0", + "hash": "sha256-muK7oXIX7ykqhXskuUt0KX6Hzg5VogJhUS0JiOB2BY0=" + }, + { + "pname": "System.Net.Sockets", + "version": "4.3.0", + "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=" + }, + { + "pname": "System.Numerics.Vectors", + "version": "4.4.0", + "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U=" + }, + { + "pname": "System.ObjectModel", + "version": "4.0.12", + "hash": "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s=" + }, + { + "pname": "System.ObjectModel", + "version": "4.3.0", + "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q=" + }, + { + "pname": "System.Reflection", + "version": "4.1.0", + "hash": "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs=" + }, + { + "pname": "System.Reflection", + "version": "4.3.0", + "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" + }, + { + "pname": "System.Reflection.Emit", + "version": "4.0.1", + "hash": "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk=" + }, + { + "pname": "System.Reflection.Emit", + "version": "4.3.0", + "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" + }, + { + "pname": "System.Reflection.Emit.ILGeneration", + "version": "4.0.1", + "hash": "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0=" + }, + { + "pname": "System.Reflection.Emit.ILGeneration", + "version": "4.3.0", + "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" + }, + { + "pname": "System.Reflection.Emit.Lightweight", + "version": "4.0.1", + "hash": "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g=" + }, + { + "pname": "System.Reflection.Emit.Lightweight", + "version": "4.3.0", + "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=" + }, + { + "pname": "System.Reflection.Extensions", + "version": "4.0.1", + "hash": "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ=" + }, + { + "pname": "System.Reflection.Extensions", + "version": "4.3.0", + "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "1.0.21", + "hash": "sha256-0yqDWxwaw57YQ5dl8qdo+2o6VvG8qKp4il093uWWAUs=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "1.3.0", + "hash": "sha256-a/RQr++mSsziWaOTknicfIQX/zJrwPFExfhK6PM0tfg=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "1.6.0", + "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "5.0.0", + "hash": "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "7.0.0", + "hash": "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI=" + }, + { + "pname": "System.Reflection.Primitives", + "version": "4.0.1", + "hash": "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0=" + }, + { + "pname": "System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" + }, + { + "pname": "System.Reflection.TypeExtensions", + "version": "4.1.0", + "hash": "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4=" + }, + { + "pname": "System.Reflection.TypeExtensions", + "version": "4.3.0", + "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=" + }, + { + "pname": "System.Resources.ResourceManager", + "version": "4.0.1", + "hash": "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw=" + }, + { + "pname": "System.Resources.ResourceManager", + "version": "4.3.0", + "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" + }, + { + "pname": "System.Runtime", + "version": "4.1.0", + "hash": "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo=" + }, + { + "pname": "System.Runtime", + "version": "4.3.0", + "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "4.5.3", + "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "4.7.1", + "hash": "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "5.0.0", + "hash": "sha256-neARSpLPUzPxEKhJRwoBzhPxK+cKIitLx7WBYncsYgo=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "6.0.0", + "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" + }, + { + "pname": "System.Runtime.Extensions", + "version": "4.1.0", + "hash": "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc=" + }, + { + "pname": "System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" + }, + { + "pname": "System.Runtime.Handles", + "version": "4.0.1", + "hash": "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w=" + }, + { + "pname": "System.Runtime.Handles", + "version": "4.3.0", + "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" + }, + { + "pname": "System.Runtime.InteropServices", + "version": "4.1.0", + "hash": "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY=" + }, + { + "pname": "System.Runtime.InteropServices", + "version": "4.3.0", + "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" + }, + { + "pname": "System.Runtime.InteropServices.RuntimeInformation", + "version": "4.0.0", + "hash": "sha256-5j53amb76A3SPiE3B0llT2XPx058+CgE7OXL4bLalT4=" + }, + { + "pname": "System.Runtime.InteropServices.RuntimeInformation", + "version": "4.3.0", + "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA=" + }, + { + "pname": "System.Runtime.Loader", + "version": "4.0.0", + "hash": "sha256-gE5/ehU3Qq5phhSxGuPmSv1DFVQeiyl1/+YyrO+I7lI=" + }, + { + "pname": "System.Runtime.Numerics", + "version": "4.3.0", + "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" + }, + { + "pname": "System.Runtime.Serialization.Primitives", + "version": "4.1.1", + "hash": "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA=" + }, + { + "pname": "System.Security.AccessControl", + "version": "4.5.0", + "hash": "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM=" + }, + { + "pname": "System.Security.AccessControl", + "version": "5.0.0", + "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" + }, + { + "pname": "System.Security.Cryptography.Algorithms", + "version": "4.3.0", + "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" + }, + { + "pname": "System.Security.Cryptography.Cng", + "version": "4.3.0", + "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=" + }, + { + "pname": "System.Security.Cryptography.Csp", + "version": "4.3.0", + "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=" + }, + { + "pname": "System.Security.Cryptography.Encoding", + "version": "4.3.0", + "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" + }, + { + "pname": "System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=" + }, + { + "pname": "System.Security.Cryptography.Primitives", + "version": "4.3.0", + "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=" + }, + { + "pname": "System.Security.Cryptography.ProtectedData", + "version": "4.3.0", + "hash": "sha256-CbfRZFmnJZCAsx9cx9UehCtzsbnVo+ce+n4pXDsx4s0=" + }, + { + "pname": "System.Security.Cryptography.X509Certificates", + "version": "4.3.0", + "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" + }, + { + "pname": "System.Security.Permissions", + "version": "4.5.0", + "hash": "sha256-Fa6dX6Gyse1A/RBoin8cVaHQePbfBvp6jjWxUXPhXKQ=" + }, + { + "pname": "System.Security.Principal", + "version": "4.0.1", + "hash": "sha256-9wBgPnJfFOtrhKZ7wDXZ4q12GklQ49Ka02/9v7Frf9k=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "4.5.0", + "hash": "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "5.0.0", + "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" + }, + { + "pname": "System.Text.Encoding", + "version": "4.0.11", + "hash": "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc=" + }, + { + "pname": "System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" + }, + { + "pname": "System.Text.Encoding.CodePages", + "version": "4.5.1", + "hash": "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw=" + }, + { + "pname": "System.Text.Encoding.CodePages", + "version": "7.0.0", + "hash": "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo=" + }, + { + "pname": "System.Text.Encoding.Extensions", + "version": "4.0.11", + "hash": "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI=" + }, + { + "pname": "System.Text.Encoding.Extensions", + "version": "4.3.0", + "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" + }, + { + "pname": "System.Text.RegularExpressions", + "version": "4.1.0", + "hash": "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c=" + }, + { + "pname": "System.Text.RegularExpressions", + "version": "4.3.0", + "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0=" + }, + { + "pname": "System.Threading", + "version": "4.0.11", + "hash": "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac=" + }, + { + "pname": "System.Threading", + "version": "4.3.0", + "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" + }, + { + "pname": "System.Threading.Channels", + "version": "7.0.0", + "hash": "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM=" + }, + { + "pname": "System.Threading.Overlapped", + "version": "4.0.1", + "hash": "sha256-CAWZlavcuBQHs+kaSX9CmkpHF7wC8rFrug3XPb5KJzo=" + }, + { + "pname": "System.Threading.Tasks", + "version": "4.0.11", + "hash": "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs=" + }, + { + "pname": "System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" + }, + { + "pname": "System.Threading.Tasks.Dataflow", + "version": "4.6.0", + "hash": "sha256-YYrT3GRzVBdendxt8FUDCnOBJi0nw/CJ9VrzcPJWLSg=" + }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.0.0", + "hash": "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE=" + }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.3.0", + "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=" + }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.5.4", + "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" + }, + { + "pname": "System.Threading.Thread", + "version": "4.0.0", + "hash": "sha256-7EtSJuKqcW107FYA5Ko9NFXEWUPIzNDtlfKaQV2pvb8=" + }, + { + "pname": "System.Threading.Thread", + "version": "4.3.0", + "hash": "sha256-pMs6RNFC3nQOGz9EqIcyWmO8YLaqay+q/Qde5hqPXXg=" + }, + { + "pname": "System.Threading.ThreadPool", + "version": "4.0.10", + "hash": "sha256-/fowWjM/0ZZFC1Rwu0i5N71iRxV2JOd3jQV2Jn0wuTk=" + }, + { + "pname": "System.Threading.ThreadPool", + "version": "4.3.0", + "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=" + }, + { + "pname": "System.Threading.Timer", + "version": "4.3.0", + "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s=" + }, + { + "pname": "System.ValueTuple", + "version": "4.5.0", + "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI=" + }, + { + "pname": "System.Xml.ReaderWriter", + "version": "4.0.11", + "hash": "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA=" + }, + { + "pname": "System.Xml.ReaderWriter", + "version": "4.3.0", + "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA=" + }, + { + "pname": "System.Xml.XDocument", + "version": "4.0.11", + "hash": "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg=" + }, + { + "pname": "System.Xml.XDocument", + "version": "4.3.0", + "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI=" + }, + { + "pname": "System.Xml.XmlDocument", + "version": "4.0.1", + "hash": "sha256-gdoFrPo54v1LjkBF79f8EvtltVVjHz9ZI9kc5ve0GkY=" + }, + { + "pname": "System.Xml.XPath", + "version": "4.0.1", + "hash": "sha256-lQCoK2M51SGRuGjfiuIW26Y2goABY2RLE6cZ4816WDo=" + }, + { + "pname": "System.Xml.XPath.XmlDocument", + "version": "4.0.1", + "hash": "sha256-bK9AfAYrdSipdRbmo8Rk7394ku92UFNe2TEQF5+k/lA=" + }, + { + "pname": "xunit", + "version": "2.4.2", + "hash": "sha256-tePXTtlRgTAhfnUzc13Y9MwowU/cKttl1qlzHLqhWS0=" + }, + { + "pname": "xunit.abstractions", + "version": "2.0.3", + "hash": "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM=" + }, + { + "pname": "xunit.analyzers", + "version": "1.0.0", + "hash": "sha256-hZEaTaJN0bWw9q8tha5RziGlZ/lkDrj2S+QLQxgRjlw=" + }, + { + "pname": "xunit.assert", + "version": "2.3.0", + "hash": "sha256-lN+NiUEQoHWmoamUjvsNt2PVhHXYeHJHjHRk1BTs6R8=" + }, + { + "pname": "xunit.assert", + "version": "2.4.2", + "hash": "sha256-wMyRXZzDn9Se4c0Pzzn0U4YuKRiUtu6o4MoPjJPPzUU=" + }, + { + "pname": "xunit.core", + "version": "2.4.2", + "hash": "sha256-jRFoW8LSuqDINuJlno3xT3VfdkHFVEbDKctU/mISIMc=" + }, + { + "pname": "xunit.extensibility.core", + "version": "2.4.2", + "hash": "sha256-wlTMUOQg5NaAPEsWkNSr8QSPbbCNSicpFajp1rowCsA=" + }, + { + "pname": "xunit.extensibility.execution", + "version": "2.4.2", + "hash": "sha256-l5Q60IBYWE5tYJCdFEEQnO5rIlXcNEM5S4Ut8vFnL2U=" + }, + { + "pname": "xunit.runner.visualstudio", + "version": "2.4.5", + "hash": "sha256-Gv7U1VPKfNb7IOWrwUGUKAeurKtE3AtQmegDFNkYHHk=" + } +] diff --git a/pkgs/development/tools/godot/common.nix b/pkgs/development/tools/godot/common.nix index 6c4344f9a423..1c408d743c43 100644 --- a/pkgs/development/tools/godot/common.nix +++ b/pkgs/development/tools/godot/common.nix @@ -375,16 +375,18 @@ let strictDeps = true; - patches = lib.optionals (lib.versionOlder version "4.4") [ - (fetchpatch { - name = "wayland-header-fix.patch"; - url = "https://github.com/godotengine/godot/commit/6ce71f0fb0a091cffb6adb4af8ab3f716ad8930b.patch"; - hash = "sha256-hgAtAtCghF5InyGLdE9M+9PjPS1BWXWGKgIAyeuqkoU="; - }) - # Fix a crash in the mono test project build. It no longer seems to - # happen in 4.4, but an existing fix couldn't be identified. - ./CSharpLanguage-fix-crash-in-reload_assemblies-after-.patch - ]; + patches = + lib.optionals (lib.versionOlder version "4.4") [ + (fetchpatch { + name = "wayland-header-fix.patch"; + url = "https://github.com/godotengine/godot/commit/6ce71f0fb0a091cffb6adb4af8ab3f716ad8930b.patch"; + hash = "sha256-hgAtAtCghF5InyGLdE9M+9PjPS1BWXWGKgIAyeuqkoU="; + }) + # Fix a crash in the mono test project build. It no longer seems to + # happen in 4.4, but an existing fix couldn't be identified. + ./CSharpLanguage-fix-crash-in-reload_assemblies-after-.patch + ] + ++ lib.optional (lib.versionAtLeast version "4.5") ./fix-freetype-link-error.patch; postPatch = '' # this stops scons from hiding e.g. NIX_CFLAGS_COMPILE diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index 3a935efab866..0138dee4027f 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -59,6 +59,7 @@ rec { godotPackages_4_3 = mkGodotPackages "4.3"; godotPackages_4_4 = mkGodotPackages "4.4"; + godotPackages_4_5 = mkGodotPackages "4.5"; godotPackages_4 = godotPackages_4_4; godotPackages = godotPackages_4; @@ -68,6 +69,9 @@ rec { godot_4_4 = godotPackages_4_4.godot; godot_4_4-mono = godotPackages_4_4.godot-mono; godot_4_4-export-templates-bin = godotPackages_4_4.export-templates-bin; + godot_4_5 = godotPackages_4_5.godot; + godot_4_5-mono = godotPackages_4_5.godot-mono; + godot_4_5-export-templates-bin = godotPackages_4_5.export-templates-bin; godot_4 = godotPackages_4.godot; godot_4-mono = godotPackages_4.godot-mono; godot_4-export-templates-bin = godotPackages_4.export-templates-bin; diff --git a/pkgs/development/tools/godot/fix-freetype-link-error.patch b/pkgs/development/tools/godot/fix-freetype-link-error.patch new file mode 100644 index 000000000000..6ae73c6aa68b --- /dev/null +++ b/pkgs/development/tools/godot/fix-freetype-link-error.patch @@ -0,0 +1,16 @@ +diff --git a/modules/freetype/SCsub b/modules/freetype/SCsub +index 0a52ef46c5..c932900037 100644 +--- a/modules/freetype/SCsub ++++ b/modules/freetype/SCsub +@@ -62,9 +62,9 @@ if env["builtin_freetype"]: + if env["brotli"]: + env_freetype.Append(CPPDEFINES=["FT_CONFIG_OPTION_USE_BROTLI"]) + +- env_freetype.Prepend(CPPEXTPATH=[thirdparty_dir + "/include"]) ++ env_freetype.Prepend(CPPPATH=[thirdparty_dir + "/include"]) + # Also needed in main env for scene/ +- env.Prepend(CPPEXTPATH=[thirdparty_dir + "/include"]) ++ env.Prepend(CPPPATH=[thirdparty_dir + "/include"]) + + env_freetype.Append(CPPDEFINES=["FT2_BUILD_LIBRARY", "FT_CONFIG_OPTION_USE_PNG", "FT_CONFIG_OPTION_SYSTEM_ZLIB"]) + \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1bfacedd9336..9add3760c72e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2981,6 +2981,7 @@ with pkgs; godot3-mono-server godotPackages_4_3 godotPackages_4_4 + godotPackages_4_5 godotPackages_4 godotPackages godot_4_3 @@ -2989,6 +2990,9 @@ with pkgs; godot_4_4 godot_4_4-mono godot_4_4-export-templates-bin + godot_4_5 + godot_4_5-mono + godot_4_5-export-templates-bin godot_4 godot_4-mono godot_4-export-templates-bin From 255e6d61d14061476310b8fdd8160a83b9f57080 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 16 Sep 2025 21:08:17 +0200 Subject: [PATCH 35/64] godot: fix update script --- pkgs/development/tools/godot/export-templates-bin.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/tools/godot/export-templates-bin.nix b/pkgs/development/tools/godot/export-templates-bin.nix index 829b898b80be..d6fe6890c281 100644 --- a/pkgs/development/tools/godot/export-templates-bin.nix +++ b/pkgs/development/tools/godot/export-templates-bin.nix @@ -39,9 +39,6 @@ let mv templates "$templates/$version" ''; - # this allows update-source-version to work - passthru.src = self; - meta = { inherit (godot.meta) changelog From fd5fbeb2cb468d504f5db8f2f04ea20aec248d70 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Tue, 16 Sep 2025 20:54:18 +0200 Subject: [PATCH 36/64] godot: default to godot 4.5 --- pkgs/development/tools/godot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index 0138dee4027f..81c965da73b9 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -60,7 +60,7 @@ rec { godotPackages_4_3 = mkGodotPackages "4.3"; godotPackages_4_4 = mkGodotPackages "4.4"; godotPackages_4_5 = mkGodotPackages "4.5"; - godotPackages_4 = godotPackages_4_4; + godotPackages_4 = godotPackages_4_5; godotPackages = godotPackages_4; godot_4_3 = godotPackages_4_3.godot; From 52b2713487fa59d74c2940c52875ef89a8c2db8c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 16 Sep 2025 21:42:08 +0200 Subject: [PATCH 37/64] =?UTF-8?q?coqPackages.jasmin:=202025.02.0=20?= =?UTF-8?q?=E2=86=92=202025.06.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/jasmin/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/coq-modules/jasmin/default.nix b/pkgs/development/coq-modules/jasmin/default.nix index 1743ff667328..5001c837052c 100644 --- a/pkgs/development/coq-modules/jasmin/default.nix +++ b/pkgs/development/coq-modules/jasmin/default.nix @@ -5,10 +5,11 @@ mathcomp, mathcomp-algebra-tactics, mathcomp-word, + ITree, version ? null, }: -mkCoqDerivation { +(mkCoqDerivation { pname = "jasmin"; owner = "jasmin-lang"; @@ -27,12 +28,16 @@ mkCoqDerivation { lib.switch [ coq.coq-version mathcomp.version ] [ - (case (range "8.19" "9.1") (range "2.2" "2.4") "2025.02.0") + (case (range "8.20" "9.1") (range "2.2" "2.4") "2025.06.1") + (case (range "8.19" "9.1") (range "2.2" "2.4") "2025.02.1") (case (isEq "8.18") (isEq "2.2") "2024.07.2") ] null; releaseRev = v: "v${v}"; + release."2025.06.1".sha256 = "sha256-wEL1tN0HUa1Eb7FiQOBA6sAkuonrAMdkqq8gu9/CED0="; + release."2025.06.0".sha256 = "sha256-XfTg7ofamzMWqmRIU1/MO+S/ieNjvNEhlgIqFrchdAQ="; + release."2025.02.1".sha256 = "sha256-8P2GdplB12Q0e0XdL77w3nQL1/6Xl/gQNhGTB0WX/8I="; release."2025.02.0".sha256 = "sha256-Jlf0+VPuYWXdWyKHKHSp7h/HuCCp4VkcrgDAmh7pi5s="; release."2024.07.3".sha256 = "sha256-n/X8d7ILuZ07l24Ij8TxbQzAG7E8kldWFcUI65W4r+c="; release."2024.07.2".sha256 = "sha256-aF8SYY5jRxQ6iEr7t6mRN3BEmIDhJ53PGhuZiJGB+i8="; @@ -56,4 +61,9 @@ mkCoqDerivation { vbgl ]; }; -} +}).overrideAttrs + (o: { + propagatedBuildInputs = + o.propagatedBuildInputs + ++ lib.optional (o.version == "dev" || lib.versionAtLeast o.version "2025.06") ITree; + }) From bdf9cd701bbcafe1cef3bc82e0e1cbf0aa72061c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Sep 2025 22:01:53 +0000 Subject: [PATCH 38/64] libretro.pcsx2: 0-unstable-2025-08-30 -> 0-unstable-2025-09-14 --- pkgs/applications/emulators/libretro/cores/pcsx2.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/pcsx2.nix b/pkgs/applications/emulators/libretro/cores/pcsx2.nix index 1827412abf21..e518f9049e51 100644 --- a/pkgs/applications/emulators/libretro/cores/pcsx2.nix +++ b/pkgs/applications/emulators/libretro/cores/pcsx2.nix @@ -11,13 +11,13 @@ }: mkLibretroCore { core = "pcsx2"; - version = "0-unstable-2025-08-30"; + version = "0-unstable-2025-09-14"; src = fetchFromGitHub { owner = "libretro"; repo = "ps2"; - rev = "b0e6c4d7f4abc8cfbf2c55322fc5009a685bc042"; - hash = "sha256-6cpVsituAWX6sVP5JUvT7KjYZ7SzvD95EB90e2UxJ9A="; + rev = "bb03c99fa968b50309bd80d74598f053fe9168ce"; + hash = "sha256-qIdrsLQWH29PGL0TNcUtFw6aSFUJKJccKrhMoi/vYCA="; fetchSubmodules = true; }; From daa4ad3f5f47fe3bba85cedc8ac1668dade050c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Sep 2025 22:57:42 +0000 Subject: [PATCH 39/64] python3Packages.llama-index-llms-ollama: 0.7.1 -> 0.7.3 --- .../python-modules/llama-index-llms-ollama/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix index d21ff84b8267..8317d2893296 100644 --- a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-llms-ollama"; - version = "0.7.1"; + version = "0.7.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_ollama"; inherit version; - hash = "sha256-GJtl6iXAPGYMEFuA27UQnE/qjaaPHpBZKuv9/d5wiSg="; + hash = "sha256-Zkofjv6tyoKGyqL/lBimv662yExLsvm4IRzu2ewIPi4="; }; build-system = [ hatchling ]; From 0105bc8f3307c233b4d8b17a349f2224d00cc127 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Sep 2025 23:11:12 +0000 Subject: [PATCH 40/64] biome: 2.2.3 -> 2.2.4 --- pkgs/by-name/bi/biome/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix index 06761ccf3665..a4e7a5c36bc8 100644 --- a/pkgs/by-name/bi/biome/package.nix +++ b/pkgs/by-name/bi/biome/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "biome"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "biomejs"; repo = "biome"; rev = "@biomejs/biome@${finalAttrs.version}"; - hash = "sha256-xfaF9wg8nWXFWfJCp25sIi65RjZJaRlNSEAboYl3zKI="; + hash = "sha256-ygpuBgqrjfcAGmd64i7vLLVPr0QaFhVo6xsUT1V8MA4="; }; - cargoHash = "sha256-8oN+eSR/+b0MRnN0/nYsAikhGahPH5imV5M2OKso9Bg="; + cargoHash = "sha256-KQJJUJ2bIEHJAm2XAMoCtk1u2Alw9jX1N/nEWdOTcX8="; nativeBuildInputs = [ pkg-config ]; From e3a82366de1dd54af698726119b2cc1beb49bf85 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sun, 7 Sep 2025 15:29:00 +0200 Subject: [PATCH 41/64] services.hostapd: add assertions and warnings to detect conflict with `networking.wireless.iwd` or `networking.wireless` Co-authored-by: Michele Guerini Rocco --- nixos/modules/services/networking/hostapd.nix | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index c7c9c60b68f9..5fa3cadb9a7e 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -1325,11 +1325,35 @@ in ]; config = mkIf cfg.enable { + warnings = + let + wirelessEnabled = config.networking.wireless.enable; + wirelessInterfaces = config.networking.wireless.interfaces; + hostapdInterfaces = lib.attrNames cfg.radios; + hasInterfaceConflict = lib.intersectLists hostapdInterfaces wirelessInterfaces != [ ]; + # we check if wirelessInterfaces is empty as that means all interfaces implicit + shouldWarn = wirelessEnabled && (wirelessInterfaces == [ ] || hasInterfaceConflict); + in + if shouldWarn then + [ + '' + Some wireless interface is configured for both for client and access point mode: + this is not allowed. Either specify `networking.wireless.interfaces` and exclude + those from `services.hostapd.radios` or make sure to not run the `wpa_supplicant` + and `hostapd` services simultaneously. + '' + ] + else + [ ]; assertions = [ { assertion = cfg.radios != { }; message = "At least one radio must be configured with hostapd!"; } + { + assertion = !config.networking.wireless.iwd.enable; + message = "hostapd and iwd conflict, use `networking.wireless.enable` in combination with `networking.wireless.interfaces`"; + } ] # Radio warnings ++ (concatLists ( From 8508387ed451ea36c87c8aca36f2bea86c3ee0a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Sep 2025 23:22:04 +0000 Subject: [PATCH 42/64] tfswitch: 1.5.1 -> 1.6.0 --- pkgs/by-name/tf/tfswitch/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tf/tfswitch/package.nix b/pkgs/by-name/tf/tfswitch/package.nix index 53205a33322c..236b2554198d 100644 --- a/pkgs/by-name/tf/tfswitch/package.nix +++ b/pkgs/by-name/tf/tfswitch/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "tfswitch"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "warrensbox"; repo = "terraform-switcher"; rev = "v${version}"; - sha256 = "sha256-gXf6lqxWTX44fhAa34QlcKBxc4xLNVFUsGOlKvWnWKc="; + sha256 = "sha256-mkS53Bqw59F7Q8QyyMjQVm0uBR/HUUnzjCHNT/GiIEg="; }; vendorHash = "sha256-cc1ZvVCcjFlJcHs0DH4atyWISrrDfyXPK6j2dSgWD0k="; From e7798b61c6ad61ce211a663fe651bc3c467080ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Sep 2025 00:05:09 +0000 Subject: [PATCH 43/64] hugo: 0.149.1 -> 0.150.0 --- pkgs/by-name/hu/hugo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index 73033c189629..4be01da58be8 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "hugo"; - version = "0.149.1"; + version = "0.150.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; tag = "v${finalAttrs.version}"; - hash = "sha256-IGgh3uipi1HWdB3Y9hNGMUFL1WQVDGJlxd1dNK7OhH8="; + hash = "sha256-TWBwF/GPNPLNSEBmG0wVvqY+mgQpZk2MiQoLxB+dBuU="; }; - vendorHash = "sha256-d1eZ452ia2bj6ahEl1Mbva2iBi5IaKeYidP9bg7Thtc="; + vendorHash = "sha256-/jbShK+wEybD8hh5+1+Qd+NJkmp3w+BYf2UsTPEgwhw="; checkFlags = let From e75e797a700c08aeccfb5f40eeda4be66bce8bcc Mon Sep 17 00:00:00 2001 From: Defelo Date: Wed, 17 Sep 2025 01:02:09 +0000 Subject: [PATCH 44/64] uiua-unstable: 0.17.0-rc.1 -> 0.17.0-rc.2 Changelog: https://github.com/uiua-lang/uiua/blob/refs/tags/0.17.0-rc.2/changelog.md Diff: https://github.com/uiua-lang/uiua/compare/0.17.0-rc.1...0.17.0-rc.2 --- pkgs/by-name/ui/uiua/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ui/uiua/unstable.nix b/pkgs/by-name/ui/uiua/unstable.nix index 4829d327ac1c..304c161d0c22 100644 --- a/pkgs/by-name/ui/uiua/unstable.nix +++ b/pkgs/by-name/ui/uiua/unstable.nix @@ -1,7 +1,7 @@ rec { - version = "0.17.0-rc.1"; + version = "0.17.0-rc.2"; tag = version; - hash = "sha256-ITV8T3gfP52e8Wtikm5e68FS2Pyh+adOq/G7xpQ46GU="; - cargoHash = "sha256-K8hdkWKcMLw9ImdG0B/VhZV2j6bzMevrwQYEpUlGuzs="; + hash = "sha256-2EO1nlAMbBi+DAuxgnf7eUKYiyXDt2+0rxFXR520V0U="; + cargoHash = "sha256-uufkv/UIb6jlagercZvA6eOQ4Pu3ZHWRpnd0pQbX8vY="; updateScript = ./update-unstable.sh; } From 740ab639a87b39910cb2460520466633dd31afa8 Mon Sep 17 00:00:00 2001 From: Defelo Date: Wed, 17 Sep 2025 01:00:51 +0000 Subject: [PATCH 45/64] miniserve: 0.31.0 -> 0.32.0 Changelog: https://github.com/svenstaro/miniserve/blob/v0.32.0/CHANGELOG.md Diff: https://github.com/svenstaro/miniserve/compare/v0.31.0...v0.32.0 --- pkgs/by-name/mi/miniserve/package.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix index a7928033bb1c..25fdbfab5209 100644 --- a/pkgs/by-name/mi/miniserve/package.nix +++ b/pkgs/by-name/mi/miniserve/package.nix @@ -10,29 +10,20 @@ curl, versionCheckHook, nix-update-script, - fetchpatch, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "miniserve"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; tag = "v${finalAttrs.version}"; - hash = "sha256-sSCS5jHhu0PBF/R3YqbR9krZghNNa2cPkLkK8kvWWd4="; + hash = "sha256-9x2LGJwPf6QEvHvGD8i9Bz3tV8DNAtd9Wp9tXsbI2qo="; }; - patches = [ - (fetchpatch { - name = "upload.patch"; - url = "https://github.com/svenstaro/miniserve/commit/d41ade0d79e2c175515701350f763dd461c55964.patch"; - hash = "sha256-2xQPcJFjlvrCeobuDXm+eVZzDsKoQoZL7OXEJxncX5k="; - }) - ]; - - cargoHash = "sha256-Gb1k4sd2/OV1GskFZBn7EapZTlhb9LK19lJHVP7uCK0="; + cargoHash = "sha256-JVzWmo+28K1kG4QaiAkGgBr8kkdfqoylJBWi+Fo9L6c="; nativeBuildInputs = [ pkg-config From 31c5bceb7a61ae73b3abc3ecfb76e74ce94e4717 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Sep 2025 01:43:33 +0000 Subject: [PATCH 46/64] python3Packages.feedparser: 6.0.11 -> 6.0.12 --- pkgs/development/python-modules/feedparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/feedparser/default.nix b/pkgs/development/python-modules/feedparser/default.nix index 0d2035d6c719..d31dc4774e42 100644 --- a/pkgs/development/python-modules/feedparser/default.nix +++ b/pkgs/development/python-modules/feedparser/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "feedparser"; - version = "6.0.11"; + version = "6.0.12"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-ydBAe2TG8qBl0OuyksKzXAEFDMDcM3V0Yaqr3ExBhNU="; + hash = "sha256-ZPds6Qrj6O9dHt4PjTtQzia8znHdiuXoKxzS1KX5Qig="; }; nativeBuildInputs = [ setuptools ]; From b047f2e66641a91c63884ada54d52b7add6dc8d5 Mon Sep 17 00:00:00 2001 From: Parthiv Krishna Date: Tue, 16 Sep 2025 06:31:17 +0000 Subject: [PATCH 47/64] maintainers: add parthiv-krishna --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 347b35e84e6d..16cbc60b2dcf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19674,6 +19674,12 @@ githubId = 821972; name = "Parth Mehrotra"; }; + parthiv-krishna = { + email = "nixpkgs@parthiv.cc"; + github = "parthiv-krishna"; + githubId = 20658472; + name = "Parthiv Krishna"; + }; pascalj = { email = "nix@pascalj.de"; github = "pascalj"; From 3df6d80063e7898b15b43e8563d92cb8ab887915 Mon Sep 17 00:00:00 2001 From: Parthiv Krishna Date: Tue, 16 Sep 2025 06:32:48 +0000 Subject: [PATCH 48/64] homepage-dashboard: add `parthiv-krishna` to maintainers --- nixos/tests/homepage-dashboard.nix | 2 +- pkgs/by-name/ho/homepage-dashboard/package.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/homepage-dashboard.nix b/nixos/tests/homepage-dashboard.nix index 35165f650e9d..53e5b113cd02 100644 --- a/nixos/tests/homepage-dashboard.nix +++ b/nixos/tests/homepage-dashboard.nix @@ -1,7 +1,7 @@ { lib, ... }: { name = "homepage-dashboard"; - meta.maintainers = with lib.maintainers; [ ]; + meta.maintainers = with lib.maintainers; [ parthiv-krishna ]; nodes.machine = _: { services.homepage-dashboard = { diff --git a/pkgs/by-name/ho/homepage-dashboard/package.nix b/pkgs/by-name/ho/homepage-dashboard/package.nix index 6428c52261d6..1ae2d7dfe1cd 100644 --- a/pkgs/by-name/ho/homepage-dashboard/package.nix +++ b/pkgs/by-name/ho/homepage-dashboard/package.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "homepage"; homepage = "https://gethomepage.dev"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ parthiv-krishna ]; platforms = lib.platforms.all; }; }) From 4058df754ee65c3b5105245be75ef31437082288 Mon Sep 17 00:00:00 2001 From: Parthiv Krishna Date: Tue, 16 Sep 2025 06:33:37 +0000 Subject: [PATCH 49/64] homepage-dashboard: add unixtools.ping to wrapper PATH This gives homepage access to `ping` so it can be used when the ping property on a service is configured --- pkgs/by-name/ho/homepage-dashboard/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ho/homepage-dashboard/package.nix b/pkgs/by-name/ho/homepage-dashboard/package.nix index 1ae2d7dfe1cd..b5f753af768d 100644 --- a/pkgs/by-name/ho/homepage-dashboard/package.nix +++ b/pkgs/by-name/ho/homepage-dashboard/package.nix @@ -6,6 +6,7 @@ pnpm_10, python3, stdenv, + unixtools, cctools, lib, nixosTests, @@ -89,7 +90,8 @@ stdenv.mkDerivation (finalAttrs: { --set-default PORT 3000 \ --set-default HOMEPAGE_CONFIG_DIR /var/lib/homepage-dashboard \ --set-default NIXPKGS_HOMEPAGE_CACHE_DIR /var/cache/homepage-dashboard \ - --add-flags "$out/share/homepage/server.js" + --add-flags "$out/share/homepage/server.js" \ + --set PATH "${lib.makeBinPath [ unixtools.ping ]}" ${if enableLocalIcons then installLocalIcons else ""} From c36784ca3e6bbf2f8a1a158f2966f2d85ab6a0d5 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 17 Sep 2025 04:36:18 +0100 Subject: [PATCH 50/64] easyloggingpp: drop Deprecated upstream. Only used by `encfs`, which is also deprecated, and vendors a newer version anyway. Will be broken by CMake 4. --- pkgs/by-name/ea/easyloggingpp/package.nix | 36 ----------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 pkgs/by-name/ea/easyloggingpp/package.nix diff --git a/pkgs/by-name/ea/easyloggingpp/package.nix b/pkgs/by-name/ea/easyloggingpp/package.nix deleted file mode 100644 index 8aa369284f6f..000000000000 --- a/pkgs/by-name/ea/easyloggingpp/package.nix +++ /dev/null @@ -1,36 +0,0 @@ -# To use this package with a CMake and pkg-config build: -# pkg_check_modules(EASYLOGGINGPP REQUIRED easyloggingpp) -# add_executable(main src/main.cpp ${EASYLOGGINGPP_PREFIX}/include/easylogging++.cc) -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - gtest, -}: -stdenv.mkDerivation rec { - pname = "easyloggingpp"; - version = "9.97.1"; - src = fetchFromGitHub { - owner = "amrayn"; - repo = "easyloggingpp"; - rev = "v${version}"; - sha256 = "sha256-R4NdwsUywgJoK5E/OdZXFds6iBKOsMa0E+2PDdQbV6E="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ gtest ]; - cmakeFlags = [ "-Dtest=ON" ]; - env.NIX_CFLAGS_COMPILE = "-std=c++14" + lib.optionalString stdenv.hostPlatform.isLinux " -pthread"; - postInstall = '' - mkdir -p $out/include - cp ../src/easylogging++.cc $out/include - ''; - meta = { - description = "C++ logging library"; - homepage = "https://github.com/amrayn/easyloggingpp"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ acowley ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5d903ac3ed8b..dbe7353e97df 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -786,6 +786,7 @@ mapAliases { EBTKS = ebtks; # Added 2024-01-21 eask = eask-cli; # Added 2024-09-05 + easyloggingpp = throw "easyloggingpp has been removed, as it is deprecated upstream and does not build with CMake 4"; # Added 2025-09-17 eboard = throw "'eboard' has been removed due to lack of maintenance upstream. Consider using 'kdePackages.knights' instead"; # Added 2024-10-19 ec2_ami_tools = throw "'ec2_ami_tools' has been renamed to/replaced by 'ec2-ami-tools'"; # Converted to throw 2024-10-17 ec2_api_tools = throw "'ec2_api_tools' has been renamed to/replaced by 'ec2-api-tools'"; # Converted to throw 2024-10-17 From 829cc555dcfbc43599d2068fab45ea8b6c34e40b Mon Sep 17 00:00:00 2001 From: maxicode2 <65052855+maxicode2@users.noreply.github.com> Date: Tue, 16 Sep 2025 21:47:11 -0700 Subject: [PATCH 51/64] applesauce: init at 0.5.19 --- pkgs/by-name/ap/applesauce/package.nix | 33 ++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/ap/applesauce/package.nix diff --git a/pkgs/by-name/ap/applesauce/package.nix b/pkgs/by-name/ap/applesauce/package.nix new file mode 100644 index 000000000000..0351a00a2919 --- /dev/null +++ b/pkgs/by-name/ap/applesauce/package.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "applesauce"; + version = "0.5.19"; + + src = fetchFromGitHub { + owner = "Dr-Emann"; + repo = "applesauce"; + tag = "applesauce-cli-v${finalAttrs.version}"; + hash = "sha256-OJZOB7h3qFkaCaPi+EJxIFX8q/Q38vtI0CmDK4PMD1g="; + }; + + cargoHash = "sha256-gQQpvS2LtlDBXjTqQvSUCXv5UCiQm1kiS/yPcG5KGxY="; + + meta = { + description = "Transparent compression for Apple File System Compression (AFSC)"; + homepage = "https://github.com/Dr-Emann/applesauce"; + changelog = "https://github.com/Dr-Emann/applesauce/releases/tag/applesauce-cli-v${finalAttrs.version}"; + license = with lib.licenses; [ + gpl3Plus + ]; + maintainers = with lib.maintainers; [ + maxicode + ]; + mainProgram = "applesauce"; + platforms = lib.platforms.darwin; + }; +}) From 30622111383cd870ae5eccc948aac5e84e845034 Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 17 Sep 2025 14:01:46 +0800 Subject: [PATCH 52/64] pidginPackages.pidgin-msn-pecan: drop --- .../pidgin/pidgin-plugins/default.nix | 3 +- .../pidgin-plugins/msn-pecan/default.nix | 30 ------------------- pkgs/top-level/aliases.nix | 2 +- 3 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/msn-pecan/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix index fe0696361e2e..d1e934dde494 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix @@ -26,8 +26,6 @@ lib.makeScope newScope ( texLive = texliveBasic; }; - pidgin-msn-pecan = callPackage ./msn-pecan { }; - pidgin-mra = callPackage ./pidgin-mra { }; pidgin-carbons = callPackage ./carbons { }; @@ -69,5 +67,6 @@ lib.makeScope newScope ( purple-matrix = throw "'pidginPackages.purple-matrix' has been unmaintained since April 2022, so it was removed."; pidgin-skypeweb = throw "'pidginPackages.pidgin-skypeweb' has been removed since Skype was shut down in May 2025."; purple-hangouts = throw "'pidginPackages.purple-hangouts' has been removed as Hangouts Classic is obsolete and migrated to Google Chat."; + pidgin-msn-pecan = throw "'pidginPackages.pidgin-msn-pecan' has been removed as it's unmaintained upstream and doesn't work with escargot"; } ) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/msn-pecan/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/msn-pecan/default.nix deleted file mode 100644 index 1d50370c4be7..000000000000 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/msn-pecan/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - pidgin, -}: - -stdenv.mkDerivation rec { - pname = "pidgin-msn-pecan"; - version = "0.1.4"; - src = fetchFromGitHub { - owner = "felipec"; - repo = "msn-pecan"; - rev = "v${version}"; - sha256 = "0133rpiy4ik6rx9qn8m38vp7w505hnycggr53g3a2hfpk5xj03zh"; - }; - - meta = { - description = "Alternative MSN protocol plug-in for Pidgin IM"; - homepage = "https://github.com/felipec/msn-pecan"; - platforms = lib.platforms.linux; - }; - - makeFlags = [ - "PURPLE_LIBDIR=${placeholder "out"}/lib" - "PURPLE_DATADIR=${placeholder "out"}/share/data" - ]; - - buildInputs = [ pidgin ]; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index beea5c3f21a3..53624b8c8c73 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1968,6 +1968,7 @@ mapAliases { phlare = throw "'phlare' has been removed as the upstream project was archived."; # Added 2025-03-27 picom-next = picom; # Added 2024-02-13 pict-rs_0_3 = throw "pict-rs_0_3 has been removed, as it was an outdated version and no longer compiled"; # Added 2024-08-20 + pidgin-msn-pecan = throw "'pidgin-msn-pecan' has been removed as it's unmaintained upstream and doesn't work with escargot"; # Added 2025-09-17 pidgin-skypeweb = throw "'pidgin-skypeweb' has been removed since Skype was shut down in May 2025"; # Added 2025-09-15 pilipalax = throw "'pilipalax' has been removed from nixpkgs due to it not being maintained"; # Added 2025-07-25 pio = throw "pio has been removed due to lack of upstream maintenance"; # Added 2025-01-25 @@ -2752,7 +2753,6 @@ mapAliases { inherit (pidginPackages) pidgin-indicator pidgin-latex - pidgin-msn-pecan pidgin-mra pidgin-carbons pidgin-xmpp-receipts From 091724ed5c8e8b37ba67308ab103f11fbb27476f Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 17 Sep 2025 14:06:54 +0800 Subject: [PATCH 53/64] pidginPackages.pidgin-mra: drop --- .../pidgin/pidgin-plugins/default.nix | 3 +- .../pidgin-plugins/pidgin-mra/default.nix | 39 ------------------- pkgs/top-level/aliases.nix | 2 +- 3 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-mra/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix index d1e934dde494..74a1a469eec1 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix @@ -26,8 +26,6 @@ lib.makeScope newScope ( texLive = texliveBasic; }; - pidgin-mra = callPackage ./pidgin-mra { }; - pidgin-carbons = callPackage ./carbons { }; pidgin-xmpp-receipts = callPackage ./pidgin-xmpp-receipts { }; @@ -68,5 +66,6 @@ lib.makeScope newScope ( pidgin-skypeweb = throw "'pidginPackages.pidgin-skypeweb' has been removed since Skype was shut down in May 2025."; purple-hangouts = throw "'pidginPackages.purple-hangouts' has been removed as Hangouts Classic is obsolete and migrated to Google Chat."; pidgin-msn-pecan = throw "'pidginPackages.pidgin-msn-pecan' has been removed as it's unmaintained upstream and doesn't work with escargot"; + pidgin-mra = throw "'pidginPackages.pidgin-mra' has been removed since mail.ru agent service has stopped functioning in 2024."; } ) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-mra/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-mra/default.nix deleted file mode 100644 index 447944b0e32d..000000000000 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-mra/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - pkg-config, - pidgin, -}: - -stdenv.mkDerivation { - pname = "pidgin-mra"; - version = "unstable-2014-07-08"; - - src = fetchFromGitHub { - owner = "dreadatour"; - repo = "pidgin-mra"; - rev = "54b299266265cde800289b2d51f13b81f6bf379c"; - sha256 = "sha256-fKdEOaijW2LfsH8RHlVGbMpL7Zhu+x2vW4fPEN4puKk="; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ pidgin ]; - - postPatch = '' - sed -i 's|-I/usr/include/libpurple|$(shell pkg-config --cflags purple)|' Makefile - ''; - - makeFlags = [ - "DESTDIR=/" - "LIBDIR=${placeholder "out"}/lib" - "DATADIR=${placeholder "out"}/share" - ]; - - meta = { - homepage = "https://github.com/dreadatour/pidgin-mra"; - description = "Mail.ru Agent plugin for Pidgin / libpurple"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 53624b8c8c73..98ed5cc28115 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1968,6 +1968,7 @@ mapAliases { phlare = throw "'phlare' has been removed as the upstream project was archived."; # Added 2025-03-27 picom-next = picom; # Added 2024-02-13 pict-rs_0_3 = throw "pict-rs_0_3 has been removed, as it was an outdated version and no longer compiled"; # Added 2024-08-20 + pidgin-mra = throw "'pidgin-mra' has been removed since mail.ru agent service has stopped functioning in 2024."; # Added 2025-09-17 pidgin-msn-pecan = throw "'pidgin-msn-pecan' has been removed as it's unmaintained upstream and doesn't work with escargot"; # Added 2025-09-17 pidgin-skypeweb = throw "'pidgin-skypeweb' has been removed since Skype was shut down in May 2025"; # Added 2025-09-15 pilipalax = throw "'pilipalax' has been removed from nixpkgs due to it not being maintained"; # Added 2025-07-25 @@ -2753,7 +2754,6 @@ mapAliases { inherit (pidginPackages) pidgin-indicator pidgin-latex - pidgin-mra pidgin-carbons pidgin-xmpp-receipts pidgin-otr From 9e3b4e7f3087019835c006c4b7b55964203fc901 Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 17 Sep 2025 14:13:17 +0800 Subject: [PATCH 54/64] pidginPackages.purple-facebook: drop --- .../pidgin/pidgin-plugins/default.nix | 4 +- .../purple-facebook/default.nix | 79 ------------------- pkgs/top-level/aliases.nix | 2 +- 3 files changed, 2 insertions(+), 83 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-facebook/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix index 74a1a469eec1..effb8d554474 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix @@ -57,9 +57,6 @@ lib.makeScope newScope ( tdlib-purple = callPackage ./tdlib-purple { }; pidgin-opensteamworks = callPackage ./pidgin-opensteamworks { }; - - purple-facebook = callPackage ./purple-facebook { }; - } // lib.optionalAttrs config.allowAliases { purple-matrix = throw "'pidginPackages.purple-matrix' has been unmaintained since April 2022, so it was removed."; @@ -67,5 +64,6 @@ lib.makeScope newScope ( purple-hangouts = throw "'pidginPackages.purple-hangouts' has been removed as Hangouts Classic is obsolete and migrated to Google Chat."; pidgin-msn-pecan = throw "'pidginPackages.pidgin-msn-pecan' has been removed as it's unmaintained upstream and doesn't work with escargot"; pidgin-mra = throw "'pidginPackages.pidgin-mra' has been removed since mail.ru agent service has stopped functioning in 2024."; + purple-facebook = throw "'pidginPackages.purple-facebook' has been removed as it is unmaintained and doesn't support e2ee enforced by facebook."; } ) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-facebook/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-facebook/default.nix deleted file mode 100644 index 2a7a5238ec41..000000000000 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-facebook/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchhg, - pidgin, - glib, - json-glib, - autoreconfHook, -}: - -let - pidginHg = fetchhg { - url = "https://bitbucket.org/pidgin/main"; - # take from VERSION file - rev = "9ff9acf9fa14"; - sha256 = "06imlhsps4wrjgjb92zpaxprxfxl2pjb2x9pl859c8cryssrz2jv"; - }; - -in -stdenv.mkDerivation rec { - pname = "purple-facebook"; - version = "0.9.5"; - - src = fetchFromGitHub { - owner = "dequis"; - repo = "purple-facebook"; - rev = "v${version}-9ff9acf9fa14"; - sha256 = "0a1860bkzrmyxahm9rlxi80z335w491wzdaqaw6j9ccavbymhwhs"; - }; - - postPatch = '' - # we do all patching from update.sh in preAutoreconf - echo "#!${stdenv.shell}" > update.sh - ''; - - preAutoreconf = '' - for FILE in $(cat MANIFEST_PIDGIN); do - install -Dm644 "${pidginHg}/$FILE" "pidgin/$FILE" || true - done - - touch $(cat MANIFEST_VOIDS) - - patchdir="$(pwd)/patches" - pushd pidgin - - for patch in $(ls -1 "$patchdir"); do - patch -p1 -i "$patchdir/$patch" - done - popd - - ./autogen.sh - ''; - - makeFlags = [ - "PLUGIN_DIR_PURPLE=/lib/pidgin/" - "DATA_ROOT_DIR_PURPLE=/share" - ]; - - installPhase = '' - mkdir -p $out/lib/purple-2 - cp pidgin/libpurple/protocols/facebook/.libs/*.so $out/lib/purple-2/ - ''; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ - pidgin - glib - json-glib - ]; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Facebook protocol plugin for libpurple"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ davorb ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 98ed5cc28115..c2ef9fc528f6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2098,6 +2098,7 @@ mapAliases { psensor = throw "'psensor' has been removed due to lack of maintenance upstream. Consider using 'mission-center', 'resources' or 'monitorets' instead"; # Added 2024-09-14 psstop = throw "'psstop' has been removed because the upstream repo has been archived"; # Added 2025-05-10 ptask = throw "'ptask' has been removed because its upstream is unavailable"; # Added 2025-05-10 + purple-facebook = throw "'purple-facebook' has been removed as it is unmaintained and doesn't support e2ee enforced by facebook."; # Added 2025-09-17 purple-signald = throw "'purple-signald' has been removed due to lack of upstream maintenance"; # Added 2025-05-17 purple-matrix = throw "'purple-matrix' has been unmaintained since April 2022, so it was removed."; # Added 2025-09-01 purple-hangouts = throw "'purple-hangouts' has been removed as Hangouts Classic is obsolete and migrated to Google Chat."; # Added 2025-09-17 @@ -2770,7 +2771,6 @@ mapAliases { purple-xmpp-http-upload tdlib-purple pidgin-opensteamworks - purple-facebook ; } From a91f29a8b0490480f868d2c0e4f89323654c7fcb Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 17 Sep 2025 14:24:28 +0800 Subject: [PATCH 55/64] pidginPackages.pidgin-opensteamworks: drop --- .../pidgin/pidgin-plugins/default.nix | 3 +- .../pidgin-opensteamworks/default.nix | 51 ------------------- pkgs/top-level/aliases.nix | 2 +- 3 files changed, 2 insertions(+), 54 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix index effb8d554474..7736684e5225 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix @@ -55,8 +55,6 @@ lib.makeScope newScope ( purple-xmpp-http-upload = callPackage ./purple-xmpp-http-upload { }; tdlib-purple = callPackage ./tdlib-purple { }; - - pidgin-opensteamworks = callPackage ./pidgin-opensteamworks { }; } // lib.optionalAttrs config.allowAliases { purple-matrix = throw "'pidginPackages.purple-matrix' has been unmaintained since April 2022, so it was removed."; @@ -65,5 +63,6 @@ lib.makeScope newScope ( pidgin-msn-pecan = throw "'pidginPackages.pidgin-msn-pecan' has been removed as it's unmaintained upstream and doesn't work with escargot"; pidgin-mra = throw "'pidginPackages.pidgin-mra' has been removed since mail.ru agent service has stopped functioning in 2024."; purple-facebook = throw "'pidginPackages.purple-facebook' has been removed as it is unmaintained and doesn't support e2ee enforced by facebook."; + pidgin-opensteamworks = throw "'pidginPackages.pidgin-opensteamworks' has been removed as it is unmaintained and no longer works with Steam."; } ) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix deleted file mode 100644 index 3e2231c887d3..000000000000 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - pkg-config, - pidgin, - glib, - json-glib, - nss, - nspr, - libsecret, -}: - -stdenv.mkDerivation rec { - pname = "pidgin-opensteamworks"; - version = "1.7.2"; - - src = fetchFromGitHub { - owner = "EionRobb"; - repo = "pidgin-opensteamworks"; - rev = version; - sha256 = "sha256-VWsoyFG+Ro+Y6ngSTMQ7yBYf6awCMNOc6U0WqNeg/jU="; - }; - - sourceRoot = "${src.name}/steam-mobile"; - - installFlags = [ - "PLUGIN_DIR_PURPLE=${placeholder "out"}/lib/purple-2" - "DATA_ROOT_DIR_PURPLE=${placeholder "out"}/share" - ]; - - nativeBuildInputs = [ - pkg-config - ]; - buildInputs = [ - pidgin - glib - json-glib - nss - nspr - libsecret - ]; - - meta = with lib; { - homepage = "https://github.com/EionRobb/pidgin-opensteamworks"; - description = "Plugin for Pidgin 2.x which implements Steam Friends/Steam IM compatibility"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ arobyn ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c2ef9fc528f6..a2ad31dbad30 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1970,6 +1970,7 @@ mapAliases { pict-rs_0_3 = throw "pict-rs_0_3 has been removed, as it was an outdated version and no longer compiled"; # Added 2024-08-20 pidgin-mra = throw "'pidgin-mra' has been removed since mail.ru agent service has stopped functioning in 2024."; # Added 2025-09-17 pidgin-msn-pecan = throw "'pidgin-msn-pecan' has been removed as it's unmaintained upstream and doesn't work with escargot"; # Added 2025-09-17 + pidgin-opensteamworks = throw "'pidgin-opensteamworks' has been removed as it is unmaintained and no longer works with Steam."; # Added 2025-09-17 pidgin-skypeweb = throw "'pidgin-skypeweb' has been removed since Skype was shut down in May 2025"; # Added 2025-09-15 pilipalax = throw "'pilipalax' has been removed from nixpkgs due to it not being maintained"; # Added 2025-07-25 pio = throw "pio has been removed due to lack of upstream maintenance"; # Added 2025-01-25 @@ -2770,7 +2771,6 @@ mapAliases { purple-vk-plugin purple-xmpp-http-upload tdlib-purple - pidgin-opensteamworks ; } From 9f1c1d700044e7f5244c228d7b480af290ddb181 Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 17 Sep 2025 14:31:26 +0800 Subject: [PATCH 56/64] pidginPackages.purple-vk-plugin: drop --- .../pidgin/pidgin-plugins/default.nix | 3 +- .../purple-vk-plugin/default.nix | 41 ------------------- pkgs/top-level/aliases.nix | 2 +- 3 files changed, 2 insertions(+), 44 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-vk-plugin/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix index 7736684e5225..5356d189112e 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix @@ -50,8 +50,6 @@ lib.makeScope newScope ( purple-slack = callPackage ./purple-slack { }; - purple-vk-plugin = callPackage ./purple-vk-plugin { }; - purple-xmpp-http-upload = callPackage ./purple-xmpp-http-upload { }; tdlib-purple = callPackage ./tdlib-purple { }; @@ -64,5 +62,6 @@ lib.makeScope newScope ( pidgin-mra = throw "'pidginPackages.pidgin-mra' has been removed since mail.ru agent service has stopped functioning in 2024."; purple-facebook = throw "'pidginPackages.purple-facebook' has been removed as it is unmaintained and doesn't support e2ee enforced by facebook."; pidgin-opensteamworks = throw "'pidginPackages.pidgin-opensteamworks' has been removed as it is unmaintained and no longer works with Steam."; + purple-vk-plugin = throw "'pidginPackages.purple-vk-plugin' has been removed as upstream repository was deleted and no active forks are found."; } ) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-vk-plugin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-vk-plugin/default.nix deleted file mode 100644 index ad3ad0d088a5..000000000000 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-vk-plugin/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - stdenv, - fetchhg, - pidgin, - cmake, - libxml2, -}: - -let - version = "40ddb6d"; -in -stdenv.mkDerivation { - pname = "purple-vk-plugin"; - inherit version; - - src = fetchhg { - url = "https://bitbucket.org/olegoandreev/purple-vk-plugin"; - rev = version; - sha256 = "02p57fgx8ml00cbrb4f280ak2802svz80836dzk9f1zwm1bcr2qc"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ - pidgin - libxml2 - ]; - - preConfigure = '' - sed -i -e 's|DESTINATION.*PURPLE_PLUGIN_DIR}|DESTINATION lib/purple-2|' CMakeLists.txt - ''; - - cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=1" ]; - - meta = { - homepage = "https://bitbucket.org/olegoandreev/purple-vk-plugin"; - description = "Vk (russian social network) plugin for Pidgin / libpurple"; - license = lib.licenses.gpl3; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a2ad31dbad30..0eb069218f0b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2103,6 +2103,7 @@ mapAliases { purple-signald = throw "'purple-signald' has been removed due to lack of upstream maintenance"; # Added 2025-05-17 purple-matrix = throw "'purple-matrix' has been unmaintained since April 2022, so it was removed."; # Added 2025-09-01 purple-hangouts = throw "'purple-hangouts' has been removed as Hangouts Classic is obsolete and migrated to Google Chat."; # Added 2025-09-17 + purple-vk-plugin = throw "'purple-vk-plugin' has been removed as upstream repository was deleted and no active forks are found."; # Added 2025-09-17 pwndbg = throw "'pwndbg' has been removed due to dependency version incompatibilities that are infeasible to maintain in nixpkgs. Use the downstream flake that pwndbg provides instead: https://github.com/pwndbg/pwndbg"; # Added 2025-02-09 pxlib = throw "pxlib has been removed due to failing to build and lack of upstream maintenance"; # Added 2025-04-28 pxview = throw "pxview has been removed due to failing to build and lack of upstream maintenance"; # Added 2025-04-28 @@ -2768,7 +2769,6 @@ mapAliases { purple-mm-sms purple-plugin-pack purple-slack - purple-vk-plugin purple-xmpp-http-upload tdlib-purple ; From 9504a768701eb2932f3bb9bb3ef0807a02e4c8e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Sep 2025 06:56:10 +0000 Subject: [PATCH 57/64] sillytavern: 1.13.3 -> 1.13.4 --- pkgs/by-name/si/sillytavern/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/sillytavern/package.nix b/pkgs/by-name/si/sillytavern/package.nix index dff4d6fbdd82..90a0168c361f 100644 --- a/pkgs/by-name/si/sillytavern/package.nix +++ b/pkgs/by-name/si/sillytavern/package.nix @@ -5,15 +5,15 @@ }: buildNpmPackage (finalAttrs: { pname = "sillytavern"; - version = "1.13.3"; + version = "1.13.4"; src = fetchFromGitHub { owner = "SillyTavern"; repo = "SillyTavern"; tag = finalAttrs.version; - hash = "sha256-IR2lR6kkjHXIHqCZJ+KK7abxK+oyJzWyEya86e3cEn8="; + hash = "sha256-C1VWyowuk4w1F5u88Xcp9m3UgNmcDKEn/NSojuLGAd8="; }; - npmDepsHash = "sha256-cAfFRJY2cVBSu3gp2zGlHe84L7c9PahZDyO7iREjHWs="; + npmDepsHash = "sha256-lVG00oUzrMxIVoKqTRtkMYUmS45YEOkcepXJl4vth2w="; dontNpmBuild = true; From db0ca5c3477cc761ec1569f2ee31387b4ce03fcd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Sep 2025 07:15:57 +0000 Subject: [PATCH 58/64] linuxKernel.kernels.linux_lqx: 6.16.5 -> 6.16.7 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 541b3ce3525f..0a3a2565e547 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -23,9 +23,9 @@ let }; # ./update-zen.py lqx lqx = { - version = "6.16.5"; # lqx + version = "6.16.7"; # lqx suffix = "lqx1"; # lqx - sha256 = "149pkbzsx1z5b8qizf03nz5b4p7in0kbyy8d35svvzrljr6dzjqn"; # lqx + sha256 = "1rw5iz9d2zz39hzg9p0nxbprz25hgiaycax5iq2yg87mqsxdajad"; # lqx isLqx = true; }; }; From 74411c6c0d5ef37c3c93dea06e24d92c0f204415 Mon Sep 17 00:00:00 2001 From: Parthiv Krishna Date: Wed, 17 Sep 2025 08:20:45 +0000 Subject: [PATCH 59/64] nixosTests.homepage-dashboard: add test for ping property on service Use homepage's API to ensure that ping works --- nixos/tests/homepage-dashboard.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/nixos/tests/homepage-dashboard.nix b/nixos/tests/homepage-dashboard.nix index 53e5b113cd02..d72ebc215295 100644 --- a/nixos/tests/homepage-dashboard.nix +++ b/nixos/tests/homepage-dashboard.nix @@ -21,10 +21,23 @@ ]; } ]; + services = [ + { + Machines = [ + { + Localhost = { + ping = "127.0.0.1"; + }; + } + ]; + } + ]; }; }; testScript = '' + import json + # Ensure the services are started on managed machine machine.wait_for_unit("homepage-dashboard.service") machine.wait_for_open_port(8082) @@ -40,5 +53,9 @@ # Ensure that we see the custom bookmarks on the page page = machine.succeed("curl --fail http://127.0.0.1:8082/api/bookmarks") assert "nixpkgs" in page, "Custom bookmarks not found" + + # Ensure that the ping command works + response = machine.succeed("curl --fail \"http://localhost:8082/api/ping?groupName=Machines&serviceName=Localhost\"") + assert json.loads(response)["alive"] is True, "Ping to localhost failed" ''; } From dc420e2811c1823fa2e3097eb4cccef12a0f0761 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Sep 2025 09:16:04 +0000 Subject: [PATCH 60/64] python3Packages.llama-index-llms-openai: 0.5.4 -> 0.5.6 --- .../python-modules/llama-index-llms-openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix index 738c32e3abfc..c0f82167d880 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-llms-openai"; - version = "0.5.4"; + version = "0.5.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai"; inherit version; - hash = "sha256-nja20vxfBWsA7mVZAbO7fnBgsj97GUOYift41pY0D1Q="; + hash = "sha256-klM+g74usyHYSgGoT7K/RQa/aExBDNlMyymubJSaJ9Q="; }; pythonRemoveDeps = [ From b28b2e3c01c382409edf202ea222ea4e103eed46 Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Wed, 17 Sep 2025 11:36:20 +0200 Subject: [PATCH 61/64] claude-code: 1.0.115 -> 1.0.117 Changelog: https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md --- pkgs/by-name/cl/claude-code/package-lock.json | 8 ++++---- pkgs/by-name/cl/claude-code/package.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index 1f0d949b2d7d..528efab9ed13 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -6,13 +6,13 @@ "packages": { "": { "dependencies": { - "@anthropic-ai/claude-code": "^1.0.115" + "@anthropic-ai/claude-code": "^1.0.117" } }, "node_modules/@anthropic-ai/claude-code": { - "version": "1.0.115", - "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.115.tgz", - "integrity": "sha512-scnmcSgtmRM4wUUWr+BfU+krK+m/n4Sxvhu9ePUlYRWklWrYnySvJ1WrAZG6/v9G6vDLDdoKIW7yol8SGnOSqA==", + "version": "1.0.117", + "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.117.tgz", + "integrity": "sha512-ZSBFpwPqMZJZq9//BYSW0MLGQY0svAtncPe2EVxohO87Gym6Dqi+IRSVZkWSwF07gmzZH3luqrepX3q33l7T+Q==", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index e8d1c286dc3a..edda4f325912 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "claude-code"; - version = "1.0.115"; + version = "1.0.117"; nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz"; - hash = "sha256-pN74V0cFmNjlkTp6qmoOa9z15BhTyM3U6VMi8pTiKcA="; + hash = "sha256-mGAc09YRUE6sjy4/gimGVIbPuRHANOyBP/hpuHsbZVI="; }; - npmDepsHash = "sha256-YUKJhBOxUL9hLnwb61sYqcjGIql4drOIku1t3v5c0Zo="; + npmDepsHash = "sha256-U/trPqqN4FNuH6yHlvkPL9DHR2Lw21+3xVtwenu/4Fs="; postPatch = '' cp ${./package-lock.json} package-lock.json From 5470198ddeb7f90949f9c98f81b68b163765f3f0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 17 Sep 2025 12:13:32 +0200 Subject: [PATCH 62/64] nixos/wyoming/piper: fix cuda option reference Fixes: #443686 --- nixos/modules/services/home-automation/wyoming/piper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/home-automation/wyoming/piper.nix b/nixos/modules/services/home-automation/wyoming/piper.nix index b332c34bd926..250d46c76bbd 100644 --- a/nixos/modules/services/home-automation/wyoming/piper.nix +++ b/nixos/modules/services/home-automation/wyoming/piper.nix @@ -175,7 +175,7 @@ in ++ lib.optionals options.streaming [ "--streaming" ] - ++ lib.optionals options.cuda [ + ++ lib.optionals options.useCUDA [ "--use-cuda" ] ++ options.extraArgs From fe1085c20d64a3bfa0815ae9979c2be338dcf3b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Sep 2025 10:43:03 +0000 Subject: [PATCH 63/64] gitea-mcp-server: 0.3.2 -> 0.4.0 --- pkgs/by-name/gi/gitea-mcp-server/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/gitea-mcp-server/package.nix b/pkgs/by-name/gi/gitea-mcp-server/package.nix index 4058fe77cb81..5923dd4033d0 100644 --- a/pkgs/by-name/gi/gitea-mcp-server/package.nix +++ b/pkgs/by-name/gi/gitea-mcp-server/package.nix @@ -5,14 +5,14 @@ }: buildGoModule (finalAttrs: { pname = "gitea-mcp-server"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitea { domain = "gitea.com"; owner = "gitea"; repo = "gitea-mcp"; tag = "v${finalAttrs.version}"; - hash = "sha256-BuSkrQl7HVZxsMF0w6F2Nf9QEuWpZV6pxChcvSgV0Eo="; + hash = "sha256-MWH50NOZKp0OxuIELnbp34GKLWFaVOZCZOQnNLvYHro="; }; vendorHash = "sha256-LZIgADgUUNrMPBdCF0kz4koZUvGfHvzb8T+hwbiIYjs="; From 242938064c3061a8326b7630fb4d6d867889abca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Sep 2025 11:20:30 +0000 Subject: [PATCH 64/64] python3Packages.bthome-ble: 3.14.1 -> 3.14.2 --- pkgs/development/python-modules/bthome-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index c01d1749e137..1ea295a14750 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "3.14.1"; + version = "3.14.2"; pyproject = true; src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = "bthome-ble"; tag = "v${version}"; - hash = "sha256-ySvEO4ic1Oo0b/kBADOMRgf9Thq6sBvxYWFKQpH3ouU="; + hash = "sha256-kxKQnHrRZE7ugrRn7VSwQ99TtEX/DmH5x4Yy22UsXjA="; }; build-system = [ poetry-core ];