From fbc141246d8b6352853b6a6a325c74499dc972bd Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Mon, 30 Dec 2024 19:46:28 +0100 Subject: [PATCH 001/155] iverilog: set correct build compilers --- pkgs/by-name/iv/iverilog/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/iv/iverilog/package.nix b/pkgs/by-name/iv/iverilog/package.nix index 6ae58d945ad1..d018d650dbbe 100644 --- a/pkgs/by-name/iv/iverilog/package.nix +++ b/pkgs/by-name/iv/iverilog/package.nix @@ -13,6 +13,7 @@ python3, readline, zlib, + buildPackages, }: stdenv.mkDerivation rec { @@ -33,8 +34,8 @@ stdenv.mkDerivation rec { gperf ]; - CC_FOR_BUILD = "${stdenv.cc}/bin/cc"; - CXX_FOR_BUILD = "${stdenv.cc}/bin/c++"; + CC_FOR_BUILD = "${buildPackages.stdenv.cc}/bin/cc"; + CXX_FOR_BUILD = "${buildPackages.stdenv.cc}/bin/c++"; patches = [ # NOTE(jleightcap): `-Werror=format-security` warning patched shortly after release, backport the upstream fix From 4293b7c00b21e8d1604b1fea805ee733f5a39b4d Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 15:32:12 +0100 Subject: [PATCH 002/155] fped: fix cross build --- pkgs/by-name/fp/fped/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/fp/fped/package.nix b/pkgs/by-name/fp/fped/package.nix index b227dd8bb428..af8b7b69438d 100644 --- a/pkgs/by-name/fp/fped/package.nix +++ b/pkgs/by-name/fp/fped/package.nix @@ -21,6 +21,11 @@ stdenv.mkDerivation { sha256 = "0xv364a00zwxhd9kg1z9sch5y0cxnrhk546asspyb9bh58sdzfy7"; }; + postPatch = '' + substituteInPlace Makefile \ + --replace-fail 'pkg-config' '${stdenv.cc.targetPrefix}pkg-config' + ''; + # Workaround build failure on -fno-common toolchains: # ld: postscript.o:postscript.h:29: multiple definition of # `postscript_params'; fped.o:postscript.h:29: first defined here @@ -43,6 +48,7 @@ stdenv.mkDerivation { ]; buildInputs = [ + flex gtk2 ]; From aa9f5a43e212d501a84268b067ab4eb84074fc5b Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Tue, 14 Jan 2025 20:00:44 +0100 Subject: [PATCH 003/155] perlPackages.Gtk3: fix strictDeps build --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7162c0d4a942..04190e2d713f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11336,6 +11336,7 @@ with self; { hash = "sha256-cNxL8qp0mBx54V/SmNmY4FqS66SBHxrVyfH03jdzesw="; }; propagatedBuildInputs = [ pkgs.gtk3 CairoGObject GlibObjectIntrospection ]; + nativeCheckInputs = [ GlibObjectIntrospection ]; preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' # Currently failing on macOS rm t/overrides.t From 46254927013f394de68b27ee5d395f300b302142 Mon Sep 17 00:00:00 2001 From: oxalica Date: Thu, 23 Jan 2025 14:20:48 -0500 Subject: [PATCH 004/155] electron-cash: move to by-name and format Co-authored-by: Noa Aarts --- .../el/electron-cash/package.nix} | 20 ++++++++++++++----- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 15 insertions(+), 7 deletions(-) rename pkgs/{applications/misc/electron-cash/default.nix => by-name/el/electron-cash/package.nix} (90%) diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/by-name/el/electron-cash/package.nix similarity index 90% rename from pkgs/applications/misc/electron-cash/default.nix rename to pkgs/by-name/el/electron-cash/package.nix index 2cdcfef62bac..30b45cf1e2b1 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/by-name/el/electron-cash/package.nix @@ -1,5 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook -, secp256k1, qtwayland }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, + qt5, + secp256k1, +}: python3Packages.buildPythonApplication rec { pname = "electron-cash"; @@ -49,9 +55,9 @@ python3Packages.buildPythonApplication rec { pysatochip ]; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; - buildInputs = [ ] ++ lib.optional stdenv.hostPlatform.isLinux qtwayland; + buildInputs = [ ] ++ lib.optional stdenv.hostPlatform.isLinux qt5.qtwayland; postPatch = '' substituteInPlace contrib/requirements/requirements.txt \ @@ -89,7 +95,11 @@ python3Packages.buildPythonApplication rec { ''; homepage = "https://www.electroncash.org/"; platforms = platforms.unix; - maintainers = with maintainers; [ lassulus nyanloutre oxalica ]; + maintainers = with maintainers; [ + lassulus + nyanloutre + oxalica + ]; license = licenses.mit; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c740e1a8bfa3..3e392367f21c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13255,8 +13255,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit; }; - electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { }; - electrum = libsForQt5.callPackage ../applications/misc/electrum { }; electrum-grs = libsForQt5.callPackage ../applications/misc/electrum/grs.nix { }; From cf28b966f3590bfcea7edd80e08d4bffeae215fd Mon Sep 17 00:00:00 2001 From: oxalica Date: Thu, 23 Jan 2025 20:37:43 -0500 Subject: [PATCH 005/155] electron-cash: 4.3.1 -> 4.4.2, fix build and tests --- pkgs/by-name/el/electron-cash/package.nix | 43 +++++++++++++---------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/el/electron-cash/package.nix b/pkgs/by-name/el/electron-cash/package.nix index 30b45cf1e2b1..ff2b24cdc7e0 100644 --- a/pkgs/by-name/el/electron-cash/package.nix +++ b/pkgs/by-name/el/electron-cash/package.nix @@ -9,13 +9,13 @@ python3Packages.buildPythonApplication rec { pname = "electron-cash"; - version = "4.3.1"; + version = "4.4.2"; src = fetchFromGitHub { owner = "Electron-Cash"; repo = "Electron-Cash"; tag = version; - sha256 = "sha256-xOyj5XerOwgfvI0qj7+7oshDvd18h5IeZvcJTis8nWo="; + sha256 = "sha256-hqaPxetS6JONvlRMjNonXUGFpdmnuadD00gcPzY07x0="; }; build-system = with python3Packages; [ @@ -44,6 +44,7 @@ python3Packages.buildPythonApplication rec { psutil pycryptodomex cryptography + zxing-cpp # requirements-hw trezor @@ -59,32 +60,38 @@ python3Packages.buildPythonApplication rec { buildInputs = [ ] ++ lib.optional stdenv.hostPlatform.isLinux qt5.qtwayland; - postPatch = '' - substituteInPlace contrib/requirements/requirements.txt \ - --replace "qdarkstyle==2.6.8" "qdarkstyle<3" - - substituteInPlace setup.py \ - --replace "(share_dir" "(\"share\"" - ''; - # If secp256k1 wasn't added to the library path, the following warning is given: # # Electron Cash was unable to find the secp256k1 library on this system. # Elliptic curve cryptography operations will be performed in slow # Python-only mode. + # + # Upstream hardcoded `libsecp256k1.so.0` where we provides + # `libsecp256k1.so.5`. The only breaking change is the removal of two + # functions which seem not used by electron-cash. + # See: + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "(share_dir" '("share"' + substituteInPlace electroncash/secp256k1.py \ + --replace-fail "libsecp256k1.so.0" "${secp256k1}/lib/libsecp256k1.so.5" + ''; + preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") - makeWrapperArgs+=( - "--prefix" "LD_LIBRARY_PATH" ":" "${secp256k1}/lib" - ) ''; doInstallCheck = true; installCheckPhase = '' - $out/bin/electron-cash help >/dev/null + output="$($out/bin/electron-cash help 2>&1)" + if [[ "$output" == *"failed to load"* ]]; then + echo "$output" + echo "Forbidden text detected: failed to load" + exit 1 + fi ''; - meta = with lib; { + meta = { description = "Bitcoin Cash SPV Wallet"; mainProgram = "electron-cash"; longDescription = '' @@ -94,12 +101,12 @@ python3Packages.buildPythonApplication rec { of the blockchain. ''; homepage = "https://www.electroncash.org/"; - platforms = platforms.unix; - maintainers = with maintainers; [ + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ lassulus nyanloutre oxalica ]; - license = licenses.mit; + license = lib.licenses.mit; }; } From 28a8c651160fa3d9c14fd1d3ff3d10a2e992f24a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 8 Feb 2025 10:08:10 +0000 Subject: [PATCH 006/155] SDL2_image: 2.8.4 -> 2.8.5 Changes: https://github.com/libsdl-org/SDL_image/releases/tag/release-2.8.5 --- pkgs/by-name/sd/SDL2_image/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sd/SDL2_image/package.nix b/pkgs/by-name/sd/SDL2_image/package.nix index a4b150858520..64b311a23864 100644 --- a/pkgs/by-name/sd/SDL2_image/package.nix +++ b/pkgs/by-name/sd/SDL2_image/package.nix @@ -23,11 +23,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "SDL2_image"; - version = "2.8.4"; + version = "2.8.5"; src = fetchurl { url = "https://www.libsdl.org/projects/SDL_image/release/SDL2_image-${finalAttrs.version}.tar.gz"; - hash = "sha256-WomgFCChkridvMX1JnRIGB1dzIHS9aFojLHqxvVX2mc="; + hash = "sha256-i8TFf0HiwNt/m3SbJT72zs3G8LaJ7L427pe1ARX/9kU="; }; nativeBuildInputs = [ From 89de2178e4ee3459c7a876024b46d6bb883f7266 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 17 Feb 2025 09:58:06 -0500 Subject: [PATCH 007/155] sage: remove optional jmol dep (and thus also jre8) We are now past Sage 10.5, and jmol is now optional so unneeded in the default env. See https://github.com/sagemath/sage/issues/31027 --- pkgs/by-name/sa/sage/env-locations.nix | 3 --- pkgs/by-name/sa/sage/sage-env.nix | 5 ----- 2 files changed, 8 deletions(-) diff --git a/pkgs/by-name/sa/sage/env-locations.nix b/pkgs/by-name/sa/sage/env-locations.nix index 8a9974af763e..4d4ebf7e57bc 100644 --- a/pkgs/by-name/sa/sage/env-locations.nix +++ b/pkgs/by-name/sa/sage/env-locations.nix @@ -9,7 +9,6 @@ polytopes_db, gap, combinatorial_designs, - jmol, mathjax, three, cysignals, @@ -37,8 +36,6 @@ writeTextFile rec { export ECLDIR='${maxima.lisp-compiler}/lib/${maxima.lisp-compiler.pname}-${maxima.lisp-compiler.version}/' export COMBINATORIAL_DESIGN_DATA_DIR="${combinatorial_designs}/share/combinatorial_designs" export CREMONA_MINI_DATA_DIR="${elliptic_curves}/share/cremona" - export JMOL_DIR="${jmol}/share/jmol" # point to the directory that contains JmolData.jar - export JSMOL_DIR="${jmol}/share/jsmol" export MATHJAX_DIR="${mathjax}/lib/node_modules/mathjax" export THREEJS_DIR="${three}/lib/node_modules/three" export SAGE_INCLUDE_DIRECTORIES="${cysignals}/${cysignals.pythonModule.sitePackages}" diff --git a/pkgs/by-name/sa/sage/sage-env.nix b/pkgs/by-name/sa/sage/sage-env.nix index 0a1dabb14347..a480159d34c2 100644 --- a/pkgs/by-name/sa/sage/sage-env.nix +++ b/pkgs/by-name/sa/sage/sage-env.nix @@ -31,7 +31,6 @@ rWrapper, gfan, cddlib, - jmol, tachyon, glpk, eclib, @@ -50,7 +49,6 @@ zlib, gsl, ntl, - jre8, less, }: @@ -87,7 +85,6 @@ let rWrapper gfan cddlib - jmol tachyon glpk eclib @@ -98,7 +95,6 @@ let ecm lcalc rubiks - jre8 # only needed for `jmol` (https://sourceforge.net/p/jmol/mailman/message/58818762/), which will be optional in sage 10.5 less # needed to prevent transient test errors until https://github.com/ipython/ipython/pull/11864 is resolved ]) ); @@ -176,7 +172,6 @@ writeTextFile rec { eclib gsl ntl - jmol sympow ] ) From 668a5204eacb7ed672424d1673dfafd0840a39ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Mar 2025 19:14:09 +0000 Subject: [PATCH 008/155] geos: 3.13.0 -> 3.13.1 --- pkgs/development/libraries/geos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 75c5f4981dfd..10b7a377ea63 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "geos"; - version = "3.13.0"; + version = "3.13.1"; src = fetchFromGitHub { owner = "libgeos"; repo = "geos"; tag = finalAttrs.version; - hash = "sha256-WcE5dbfbeq9uCRgfVgiA3MTOisRpilXxjquEM5aKTCc="; + hash = "sha256-zPVP01AMIBKMnKi6Sq++CIaVZb5JA1v8/QAdGzKdL8Y="; }; nativeBuildInputs = [ cmake ]; From d2b4fdeef2abd2cb56b14e93002c3ff36cd35536 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Thu, 6 Mar 2025 12:30:51 -0700 Subject: [PATCH 009/155] jackaudio: fix cross build for FreeBSD --- pkgs/misc/jackaudio/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index ea9700f1c303..78e32544b1a3 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -19,6 +19,9 @@ libobjc, Accelerate, + # BSD Dependencies + freebsd, + # Optional Dependencies dbus ? null, libffado ? null, @@ -84,6 +87,9 @@ stdenv.mkDerivation (finalAttrs: { CoreAudio Accelerate libobjc + ] + ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ + freebsd.libsysinfo ]; patches = [ @@ -106,7 +112,10 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional (optDbus != null) "--dbus" ++ lib.optional (optLibffado != null) "--firewire" - ++ lib.optional (optAlsaLib != null) "--alsa"; + ++ lib.optional (optAlsaLib != null) "--alsa" + ++ lib.optional ( + stdenv.hostPlatform != stdenv.buildPlatform + ) "--platform=${stdenv.hostPlatform.parsed.kernel.name}"; postInstall = ( if libOnly then From 929153f9ddf73bb8d17723e4c80b5261fa1d61f1 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 7 Mar 2025 16:21:30 +0100 Subject: [PATCH 010/155] python3Packages.case-converter: init at 1.2.0 --- .../python-modules/case-converter/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/case-converter/default.nix diff --git a/pkgs/development/python-modules/case-converter/default.nix b/pkgs/development/python-modules/case-converter/default.nix new file mode 100644 index 000000000000..b3795d39494c --- /dev/null +++ b/pkgs/development/python-modules/case-converter/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "case-converter"; + version = "1.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "chrisdoherty4"; + repo = "python-case-converter"; + tag = "v${version}"; + hash = "sha256-PS/9Ndl3oD9zimEf819dNoSAeNJPndVjT+dkfW7FIJs="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "caseconverter" ]; + + doCheck = true; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "Case conversion library for Python"; + homepage = "https://github.com/chrisdoherty4/python-case-converter"; + changelog = "https://github.com/chrisdoherty4/python-case-converter/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cd113d17b676..1bc389344f29 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2116,6 +2116,8 @@ self: super: with self; { casbin = callPackage ../development/python-modules/casbin { }; + case-converter = callPackage ../development/python-modules/case-converter { }; + cashaddress = callPackage ../development/python-modules/cashaddress { }; cashews = callPackage ../development/python-modules/cashews { }; From 6813f7fdaaa498d56571c9c288ae621634b9b571 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Mon, 24 Feb 2025 19:04:47 -0700 Subject: [PATCH 011/155] freebsd.libsysinfo: init --- .../bsd/freebsd/pkgs/libsysinfo.nix | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/libsysinfo.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libsysinfo.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libsysinfo.nix new file mode 100644 index 000000000000..a88a3706b110 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libsysinfo.nix @@ -0,0 +1,56 @@ +{ + lib, + mkDerivation, + fetchurl, + fetchFromGitHub, +}: +let + pcFile = fetchurl { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/a613e66a54d54251878412b74c1e99defdac4192/devel/libsysinfo/files/libsysinfo.pc.in"; + hash = "sha256-KeCOYLCYeoJm+AwaagygKve2f+jNaIfaO7c/UnMegAg="; + }; +in +mkDerivation rec { + pname = "libsysinfo"; + path = "..."; + version = "0.0.3"; + src = fetchFromGitHub { + owner = "bsdimp"; + repo = "libsysinfo"; + rev = "e535d95d1598932a0084a027402104d6e0276479"; + hash = "sha256-HFgaYRR9HQM0iVJBWq1nrPGZIl/Y/5C0JJUunlzCZLI="; + }; + + outputs = [ + "out" + "man" + "debug" + ]; + + env.NIX_LDFLAGS = "-lkvm"; + + # bash-sh syntax differences + postPatch = '' + substituteInPlace Makefile --replace-fail 'then else' 'then :; else' + substituteInPlace Makefile --replace-fail 'mkdir' 'mkdir -p' + ''; + + postInstall = '' + mkdir -p $out/lib/pkgconfig + substitute ${pcFile} $out/lib/pkgconfig/libsysinfo.pc \ + --replace-fail '%%PREFIX%%' "$out" \ + --replace-fail '%%COMMENT%%' "${meta.description}" \ + --replace-fail '%%PORTVERSION%%' "${version}" + + mkdir -p $out/include/sys + ln -s ../sysinfo.h $out/include/sys/sysinfo.h + ''; + + meta = { + description = "GNU libc's sysinfo port for FreeBSD"; + homepage = "https://github.com/bsdimp/libsysinfo"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ rhelmot ]; + platforms = lib.platforms.freebsd; + }; +} From 54b39e83548807ece7ace13df65eb0513c953aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Ribeiro?= Date: Tue, 11 Mar 2025 05:42:41 +0000 Subject: [PATCH 012/155] feishin: 0.12.2 -> 0.12.3 Diff: https://github.com/jeffvli/feishin/compare/v0.12.2...v0.12.3 Changelog: https://github.com/jeffvli/feishin/releases/tag/v0.12.3 --- pkgs/by-name/fe/feishin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix index 4b7f91f5b05f..b54d3be19c72 100644 --- a/pkgs/by-name/fe/feishin/package.nix +++ b/pkgs/by-name/fe/feishin/package.nix @@ -11,13 +11,13 @@ }: let pname = "feishin"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "jeffvli"; repo = "feishin"; rev = "v${version}"; - hash = "sha256-2kWeUlOTAd1Usw/cLOARyLqxEzZRk27RuHjLwupnq80="; + hash = "sha256-Tjh68b+41YrMNB14AZ3jXqBXDOmaaOYQKXJOyTUF474="; }; electron = electron_33; From 51232abb373f92c93888d0f37104c04245ea0eef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?VESSE=20L=C3=A9o?= Date: Wed, 12 Mar 2025 09:07:12 +0100 Subject: [PATCH 013/155] tlafmt: init at 0.3.0 --- pkgs/by-name/tl/tlafmt/package.nix | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 pkgs/by-name/tl/tlafmt/package.nix diff --git a/pkgs/by-name/tl/tlafmt/package.nix b/pkgs/by-name/tl/tlafmt/package.nix new file mode 100644 index 000000000000..8a18c4ae4789 --- /dev/null +++ b/pkgs/by-name/tl/tlafmt/package.nix @@ -0,0 +1,29 @@ +{ + rustPlatform, + lib, + fetchFromGitHub, +}: +rustPlatform.buildRustPackage rec { + pname = "tlafmt"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "domodwyer"; + repo = "tlafmt"; + tag = "v${version}"; + hash = "sha256-jBY7erB2LuKwCkshVHLV5kFVRJ8lkT63z1gt1Tikei4="; + }; + + useFetchCargoVendor = true; + + cargoHash = "sha256-765tp4wUh7G92vaoViufo6Kk2c/w2d1XjZ3aN5UUAv0="; + + meta = with lib; { + description = "A formatter for TLA+ specs"; + homepage = "https://github.com/domodwyer/tlafmt"; + license = licenses.apsl20; + maintainers = with maintainers; [ ciflire ]; + mainProgram = "tlafmt"; + }; +} + From 3e1c7a9f0ef5dab4de45df8bbc6921afe3b41f4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?VESSE=20L=C3=A9o?= Date: Wed, 12 Mar 2025 09:08:36 +0100 Subject: [PATCH 014/155] maintainers: add ciflire fix: fileformat fix: failure on format fix: githubId type fix: after squash --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/by-name/tl/tlafmt/package.nix | 9 ++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 78f712b38133..85034827b0f4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4349,6 +4349,12 @@ github = "ciferkey"; githubId = 101422; }; + ciflire = { + name = "Léo Vesse"; + email = "leovesse@gmail.com"; + github = "Ciflire"; + githubId = 39668077; + }; cig0 = { name = "Martín Cigorraga"; email = "cig0.github@gmail.com"; diff --git a/pkgs/by-name/tl/tlafmt/package.nix b/pkgs/by-name/tl/tlafmt/package.nix index 8a18c4ae4789..f7d5ee71a8b1 100644 --- a/pkgs/by-name/tl/tlafmt/package.nix +++ b/pkgs/by-name/tl/tlafmt/package.nix @@ -18,12 +18,11 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-765tp4wUh7G92vaoViufo6Kk2c/w2d1XjZ3aN5UUAv0="; - meta = with lib; { - description = "A formatter for TLA+ specs"; + meta = { + description = "Formatter for TLA+ specs"; homepage = "https://github.com/domodwyer/tlafmt"; - license = licenses.apsl20; - maintainers = with maintainers; [ ciflire ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ ciflire ]; mainProgram = "tlafmt"; }; } - From 4ba3d237aea2bcb98e484ecbccd813394e0aeec4 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Mon, 10 Mar 2025 23:22:02 -0700 Subject: [PATCH 015/155] freebsd.libdevdctl: init --- pkgs/os-specific/bsd/freebsd/pkgs/libdevdctl.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/libdevdctl.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libdevdctl.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libdevdctl.nix new file mode 100644 index 000000000000..0cf5421daead --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libdevdctl.nix @@ -0,0 +1,15 @@ +{ + lib, + mkDerivation, +}: +mkDerivation { + path = "lib/libdevdctl"; + clangFixup = false; + + outputs = [ + "out" + "debug" + ]; + + meta.platforms = lib.platforms.freebsd; +} From 31e0550580d831aa2e9fe7807c288e8de22ad345 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Mon, 10 Mar 2025 23:21:51 -0700 Subject: [PATCH 016/155] freebsd.zfsd: init --- pkgs/os-specific/bsd/freebsd/pkgs/zfsd.nix | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/zfsd.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/zfsd.nix b/pkgs/os-specific/bsd/freebsd/pkgs/zfsd.nix new file mode 100644 index 000000000000..c5ca7aa1211b --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/zfsd.nix @@ -0,0 +1,40 @@ +{ + mkDerivation, + lib, + libgeom, + libzfs, + libdevdctl, + libsbuf, + libbsdxml, +}: +mkDerivation { + path = "cddl/usr.sbin/zfsd"; + extraPaths = [ + "sys/contrib/openzfs" + ]; + clangFixup = false; + ouptuts = [ + "out" + "man" + "debug" + ]; + + buildInputs = [ + libgeom + libzfs + libdevdctl + libsbuf + libbsdxml + ]; + + MK_TESTS = "no"; + + meta = { + mainProgram = "zfsd"; + platforms = lib.platforms.freebsd; + license = with lib.licenses; [ + cddl + bsd2 + ]; + }; +} From 029ff0e17e693fde088905baba18045a14e7f2e4 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Thu, 13 Mar 2025 02:44:42 -0700 Subject: [PATCH 017/155] zfstools: support FreeBSD --- pkgs/by-name/zf/zfstools/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zf/zfstools/package.nix b/pkgs/by-name/zf/zfstools/package.nix index 49b34961841c..c11aafa65998 100644 --- a/pkgs/by-name/zf/zfstools/package.nix +++ b/pkgs/by-name/zf/zfstools/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, ruby, zfs, + freebsd, makeWrapper, }: @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { for f in $out/bin/*; do wrapProgram $f \ --set RUBYLIB $out/lib \ - --prefix PATH : ${zfs}/bin + --prefix PATH : ${if stdenv.hostPlatform.isFreeBSD then freebsd.zfs else zfs}/bin done ''; @@ -43,6 +44,6 @@ stdenv.mkDerivation rec { for ZFS, which also supports auto snapshotting mysql databases. ''; license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.freebsd; }; } From 97b2789fc52ddfecdc3579f4af1cc0078455ab23 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Mon, 10 Mar 2025 14:57:11 -0700 Subject: [PATCH 018/155] freebsd.libbsdxml: split debug output --- pkgs/os-specific/bsd/freebsd/pkgs/libbsdxml.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libbsdxml.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libbsdxml.nix index 333e4048c837..fe432578d0ca 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libbsdxml.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libbsdxml.nix @@ -3,4 +3,8 @@ mkDerivation { path = "lib/libexpat"; extraPaths = [ "contrib/expat" ]; buildInputs = [ ]; + outputs = [ + "out" + "debug" + ]; } From 9543cc5eccc04ec6f6f863600a913b4b83d9d639 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Tue, 11 Mar 2025 02:13:14 -0700 Subject: [PATCH 019/155] freebsd.geom: split outputs; link gpart manpage --- pkgs/os-specific/bsd/freebsd/pkgs/geom.nix | 18 ++++++++++++++++++ pkgs/os-specific/bsd/freebsd/pkgs/libgeom.nix | 7 +++++++ 2 files changed, 25 insertions(+) diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/geom.nix b/pkgs/os-specific/bsd/freebsd/pkgs/geom.nix index 552d2e420120..3eb46ee32217 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/geom.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/geom.nix @@ -1,4 +1,5 @@ { + lib, mkDerivation, libgeom, libufs, @@ -18,6 +19,12 @@ let "sys/opencrypto" ]; + outputs = [ + "out" + "man" + "debug" + ]; + # libgeom needs sbuf and bsdxml but linker doesn't know that buildInputs = [ libgeom @@ -37,8 +44,19 @@ mkDerivation { "lib/Makefile.inc" "lib/geom" ]; + outputs = [ + "out" + "man" + "debug" + ]; GEOM_CLASS_DIR = "${libs}/lib"; + # link in man pages from libs + postInstall = '' + mkdir -p $man/share/man/man8 + ln -s ${lib.getMan libs}/share/man/man8/*.8* $man/share/man/man8/ + ''; + buildInputs = [ libgeom ]; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libgeom.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libgeom.nix index 295d9d75c537..8a904453288a 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libgeom.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libgeom.nix @@ -5,6 +5,13 @@ }: mkDerivation { path = "lib/libgeom"; + + outputs = [ + "out" + "man" + "debug" + ]; + buildInputs = [ libbsdxml libsbuf From 833099403209233cbb563c0bc314f3d19934bcf2 Mon Sep 17 00:00:00 2001 From: KSJ2000 Date: Fri, 14 Mar 2025 16:31:35 +0200 Subject: [PATCH 020/155] maintainers: add j-mendez as per https://github.com/spider-rs/spider/issues/276#issuecomment-2718173782 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dc9f4b706261..8569276e884d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11281,6 +11281,12 @@ { fingerprint = "816D 23F5 E672 EC58 7674 4A73 197F 9A63 2D13 9E30"; } ]; }; + j-mendez = { + email = "jeff@a11ywatch.com"; + github = "j-mendez"; + githubId = 8095978; + name = "j-mendez"; + }; jmendyk = { email = "jakub@ndyk.me"; github = "JMendyk"; From b74ffe1cb309020c14c651cc4ca981df494d6b26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Mon, 10 Mar 2025 18:17:32 -0400 Subject: [PATCH 021/155] lib/modules: disallow setting config, options in specialArgs of evalModules --- lib/modules.nix | 3 +++ lib/tests/modules.sh | 3 +++ lib/tests/modules/specialArgs-config.nix | 18 ++++++++++++++++++ lib/tests/modules/specialArgs-options.nix | 18 ++++++++++++++++++ 4 files changed, 42 insertions(+) create mode 100644 lib/tests/modules/specialArgs-config.nix create mode 100644 lib/tests/modules/specialArgs-options.nix diff --git a/lib/modules.nix b/lib/modules.nix index 935ef4baabad..ef6a2339895a 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -5,6 +5,7 @@ let addErrorContext all any + assertMsg attrByPath attrNames catAttrs @@ -101,6 +102,8 @@ let , # This would be remove in the future, Prefer _module.check option instead. check ? true }: + assert assertMsg (!specialArgs?config) "Do not set config in the specialArgs argument to evalModules."; + assert assertMsg (!specialArgs?options) "Do not set options in the specialArgs argument to evalModules."; let withWarnings = x: warnIf (evalModulesArgs?args) "The args argument to evalModules is deprecated. Please set config._module.args instead." diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 1505782547f5..60f7536d0d43 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -137,6 +137,9 @@ checkConfigOutput '^true$' config.result ./module-argument-default.nix # gvariant checkConfigOutput '^true$' config.assertion ./gvariant.nix +# specialArgs checks for evalModules +checkConfigError 'Do not set config in the specialArgs argument to evalModules\.' config.fail.config ./specialArgs-config.nix +checkConfigError 'Do not set options in the specialArgs argument to evalModules\.' config.fail.config ./specialArgs-options.nix checkConfigOutput '"ok"' config.result ./specialArgs-lib.nix # https://github.com/NixOS/nixpkgs/pull/131205 diff --git a/lib/tests/modules/specialArgs-config.nix b/lib/tests/modules/specialArgs-config.nix new file mode 100644 index 000000000000..a392a870a1ee --- /dev/null +++ b/lib/tests/modules/specialArgs-config.nix @@ -0,0 +1,18 @@ +{ lib, ... }: +{ + config = { + _module.freeformType = lib.types.anything; + + fail = lib.evalModules { + specialArgs = { + config = { }; + }; + modules = [ + { + options.a = lib.mkEnableOption "a"; + config.a = true; + } + ]; + }; + }; +} diff --git a/lib/tests/modules/specialArgs-options.nix b/lib/tests/modules/specialArgs-options.nix new file mode 100644 index 000000000000..1a84770c9ef6 --- /dev/null +++ b/lib/tests/modules/specialArgs-options.nix @@ -0,0 +1,18 @@ +{ lib, ... }: +{ + config = { + _module.freeformType = lib.types.anything; + + fail = lib.evalModules { + specialArgs = { + options = { }; + }; + modules = [ + { + options.a = lib.mkEnableOption "a"; + config.a = true; + } + ]; + }; + }; +} From 0cb52f7e3ee543e8bb2026489a2a3a7540811db5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Mar 2025 22:36:37 +0000 Subject: [PATCH 022/155] marimo: 0.11.17 -> 0.11.20 --- pkgs/development/python-modules/marimo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 3600befbbd59..58400d0aba6d 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -33,13 +33,13 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.11.17"; + version = "0.11.20"; pyproject = true; # The github archive does not include the static assets src = fetchPypi { inherit pname version; - hash = "sha256-jKDNbBhDnQyzaPe1JLXpNZaIhQmt0/1LIurT5WAKiNc="; + hash = "sha256-94UP5kDKQ5JS9egEOuMQQoewSTctIRRPt0b50yYg+r8="; }; build-system = [ hatchling ]; From 02600c4ac5510daac0166e8304502edd587fdd8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=BA=E0=B8=95=E0=B8=B1?= =?UTF-8?q?=E0=B8=A5?= Date: Tue, 25 Feb 2025 16:59:36 +0700 Subject: [PATCH 023/155] nixos/movim: improve systemd dependency directives --- nixos/modules/services/web-apps/movim.nix | 29 +++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/web-apps/movim.nix b/nixos/modules/services/web-apps/movim.nix index ded4e30b5bfb..081689f8812e 100644 --- a/nixos/modules/services/web-apps/movim.nix +++ b/nixos/modules/services/web-apps/movim.nix @@ -734,8 +734,9 @@ in wantedBy = [ "multi-user.target" ]; requiredBy = [ "${phpExecutionUnit}.service" ]; before = [ "${phpExecutionUnit}.service" ]; - after = lib.optional cfg.database.createLocally dbService; + wants = [ "local-fs.target" ]; requires = lib.optional cfg.database.createLocally dbService; + after = lib.optional cfg.database.createLocally dbService; serviceConfig = { @@ -788,8 +789,24 @@ in services.movim = { description = "Movim daemon"; wantedBy = [ "multi-user.target" ]; - after = [ "movim-data-setup.service" ]; - requires = [ "movim-data-setup.service" ] ++ lib.optional cfg.database.createLocally dbService; + wants = [ + "network.target" + "local-fs.target" + ]; + requires = + [ + "movim-data-setup.service" + "${phpExecutionUnit}.service" + ] + ++ lib.optional cfg.database.createLocally dbService + ++ lib.optional (cfg.nginx != null) "nginx.service"; + after = + [ + "movim-data-setup.service" + "${phpExecutionUnit}.service" + ] + ++ lib.optional cfg.database.createLocally dbService + ++ lib.optional (cfg.nginx != null) "nginx.service"; environment = { PUBLIC_URL = "//${cfg.domain}"; WS_PORT = builtins.toString cfg.port; @@ -804,8 +821,12 @@ in }; services.${phpExecutionUnit} = { - after = [ "movim-data-setup.service" ]; + wantedBy = lib.optional (cfg.nginx != null) "nginx.service"; + requiredBy = [ "movim.service" ]; + before = [ "movim.service" ] ++ lib.optional (cfg.nginx != null) "nginx.service"; + wants = [ "network.target" ]; requires = [ "movim-data-setup.service" ] ++ lib.optional cfg.database.createLocally dbService; + after = [ "movim-data-setup.service" ] ++ lib.optional cfg.database.createLocally dbService; }; tmpfiles.settings."10-movim" = with cfg; { From 521d3689fbc935062647ef94e3ace8208df1f5c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=BA=E0=B8=95=E0=B8=B1?= =?UTF-8?q?=E0=B8=A5?= Date: Wed, 12 Mar 2025 14:13:08 +0700 Subject: [PATCH 024/155] nixos/movim: move phpExecutionUnit service in requires order --- nixos/modules/services/web-apps/movim.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/web-apps/movim.nix b/nixos/modules/services/web-apps/movim.nix index 081689f8812e..5eb7231a1523 100644 --- a/nixos/modules/services/web-apps/movim.nix +++ b/nixos/modules/services/web-apps/movim.nix @@ -786,6 +786,15 @@ in ); }; + services.${phpExecutionUnit} = { + wantedBy = lib.optional (cfg.nginx != null) "nginx.service"; + requiredBy = [ "movim.service" ]; + before = [ "movim.service" ] ++ lib.optional (cfg.nginx != null) "nginx.service"; + wants = [ "network.target" ]; + requires = [ "movim-data-setup.service" ] ++ lib.optional cfg.database.createLocally dbService; + after = [ "movim-data-setup.service" ] ++ lib.optional cfg.database.createLocally dbService; + }; + services.movim = { description = "Movim daemon"; wantedBy = [ "multi-user.target" ]; @@ -820,15 +829,6 @@ in }; }; - services.${phpExecutionUnit} = { - wantedBy = lib.optional (cfg.nginx != null) "nginx.service"; - requiredBy = [ "movim.service" ]; - before = [ "movim.service" ] ++ lib.optional (cfg.nginx != null) "nginx.service"; - wants = [ "network.target" ]; - requires = [ "movim-data-setup.service" ] ++ lib.optional cfg.database.createLocally dbService; - after = [ "movim-data-setup.service" ] ++ lib.optional cfg.database.createLocally dbService; - }; - tmpfiles.settings."10-movim" = with cfg; { "${dataDir}".d = { inherit user group; From 27012300eda6c3f7a1d1b0a2d79fbabbaf214c41 Mon Sep 17 00:00:00 2001 From: charain <42235952+chai-yuan@users.noreply.github.com> Date: Sun, 16 Mar 2025 15:06:25 +0800 Subject: [PATCH 025/155] maintainers: add charain --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4549dd47d887..84fa69640293 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4121,6 +4121,12 @@ name = "ChaosAttractor"; keys = [ { fingerprint = "A137 4415 DB7C 6439 10EA 5BF1 0FEE 4E47 5940 E125"; } ]; }; + charain = { + email = "charain_li@outlook.com"; + github = "chai-yuan"; + githubId = 42235952; + name = "charain"; + }; charB66 = { email = "nix.disparate221@passinbox.com"; github = "charB66"; From f0f9bdd5774e1f163d1d6f8d9aa7ecb90332ccac Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 15 Mar 2025 17:41:33 +0100 Subject: [PATCH 026/155] buildVscodeExtension: support `finalAttrs` through `lib.extendMkDerivation` --- .../vscode/extensions/vscode-utils.nix | 67 +++++++++---------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix index 74d674dced92..6d6b1d294fa1 100644 --- a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix +++ b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix @@ -9,38 +9,37 @@ jq, }: let - buildVscodeExtension = - a@{ - pname ? null, # Only optional for backward compatibility. - src, - # Same as "Unique Identifier" on the extension's web page. - # For the moment, only serve as unique extension dir. - vscodeExtPublisher, - vscodeExtName, - vscodeExtUniqueId, - configurePhase ? '' - runHook preConfigure - runHook postConfigure - '', - buildPhase ? '' - runHook preBuild - runHook postBuild - '', - dontPatchELF ? true, - dontStrip ? true, - nativeBuildInputs ? [ ], - passthru ? { }, - ... - }: - stdenv.mkDerivation ( - (removeAttrs a [ - "vscodeExtUniqueId" - "pname" - ]) - // (lib.optionalAttrs (pname != null) { + buildVscodeExtension = lib.extendMkDerivation { + constructDrv = stdenv.mkDerivation; + excludeDrvArgNames = [ + "vscodeExtUniqueId" + ]; + extendDrvArgs = + finalAttrs: + { + pname ? null, # Only optional for backward compatibility. + src, + # Same as "Unique Identifier" on the extension's web page. + # For the moment, only serve as unique extension dir. + vscodeExtPublisher, + vscodeExtName, + vscodeExtUniqueId, + configurePhase ? '' + runHook preConfigure + runHook postConfigure + '', + buildPhase ? '' + runHook preBuild + runHook postBuild + '', + dontPatchELF ? true, + dontStrip ? true, + nativeBuildInputs ? [ ], + passthru ? { }, + ... + }: + { pname = "vscode-extension-${pname}"; - }) - // { passthru = passthru // { inherit vscodeExtPublisher vscodeExtName vscodeExtUniqueId; @@ -57,12 +56,12 @@ let # If other directories are present but `sourceRoot` is unset, the unpacker phase fails. sourceRoot = "extension"; + # This cannot be removed, it is used by some extensions. installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}"; nativeBuildInputs = [ unzip ] ++ nativeBuildInputs; installPhase = '' - runHook preInstall mkdir -p "$out/$installPrefix" @@ -70,8 +69,8 @@ let runHook postInstall ''; - } - ); + }; + }; fetchVsixFromVscodeMarketplace = mktplcExtRef: fetchurl (import ./mktplcExtRefToFetchArgs.nix mktplcExtRef); From 82d30e0d4fb1275fc148498eaafe42bc04966733 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 15 Mar 2025 18:02:51 +0100 Subject: [PATCH 027/155] buildVscodeMarketplaceExtension: support `finalAttrs` through `lib.extendMkDerivation` --- .../vscode/extensions/vscode-utils.nix | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix index 6d6b1d294fa1..ad1abe7f9402 100644 --- a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix +++ b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix @@ -75,30 +75,32 @@ let fetchVsixFromVscodeMarketplace = mktplcExtRef: fetchurl (import ./mktplcExtRefToFetchArgs.nix mktplcExtRef); - buildVscodeMarketplaceExtension = - a@{ - name ? "", - src ? null, - vsix ? null, - mktplcRef, - ... - }: - assert "" == name; - assert null == src; - buildVscodeExtension ( - (removeAttrs a [ - "mktplcRef" - "vsix" - ]) - // { + buildVscodeMarketplaceExtension = lib.extendMkDerivation { + constructDrv = buildVscodeExtension; + excludeDrvArgNames = [ + "mktplcRef" + "vsix" + ]; + extendDrvArgs = + finalAttrs: + { + name ? "", + src ? null, + vsix ? null, + mktplcRef, + ... + }: + assert "" == name; + assert null == src; + { + inherit (mktplcRef) version; pname = "${mktplcRef.publisher}-${mktplcRef.name}"; - version = mktplcRef.version; src = if (vsix != null) then vsix else fetchVsixFromVscodeMarketplace mktplcRef; vscodeExtPublisher = mktplcRef.publisher; vscodeExtName = mktplcRef.name; vscodeExtUniqueId = "${mktplcRef.publisher}.${mktplcRef.name}"; - } - ); + }; + }; mktplcRefAttrList = [ "name" From 7e022a68d457d9ece55c65b0b755c9e0eec491c6 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 15 Mar 2025 18:55:19 +0100 Subject: [PATCH 028/155] buildVscodeExtension: remove unused parameter `src` --- pkgs/applications/editors/vscode/extensions/vscode-utils.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix index ad1abe7f9402..acea5cb1a229 100644 --- a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix +++ b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix @@ -18,7 +18,6 @@ let finalAttrs: { pname ? null, # Only optional for backward compatibility. - src, # Same as "Unique Identifier" on the extension's web page. # For the moment, only serve as unique extension dir. vscodeExtPublisher, From 5583bc2d90922d48cf60e62cc29e2ccdce5e1714 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Mon, 17 Mar 2025 07:54:57 +0100 Subject: [PATCH 029/155] gdal: fix tests for geos 3.13.1 --- pkgs/development/libraries/gdal/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 4e2000b85de4..7b218e3fb41d 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -3,6 +3,7 @@ stdenv, callPackage, fetchFromGitHub, + fetchpatch, useMinimalFeatures ? false, useArmadillo ? (!useMinimalFeatures), @@ -92,6 +93,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-PanWqieJU1opR8iAwGsAeAt5cPXNOkwT5E6D6xPNCWs="; }; + patches = [ + # Fix tests for GEOS 3.13.1 + (fetchpatch { + url = "https://github.com/OSGeo/gdal/commit/e873236abfb7885d0b987934041c6b61f6aea5d0.patch"; + hash = "sha256-iThP8Dfu6k6uhb+jB5Vs5P10UVeY6rLotdDAgX1v6vE="; + }) + ]; + nativeBuildInputs = [ bison From 92edc3b32616c69a9fa5d8b421ba4a7e9c4046a1 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Wed, 12 Mar 2025 11:57:30 +0000 Subject: [PATCH 030/155] nexusmods-app.tests: remove These tests currently do not work, due to issues running the app's CLI in a nix build environment: - The CLI always starts or connects to an existing main app process - The main app process requires network access (or cached files) - The main app process (usually?) requires a display --- pkgs/by-name/ne/nexusmods-app/package.nix | 41 +---------------------- 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix index d49e972513cc..9397357f2b6d 100644 --- a/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/pkgs/by-name/ne/nexusmods-app/package.nix @@ -8,8 +8,6 @@ fetchgit, imagemagick, lib, - makeFontsConf, - runCommand, xdg-utils, nix-update-script, pname ? "nexusmods-app", @@ -146,44 +144,7 @@ buildDotnetModule (finalAttrs: { "NexusMods.Games.FOMOD.Tests.FomodXmlInstallerTests.InstallsFilesSimple_UsingRar" ]; - passthru = { - tests = - let - runTest = - name: script: - runCommand "${pname}-test-${name}" - { - nativeBuildInputs = [ finalAttrs.finalPackage ]; - FONTCONFIG_FILE = makeFontsConf { - fontDirectories = [ ]; - }; - } - '' - export XDG_DATA_HOME="$PWD/data" - export XDG_STATE_HOME="$PWD/state" - export XDG_CACHE_HOME="$PWD/cache" - mkdir -p "$XDG_DATA_HOME" "$XDG_STATE_HOME" "$XDG_CACHE_HOME" - # TODO: on error, print $XDG_STATE_HOME/NexusMods.App/Logs/nexusmods.app.main.current.log - ${script} - touch $out - ''; - in - { - serve = runTest "serve" '' - NexusMods.App - ''; - help = runTest "help" '' - NexusMods.App --help - ''; - associate-nxm = runTest "associate-nxm" '' - NexusMods.App associate-nxm - ''; - list-tools = runTest "list-tools" '' - NexusMods.App list-tools - ''; - }; - updateScript = nix-update-script { }; - }; + passthru.updateScript = nix-update-script { }; meta = { mainProgram = "NexusMods.App"; From a014215f76e32c6fa9500c4ec28731f74a751174 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Tue, 11 Mar 2025 12:30:26 +0000 Subject: [PATCH 031/155] nexusmods-app: 0.7.3 -> 0.8.2 Changelog: https://github.com/Nexus-Mods/NexusMods.App/releases/tag/v0.8.2 Also updated disabled tests. --- doc/release-notes/rl-2505.section.md | 2 +- pkgs/by-name/ne/nexusmods-app/deps.json | 209 +++++++++++++--------- pkgs/by-name/ne/nexusmods-app/package.nix | 20 ++- 3 files changed, 134 insertions(+), 97 deletions(-) diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index 58bb1371f1bc..92b6314448d2 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -48,7 +48,7 @@ ### NexusMods.App upgraded {#sec-nixpkgs-release-25.05-incompatibilities-nexusmods-app-upgraded} -- `nexusmods-app` has been upgraded from version 0.6.3 to 0.7.3. +- `nexusmods-app` has been upgraded from version 0.6.3 to 0.8.2. - Before upgrading, you **must reset all app state** (mods, games, settings, etc). NexusMods.App will crash if any state from a version older than 0.7.0 is still present. diff --git a/pkgs/by-name/ne/nexusmods-app/deps.json b/pkgs/by-name/ne/nexusmods-app/deps.json index d0f50a18e4fe..b97cd221b2d9 100644 --- a/pkgs/by-name/ne/nexusmods-app/deps.json +++ b/pkgs/by-name/ne/nexusmods-app/deps.json @@ -31,8 +31,8 @@ }, { "pname": "Avalonia", - "version": "11.2.2", - "hash": "sha256-lYWqgjYOyh4pg+TdkgqeFhi8OMI1p9IOvSntVXo5zvE=" + "version": "11.2.4", + "hash": "sha256-CcdWUxqd43A4KeY1K4T5M6R1M0zuwdwyd5Qh/BAlNT4=" }, { "pname": "Avalonia.Angle.Windows.Natives", @@ -51,43 +51,43 @@ }, { "pname": "Avalonia.BuildServices", - "version": "0.0.29", - "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY=" + "version": "0.0.31", + "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA=" }, { "pname": "Avalonia.Controls.ColorPicker", - "version": "11.2.2", - "hash": "sha256-Mmp7Mjy9Y6uvkfjE8KLWoJWcVZHiJwqmhQupsxYRExo=" + "version": "11.2.4", + "hash": "sha256-21Wfb4p0dCevw8Iu/Fchngt1teAnBaxEWgiUpFkerTo=" }, { "pname": "Avalonia.Controls.DataGrid", - "version": "11.2.2", - "hash": "sha256-RbkISZEp55N9dtqvPp0Ej2/wpU/YzI4wgJjBCJnIGl4=" + "version": "11.2.4", + "hash": "sha256-fqQBKzHcL0CwuOQ90Gp+UUZZP9OQ9U6H41bvikxQJpo=" }, { "pname": "Avalonia.Controls.TreeDataGrid", - "version": "11.1.0", - "hash": "sha256-WU0vs7a3BTQQiJn+fBhs+o+iKt5aukIVjpfH5LyyWwc=" + "version": "11.1.1", + "hash": "sha256-pEh7qGLhkirOW81xqy8iRMmFpOgdyTFpWpUHrkHgmcM=" }, { "pname": "Avalonia.Desktop", - "version": "11.2.2", - "hash": "sha256-ucd2SH0CAjwE5TSgwhhzYZqMD1zuTlR7qLQDl3mYGvg=" + "version": "11.2.4", + "hash": "sha256-WKTOx7RNSb0fOMg5Za4j+u9DwKXDqVzHwQCEXSm7TFo=" }, { "pname": "Avalonia.Diagnostics", - "version": "11.2.2", - "hash": "sha256-aOji+/TYSP0l3dpn62bvWMdce2YkYi5xzRPC3nS6ZGc=" + "version": "11.2.4", + "hash": "sha256-MUSfRXeJ1bstO2rTqWWCQyVq2EpjM5b5bxe0KxVAEU4=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.2.2", - "hash": "sha256-c/u6TX1Hl2h8B5xe7Zo1AJ6cR5BazI19NRnw56a36y0=" + "version": "11.2.4", + "hash": "sha256-lw8YFXR/pn0awFvFW+OhjZ2LbHonL6zwqLIz+pQp+Sk=" }, { "pname": "Avalonia.Headless", - "version": "11.2.2", - "hash": "sha256-XGKYwxFAdrOWq2HgFY42+8wS03t2bHGNuajwKC4mLHc=" + "version": "11.2.4", + "hash": "sha256-3XvLm+pu+s3gXJVyn8dl8teQX4ikNn+dvKXb18Owsn8=" }, { "pname": "Avalonia.Labs.Panels", @@ -96,13 +96,13 @@ }, { "pname": "Avalonia.Native", - "version": "11.2.2", - "hash": "sha256-2Scuc+OCtfLChDYCi4feCh9XUrgJpbVaek3xRnpOGDE=" + "version": "11.2.4", + "hash": "sha256-MvxivGjYerXcr70JpWe9CCXO6MU9QQgCkmZfjZCFdJM=" }, { "pname": "Avalonia.ReactiveUI", - "version": "11.2.2", - "hash": "sha256-Rr/wmmS47korAK0nAplpWCWrS1O9YZZD6i+efR7btN0=" + "version": "11.2.4", + "hash": "sha256-LqwLUDCIbJowol6BNTTsK7a7KjcLLbCM3y3KKvuHRGw=" }, { "pname": "Avalonia.Remote.Protocol", @@ -111,8 +111,8 @@ }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.2.2", - "hash": "sha256-lMb3VvHXQGxn0dyEGkzKXxFocvPJUaNnOpRJpHF9ORU=" + "version": "11.2.4", + "hash": "sha256-mKQVqtzxnZu6p64ZxIHXKSIw3AxAFjhmrxCc5/1VXfc=" }, { "pname": "Avalonia.Skia", @@ -126,8 +126,8 @@ }, { "pname": "Avalonia.Skia", - "version": "11.2.2", - "hash": "sha256-YmOT+r4OfyOyg8epho6bVaEW2HImEfsZ5rNqhWIY5Fk=" + "version": "11.2.4", + "hash": "sha256-82UQGuCl5hN5kdA3Uz7hptpNnG1EPlSB6k/a6XPSuXI=" }, { "pname": "Avalonia.Svg.Skia", @@ -136,23 +136,23 @@ }, { "pname": "Avalonia.Themes.Fluent", - "version": "11.2.2", - "hash": "sha256-+wBsbMAMDMRkZN/t94qwQgyew8eCY2RBreoTCgs3KJU=" + "version": "11.2.4", + "hash": "sha256-CPun/JWFCVoGxgMA510/gMP2ZB9aZJ9Bk8yuNjwo738=" }, { "pname": "Avalonia.Themes.Simple", - "version": "11.2.2", - "hash": "sha256-HXkfpUuTN8hSBMXCCGW78+2GC5w3VdTUp1qm7HvUZPI=" + "version": "11.2.4", + "hash": "sha256-rnF2/bzN8AuOFlsuekOxlu+uLI7n1kIAmC36FFXMKak=" }, { "pname": "Avalonia.Win32", - "version": "11.2.2", - "hash": "sha256-pouvlprL9VeEi1dG5zR6nFj+I/4CIjH1rHbV3N9/FHg=" + "version": "11.2.4", + "hash": "sha256-LJSKiLbdof8qouQhN7pY1RkMOb09IiAu/nrJFR2OybY=" }, { "pname": "Avalonia.X11", - "version": "11.2.2", - "hash": "sha256-86EIfm1zEvKleliP58xAs7KGxP/n7x2m8ca8C9W1XqA=" + "version": "11.2.4", + "hash": "sha256-qty8D2/HlZz/7MiEhuagjlKlooDoW3fow5yJY5oX4Uk=" }, { "pname": "AvaloniaEdit.TextMate", @@ -274,6 +274,11 @@ "version": "9.0.4", "hash": "sha256-3pyiJeWRwfaT7p1ArsoR13aI78Jo13aHOEw3BelTS9g=" }, + { + "pname": "DynamicData", + "version": "9.1.2", + "hash": "sha256-rDbtd7Fw/rhq6s9G4p/rltZ3EIR5r1RcMXsAEe7nZjw=" + }, { "pname": "EmptyFiles", "version": "8.5.0", @@ -306,8 +311,8 @@ }, { "pname": "FluentAssertions", - "version": "6.12.2", - "hash": "sha256-yvbnZapTF610zG8YhMOESn0iXudX4xVCdoSKVo6eu+w=" + "version": "7.1.0", + "hash": "sha256-AHHBQ5l7RCnjitxNE2aElBkdlg3BCcN9z+r9QrM+GeA=" }, { "pname": "FluentAssertions.Analyzers", @@ -356,58 +361,58 @@ }, { "pname": "GameFinder", - "version": "4.4.0", - "hash": "sha256-MaVW4qgbZgsoyIq8cLQLNJnZe2M7wsKAIE+ICxRNyzg=" + "version": "4.5.0", + "hash": "sha256-n9LaGrFy4kHTeXfk5HQbnZli1rzIaw0kWx4bXjUuFm8=" }, { "pname": "GameFinder.Common", - "version": "4.4.0", - "hash": "sha256-7tk84DGPBM2M8KvuTnDm4hLVmLUMd8GSLDFhsjl7Ra0=" + "version": "4.5.0", + "hash": "sha256-2HHwusG2DqMSfgH3eD07afvLTmRsUSOcPc6yIuHcMks=" }, { "pname": "GameFinder.Launcher.Heroic", - "version": "4.4.0", - "hash": "sha256-/fp62b11/TXEMsrZzafHbbZYmU9pGgr7qVE2iUCVJik=" + "version": "4.5.0", + "hash": "sha256-N9wQl4kTPcQC0ulqPm5OugCVeBUEstVLyG87/dwu1Fg=" }, { "pname": "GameFinder.RegistryUtils", - "version": "4.4.0", - "hash": "sha256-6Yk3A88xSWO7wr+1bJQtH6D2DRzQ0AOb8HkmSb34MPk=" + "version": "4.5.0", + "hash": "sha256-n6ZmjyUlAp75mVIYi0R4ncQX7hqLAvsgapMf58Mr3Jo=" }, { "pname": "GameFinder.StoreHandlers.EADesktop", - "version": "4.4.0", - "hash": "sha256-k2tUCIxnKEdIZtaqATpJLoHh6p0mgLIB1UzBWoEcDec=" + "version": "4.5.0", + "hash": "sha256-JUt5STjbESpaFmvDeGM0yQqgQziD4Or5FxBPwW4XMJE=" }, { "pname": "GameFinder.StoreHandlers.EGS", - "version": "4.4.0", - "hash": "sha256-7zxg064pFoHOYOa2kibtC1kpYgXRpbFh1Z9EatEcSNE=" + "version": "4.5.0", + "hash": "sha256-O8rFUroxJHQoX0UFK4xmV637Qz+bm5Xk/SCIbhRDZQA=" }, { "pname": "GameFinder.StoreHandlers.GOG", - "version": "4.4.0", - "hash": "sha256-8LWj1MaEKhukBXs0ZIt5pt5z1H1i3VuoJONqqH6gNvY=" + "version": "4.5.0", + "hash": "sha256-EyX15gumoPf4hyZ4Q8YFfyQfD1dj6J2RmilcGnkf7NE=" }, { "pname": "GameFinder.StoreHandlers.Origin", - "version": "4.4.0", - "hash": "sha256-TP9KYLDIZxFn3+N58zwjBPrL5COl2HxEpfr550OsUrM=" + "version": "4.5.0", + "hash": "sha256-N2TS31L6hzJKn4LsW7g31v2LRsCjKyjVdOH6Kum7vWE=" }, { "pname": "GameFinder.StoreHandlers.Steam", - "version": "4.4.0", - "hash": "sha256-D6ABxneqdc+467RvYMs8qULyYHNTs7I0GsmXBIpiZMM=" + "version": "4.5.0", + "hash": "sha256-IjdnksYT1EApOxYix6eInBAE2khwOyTbK11hjNqXZT8=" }, { "pname": "GameFinder.StoreHandlers.Xbox", - "version": "4.4.0", - "hash": "sha256-xLZJ4J79ptEjPduwdY8E288UJRQ92JnHSjkJc6Ubt+4=" + "version": "4.5.0", + "hash": "sha256-CmiTBT2T3pC3GzqxUr6T2hQNDp9gmxrRPDkFOzNC3Yo=" }, { "pname": "GameFinder.Wine", - "version": "4.4.0", - "hash": "sha256-lmGF+gzipCBIu/c4wR2Qgqq6/5Dd4ZhqlxUuCRX7pmY=" + "version": "4.5.0", + "hash": "sha256-QARwwZNoHOEnSnHZXeqoGj9R0uK+hMXte9Hc38vZlAI=" }, { "pname": "Gee.External.Capstone", @@ -439,6 +444,11 @@ "version": "2.52.0", "hash": "sha256-XoY+jt+JIt6SzvCjUSXKKa9Q8Bu5UrNJv2z1hCBKDrY=" }, + { + "pname": "Halgari.Jamarino.IntervalTree", + "version": "1.0.0-alpha", + "hash": "sha256-EyVYjSpQ3g+N6knSmQzS2j7ueoowZOHxjYX93lSRQns=" + }, { "pname": "HarfBuzzSharp", "version": "7.3.0.2", @@ -511,8 +521,8 @@ }, { "pname": "HtmlAgilityPack", - "version": "1.11.70", - "hash": "sha256-V/SI2N1+jNkwjSQRd2Y/XVVhdOKvSNz3/NeIFE9V3wY=" + "version": "1.11.71", + "hash": "sha256-ddNrIXTfiu8gwrUs/5xYDjpD0sOth90kut6qCgxGUSE=" }, { "pname": "Humanizer", @@ -779,11 +789,6 @@ "version": "2.5.2", "hash": "sha256-idb2hvuDlxl83x0yttGHnTgEQmwLLdUT7QfMeGDXVJE=" }, - { - "pname": "Jamarino.IntervalTree", - "version": "1.2.2", - "hash": "sha256-L8vFWl+1OUviHB+TOkw7Po0+IBLnJMZ1fnvqcYQOuRQ=" - }, { "pname": "JetBrains.Annotations", "version": "2024.3.0", @@ -839,6 +844,11 @@ "version": "14.0.0", "hash": "sha256-mwh8d7qmM7m6IbnLSPNq8ZMcD24/1ypM3Gdf6GZm0ao=" }, + { + "pname": "Markdig", + "version": "0.38.0", + "hash": "sha256-5DuDlj+TCDJWP8oJM2WU48ps3HFuUg5P28O/SPcjwGk=" + }, { "pname": "Markdown.Avalonia.Tight", "version": "11.0.3-a1", @@ -1169,11 +1179,6 @@ "version": "8.0.0", "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8=" }, - { - "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "8.0.1", - "hash": "sha256-lzTYLpRDAi3wW9uRrkTNJtMmaYdtGJJHdBLbUKu60PM=" - }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "version": "8.0.2", @@ -1554,6 +1559,11 @@ "version": "5.0.0", "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=" }, + { + "pname": "Microsoft.Win32.SystemEvents", + "version": "6.0.0", + "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA=" + }, { "pname": "Nerdbank.FullDuplexStream", "version": "1.1.12", @@ -1626,18 +1636,18 @@ }, { "pname": "NexusMods.MnemonicDB", - "version": "0.9.98", - "hash": "sha256-1B1PBH/iUuLOPsUo5WAsSAkDGWQBTlY8sk/sAiugpB0=" + "version": "0.9.114", + "hash": "sha256-VE1SEKwsS+XAi12l+0jYOQDG1zYSI1t9wKDjXMMyyng=" }, { "pname": "NexusMods.MnemonicDB.Abstractions", - "version": "0.9.98", - "hash": "sha256-rZ9UP6BcxYPlHKqyGj0G5q+woEjvpRS/jg69UY4aWDE=" + "version": "0.9.114", + "hash": "sha256-6nNJkQp5FhO29oKnwSvP3Qw6/Zab3RwB3F7WkS6mDBY=" }, { "pname": "NexusMods.MnemonicDB.SourceGenerator", - "version": "0.9.98", - "hash": "sha256-jP07gJZQ9ZT9DXyWIQOlgmZx0onqiUe3w2JiN55NA94=" + "version": "0.9.114", + "hash": "sha256-vMGecXrBoDgWFk1VyMqsENEVpWuGVaPULjJ4azZThRE=" }, { "pname": "NexusMods.Paths", @@ -1719,6 +1729,11 @@ "version": "6.3.4", "hash": "sha256-rXYXgdJMtwne3skk4jMgqyZlwh3QCTX9hIHvvXafxUM=" }, + { + "pname": "NuGet.Versioning", + "version": "6.12.1", + "hash": "sha256-f/ejCuzCAwKs4N4Ec6yf2RovrhBT0nj0hRDP+03/Iy4=" + }, { "pname": "NuGet.Versioning", "version": "6.3.4", @@ -2436,8 +2451,8 @@ }, { "pname": "System.Configuration.ConfigurationManager", - "version": "4.4.0", - "hash": "sha256-+8wGYllXnIxRzy9dLhZFB88GoPj8ivYXS0KUfcivT8I=" + "version": "6.0.0", + "hash": "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms=" }, { "pname": "System.Console", @@ -2499,6 +2514,11 @@ "version": "4.3.0", "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" }, + { + "pname": "System.Drawing.Common", + "version": "6.0.0", + "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo=" + }, { "pname": "System.Dynamic.Runtime", "version": "4.0.11", @@ -2866,13 +2886,13 @@ }, { "pname": "System.Security.AccessControl", - "version": "4.5.0", - "hash": "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM=" + "version": "5.0.0", + "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" }, { "pname": "System.Security.AccessControl", - "version": "5.0.0", - "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" + "version": "6.0.0", + "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg=" }, { "pname": "System.Security.Claims", @@ -2924,6 +2944,11 @@ "version": "4.4.0", "hash": "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE=" }, + { + "pname": "System.Security.Cryptography.ProtectedData", + "version": "6.0.0", + "hash": "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY=" + }, { "pname": "System.Security.Cryptography.X509Certificates", "version": "4.3.0", @@ -2934,6 +2959,11 @@ "version": "4.5.0", "hash": "sha256-Fa6dX6Gyse1A/RBoin8cVaHQePbfBvp6jjWxUXPhXKQ=" }, + { + "pname": "System.Security.Permissions", + "version": "6.0.0", + "hash": "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs=" + }, { "pname": "System.Security.Principal", "version": "4.3.0", @@ -2949,11 +2979,6 @@ "version": "4.4.0", "hash": "sha256-lwNBM33EW45j6o8bM4hKWirEUZCvep0VYFchc50JOYc=" }, - { - "pname": "System.Security.Principal.Windows", - "version": "4.5.0", - "hash": "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY=" - }, { "pname": "System.Security.Principal.Windows", "version": "5.0.0", @@ -3069,6 +3094,11 @@ "version": "4.3.0", "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s=" }, + { + "pname": "System.Windows.Extensions", + "version": "6.0.0", + "hash": "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM=" + }, { "pname": "System.Xml.ReaderWriter", "version": "4.3.0", @@ -3279,6 +3309,11 @@ "version": "1.4.13", "hash": "sha256-pLtx0/2oTKYO1Y1Vg3k/Eli2OWHT5uorGdBp2uXvFfw=" }, + { + "pname": "YamlDotNet", + "version": "16.3.0", + "hash": "sha256-4Gi8wSQ8Rsi/3+LyegJr//A83nxn2fN8LN1wvSSp39Q=" + }, { "pname": "ZstdSharp.Port", "version": "0.8.2", diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix index 9397357f2b6d..9340467099f6 100644 --- a/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/pkgs/by-name/ne/nexusmods-app/package.nix @@ -24,12 +24,12 @@ let in buildDotnetModule (finalAttrs: { inherit pname; - version = "0.7.3"; + version = "0.8.2"; src = fetchgit { url = "https://github.com/Nexus-Mods/NexusMods.App.git"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-p3MTxuLR/mkVrL+hwW2R13/eVHWWulZPRh9OsuHq9kU="; + hash = "sha256-qRo+s1Wf6WXR1kFqvGA6n+Bsp6qTzpK8/W9fuiaA+Yo="; fetchSubmodules = true; fetchLFS = true; }; @@ -131,14 +131,16 @@ buildDotnetModule (finalAttrs: { disabledTests = [ - "NexusMods.UI.Tests.ImageCacheTests.Test_LoadAndCache_RemoteImage" - "NexusMods.UI.Tests.ImageCacheTests.Test_LoadAndCache_ImageStoredFile" + # Fails attempting to download game hashes DB from github: + # HttpRequestException : Resource temporarily unavailable (github.com:443) + "NexusMods.DataModel.SchemaVersions.Tests.LegacyDatabaseSupportTests.TestDatabase" + "NexusMods.DataModel.SchemaVersions.Tests.MigrationSpecificTests.TestsFor_0001_ConvertTimestamps.OldTimestampsAreInRange" + "NexusMods.DataModel.SchemaVersions.Tests.MigrationSpecificTests.TestsFor_0003_FixDuplicates.No_Duplicates" + "NexusMods.DataModel.SchemaVersions.Tests.MigrationSpecificTests.TestsFor_0004_RemoveGameFiles.Test" - # Fails in ofborg with VerifyException tests/Games/NexusMods.Games.StardewValley.Tests - "NexusMods.Games.StardewValley.Tests.StardewValleyInstallersTests.CanInstallMod" - - # Fails with: Expected a to be thrown, but no exception was thrown. - "NexusMods.Networking.ModUpdates.Tests.PerFeedCacheUpdaterTests.Constructor_WithItemsFromDifferentGames_ShouldThrowArgumentException_InDebug" + # Fails attempting to fetch SMAPI version data from github: + # https://github.com/erri120/smapi-versions/raw/main/data/game-smapi-versions.json + "NexusMods.Games.StardewValley.Tests.SMAPIGameVersionDiagnosticEmitterTests.Test_TryGetLastSupportedSMAPIVersion" ] ++ lib.optionals (!_7zz.meta.unfree) [ "NexusMods.Games.FOMOD.Tests.FomodXmlInstallerTests.InstallsFilesSimple_UsingRar" From 52083ce9388169bec5ee315843d2becb51fbdb10 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 18:52:37 +0000 Subject: [PATCH 032/155] postgresqlPackages.citus: 13.0.0 -> 13.0.2 --- pkgs/servers/sql/postgresql/ext/citus.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/citus.nix index 7877f48a7620..83e300bff8d5 100644 --- a/pkgs/servers/sql/postgresql/ext/citus.nix +++ b/pkgs/servers/sql/postgresql/ext/citus.nix @@ -10,13 +10,13 @@ buildPostgresqlExtension rec { pname = "citus"; - version = "13.0.0"; + version = "13.0.2"; src = fetchFromGitHub { owner = "citusdata"; repo = "citus"; rev = "v${version}"; - hash = "sha256-1if/rYMQV1RG4ZkjqTFuFYu5f1JhJiMF4rCVo8gp7+8="; + hash = "sha256-SuJs6OCHKO7efQagsATgn/V9rgMyuXQIHGCEP9ME7tQ="; }; buildInputs = [ @@ -29,7 +29,7 @@ buildPostgresqlExtension rec { # latest release with Postgres' 3 latest releases." # https://www.citusdata.com/updates/v12-0/#deprecated_features broken = - versionOlder postgresql.version "14" + versionOlder postgresql.version "15" || # PostgreSQL 17 support issue upstream: https://github.com/citusdata/citus/issues/7708 # Check after next package update. From 18c1698f439540dae36d47b8e855f6a272b47816 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 18:52:41 +0000 Subject: [PATCH 033/155] postgresqlPackages.pg-gvm: 22.6.7 -> 22.6.8 --- pkgs/servers/sql/postgresql/ext/pg-gvm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg-gvm.nix b/pkgs/servers/sql/postgresql/ext/pg-gvm.nix index 0332bf986232..33b6f2aa24b4 100644 --- a/pkgs/servers/sql/postgresql/ext/pg-gvm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg-gvm.nix @@ -14,13 +14,13 @@ buildPostgresqlExtension (finalAttrs: { pname = "pg-gvm"; - version = "22.6.7"; + version = "22.6.8"; src = fetchFromGitHub { owner = "greenbone"; repo = "pg-gvm"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-Sa9ltW3KV/69OCxD3gRcp5owL0oW+z3fs4fRBHbSh30="; + hash = "sha256-D8KpOTF+vcBNIn//8Y0Hwk4B+OBF2Hh3dkWyO2KYeqw="; }; nativeBuildInputs = [ From 74b4466fe99eff242fb73a130f93dc98a885599a Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:05:39 +0100 Subject: [PATCH 034/155] postgresqlPackages.pg_repack: fix update script --- pkgs/servers/sql/postgresql/ext/pg_repack.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix index f7cb29c40ad5..388a82cb29cb 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix @@ -6,6 +6,7 @@ postgresqlTestExtension, testers, buildPostgresqlExtension, + gitUpdater, }: buildPostgresqlExtension (finalAttrs: { @@ -21,6 +22,10 @@ buildPostgresqlExtension (finalAttrs: { sha256 = "sha256-wfjiLkx+S3zVrAynisX1GdazueVJ3EOwQEPcgUQt7eA="; }; + passthru.updateScript = gitUpdater { + rev-prefix = "ver_"; + }; + passthru.tests = { version = testers.testVersion { package = finalAttrs.finalPackage; From d53a2206256872d89f2068af119c154a1bfc63ee Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:06:09 +0100 Subject: [PATCH 035/155] postgresqlPackages.pgvecto-rs: modernize --- .../sql/postgresql/ext/pgvecto-rs/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix index b7a1496a37fe..800a0b1fa279 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix @@ -1,17 +1,17 @@ { - lib, buildPgrxExtension, cargo-pgrx_0_12_0_alpha_1, clang_16, fetchFromGitHub, + lib, nix-update-script, nixosTests, openssl, pkg-config, postgresql, + replaceVars, rustPlatform, stdenv, - replaceVars, }: let @@ -50,7 +50,7 @@ in src = fetchFromGitHub { owner = "tensorchord"; repo = "pgvecto.rs"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-X7BY2Exv0xQNhsS/GA7GNvj9OeVDqVCd/k3lUkXtfgE="; }; @@ -90,18 +90,18 @@ in tests = nixosTests.postgresql.pgvecto-rs.passthru.override postgresql; }; - meta = with lib; { + meta = { # Upstream removed support for PostgreSQL 13 on 0.3.0: https://github.com/tensorchord/pgvecto.rs/issues/343 broken = - (versionOlder postgresql.version "14") + (lib.versionOlder postgresql.version "14") || # PostgreSQL 17 support issue upstream: https://github.com/tensorchord/pgvecto.rs/issues/607 # Check after next package update. - versionAtLeast postgresql.version "17" && version == "0.3.0"; + lib.versionAtLeast postgresql.version "17" && version == "0.3.0"; description = "Scalable, Low-latency and Hybrid-enabled Vector Search in Postgres"; homepage = "https://github.com/tensorchord/pgvecto.rs"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ diogotcorreia esclear ]; From 8fc19e6d7e1505b3b08f9ed9abfa02f32d929113 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:06:21 +0100 Subject: [PATCH 036/155] postgresqlPackages.plv8: modernize --- pkgs/servers/sql/postgresql/ext/plv8/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/plv8/default.nix index 3e00db9400fe..7ab270d50f04 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8/default.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8/default.nix @@ -1,16 +1,16 @@ { - stdenv, - lib, + buildPostgresqlExtension, fetchFromGitHub, + jitSupport, + lib, nodejs_20, perl, postgresql, - jitSupport, - buildPostgresqlExtension, + stdenv, # For test - runCommand, coreutils, gnugrep, + runCommand, }: let @@ -23,7 +23,7 @@ buildPostgresqlExtension (finalAttrs: { src = fetchFromGitHub { owner = "plv8"; repo = "plv8"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ivQZJSNn5giWF351fqZ7mBZoJkGtby5T7beK45g3Zqs="; }; @@ -130,7 +130,7 @@ buildPostgresqlExtension (finalAttrs: { }; }; - meta = with lib; { + meta = { description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL"; homepage = "https://plv8.github.io/"; changelog = "https://github.com/plv8/plv8/blob/r${finalAttrs.version}/Changes"; @@ -139,7 +139,7 @@ buildPostgresqlExtension (finalAttrs: { "x86_64-linux" "aarch64-linux" ]; - license = licenses.postgresql; + license = lib.licenses.postgresql; broken = jitSupport; }; }) From c982a346b590723ec58b4f7021b8c519640cec1e Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:06:31 +0100 Subject: [PATCH 037/155] postgresqlPackages.age: modernize --- pkgs/servers/sql/postgresql/ext/age.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix index ca052c4c7ff7..29283f8c1875 100644 --- a/pkgs/servers/sql/postgresql/ext/age.nix +++ b/pkgs/servers/sql/postgresql/ext/age.nix @@ -1,12 +1,12 @@ { - lib, - stdenv, bison, + buildPostgresqlExtension, fetchFromGitHub, flex, + lib, perl, postgresql, - buildPostgresqlExtension, + stdenv, }: let @@ -27,7 +27,7 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "apache"; repo = "age"; - rev = "PG${lib.versions.major postgresql.version}/v${ + tag = "PG${lib.versions.major postgresql.version}/v${ builtins.replaceStrings [ "." ] [ "_" ] version }"; hash = @@ -73,13 +73,13 @@ buildPostgresqlExtension rec { ''; }; - meta = with lib; { - broken = !builtins.elem (versions.major postgresql.version) (builtins.attrNames hashes); + meta = { + broken = !builtins.elem (lib.versions.major postgresql.version) (builtins.attrNames hashes); description = "Graph database extension for PostgreSQL"; homepage = "https://age.apache.org/"; changelog = "https://github.com/apache/age/raw/v${src.rev}/RELEASE"; maintainers = [ ]; platforms = postgresql.meta.platforms; - license = licenses.asl20; + license = lib.licenses.asl20; }; } From 783eaa5d9109805dd5b9ff058b7e1dfcc4ee19f8 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:07:07 +0100 Subject: [PATCH 038/155] postgresqlPackages.age: remove hash for v12 v12 had been removed from nixpkgs a while ago. --- pkgs/servers/sql/postgresql/ext/age.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix index 29283f8c1875..ddd93d953313 100644 --- a/pkgs/servers/sql/postgresql/ext/age.nix +++ b/pkgs/servers/sql/postgresql/ext/age.nix @@ -17,7 +17,6 @@ let "15" = "sha256-webZWgWZGnSoXwTpk816tjbtHV1UIlXkogpBDAEL4gM="; "14" = "sha256-jZXhcYBubpjIJ8M5JHXKV5f6VK/2BkypH3P7nLxZz3E="; "13" = "sha256-HR6nnWt/V2a0rD5eHHUsFIZ1y7lmvLz36URt9pPJnCw="; - "12" = "sha256-JFNk17ESsIt20dwXrfBkQ5E6DbZzN/Q9eS6+WjCXGd4="; }; in buildPostgresqlExtension rec { From 3a0a1704d312fa103bfe613f8fbb099c4c36f01b Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:07:38 +0100 Subject: [PATCH 039/155] postgresqlPackages.anonymizer: sort arguments --- pkgs/servers/sql/postgresql/ext/anonymizer.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/anonymizer.nix b/pkgs/servers/sql/postgresql/ext/anonymizer.nix index e70a6afad1c4..3fdb9e3b78b4 100644 --- a/pkgs/servers/sql/postgresql/ext/anonymizer.nix +++ b/pkgs/servers/sql/postgresql/ext/anonymizer.nix @@ -1,13 +1,13 @@ { + buildPostgresqlExtension, + jitSupport, lib, - stdenv, + llvm, + nixosTests, pg-dump-anon, postgresql, runtimeShell, - jitSupport, - llvm, - buildPostgresqlExtension, - nixosTests, + stdenv, }: buildPostgresqlExtension (finalAttrs: { From 569b0d15e41c3aaf34a678bc5ef2a81a96a2ee43 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:08:54 +0100 Subject: [PATCH 040/155] postgresqlPackages.apache_datasketches: modernize --- .../sql/postgresql/ext/apache_datasketches.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix index 25c06e6c038c..142e6aa6ce3a 100644 --- a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix +++ b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix @@ -1,11 +1,11 @@ { - stdenv, - lib, - fetchFromGitHub, - postgresql, boost186, - postgresqlTestExtension, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + postgresqlTestExtension, + stdenv, }: let @@ -15,7 +15,7 @@ let name = "datasketches-postgresql"; owner = "apache"; repo = "datasketches-postgresql"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-W41uAs3W4V7c9O/wBw3rut65bcmY8EdQS1/tPszMGqA="; }; @@ -23,7 +23,7 @@ let name = "datasketches-cpp"; owner = "apache"; repo = "datasketches-cpp"; - rev = "refs/tags/5.0.2"; + tag = "5.0.2"; hash = "sha256-yGk1OckYipAgLTQK6w6p6EdHMxBIQSjPV/MMND3cDks="; }; in From bae59b9f7284133b59673c14bb116ec8facdc6b4 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 7 Mar 2025 16:31:43 +0100 Subject: [PATCH 041/155] python3Packages.easyeda2ato: init at 0.6.5 easyda2ato --- .../python-modules/easyeda2ato/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/easyeda2ato/default.nix diff --git a/pkgs/development/python-modules/easyeda2ato/default.nix b/pkgs/development/python-modules/easyeda2ato/default.nix new file mode 100644 index 000000000000..362b07e2ce67 --- /dev/null +++ b/pkgs/development/python-modules/easyeda2ato/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + pydantic, + requests, +}: + +buildPythonPackage rec { + pname = "easyeda2ato"; + version = "0.2.7"; + pyproject = true; + + # repo version does not match + src = fetchPypi { + inherit pname version; + + hash = "sha256-bHhBN+h9Vx9Q4wZVKxMzkEEXzV7hKoQz8i+JpkSFsYA="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + pydantic + requests + ]; + + pythonImportsCheck = [ "easyeda2kicad" ]; + + doCheck = false; # no tests + + meta = { + description = "Convert any LCSC components (including EasyEDA) to KiCad library"; + homepage = "https://github.com/uPesy/easyeda2kicad.py"; + changelog = "https://github.com/uPesy/easyeda2kicad.py/releases/tag/v${version}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ sigmanificient ]; + mainProgram = "easyeda2kicad"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1bc389344f29..69f3030e8d00 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4074,6 +4074,8 @@ self: super: with self; { easydict = callPackage ../development/python-modules/easydict { }; + easyeda2ato = callPackage ../development/python-modules/easyeda2ato { }; + easyenergy = callPackage ../development/python-modules/easyenergy { }; easygui = callPackage ../development/python-modules/easygui { }; From a23c97c08005d8bd6ecab2261c110bd938dae0fa Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 7 Mar 2025 17:09:08 +0100 Subject: [PATCH 042/155] python3Packages.docopt-subcommands: init at 4.0.0-unstable-2020-01-06 --- .../docopt-subcommands/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/docopt-subcommands/default.nix diff --git a/pkgs/development/python-modules/docopt-subcommands/default.nix b/pkgs/development/python-modules/docopt-subcommands/default.nix new file mode 100644 index 000000000000..1ee538957aac --- /dev/null +++ b/pkgs/development/python-modules/docopt-subcommands/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + docopt, + pytestCheckHook, + hypothesis, +}: + +buildPythonPackage { + pname = "docopt-subcommands"; + version = "4.0.0-unstable-2020-01-06"; + pyproject = true; + + src = fetchFromGitHub { + owner = "abingham"; + repo = "docopt-subcommands"; + rev = "5693cbac24701c53e55fa182c1d563736e6a0557"; # no tags + hash = "sha256-bNFmRMzyC9BQB/J0ACqYxkS7lHG4CWd5/by7QgCopFo="; + }; + + build-system = [ setuptools ]; + + dependencies = [ docopt ]; + + pythonImportsCheck = [ "docopt_subcommands" ]; + + nativeCheckInputs = [ + pytestCheckHook + hypothesis + ]; + + meta = { + description = "Create subcommand-based CLI programs with docopt"; + homepage = "https://github.com/abingham/docopt-subcommands"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 69f3030e8d00..9146579d4e41 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3860,6 +3860,8 @@ self: super: with self; { docopt-ng = callPackage ../development/python-modules/docopt-ng { }; + docopt-subcommands = callPackage ../development/python-modules/docopt-subcommands { }; + docplex = callPackage ../development/python-modules/docplex { }; docrep = callPackage ../development/python-modules/docrep { }; From 93ceb27fb830c778fab50bbd3988c0f97061652a Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 7 Mar 2025 17:14:51 +0100 Subject: [PATCH 043/155] python3Packages.eseries: init at 1.2.1-unstable-2023-12-17 --- .../python-modules/eseries/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/eseries/default.nix diff --git a/pkgs/development/python-modules/eseries/default.nix b/pkgs/development/python-modules/eseries/default.nix new file mode 100644 index 000000000000..2db32b229bb8 --- /dev/null +++ b/pkgs/development/python-modules/eseries/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + docopt-subcommands, + future, + pytestCheckHook, + hypothesis, +}: + +buildPythonPackage { + pname = "eseries"; + version = "1.2.1-unstable-2023-12-17"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rob-smallshire"; + repo = "eseries"; + rev = "3becd72de8b1b533b4a637169022231271a934fb"; # no tags + hash = "sha256-iQBh4L+t24pOBh86wEqu5e6/RUmTQdCX+rOV/H2ywaY="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + docopt-subcommands + future + ]; + + pythonImportsCheck = [ "eseries" ]; + + nativeCheckInputs = [ + pytestCheckHook + hypothesis + ]; + + meta = { + description = "Find value in the E-series used for electronic components values"; + homepage = "https://github.com/rob-smallshire/eseries"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; + mainProgram = "eseries"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9146579d4e41..68d64a0e3516 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4293,6 +4293,8 @@ self: super: with self; { es-client = callPackage ../development/python-modules/es-client { }; + eseries = callPackage ../development/python-modules/eseries { }; + esig = callPackage ../development/python-modules/esig { }; espeak-phonemizer = callPackage ../development/python-modules/espeak-phonemizer { }; From 573098527b5825536394acaaf090b93e48c95134 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 7 Mar 2025 17:29:55 +0100 Subject: [PATCH 044/155] python3Packages.quart-schema: init at 0.21.0 --- .../python-modules/quart-schema/default.nix | 60 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/python-modules/quart-schema/default.nix diff --git a/pkgs/development/python-modules/quart-schema/default.nix b/pkgs/development/python-modules/quart-schema/default.nix new file mode 100644 index 000000000000..99885cb26b21 --- /dev/null +++ b/pkgs/development/python-modules/quart-schema/default.nix @@ -0,0 +1,60 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pdm-backend, + pyhumps, + quart, + msgspec, + attrs, + pytestCheckHook, + pytest-asyncio, + pydantic, + hypothesis, +}: + +buildPythonPackage rec { + pname = "quart-schema"; + version = "0.21.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pgjones"; + repo = "quart-schema"; + tag = version; + hash = "sha256-FpjnhSTkjskCxT874ABrD3Zew4g4R977xaYvJhVTDxw="; + }; + + build-system = [ pdm-backend ]; + + dependencies = [ + pyhumps + quart + msgspec + attrs + ]; + + pythonImportsCheck = [ + "quart" + "quart_schema" + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + pydantic + hypothesis + ]; + + preCheck = '' + substituteInPlace pyproject.toml \ + --replace-fail "--no-cov-on-fail" "" + ''; + + meta = { + description = "Create subcommand-based CLI programs with docopt"; + homepage = "https://github.com/abingham/docopt-subcommands"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 68d64a0e3516..9cc830e269e8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14031,6 +14031,8 @@ self: super: with self; { quart-cors = callPackage ../development/python-modules/quart-cors { }; + quart-schema = callPackage ../development/python-modules/quart-schema { }; + quaternion = callPackage ../development/python-modules/quaternion { }; qudida = callPackage ../development/python-modules/qudida { }; From b0ddacd1e89340d714da4fb6bcd39afd0f021d31 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 7 Mar 2025 17:49:18 +0100 Subject: [PATCH 045/155] python3Packages.atopile: init at 0.2.69 --- .../python-modules/atopile/default.nix | 126 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 128 insertions(+) create mode 100644 pkgs/development/python-modules/atopile/default.nix diff --git a/pkgs/development/python-modules/atopile/default.nix b/pkgs/development/python-modules/atopile/default.nix new file mode 100644 index 000000000000..8f43b9091078 --- /dev/null +++ b/pkgs/development/python-modules/atopile/default.nix @@ -0,0 +1,126 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + # build-system + hatchling, + scikit-build-core, + hatch-vcs, + nanobind, + # deps + antlr4-python3-runtime, + attrs, + case-converter, + cattrs, + click, + deepdiff, + easyeda2ato, + eseries, + fake-useragent, + fastapi, + gitpython, + igraph, + jinja2, + natsort, + networkx, + pandas, + pint, + pygls, + quart-cors, + quart-schema, + quart, + rich, + ruamel-yaml, + schema, + scipy, + semver, + toolz, + urllib3, + uvicorn, + watchfiles, + pyyaml, + # tests + pytestCheckHook, + pytest-xdist, + pytest-timeout, +}: + +buildPythonPackage rec { + pname = "atopile"; + version = "0.2.69"; + pyproject = true; + + src = fetchFromGitHub { + owner = "atopile"; + repo = "atopile"; + tag = "v${version}"; + hash = "sha256-mQYnaWch0lVzz1hV6WboYxBGe3ruw+mK2AwMx13DQJM="; + }; + + build-system = [ + hatchling + scikit-build-core + hatch-vcs + nanobind + ]; + + dependencies = [ + antlr4-python3-runtime + attrs + case-converter + cattrs + click + deepdiff + easyeda2ato + eseries + fake-useragent + fastapi + gitpython + igraph + jinja2 + natsort + networkx + pandas + pint + pygls + quart-cors + quart-schema + quart + rich + ruamel-yaml + schema + scipy + semver + toolz + urllib3 + uvicorn + watchfiles + pyyaml # required for ato + ]; + + pythonRelaxDeps = [ "antlr4-python3-runtime" ]; + + pythonImportsCheck = [ "atopile" ]; + + preCheck = '' + substituteInPlace pyproject.toml \ + --replace-fail "--html=artifacts/test-report.html" "" \ + --replace-fail "--self-contained-html" "" + ''; + + nativeCheckInputs = [ + pytestCheckHook + pytest-xdist + pytest-timeout + ]; + + meta = { + description = "Design circuit boards with code"; + homepage = "https://aiopg.readthedocs.io/"; + downloadPage = "https://github.com/atopile/atopile"; + changelog = "https://github.com/atopile/atopile/releases/tag/${src.rev}"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ sigmanificient ]; + mainProgram = "ato"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9cc830e269e8..190f650386c6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -996,6 +996,8 @@ self: super: with self; { atomicwrites-homeassistant = callPackage ../development/python-modules/atomicwrites-homeassistant { }; + atopile = callPackage ../development/python-modules/atopile { }; + atomman = callPackage ../development/python-modules/atomman { }; atproto = callPackage ../development/python-modules/atproto { }; From b3faabdae634fa16c75cbf48e2a60750b1c1f1ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Mar 2025 20:38:01 +0000 Subject: [PATCH 046/155] codeberg-pages: 6.2 -> 6.2.1 --- pkgs/by-name/co/codeberg-pages/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/codeberg-pages/package.nix b/pkgs/by-name/co/codeberg-pages/package.nix index fc30528bba88..bb017ebf0fef 100644 --- a/pkgs/by-name/co/codeberg-pages/package.nix +++ b/pkgs/by-name/co/codeberg-pages/package.nix @@ -7,17 +7,17 @@ buildGoModule rec { pname = "codeberg-pages"; - version = "6.2"; + version = "6.2.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "Codeberg"; repo = "pages-server"; rev = "v${version}"; - hash = "sha256-VZIrg6Hzn9yP9zdOPGx6HOK64XHeX5xc52hZXwmuMKA="; + hash = "sha256-kWEwKdm/GAUtsc4ZyCn7VJm9vVWDBOHJRer2FP1L/g0="; }; - vendorHash = "sha256-pBCVkuCuyUxla6+uZM3SWXApBpMv0rFORP4tffXkuF4="; + vendorHash = "sha256-qGjcMZhwflYdwOrGS9EApkwVLLSolQBBIeU8AU/fT/I="; postPatch = '' # disable httptest From e5c41b56ffef1eeba8af27d0fb5a8c5ce43276e9 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 17 Mar 2025 22:55:55 +0100 Subject: [PATCH 047/155] {,red}baron: fix meta.homepage --- pkgs/development/python-modules/baron/default.nix | 2 +- pkgs/development/python-modules/redbaron/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/baron/default.nix b/pkgs/development/python-modules/baron/default.nix index 8e766dc78486..d3ef9ed6143e 100644 --- a/pkgs/development/python-modules/baron/default.nix +++ b/pkgs/development/python-modules/baron/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { doCheck = isPy3k; meta = with lib; { - homepage = "https://github.com/gristlabs/asttokens"; + homepage = "https://github.com/PyCQA/baron"; description = "Abstraction on top of baron, a FST for python to make writing refactoring code a realistic task"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ marius851000 ]; diff --git a/pkgs/development/python-modules/redbaron/default.nix b/pkgs/development/python-modules/redbaron/default.nix index 5938221f7c0d..51efa7937e29 100644 --- a/pkgs/development/python-modules/redbaron/default.nix +++ b/pkgs/development/python-modules/redbaron/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { - homepage = "https://github.com/gristlabs/asttokens"; + homepage = "https://github.com/PyCQA/redbaron"; description = "Abstraction on top of baron, a FST for python to make writing refactoring code a realistic task"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ marius851000 ]; From 3cc185c344ddd9ebb686bbdd345bd811532c5d42 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Mon, 17 Mar 2025 23:39:10 +0100 Subject: [PATCH 048/155] izrss: 0.1.2 -> 0.2.0 --- pkgs/by-name/iz/izrss/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/iz/izrss/package.nix b/pkgs/by-name/iz/izrss/package.nix index fbd6220dfee8..a9f6c15fef12 100644 --- a/pkgs/by-name/iz/izrss/package.nix +++ b/pkgs/by-name/iz/izrss/package.nix @@ -5,7 +5,7 @@ ... }: let - version = "0.1.2"; + version = "0.2.0"; in buildGoModule { pname = "izrss"; @@ -15,7 +15,7 @@ buildGoModule { owner = "isabelroses"; repo = "izrss"; tag = "v${version}"; - hash = "sha256-t/YvSl6JoYLHsCPkRlbaM8OlAMQc83cb4sOKF7S/CFw="; + hash = "sha256-t+RtdKrYI0MNGSR1ABvClKv+hUJ4Tpg7yKS2qbm7BKc="; }; ldflags = [ @@ -24,7 +24,7 @@ buildGoModule { "-X main.version=${version}" ]; - vendorHash = "sha256-bB6oxIbFqY0rPoGetIGfKEdfPsX9cqeb9WcjtgjAAJA="; + vendorHash = "sha256-2L/EUoPbz6AZqv84XPhiZhImOL4wyBOzx6Od4+nTJeY="; meta = { description = "RSS feed reader for the terminal written in Go"; From 5830a4ea7db09035f2eadcc3b31cc9fd71f69fbb Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Mon, 17 Mar 2025 22:06:31 +0000 Subject: [PATCH 049/155] nexusmods-app: drop .NET 8 dependency Bumping StrawberryShake allows us to drop the dependency on .NET 8 runtime. See upstream PR https://github.com/Nexus-Mods/NexusMods.App/pull/2830 --- pkgs/by-name/ne/nexusmods-app/deps.json | 56 ++++++++++------------- pkgs/by-name/ne/nexusmods-app/package.nix | 14 +++--- 2 files changed, 30 insertions(+), 40 deletions(-) diff --git a/pkgs/by-name/ne/nexusmods-app/deps.json b/pkgs/by-name/ne/nexusmods-app/deps.json index b97cd221b2d9..a9b2f5a7fbf1 100644 --- a/pkgs/by-name/ne/nexusmods-app/deps.json +++ b/pkgs/by-name/ne/nexusmods-app/deps.json @@ -501,23 +501,23 @@ }, { "pname": "HotChocolate.Language.SyntaxTree", - "version": "14.1.0", - "hash": "sha256-4cRFDfLW+A0378BZ0wzPrc7FOiuTdCtlA4gyitSrhiI=" + "version": "15.0.3", + "hash": "sha256-PXlle10Q2Yuhcip1WhY922G5ObD4yRwYyPyUqci7Z7A=" }, { "pname": "HotChocolate.Transport.Abstractions", - "version": "14.1.0", - "hash": "sha256-i8i4ovnxHcFRrnU/a3U01izWEa+OsOjxgLDRq7wo1vs=" + "version": "15.0.3", + "hash": "sha256-uRSetnfWOwar73WO/wplsHexCzpbZf6xYxVBLWaIwLo=" }, { "pname": "HotChocolate.Transport.Http", - "version": "14.1.0", - "hash": "sha256-e5VoAtmieIhNvhtGMnmPXqYAZE9SrXlfyJmDKF7LBJo=" + "version": "15.0.3", + "hash": "sha256-9SkFbGb/uYmIGPDT1LnF3m42c8sEeCZBv4OuClMEU6w=" }, { "pname": "HotChocolate.Utilities", - "version": "14.1.0", - "hash": "sha256-KIYlc1jDG1BT6gZGZoei6ypHXZo9I3dN4zM/NpDWJuI=" + "version": "15.0.3", + "hash": "sha256-9y7iNQqv1wrkuGZ3ovXkQQ+seSB4bZwexfmlneoeEAg=" }, { "pname": "HtmlAgilityPack", @@ -889,11 +889,6 @@ "version": "6.0.0", "hash": "sha256-lNL5C4W7/p8homWooO/3ZKDZQ2M0FUTDixJwqWBPVbo=" }, - { - "pname": "Microsoft.AspNetCore.WebUtilities", - "version": "8.0.0", - "hash": "sha256-e4wqTJUgPfq6CfRwuXTw32K9vB+hOpSLxSZDpzv23Yg=" - }, { "pname": "Microsoft.AspNetCore.WebUtilities", "version": "9.0.0", @@ -1269,11 +1264,6 @@ "version": "9.0.0", "hash": "sha256-NhEDqZGnwCDFyK/NKn1dwLQExYE82j1YVFcrhXVczqY=" }, - { - "pname": "Microsoft.Extensions.Http", - "version": "8.0.0", - "hash": "sha256-UgljypOLld1lL7k7h1noazNzvyEHIJw+r+6uGzucFSY=" - }, { "pname": "Microsoft.Extensions.Http", "version": "9.0.0", @@ -1384,11 +1374,6 @@ "version": "9.0.0", "hash": "sha256-pplZskMsR3gGbs3I0wycGsvIMPIpfWFJpOsR9GkiYRw=" }, - { - "pname": "Microsoft.Extensions.ObjectPool", - "version": "8.0.0", - "hash": "sha256-FxFr5GC0y6vnp5YD2A2vISXYizAz3k/QyrH7sBXP5kg=" - }, { "pname": "Microsoft.Extensions.ObjectPool", "version": "9.0.0", @@ -2251,28 +2236,28 @@ }, { "pname": "StrawberryShake.Core", - "version": "14.1.0", - "hash": "sha256-h1Ozv0vdR2UvHIw3JqoBNKPVuD1S31aui7IQ8i8hcnE=" + "version": "15.0.3", + "hash": "sha256-bAqmB6l6r1GAAm6w0BcUdwGlktU/FAeB3vPiENmOaKg=" }, { "pname": "StrawberryShake.Resources", - "version": "14.1.0", - "hash": "sha256-6uOb5V7UeHM9OKUTJ4p8/YwvI16LcrC12tPhSAw3U0Q=" + "version": "15.0.3", + "hash": "sha256-m50HKpBrcQkrJxlRAfg2RNobMbv9yw3jakDz7Hp/sn8=" }, { "pname": "StrawberryShake.Server", - "version": "14.1.0", - "hash": "sha256-6K6TnX8YL0Dbt8wTv9FmBlbSo+UfaucHi9a5CqWCjoY=" + "version": "15.0.3", + "hash": "sha256-Tdl27WUE0pA+SXZetKjPPcQxM6rxzf1Cnjz6Jw/XZaM=" }, { "pname": "StrawberryShake.Transport.Http", - "version": "14.1.0", - "hash": "sha256-Pa2vACAYMgLrAxiZUR7PxBvPY9wrclQRYGZod/VMG5Q=" + "version": "15.0.3", + "hash": "sha256-UmB5tTEwB0JImx/LDb+ihCao4YxsT3XvHJpuUDBMODc=" }, { "pname": "StrawberryShake.Transport.WebSockets", - "version": "14.1.0", - "hash": "sha256-Hqp6GSxMcYorg5v8ns24DNfUDwYGY3urg0FKPleD86I=" + "version": "15.0.3", + "hash": "sha256-Nz70BHgzDzxIRzIjKgx6Vx1T+K/UKoPkG6wP/yNKVYs=" }, { "pname": "Svg.Custom", @@ -2609,6 +2594,11 @@ "version": "8.0.0", "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" }, + { + "pname": "System.IO.Pipelines", + "version": "9.0.0", + "hash": "sha256-vb0NrPjfEao3kfZ0tavp2J/29XnsQTJgXv3/qaAwwz0=" + }, { "pname": "System.Linq", "version": "4.1.0", diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix index 9340467099f6..f98c2fd3c789 100644 --- a/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/pkgs/by-name/ne/nexusmods-app/package.nix @@ -59,18 +59,18 @@ buildDotnetModule (finalAttrs: { nugetDeps = ./deps.json; mapNuGetDependencies = true; - # TODO: remove .NET 8; StrawberryShake currently needs it - dotnet-sdk = - with dotnetCorePackages; - combinePackages [ - sdk_9_0 - runtime_8_0 - ]; + dotnet-sdk = dotnetCorePackages.sdk_9_0; dotnet-runtime = dotnetCorePackages.runtime_9_0; postPatch = '' # for some reason these tests fail (intermittently?) with a zero timestamp touch tests/NexusMods.UI.Tests/WorkspaceSystem/*.verified.png + + # Bump StrawberryShake so we can drop .NET 8 + # See https://github.com/Nexus-Mods/NexusMods.App/pull/2830 + substituteInPlace Directory.Packages.props \ + --replace-fail 'Include="StrawberryShake.Server" Version="14.1.0"' \ + 'Include="StrawberryShake.Server" Version="15.0.3"' ''; makeWrapperArgs = [ From 199953df7dee8104865f7e9f38ee9ae98062ac10 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Tue, 18 Mar 2025 02:19:21 +0100 Subject: [PATCH 050/155] amdgpu_top: 0.10.3 -> 0.10.4 --- pkgs/by-name/am/amdgpu_top/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/am/amdgpu_top/package.nix b/pkgs/by-name/am/amdgpu_top/package.nix index d0d3f84d8ffa..a4627056ac62 100644 --- a/pkgs/by-name/am/amdgpu_top/package.nix +++ b/pkgs/by-name/am/amdgpu_top/package.nix @@ -16,17 +16,17 @@ rustPlatform.buildRustPackage rec { pname = "amdgpu_top"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "Umio-Yasuno"; repo = "amdgpu_top"; rev = "v${version}"; - hash = "sha256-9PHMPyL2yg36vG+wax0Lb/LFT7CQWnBnZ+t38hr01PE="; + hash = "sha256-OvxrcVjngIW/fVIPX1XhbGImAeDifoLzlaZpXUYS9FA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-W20jtH3w8LVqKwdf2ifwXKO2xgF3e/DuZ8vWqHOAGy0="; + cargoHash = "sha256-na6pghbJ7Ek+rdbX4qJt2kv7C3AAqpgU/nYHaT9CQdo="; buildInputs = [ libdrm From ac79e70a1eb9ca5f12961c385c6db7413b39acc2 Mon Sep 17 00:00:00 2001 From: Colin Date: Tue, 18 Mar 2025 06:50:59 +0000 Subject: [PATCH 051/155] nvimpager: enable strictDeps & cleanup inputs --- pkgs/by-name/nv/nvimpager/package.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nv/nvimpager/package.nix b/pkgs/by-name/nv/nvimpager/package.nix index 8c1e479c6021..9a4b8908b2d0 100644 --- a/pkgs/by-name/nv/nvimpager/package.nix +++ b/pkgs/by-name/nv/nvimpager/package.nix @@ -2,6 +2,7 @@ fetchFromGitHub, lib, stdenv, + bash, ncurses, neovim, procps, @@ -22,11 +23,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ - ncurses # for tput - procps # for nvim_get_proc() which uses ps(1) + bash ]; nativeBuildInputs = [ scdoc ]; + strictDeps = true; + makeFlags = [ "PREFIX=$(out)" ]; buildFlags = [ "nvimpager.configured" @@ -40,8 +42,10 @@ stdenv.mkDerivation rec { doCheck = true; nativeCheckInputs = [ lua51Packages.busted - util-linux + ncurses # for tput neovim + procps # for nvim_get_proc() which uses ps(1) + util-linux ]; # filter out one test that fails in the sandbox of nix or with neovim v0.10 # or on macOS @@ -51,6 +55,10 @@ stdenv.mkDerivation rec { }') ''; + postFixup = '' + patchShebangs --update --host $out/bin/nvimpager + ''; + meta = with lib; { description = "Use neovim as pager"; longDescription = '' From 4094484e743315f60ceface02add7fbc77906dc4 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 18 Mar 2025 11:08:30 +0100 Subject: [PATCH 052/155] python313Packages.pytorch-pfn-extras: disable failing test on python 3.13 --- .../python-modules/pytorch-pfn-extras/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix index 33a4db6a81b1..2c63c289766e 100644 --- a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix +++ b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix @@ -17,6 +17,7 @@ onnx, pytestCheckHook, torchvision, + pythonAtLeast, }: buildPythonPackage rec { @@ -60,7 +61,11 @@ buildPythonPackage rec { # where 4 = .call_count "test_lr_scheduler_wait_for_first_optimizer_step" ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + ++ lib.optionals (pythonAtLeast "3.13") [ + # RuntimeError: Dynamo is not supported on Python 3.13+ + "test_register" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # torch.distributed is not available on darwin "test_create_distributed_evaluator" "test_distributed_evaluation" From 50df33fe2ca68c470f12fcce7e4fcc74c3d819af Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Mar 2025 11:45:37 +0100 Subject: [PATCH 053/155] firefox-unwrapped: 136.0.1 -> 136.0.2 https://www.mozilla.org/en-US/firefox/136.0.2/releasenotes/ --- .../networking/browsers/firefox/packages/firefox.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix index b95aff4c445f..9dfc70f6151f 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix @@ -9,10 +9,10 @@ buildMozillaMach rec { pname = "firefox"; - version = "136.0.1"; + version = "136.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "e5833ccf97796c15b5156357427621d1f2d1d7ee55b53262f3935eadb98229c74a355bbe2f72a4168ec4e29dd3f83f4eaca99c5215d61bd087475331d3522abd"; + sha512 = "50dfbedb6bd513a3c6cf90558d7c6993cc78558cccc69fcc882f8e54eb8e8bec9779dce6fb7211c1a0234ac4a189438c5fa55ee9d0d06fcbae5cf44778af2ef1"; }; meta = { From 05e447c2f818362249e6d0700efb77764d7c15f1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Mar 2025 11:46:06 +0100 Subject: [PATCH 054/155] firefox-bin-unwrapped: 136.0.1 -> 136.0.2 https://www.mozilla.org/en-US/firefox/136.0.2/ --- .../browsers/firefox-bin/release_sources.nix | 1238 ++++++++--------- 1 file changed, 619 insertions(+), 619 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 11044ef82a1c..7dbdde1a90ac 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1859 +1,1859 @@ { - version = "136.0.1"; + version = "136.0.2"; sources = [ { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/ach/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/ach/firefox-136.0.2.tar.xz"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "faeb510012e2bac93ebcc6a5d0b6df8a34279a2d22b88585f11ed98a9f5cb992"; + sha256 = "558938cd8ff67b0d5c3161b3d1b81cfae873a3d8aa6ae9974f638e634946d6ce"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/af/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/af/firefox-136.0.2.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "d94db8c5dc0d08caff68ecd17131cb25507e7499997817ccd814842d40a72f5d"; + sha256 = "8f463f45e04e1be33791a8a74c0e6b2d5f42d00f1b8ddb107874b083ef304bc5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/an/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/an/firefox-136.0.2.tar.xz"; locale = "an"; arch = "linux-x86_64"; - sha256 = "c7948b049f33c45fbca9d12e6d406ffc46a77df95e812f476a1c48cf8883924e"; + sha256 = "023f7e232c6bc351d3b0974636f30264f991c2d13d41ba5c9ac28cae0e27588d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/ar/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/ar/firefox-136.0.2.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "78ded856d6fcd22f5be7a6c06b411f5a878eace63dcd59a86535fb14eb162e1d"; + sha256 = "c3bb6bd95af58cf12c1310bb35424e7f8374ce24b1a284462f8a97d246bf58e7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/ast/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/ast/firefox-136.0.2.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "9f90ecd0249aa7f7bdd961d2fc5781f63f968c95365d14f8490cb2e63b45b09e"; + sha256 = "ba4b88cf7c9696b0348b75719e9bc3811ffd07584526532f88b56624d8026954"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/az/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/az/firefox-136.0.2.tar.xz"; locale = "az"; arch = "linux-x86_64"; - sha256 = "b0b8b227196a1c0e136b8369e17e1b7f358f7a755fe6edd7f61d890aa9d3e9f6"; + sha256 = "f4d9abea0d79de7c9b1adef5a07887ab79deec707dc158f6c8b157676f39eff8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/be/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/be/firefox-136.0.2.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "d92fec715e890433fee8bdd9f4f4967e84a8383cc80c90d954e80321073dc1d5"; + sha256 = "e822c3f7994fe2caf0116bb9891a15eb1925b16154fb55537ed0499771cd88fb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/bg/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/bg/firefox-136.0.2.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "3b2ffc1f5f944ca1b309667c566aa28281d6881c3de483c7bc23ccb9053cf4ae"; + sha256 = "cf1a529a61e75e865abbfc914af4a3f55cabf1bafed4752c81fe610aec785aee"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/bn/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/bn/firefox-136.0.2.tar.xz"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "4ae04a4ad9658cdab05ec5f00bbcc6786d5cf2007fe45a8bb7d46e115669a7bc"; + sha256 = "11114d657ce8078d1232831fc52fb4cdbfa34917393180645561e5321868d32f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/br/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/br/firefox-136.0.2.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "14e10ce95cdaa460a27fea73448943687cdb8a3ea223a5cdac7d899940e5c950"; + sha256 = "966adc08494e79fdcefbbced618547016cf38ca916550678c4fa0415cf7cd7c7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/bs/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/bs/firefox-136.0.2.tar.xz"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "fdcc5987c88f42fc60f3d0aed3660a0530a84551708144e07761b100cb092315"; + sha256 = "61773bede7ab3036a240cdb315e351ef7429027d319262c4e5756bbd37bd621c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/ca-valencia/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/ca-valencia/firefox-136.0.2.tar.xz"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "90801aed26e7ee0945aaf9f867e2a3a6fc9c9b80e78af2868025ddeb43ac9ae9"; + sha256 = "f3c99485bef968af3aebf782b80e5e6c3d36c8f9d6f08628e32617160269c4da"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/ca/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/ca/firefox-136.0.2.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "33721a16cea3a8153ce25729c2e479a757ff2048c7f4345df37dd4c0bfc8326f"; + sha256 = "e240eed34cbd6111fe985a9323b430e70acdd3f7a918a88d0253ad23f178a3ec"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/cak/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/cak/firefox-136.0.2.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "d1a4a3591f24a453554706f894808a4e8f5de6342765b9daed9863278026651f"; + sha256 = "2b7ae971aa2ad7bfc1a3034cc4836515079360839e70c1a121a2b41f7de3a432"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/cs/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/cs/firefox-136.0.2.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "9e927378f014ce9838aadfba6ed2080f8ec3eeb962de0c399d4e6f123c7df8b4"; + sha256 = "49701a9fcbb7cb299d22bd65152f972a6caf00ec016b2ac5e4bf40db8a21020b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/cy/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/cy/firefox-136.0.2.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "799551848c5472ecc51b811c8e9f6bae02da011dbe36a986b528782cbbb39b25"; + sha256 = "27d001f6a59cbc5b8dbff4d3fc1bb53a85b3fe437de0628baa973616364c8977"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/da/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/da/firefox-136.0.2.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "8e2793ddfaa8a744ceb132f242c58efc0ba9921dacf99e8ce95c9e02bf54ad96"; + sha256 = "532c6acf95541babfcc725d31905405038ab6de26a90f80c2cd47a9a886380c4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/de/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/de/firefox-136.0.2.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "487ae4136a5b83005269fadb0841cb8c7be8bd1667e353aa7d772eaff51d93f8"; + sha256 = "30e35d6f490c7734eb5876f7444d65c732a9491caa4797100db4ac654a0f84ca"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/dsb/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/dsb/firefox-136.0.2.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "cc15ced0cf3e71a71952dda3eeee602baffbd525cb80d635be8b39af1cf07a03"; + sha256 = "75cdf2771ec1f9d6cbd18f2909ac9a6952ac6ac73b1073c9014db06a06119a83"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/el/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/el/firefox-136.0.2.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "a0b34706c3526b87e16bd66e112bd0720635bd88cac8b6a31efbddafcf989121"; + sha256 = "7527d81b385d909d1444d4f0df2500fadadcd7d0f64b2fb4de6beda8d5528b5e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/en-CA/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/en-CA/firefox-136.0.2.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "a87ec40bd802933a86e133bfffb52d823fd716d847ef0d8b77426b376d819137"; + sha256 = "60f1da75d2afde3cf70ee13c6af511854715145f7de7adccde2e8fd320e34ca0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/en-GB/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/en-GB/firefox-136.0.2.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "b728f5604539d32628862ec0388c12eb6a1d7771230a96e68f3ec7c29cb0bc3d"; + sha256 = "708443a7306ad7273c8e114dabf30a0921cea36730ba604158847b044acf1033"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/en-US/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/en-US/firefox-136.0.2.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "326c3dadd05153a6825145c9200f48021e039593cd6d6c434abee326e6096835"; + sha256 = "7ea3882e814669784f0960e4d6bb50a0ac88997a1d17fb125d0f411961ad763a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/eo/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/eo/firefox-136.0.2.tar.xz"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "f4008ef0902acfa0f15a05995da1f67ce3a2f42a4adee6d83ab279a592fc7d71"; + sha256 = "b4253b8cc98865be4824188b6bdeee18c94206e02451c2e904dbf42bb7bcbb19"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/es-AR/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/es-AR/firefox-136.0.2.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "89438a730a4d9aa44a085c4490edc4b3f30040b273181451a4903c3f13232394"; + sha256 = "2c9c46b09621f603fd7e3b75deebe69a881522cf0579a618148a426cfcba343d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/es-CL/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/es-CL/firefox-136.0.2.tar.xz"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "085824b15ad849f3860da89daf9e98bddc396e7464c82bdc30589b53df6c55e3"; + sha256 = "89d6fb4d1f34944ee81c79e0d453992a4824d8a8c7e1127dfe214cbe83d70468"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/es-ES/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/es-ES/firefox-136.0.2.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "7180d29ad9830eab66e956ea5180eec71e2efa5fdfabdaec09bf1b0e74d741c2"; + sha256 = "ba30ca2c7d0fb30252d0d8abf7fe19f4dc039c85e86faa39c9f23a629baaf51e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/es-MX/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/es-MX/firefox-136.0.2.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "19581774643eb362e932a2834bbbf8414f494adaebeedf75730606e202b36121"; + sha256 = "05c82d0b79c4cf684c7a778efe6d5402cddbfecf9ebe5be561a0d816371393a6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/et/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/et/firefox-136.0.2.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "a2d96369bdf4141c5b043aea7d53956e078cb6b366514cf1e25b16edc6832582"; + sha256 = "d31f7b025c5f929ea0697fc019b651cce36b45ed414d5d4f1fc24c50a8d1c58d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/eu/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/eu/firefox-136.0.2.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "481803e73f0f406c64a7767bdac07396e09c1749467f3b8d1a3d1f529e7ad938"; + sha256 = "1291361b88ab6af455bfaf948fa4f9c2eee6dc997fdfd02a785d2302b993ce4c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/fa/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/fa/firefox-136.0.2.tar.xz"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "936c15385d52bf74a7612cc769782d79f5acf299b2bd27a4f918b81b60aa0d04"; + sha256 = "eb9748a620636e02ad57702f9ef02851e1ec64f502a9a40bf4400691b51fbf41"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/ff/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/ff/firefox-136.0.2.tar.xz"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "bd7b5cf5b61d7b9659e80f1358dcf18ade7ba43f5890ccebd13e13bb9d6d1e24"; + sha256 = "5bdce6ab6ae4b505fd6294bea22fe92d52d2ee5647ae4e22332f2343f1420f31"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/fi/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/fi/firefox-136.0.2.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "da65df83d8c293eeb7c625e948926ddbc820a0f67f1a86437d063ca84a7ab797"; + sha256 = "49d297a49da8b0594d5f2145338a79246a586dd3449d9fc16aa8f763152ce92a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/fr/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/fr/firefox-136.0.2.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "6880aa36be2747f01426088a91ad31e0f9501b59d8ed03542268a42cdafa812e"; + sha256 = "77859f61a67236aa482b43627d1afada4e41ac64157759c55b1c4097a9a355ce"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/fur/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/fur/firefox-136.0.2.tar.xz"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "a31303bfbf5bcc180aae50ca3aad558dd7b7ff2114e439239d4d9ddf8be295e4"; + sha256 = "be80074ec8b56a6791a7edb03044167164fb6a03b657cf29f0b9dc32bc015b02"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/fy-NL/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/fy-NL/firefox-136.0.2.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "bdfbc482cd153126725a75ea7a678da81b1d2933b5f164871f4f829a28240f2e"; + sha256 = "7a0a5ef74a20199cae923b1edccb997d64a94a778358d8e1f377bc7c89acd0f9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/ga-IE/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/ga-IE/firefox-136.0.2.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "ae553d7324a8971a678344a544f49545fdb8143ea607ec9dcac98187da8bdd6c"; + sha256 = "7923f71f86773b7879513ce5cc3e159b4b103aff4802439ec81ec28a556de355"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/gd/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/gd/firefox-136.0.2.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "4cd1a5ea0a540177bf1ff4d4224148693915c3c0b59d7d9f3d43dc13c2ea6624"; + sha256 = "7a5af3b54d72cb3bfb2ef388a5f8d9082e1868a01d111ac69966e0bd84bf6d87"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/gl/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/gl/firefox-136.0.2.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "17ace382c13f00a1e64eb1272206fb2a3275105bf222ec977c7b7794c2ae24cd"; + sha256 = "0b3041817cda1faaedb9dd5b1a6d66461ffd901c3f9e77ee7187631545b0640e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/gn/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/gn/firefox-136.0.2.tar.xz"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "50c48e3ebed24aa688bea1e09392faefa07ca996914428486d122d5fa6c68c6c"; + sha256 = "9f4ee346ce872ff06d8437ce645afa2e85667c7322b3096dbb6279608d09bc65"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/gu-IN/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/gu-IN/firefox-136.0.2.tar.xz"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "44a863859a01ad9f423236b4a96c5196e49e0682465ec4e061485d69b0847056"; + sha256 = "c6d790c5259b0bef6fdfd6d9ba5f65d7c754a55fc3ecfd040111638cdc415c2c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/he/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/he/firefox-136.0.2.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "9c6e260ced56f382c7a2888d0a4ba8dc947ee78327b8e88a526f97d22b8c064c"; + sha256 = "00775bf3f4bcf763d7cd0cd18b419b2f9401f7049cd02b2a38114693367ab819"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/hi-IN/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/hi-IN/firefox-136.0.2.tar.xz"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "cb2084cca95247a9b14a89936c1a8abc5e20a34dc9f25d116da876f60609d7dc"; + sha256 = "5811a4cece4e161b7536e9bc869e7ec2ee4733d97c96ba11e47122a7ee6489cd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/hr/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/hr/firefox-136.0.2.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "ee09f10dfc78643aeca77e44d25a4f07c60946751b5d87dcd80bc38d88718062"; + sha256 = "747e4fcfa50a31d570e9ba5ff08216a9b7cedd6e1e90c0c701e51f7343a20845"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/hsb/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/hsb/firefox-136.0.2.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "4a62aa41661ce7f203399a72ae146d623f547d50343577098bd9806598fe87a7"; + sha256 = "3770d0b1503d79a7e95f0d054057c0b30c2c49dc414b8d95e59072cadd94fb6b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/hu/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/hu/firefox-136.0.2.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "e4879666db83adf4f4f0aab00c445042529720145ba182e5215b83f4ce6546a4"; + sha256 = "a751b893cf82bab0bd52bb890cc999fc63a5315abbaa4d185454de7492d36701"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/hy-AM/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/hy-AM/firefox-136.0.2.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "e396916988de6eb6a66b6c09e44bd646c8b16301f86d1f91dfb4809cdb2364ad"; + sha256 = "8bf55a5d2cecf0f9a522b591f3619198f59cccd8e5172adad0b9b0fbaa826c2a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/ia/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/ia/firefox-136.0.2.tar.xz"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "1ccf12085b6c2fe8fb4546ff17e52d7729051621649e04db074676ec24d31bb7"; + sha256 = "6482c5b014cc69e366de21ad7e09e20141fe11c51b3d8a9e9628663b87a20845"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/id/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/id/firefox-136.0.2.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "4e0ab6a57b2ddcc04dd8568cc09c2c1dedaa2d197f9332ff05b36f546c282acd"; + sha256 = "df7a9c1bb9edc0edfdca96ad386e7609bccb0c802e7461c3c6d0dd61216850d1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/is/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/is/firefox-136.0.2.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "ba00aefca508c247e870f74c6ef254a6e3df34336db27f3fad6d537e49b5e78d"; + sha256 = "7cfeb340b1310f9d9e5d57af5087b26337ebfccd9e99eb6333f60c2de7c05932"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/it/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/it/firefox-136.0.2.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "47d41e577820c13071b934e304a9e02fca87360fca5c2f554aedb7360b394d5d"; + sha256 = "59123364f1f03bd556317a6fec2d536b3d760cf0575ab4ad967ca0155a6db0a4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/ja/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/ja/firefox-136.0.2.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "5f4257a844c7539219704584ed42a030b3126cd9170b3d9f5d296a89d8a6c9bd"; + sha256 = "07d00e727c3bad95f41d1c5e0e9f959d6edd24926a96184d4b67f04bfc4630cd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/ka/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/ka/firefox-136.0.2.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "7f31f96f532442a51a09fdf7debe52e67cce7725a51e5ba6c3e46c8aae8b5ad0"; + sha256 = "9c9721c410822df3c06861730ac41c84ad4ebc6eda1227cac68796758a192278"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/kab/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/kab/firefox-136.0.2.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "2dce909365b9814ca8d5a46b3584e5ee8bccfbe3b39532b1a85c2e858970646e"; + sha256 = "05705075dd9401945c068f8b038cd1b6e635332c50559f5953184754725abe46"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/kk/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/kk/firefox-136.0.2.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "33dbf4805ebc9dcc9390dc17604a5da7625c6e9655dc67feb068daca60d90b02"; + sha256 = "333c6641ca5adf7cf952addaa6b69b60b0e5efb7558498176bfabc522c7b2fb0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/km/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/km/firefox-136.0.2.tar.xz"; locale = "km"; arch = "linux-x86_64"; - sha256 = "c084dbaa4b60307050c15406a4368e93058abbab48771b2e42c649453628901d"; + sha256 = "36dca0bd3ce427061f159234aec919a1a9e4a374d06507edf9723a4e65a5125a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/kn/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/kn/firefox-136.0.2.tar.xz"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "7cf1b327b62dc330163af03ccedbe9544ebc6ab8dd8d532207873c1d80f9b4cc"; + sha256 = "2e8de5767d51de35cf8b2f4cc7786d0bb247dbdc0c93ab46cfed9627b5b6f74e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/ko/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/ko/firefox-136.0.2.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "8b415cd5d0486bcf9b1c3bc1794276b753e348ca7f1fe571ad9f44dd57c1631e"; + sha256 = "2cabb9a6eca1c0d36b9fdd5878e414f4c2aa25f57b18a1562f69a24d7f648b4d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/lij/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/lij/firefox-136.0.2.tar.xz"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "3fa1ffa2c6903c6560748ad952a5006c0274c3f9f1ecb028246c99d692147148"; + sha256 = "01aacf6cdfee82d6b2914ecd94bd48f181edb6fae6ce407b4812861c00bd47e4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/lt/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/lt/firefox-136.0.2.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "f29f105324fb81bbee3e5fbad809f5646359f66092debbbdb640586410cbca5a"; + sha256 = "b26298b76ce5c7235c7cffaa457c449395328c4c5f4e1440fac081a55c6c8799"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/lv/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/lv/firefox-136.0.2.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "517f539553ba56e5a93ccf97a2a3b7e53456006835fd02e667d1b585b39ae37d"; + sha256 = "43610d3e6a367d9300a08807187530ecd5b64662c74e793823b553053b640350"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/mk/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/mk/firefox-136.0.2.tar.xz"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "e4484517a83da8bde6e67c7f60eedda5970b4b8d7b8353fd7120a0f33bf79b03"; + sha256 = "f4d1dfe469cc1bfc5e87703e13092cebca1696ddd94248eb5073331ae0b4f32b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/mr/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/mr/firefox-136.0.2.tar.xz"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "dddc7c89a3e316395dc7816c9bb591c62740e7471e7becb8fec4de456923ad3b"; + sha256 = "80e9d0ca09dfd58dfc762dd0baec337636dc4818244d6890b1f2bf090fd1ac6f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/ms/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/ms/firefox-136.0.2.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "06ce9e89bfc4a5b7a030507859affde7cbc43b3e00b0d96fd0c743177e0acc44"; + sha256 = "505b7ff9e928593959a815683b9be1f2a411976233816dab4570cb470af23066"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/my/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/my/firefox-136.0.2.tar.xz"; locale = "my"; arch = "linux-x86_64"; - sha256 = "9b7e0024a5241794ba7776e4ba903d1a110d6f859b05e916c3fcd9da27d01330"; + sha256 = "505421948c78dbb5b170d3d2accf83f46d088acc0311636ca9cad18f87cb73bf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/nb-NO/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/nb-NO/firefox-136.0.2.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "e542342a5399c540be914fd5bc880e33eb2b4ff1889037c86b96c318774b5cb4"; + sha256 = "fd5dda27f3e037f1eb68760858297e45adda322ebab889218ef9b1a4fbd695a9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/ne-NP/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/ne-NP/firefox-136.0.2.tar.xz"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "b1d1b4fb2dacaa01dbed1aa9b01ee05084d8d4352cc7ba87425f0b5b9d249654"; + sha256 = "45e260d25ad9abc99305a102558e9281e2b9fc18cf3bc3c3793a22aaf925fe01"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/nl/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/nl/firefox-136.0.2.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "0bcafaa8937377031c2a9d14a212a9ff3a2c3f1882a9a3834d1661c2801238ec"; + sha256 = "2d317326994df62ec6bf5ca064a270c675e975b25e59e1236184ec9b760108a3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/nn-NO/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/nn-NO/firefox-136.0.2.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "f82398370c32b33d914750ff1fc34ef76073e5c92abcf9a9846aa7e6dff83d53"; + sha256 = "42160b7dad38d396c4cc6ad2537e680576177bdf6f6e42181d0c3b7bbfa2f0cd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/oc/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/oc/firefox-136.0.2.tar.xz"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "a96ef949800b268277057f3d8764529f98fff3274655a2f32ca4c7499ba047aa"; + sha256 = "30684f8982e918d90de32fb2dd0c05dbf6112d3818e211f4aee2c23f49b7598f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/pa-IN/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/pa-IN/firefox-136.0.2.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "5b7bce8279b0561b831c72b82845b5d0fc9dedf5629d1271d92b84675c94d975"; + sha256 = "ae1cc0cb808b1449ec934d04ead1d6ebde543a7847ecd4f19401dfc45f6dc041"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/pl/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/pl/firefox-136.0.2.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "6056602b54a2c904690c5439a3bad2f8b3d1cd80f3ccd43ee6bcd8d7d92cfa13"; + sha256 = "001b08f2ec046fb9eb6769a288248cb8b939b30057cc609baf12c992ed6a5648"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/pt-BR/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/pt-BR/firefox-136.0.2.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "447c8744d705905c152d4725500f7190cfadfa2f2b9dff44ec18d00e28e37c2b"; + sha256 = "60a44985423bc72cd477235511e761deee30647c8e5b2800dcffd4a315522b5f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/pt-PT/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/pt-PT/firefox-136.0.2.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "c05c5a8a2069fcb8864d1f375fc8569d536d6d3e72b2429403c25ed8c7214f34"; + sha256 = "0bfd4e96c8d5a5b3398dca5aba6a0e68bdae12fbf167ec618efafcb2b035c72c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/rm/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/rm/firefox-136.0.2.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "1f773306bef804c32375b0b55bde25bc8f0f1265467e88101ccc6448bc2a7f78"; + sha256 = "5885365e0752e7c71e1a045b062f3e2e0a73524d6ab438e79fd17ff77d8bdec3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/ro/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/ro/firefox-136.0.2.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "a4ffdecaf56ad319dc13897e58cd83bd4452534fce8bacd67175bb9fe1238c6f"; + sha256 = "b7c662438eacb9b7993eb95d7247fe01e353239e88bbac7c9586249766c48e79"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/ru/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/ru/firefox-136.0.2.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "bfdb2becd0cbfa83d22ee064ba135c3a42c682dc81bbdc7ad5da63dcc062bf13"; + sha256 = "067d26211805dec76bfbc0e2acda26106b9a269ac5eea794951966f87184c69e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/sat/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/sat/firefox-136.0.2.tar.xz"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "8ae75ac21362ac1d76235b0847967cbbe5743df898defe9c40c83d7f98b1f31c"; + sha256 = "7c62934b9f97af536e72d9320ebea8e2a1fcd7dec17eb6d83613217aa5dd3d13"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/sc/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/sc/firefox-136.0.2.tar.xz"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "b1562b700bfae68beea49c93a8884ba928a818d6cc840d29755a3a3bcb88c32c"; + sha256 = "9f61636da3fddd38d18c5ffe499e9789dd80b1a15073808a4ece37f5a14008a7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/sco/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/sco/firefox-136.0.2.tar.xz"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "7c3d642eebd79c4564448924edd07e6646d37e5fbf597d0d27811e782ecf3b20"; + sha256 = "5335ce2d8002ef303e1bb2e00e0a2721ce763ff4c54deba71dead1ea89c483b7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/si/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/si/firefox-136.0.2.tar.xz"; locale = "si"; arch = "linux-x86_64"; - sha256 = "734a4d1ec307042f892bc02cbb94b53ff633702e701f460adca1eb91dbb76051"; + sha256 = "902575f7eb4b51a07133c5353110a053f9f9e84ae233e3a8970bc495ab297005"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/sk/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/sk/firefox-136.0.2.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "cc1b51b2b65b4ec8f98a9696f5ec6c257f90bcfd5e1f9862cbb2b341fc112092"; + sha256 = "89fe905c57551e4c8b8277dbf629fa9de15f8d2f76e90638fbe6b310cf808f52"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/skr/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/skr/firefox-136.0.2.tar.xz"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "c58f0f7aba668a59a251d4209aaeb9541c21ca6f6ddf85de26648faedf3fdf38"; + sha256 = "eaf256b7213026f9ca2ea7f7ded5fdcd5dbee10f42b41d20be788f532a08c2b1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/sl/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/sl/firefox-136.0.2.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "644c0f0c4eecf3b16100c5c3136134d10c8a528c6739d7014c09a219482e41bc"; + sha256 = "368ac8a4fc7b4e758d010d8f9b57814a15e936c28c031898b4279ca4938b2ee1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/son/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/son/firefox-136.0.2.tar.xz"; locale = "son"; arch = "linux-x86_64"; - sha256 = "d911efe051c9054728e00b7101d1501dfc3f42e5365302c559cb7c6162964265"; + sha256 = "12126ee9b2b0dd21d9d05488a1a6017388a5f5076f89a18b47210b2acd74e248"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/sq/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/sq/firefox-136.0.2.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "b677cbd45adefe675cfe3e0d370b77bf48730d47be8d4ef75455f4f75b2d4b36"; + sha256 = "1a363ed9f7c864efd06e67a737e1f25acf3be0886c840fd7062679f1cc679c04"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/sr/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/sr/firefox-136.0.2.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "dcba4dee3344b12fe791d2022654314619d65af37d3c4191e9f55041f94b5cb5"; + sha256 = "d967a5a7c52abc5d90952346070731fdd488fc9a9ffe60bda53674ddff45097c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/sv-SE/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/sv-SE/firefox-136.0.2.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "c2d340b2706690e935f9b3a394aab3e685bf4c5841bb63ed02cfeb5250c0a261"; + sha256 = "12ca0edc2f1d876350e65293869889077de2769b43d9d636a87f8bb2e750abc7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/szl/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/szl/firefox-136.0.2.tar.xz"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "540a576604adcffd5edb5f915538b29308e3ab632f92e056dd2b4a8276beeb3e"; + sha256 = "45da6e9d6fe3e72be905280f4485052287277551aea22ee8b59aee9bf98942b2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/ta/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/ta/firefox-136.0.2.tar.xz"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "7cdc7c9183a6a3bea44f602e0936a0a2f91c189f9ddffeaf8c1e629918d4c424"; + sha256 = "e5751509b5bfa128aa16a60197fe627595691e9539abce4fb2632819504d2f59"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/te/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/te/firefox-136.0.2.tar.xz"; locale = "te"; arch = "linux-x86_64"; - sha256 = "a9fd21cd9d1baa1b4fe63f90a633d273cbff34b58ce7009c2badf4eeb0a15cee"; + sha256 = "09d2a440874570ac807b90fd63e93f0c20d5a0aedcd111c8b4ec56bbed5abf3f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/tg/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/tg/firefox-136.0.2.tar.xz"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "6184af2ab76fb93ec71a5fa97d6921e1e7b05ee1fc2830dc1d59ae8a3bf9f9c2"; + sha256 = "66e2c0fd93ca1e2c3102a15b22cf671a73b25e9ad4c841c6914fdca37661f1d8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/th/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/th/firefox-136.0.2.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "a6498c0fb8cc0ef98509a69538d7d96ce2ad5ef4b2a27b26fd84dabb589f7a0a"; + sha256 = "6e179f3b06d545e80ecc05b1a6951ccc5b7b6ff9ed209a1c2c49d250bf992706"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/tl/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/tl/firefox-136.0.2.tar.xz"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "1265815a2d8c0e445f80e3c16c4139d90a012b5cb74861627b7ad4e2cf004c4f"; + sha256 = "e70e4fb5c0a1c1954002b56cabd61c708210f09966902937f52f3ba2206d7741"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/tr/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/tr/firefox-136.0.2.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "a617782be15042124f944acc359b416816e14295142df694343ed51f4f3ea279"; + sha256 = "3ea571a4ff8d4bd975f88d9c3514ef9ee336ee5871bf0372cc885f4fd37a1819"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/trs/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/trs/firefox-136.0.2.tar.xz"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "9753783380d37d1adeccc46a3dbabf0d9660888f42f6900687700084a9518071"; + sha256 = "b1d509af26218d412f07e9c3ea04506e0b0b6e6468a7f2445fc51796526b716c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/uk/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/uk/firefox-136.0.2.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "bf6b60e2abbbb2497f675dd6f27d94e7f12100c18042e31ca9487d9fc071486f"; + sha256 = "66dc1fab03d54339ccd6350aeebc6ebe509017c1937f548cbd397684a9272e0e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/ur/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/ur/firefox-136.0.2.tar.xz"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "9df7b5d8422a2d1ef6b21aed8c86d8de7489078e018b6d6f48fc80166165f118"; + sha256 = "296723a6d5dd9c197d605d16a0a56c3460a17247f9addda3fa5956e92901e5c9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/uz/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/uz/firefox-136.0.2.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "ba9b7c041c3d2d75ca7eb8c12572ebc25b61d2e012650ac1424428f42f9c0086"; + sha256 = "07c58fddb4b6a6976f08006b0dacc34c297fdfa3c9aac40bb1a97f52290f7dc2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/vi/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/vi/firefox-136.0.2.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "c6d71983fd85de066b338184588d661d215e475565e2f8ff91e51921762e6b39"; + sha256 = "51b064d567894b724dbe806e290062c8f280f9c7f6e884fe4a0e2e24ad1b374d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/xh/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/xh/firefox-136.0.2.tar.xz"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "10a7b140bcd46468a333b105994d1a44ecb07842b9209d6f5d6a78f5e38a288a"; + sha256 = "1b41383fb5b8b6a773c1c00a971196cf9dd3993e45ff1253a42ba92052263fde"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/zh-CN/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/zh-CN/firefox-136.0.2.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "2aa775f5e0bc21fb6438b8c335ef989f403cffdef43a136f41dd94dd982498a8"; + sha256 = "15688aedb09513fefdbc24335504fc6ae8780f25e844f3c473d5d1e07d941b20"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/zh-TW/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-x86_64/zh-TW/firefox-136.0.2.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "64c7ba6065e3debe6a27283c5f6327eb669b6f6a47913d66c1e80b851c32eef2"; + sha256 = "f09484d49dc18482621c982e7748617b2bca73950d9ae73099dc2f0a30852383"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/ach/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/ach/firefox-136.0.2.tar.xz"; locale = "ach"; arch = "linux-i686"; - sha256 = "74fae790000ff27db4357c8af9a45fd201af1f358bf7f4c7388c0584ca200f4e"; + sha256 = "14d34c1cf7510d2d3e9994ca19bb34390e50e28b34558e8ee68cf03b39d13c74"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/af/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/af/firefox-136.0.2.tar.xz"; locale = "af"; arch = "linux-i686"; - sha256 = "8cb59efab7cf5bf736cc9b3230299c700462d51dd8a1a4b8ee980d3d5c054d43"; + sha256 = "f62c075694bb8e49c8703e0d3718bed787a7560e10c01d7ec95a98ecd77ff6cd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/an/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/an/firefox-136.0.2.tar.xz"; locale = "an"; arch = "linux-i686"; - sha256 = "44664eaf5ffdc424abd0f2176f4810049b7d839642d574f37efcb9ba2d57f439"; + sha256 = "9958425a553124463a5edec4c0cbc94d5f951116cc8e5dae10afaf28c82bc209"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/ar/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/ar/firefox-136.0.2.tar.xz"; locale = "ar"; arch = "linux-i686"; - sha256 = "ba0a0dff46c624685a8ea8fa40689baad18ad98019d9bbe53f6af31ed1707eb1"; + sha256 = "1fb0e5985bb9c947c399a3d902cc3d7b87baa17c88006bf94de6c3d651da0369"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/ast/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/ast/firefox-136.0.2.tar.xz"; locale = "ast"; arch = "linux-i686"; - sha256 = "fb0454df391ddb4d4b4c490a991ee4c1900510e8423a3c4371ceb5eefc330ea3"; + sha256 = "2e0209a2d87589ee93883229d6bb26667eaa216ca9284d1b1097e1c032ed4b3a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/az/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/az/firefox-136.0.2.tar.xz"; locale = "az"; arch = "linux-i686"; - sha256 = "c93a769f633087f415b301d39aeccda197953abda5d88c143086bb5c6afbfeaa"; + sha256 = "849bcfe41db27072704e623cadbc3933a300e33e45a425ac9f809ae53852e120"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/be/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/be/firefox-136.0.2.tar.xz"; locale = "be"; arch = "linux-i686"; - sha256 = "1c896404c5b132b35d588dea10cea3a76469f13da0bbebe003368ffa69dadf0b"; + sha256 = "c9d7c13c53d5ac635202c4e87d7c0f74f0153a62623e582d986a522f863a1e10"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/bg/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/bg/firefox-136.0.2.tar.xz"; locale = "bg"; arch = "linux-i686"; - sha256 = "c732239225f7f3f03e7a72b7939a057f3d197db789d2e0bf5d167d3d3c08d4c5"; + sha256 = "7474faf63cd86f8fd0f1db5d75f2ca8e9faa039f20685dc7746e79df4bdb0dbb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/bn/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/bn/firefox-136.0.2.tar.xz"; locale = "bn"; arch = "linux-i686"; - sha256 = "4cd5e225a6249dcf96132771170b4461ec48fea1ad72bd2c90ab5010f66ec387"; + sha256 = "7ca6ffcb5da128a1935b32fd380161d27758234c3e76685f922fa4e71cfd175a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/br/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/br/firefox-136.0.2.tar.xz"; locale = "br"; arch = "linux-i686"; - sha256 = "3ba84b177b6e9e85864280e6525b7150e938a30f8a996178f1d03b7d1b23da96"; + sha256 = "dba07e6d6bcfa3589767b7b8a3339b15c888d800d2aa2460df140fda4b92cba7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/bs/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/bs/firefox-136.0.2.tar.xz"; locale = "bs"; arch = "linux-i686"; - sha256 = "0bcfe2a21142069fe68275d5b3df0399c92ee06d55669606033555dbe5595fe9"; + sha256 = "4821f119bee27fc10c81423ceb784c78fbd28409de227ef67b15ba8801ff14be"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/ca-valencia/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/ca-valencia/firefox-136.0.2.tar.xz"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "a26f31548e08ee91c3a59cece826844de141c25d672e77ea42d9559be3c0b623"; + sha256 = "3e6d5ab61d734eef3252286159cb0746cd3aa1daaf64f2813b70696a9a098718"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/ca/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/ca/firefox-136.0.2.tar.xz"; locale = "ca"; arch = "linux-i686"; - sha256 = "caaa8b21996062415b8239e87a0184d7a8afd5a78571caa78f6eb024d2b0b009"; + sha256 = "4c34056b2e3114d1e0899bb0992c3d0bd7aa54740b9e21b747cc8c41bd3fcadf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/cak/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/cak/firefox-136.0.2.tar.xz"; locale = "cak"; arch = "linux-i686"; - sha256 = "270029664487cf05493c032575364f5c3cc75f055e0e497bfa8431c618605250"; + sha256 = "65c2e4b5f916054d994fe8974ac1175be6bf66ea7f093ae95bd22f35067984a3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/cs/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/cs/firefox-136.0.2.tar.xz"; locale = "cs"; arch = "linux-i686"; - sha256 = "0d3f8da7929ac80151da06b802c6b50c95f35d9e09c9879488f238aa73b05cbe"; + sha256 = "fe8c12793cf81e7936319b5d8951bbe490651e1be4d94e00574794be897d1c55"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/cy/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/cy/firefox-136.0.2.tar.xz"; locale = "cy"; arch = "linux-i686"; - sha256 = "3172fcad024c63dde448d5a3a5ceaaffd1fbad268c05a16d87fc2a6ed094a145"; + sha256 = "8ceff1570b6b6fd16d78a3b42775da79482f86fc95caa7e2450b470435b3a043"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/da/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/da/firefox-136.0.2.tar.xz"; locale = "da"; arch = "linux-i686"; - sha256 = "8a660b87f89ee4e3fa82f2401d492fb7a5b625fdc394f46eb2b82ae174f0c863"; + sha256 = "f65e451f1324cea9107b5806132ad0aacac2d3988e3cc3266171083d1eff7d50"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/de/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/de/firefox-136.0.2.tar.xz"; locale = "de"; arch = "linux-i686"; - sha256 = "a0e7051d141ed4d4dcb0f1a8037295a952f39d334a4176252fb999aa0b3ae63d"; + sha256 = "8009b870955cee7a9f95e8a8593c08520d8848fb4e253dc094b788ab9d971f34"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/dsb/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/dsb/firefox-136.0.2.tar.xz"; locale = "dsb"; arch = "linux-i686"; - sha256 = "da169dbf97ceba9a1e338e7d89775ab3c6b401afc18b902890828fb1b866475c"; + sha256 = "8dd159ffff91db88208417eac55a72d513161666d4b6f143b966d2f003b132b4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/el/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/el/firefox-136.0.2.tar.xz"; locale = "el"; arch = "linux-i686"; - sha256 = "cfe4013cbf7464de83e2a097cab6385469822ff5222cb992087cd3be00ae712d"; + sha256 = "1462b20e46b291c1bc7c1b192363f930d7b075c4674fea7ea5f6e96562defcfb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/en-CA/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/en-CA/firefox-136.0.2.tar.xz"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "d9993e0da0d53155b127e9f05f31024b4e499964ab8a59e457844e072367649c"; + sha256 = "23398dbcba2e751c58c0890e7e80ace1bbdbaae0940cd64db3db1f3e903fbda1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/en-GB/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/en-GB/firefox-136.0.2.tar.xz"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "0bcb019824c6a8f0b8235f8b6a653de46afe0b49234ce6c061f7fdd106430f0b"; + sha256 = "4d902b77e440104d872d679c26b605960c4ce72c7dfff6ef1fe896cc7c66cfdc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/en-US/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/en-US/firefox-136.0.2.tar.xz"; locale = "en-US"; arch = "linux-i686"; - sha256 = "714f9280f60f6b313cfa317d4947579f2309ba4fa88945104e80f3e232d78fed"; + sha256 = "1a136eb948dae3f7433fb71a89c4605d669a02ed3179b4da189f0ab2e0befa16"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/eo/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/eo/firefox-136.0.2.tar.xz"; locale = "eo"; arch = "linux-i686"; - sha256 = "1e3eeedd40421737ff801780f7d59dd2c066f791b9aa338aafa379457ab15b86"; + sha256 = "1bbf9cbca6cd31e5d58ef610c9310cd70ea529dafd66693ff504be70020c96a3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/es-AR/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/es-AR/firefox-136.0.2.tar.xz"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "8086c138af5ebe5a0d39427b93eb57085044076a8997cd521bb58c45097e9f4c"; + sha256 = "5c4fd60fc68ed030b56cd12e0c02254b2f509291369cda73008f8f2847478925"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/es-CL/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/es-CL/firefox-136.0.2.tar.xz"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "53e03a9176d199d13a88f121feaaa8c51844160502c79e8e8fb573eb488f056c"; + sha256 = "d51bd2dea99a89f1d5d5799e8d8c83aea0ae701b527dd1b79594ccb192bc1f81"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/es-ES/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/es-ES/firefox-136.0.2.tar.xz"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "6c8acac43d5850f6e8ef848b77703533c956a106b49c286fd01437ba6139aedd"; + sha256 = "36c6e57c2bc248e0f371829e8a5ebbd645537dcc756ae16e90777e27e9dc8436"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/es-MX/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/es-MX/firefox-136.0.2.tar.xz"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "a6dd3fc96b8caabd125448f33e428f18e70658f7285cdb55f736c321dc73e59d"; + sha256 = "1293c342f81c8a3d5c085da30a2c74af63f5087f49287f20a3b60ea63f726987"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/et/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/et/firefox-136.0.2.tar.xz"; locale = "et"; arch = "linux-i686"; - sha256 = "1aac14fa3689a137f9962cbb70f8006851c21085205dd236de0e40ea67cb13e6"; + sha256 = "b6e55dc55ac9df5dcfcc99c420902f6b6fd50f4180a21c934526a611e61b3b65"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/eu/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/eu/firefox-136.0.2.tar.xz"; locale = "eu"; arch = "linux-i686"; - sha256 = "ca152bf2252326ef6d22ecd9573e30355657f4c845f5f0fb0347e04845265040"; + sha256 = "338c5506e549721bd6b3efbec22bac3f1cb5946d9aa2c1bf2a74fe1dd3f12a49"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/fa/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/fa/firefox-136.0.2.tar.xz"; locale = "fa"; arch = "linux-i686"; - sha256 = "a24aad2f55115253b807560703f72b97a3e047b797bf529d4a4961ed9b96830f"; + sha256 = "21c5ea467e9bdf62768f0d8c6a1f530a9dd669dab51ddba2101e8ffcc2906336"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/ff/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/ff/firefox-136.0.2.tar.xz"; locale = "ff"; arch = "linux-i686"; - sha256 = "9ec123e76b4fa15c23a5a7abf0250d7ae4d34cdffbb453080996cbfcbc73bbff"; + sha256 = "7f1f0a00f781096bc4da14d65bad6c612aabce2c81c5bc54630028af78c648fb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/fi/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/fi/firefox-136.0.2.tar.xz"; locale = "fi"; arch = "linux-i686"; - sha256 = "9cc8fb33a7c6ebb1e31606557d202b3c6c7ecc5a31967c82596ff0d532372b1b"; + sha256 = "0db20d9d3e6d7e05c61f7c8863df6526d346c0f9c9e14cc258511ffdf50bfa30"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/fr/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/fr/firefox-136.0.2.tar.xz"; locale = "fr"; arch = "linux-i686"; - sha256 = "eebbe9a39b8157648cd7cc2c296879ffcc6ef8f16f96470c736b4c6989ac6bc3"; + sha256 = "1221763dacb8b1c3ac11efcb9a4a12ffdeede3d7f102c384ecb3f21353eb31de"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/fur/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/fur/firefox-136.0.2.tar.xz"; locale = "fur"; arch = "linux-i686"; - sha256 = "94ec109e82df233f3d6b4c512466bad57744a203361351df9fd8b2e79985d983"; + sha256 = "757de82e2eba7a1e5f6b81b9a6c6d4656b276076affc25cc5a64576911243d48"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/fy-NL/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/fy-NL/firefox-136.0.2.tar.xz"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "f2185d28195b734644e26bc73c4e01a3b7cbb289bd559df3865e757f4a55d4c0"; + sha256 = "d4826625467e5a55033a5d112d4875d69f1d81e5625ae58ff329d8da9a2d5950"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/ga-IE/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/ga-IE/firefox-136.0.2.tar.xz"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "cb1bc9023821f642b19b2b26efec84ce130cb7d283ad9d9d3c9c17b0d44e6ea3"; + sha256 = "f277b658c741ed8a8ca4143d127dc7d263c02fe730f07176c6ab68ea642bd039"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/gd/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/gd/firefox-136.0.2.tar.xz"; locale = "gd"; arch = "linux-i686"; - sha256 = "a0ceaa43ce5a78b8af48deb0d37114cb663fca4ac7062831da576840dde5f595"; + sha256 = "502f7cc312fd55f92bfd1ccca333634900ebf0cd3bba93a7c37f7692be1458c2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/gl/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/gl/firefox-136.0.2.tar.xz"; locale = "gl"; arch = "linux-i686"; - sha256 = "5c35bb0e3ea3b90b6af22c39c7045714973ef414b04cae981cc9f5f8dcb2a030"; + sha256 = "6346fd1a2edfaf6565d7589de760655d1af569ae2b45345ee49f14c7f04516e2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/gn/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/gn/firefox-136.0.2.tar.xz"; locale = "gn"; arch = "linux-i686"; - sha256 = "c899fc9151713b833208ff958403dfb631b06284009cfe43c357aaf421f12d52"; + sha256 = "be56255bc8d4183788da7e95c565d14178b037730259042ea2f117a03c684250"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/gu-IN/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/gu-IN/firefox-136.0.2.tar.xz"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "c69c0c69e07694414d22ad3860c42f45bf4bbf5259fbbb0b6da7f61531f36e81"; + sha256 = "2420dfdd46d6132ca592a2236b83d99f2f21bded20e2a883516a20546e97b929"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/he/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/he/firefox-136.0.2.tar.xz"; locale = "he"; arch = "linux-i686"; - sha256 = "8e9988fdf9306b2d0663c24790755d931894ee73934db0b53ec2d314e6293228"; + sha256 = "3b593300e6e04307bd464ca62fcc82e03aa76cfc9a1eb5daed5c9ac8c3005989"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/hi-IN/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/hi-IN/firefox-136.0.2.tar.xz"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "a3541a718c05928414b9035adfa6757823570512e4f7e07ec6fad0c73bb797bb"; + sha256 = "d53af9e831547a3d2c86a7cf323b7da7765a7ff236030e3468be1cf3536d3335"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/hr/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/hr/firefox-136.0.2.tar.xz"; locale = "hr"; arch = "linux-i686"; - sha256 = "76e97efb7cf92a9e516d1c75acf30cfda94dd8814f921ebeda9ab0fe4bf84b18"; + sha256 = "bf1e5b0a5f15658c7fbcb639f76dac4873c66ac6eb73706275e4cfd51ea212ec"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/hsb/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/hsb/firefox-136.0.2.tar.xz"; locale = "hsb"; arch = "linux-i686"; - sha256 = "987bdc95a45b5d1a358a52d0deeafe52c19bff0a028912ef559ddbbc936d79d0"; + sha256 = "e7772758b212eb9ccd5e3eeb6ae73f041ae82694c68607d26a827785183322b6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/hu/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/hu/firefox-136.0.2.tar.xz"; locale = "hu"; arch = "linux-i686"; - sha256 = "a9cbcb694a2122da56351fae64dee52d21f669b0a371bbf57e2f0bca8dd68db3"; + sha256 = "b1faaf3654d881dcca307d85512850d9656b6a1f2d7fa7a78725311e520e9ea9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/hy-AM/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/hy-AM/firefox-136.0.2.tar.xz"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "17a4cb79c05fc04b4d5aea27fe40717637573bce3ae57de6b539f64bc8fe4abf"; + sha256 = "dd2b121a2ec29d12b150793cd9c8c45dff4e579ccddd2556f3bd61d6eccc082c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/ia/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/ia/firefox-136.0.2.tar.xz"; locale = "ia"; arch = "linux-i686"; - sha256 = "d673c285b4e50980b19a9884a712c669a8648c119ca948d86f70b129cc1491bd"; + sha256 = "d9d9f8a085bf0430ab47d196ba8936db97a5a4450e06fc033a1a37e74e83be9e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/id/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/id/firefox-136.0.2.tar.xz"; locale = "id"; arch = "linux-i686"; - sha256 = "659e53b5552b5337d2ac0e074ed1f75a75cbdc21ae2613f220fab73e317682d4"; + sha256 = "a860a1fdb72400203f26b965a9db7bc01262fbe8043ac2427211695f9396deb2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/is/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/is/firefox-136.0.2.tar.xz"; locale = "is"; arch = "linux-i686"; - sha256 = "2568359350835592133baabfc529a7979c364dbcf52094066716fdf5687ad571"; + sha256 = "83604e7cd7703bc448a5afc5d55a88f9db1ba6a08b4c6e27459e326605d45808"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/it/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/it/firefox-136.0.2.tar.xz"; locale = "it"; arch = "linux-i686"; - sha256 = "6f0f19ad11f4dcc0e2053d7eb0068a6648340fa03778899670f2e76c8a5ddf01"; + sha256 = "b0885beb655ccfa73db85c6afd325efe81e4bacec9d2d5401692e48483f42ea8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/ja/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/ja/firefox-136.0.2.tar.xz"; locale = "ja"; arch = "linux-i686"; - sha256 = "211c5e94452079c9e325678109ca22df29bf620b7491b089c773a748d54c5515"; + sha256 = "ef0a6152ce4c4e7ae7c15168793bb83a98e267f93a674c3e8cfd39fcdbf31525"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/ka/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/ka/firefox-136.0.2.tar.xz"; locale = "ka"; arch = "linux-i686"; - sha256 = "c7543cd6c96e588d42a4592086ad5a3b8dc1475efc43efbca8fb3358373955e8"; + sha256 = "82a509bd832c61b69b116bca793a5826e5d9a52482f9393b670b740f01394991"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/kab/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/kab/firefox-136.0.2.tar.xz"; locale = "kab"; arch = "linux-i686"; - sha256 = "000a91c03de2ffab5f813787d405a940b420882e93d7aef8abed1674014cf61e"; + sha256 = "5df9ad1ef1d271ee774eb7b5a7d11fc41a97869ae20c12b0df56a4d385e4f0ab"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/kk/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/kk/firefox-136.0.2.tar.xz"; locale = "kk"; arch = "linux-i686"; - sha256 = "ca1eeb0629a1b09b0f689b31971a4e8d8f04c6982fc6ede8da1cd52481c80b1d"; + sha256 = "4b52e07a139b3205105b4a30fe34cc0f15fbe4bea5ff8d88e68f9beb26bb7f9b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/km/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/km/firefox-136.0.2.tar.xz"; locale = "km"; arch = "linux-i686"; - sha256 = "e5a4e34d48e8203ca4b346f49b31d1677fbfddfab3ce8eca4cb3a8e698595b81"; + sha256 = "75c0ba0aae90b3a0256fad5e659e07e28e82f888b083c8ba88f176ab1fa6aed8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/kn/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/kn/firefox-136.0.2.tar.xz"; locale = "kn"; arch = "linux-i686"; - sha256 = "b5bddea4c68faba1fadfe346d22c93ceabfa8c0ce0c4305a848e10bca1e1df43"; + sha256 = "d0c952a3bf648394b29b5856b9ff3539fc8a8e62e6ba4aa47737225f6c7da13b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/ko/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/ko/firefox-136.0.2.tar.xz"; locale = "ko"; arch = "linux-i686"; - sha256 = "8fe0cbb0d04bb58977905f3c397bced83365f861cf6c9931c1b4cec608a99917"; + sha256 = "6920b831dc0d219221d54a4af3fb9e389c3b7b3213aab6b1bae49c8282ab20dc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/lij/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/lij/firefox-136.0.2.tar.xz"; locale = "lij"; arch = "linux-i686"; - sha256 = "ce6c6bcce76e6ea178dcbbfdefd2be8237bfedc7d876fca9074620f2bba805df"; + sha256 = "f60507d382a24c39267e4917d221f28872f9ed92401cbd9037c7aab929b03375"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/lt/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/lt/firefox-136.0.2.tar.xz"; locale = "lt"; arch = "linux-i686"; - sha256 = "df0c09d6d927d91e5ce4a84d7d899bd898c91dc335d663c58ecbb445e37d7524"; + sha256 = "c7a81714f854bd12c6dfa1cc51b95f6124c90b9c48d2154d0ad423318f53135a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/lv/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/lv/firefox-136.0.2.tar.xz"; locale = "lv"; arch = "linux-i686"; - sha256 = "2692b6de81d238e6540f5267e91ffe96d6d8f0506bf3dd0d2a65357179b671cb"; + sha256 = "3f82c92e136089263e6f29ddbf92e45b2224671e5d71ebf75580a7ad1fec394d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/mk/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/mk/firefox-136.0.2.tar.xz"; locale = "mk"; arch = "linux-i686"; - sha256 = "e2e9ebf430c7e707f255212a2c7b94aadbc4934d558312903f3581f53d97e06f"; + sha256 = "df118a56ef55a9cae79ee1987b82e082227ea05abf99347058b6e5223f666ac6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/mr/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/mr/firefox-136.0.2.tar.xz"; locale = "mr"; arch = "linux-i686"; - sha256 = "c58fa4ac80e961e5871e14bfb7ae4fd12199bd407d9a0a9fc84b98e5d6e53376"; + sha256 = "15d11443fbc69e162f185917be57eb094faf83a36c0951840cb4ddcbe1484e39"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/ms/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/ms/firefox-136.0.2.tar.xz"; locale = "ms"; arch = "linux-i686"; - sha256 = "780e68a2c499c17edc4b3ed1e619b10f5047a87f70107fdef7cc1cd48daf4188"; + sha256 = "7788aba60e29128d12b3b3f4bfc465edc8e3aac7526bb7342bfe61c58253f1d4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/my/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/my/firefox-136.0.2.tar.xz"; locale = "my"; arch = "linux-i686"; - sha256 = "9e5d7e74caa0a1898edd9807516229d2aa9d4ef5612abe665acb47e9c1c491b5"; + sha256 = "af7a948e9b8ced4ec9cc660b665a7cd69b81a004ce750a12b2d5918c6c73bf96"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/nb-NO/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/nb-NO/firefox-136.0.2.tar.xz"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "b9d142deca4a891d52a177c25f366732bd4308fe0b0b53a3009cb859f143d7ff"; + sha256 = "86158a658fb19be600dfc51d437275785dd4d12c1d1e71cfb8fbc910a907e916"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/ne-NP/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/ne-NP/firefox-136.0.2.tar.xz"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "5f1d0648eb242cd150697b8e409762c164f50ddc5fafee7ec7a505dada0e86e6"; + sha256 = "a73163c8f3018a83f8d86dd70f777c87fe7be4e99b294118580c03c083972ff4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/nl/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/nl/firefox-136.0.2.tar.xz"; locale = "nl"; arch = "linux-i686"; - sha256 = "5cac83592f575f6a6adf4e9f7f22b4da68af94c6385c91895d678646a92de964"; + sha256 = "071a1191bed55c766014ee0da19db016e618cf03b37ee9a2488e803c079b8d18"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/nn-NO/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/nn-NO/firefox-136.0.2.tar.xz"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "79a1cf8f1c26a24416f6b095e88f88a32034346f4f3c407f5394d5b6d04c182c"; + sha256 = "2836bc71293eabc228bcb3679aa97b811b783a504c1dced1bd69dd6ae6bc9571"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/oc/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/oc/firefox-136.0.2.tar.xz"; locale = "oc"; arch = "linux-i686"; - sha256 = "d8d0fd1a175d89756ef46e6fad6e5edcbfb8761c80479e7f126ab3a054ce6e1f"; + sha256 = "f95b9d6dbbb445bfa2118d002a1a81278a0433b64dd2f184bb980f6268f9a04c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/pa-IN/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/pa-IN/firefox-136.0.2.tar.xz"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "e9f10a6adce49ce24bff019cb43570e25fd85be27e3da426a7c96d685245515b"; + sha256 = "bb50df49475e75f04b011c809b8aea62cf0cd7001af2724d716ec72e12699c01"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/pl/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/pl/firefox-136.0.2.tar.xz"; locale = "pl"; arch = "linux-i686"; - sha256 = "68f4848be480bf9191a3949755d0b51c81a6fc94b0e3f966f07aa065617c1ee1"; + sha256 = "5ddfa5370214c42d666fce58ab9fdd5cfeb5aad318b12c69aaeb0e94d4100893"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/pt-BR/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/pt-BR/firefox-136.0.2.tar.xz"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "0bf0b5737ac64e1a4838fa2df0de91bceab032b59e214be03534c4da18b6a388"; + sha256 = "486dd2641e431d1133b789e5a99e08ce8a31e2ee484f6db1d82fe99ca5e22cb6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/pt-PT/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/pt-PT/firefox-136.0.2.tar.xz"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "b679658559b1e07982fe231f627fcf87d8aa1c8d06e85e25e922d4952e1c12e3"; + sha256 = "ecf093f47339f7c332df235e22cc4229a75ae262d988c3d2e44a6a6d7999601b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/rm/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/rm/firefox-136.0.2.tar.xz"; locale = "rm"; arch = "linux-i686"; - sha256 = "05b9fe0fe5a4df8cda0580ab565328a2b984920ed843855e6bb9e48d76bdb62b"; + sha256 = "688902c29a377ade567bce13e306ab7eb03c6e6f91f6f3c7e4089109432ed2e1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/ro/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/ro/firefox-136.0.2.tar.xz"; locale = "ro"; arch = "linux-i686"; - sha256 = "2eeb1fc1dccb4a04886b6f83fbdb37713bade1972bd363bf32bdec87065acad1"; + sha256 = "28b4089d0bf8566183f1f85327337301e46d892ada441eb75e778f66a602f553"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/ru/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/ru/firefox-136.0.2.tar.xz"; locale = "ru"; arch = "linux-i686"; - sha256 = "2ef93e09dbfcb8989ab03b251b946fb4b48c5b19c407a82a405d998b5c891e60"; + sha256 = "0afa253c411a8e76241b4551fab912931856dd77bcc26bef38bddbd54cb619a4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/sat/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/sat/firefox-136.0.2.tar.xz"; locale = "sat"; arch = "linux-i686"; - sha256 = "a80d167dc8d76e22e88387938d2ee609c720b4f1661004046210381f056a6819"; + sha256 = "cb8cf47b46f8a088f23b52ab4e9e20f592ca12ac60d34abcfe443ea640233568"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/sc/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/sc/firefox-136.0.2.tar.xz"; locale = "sc"; arch = "linux-i686"; - sha256 = "406e98e2c740fd4d0ddc3a162a1b4289394921e67294dd25e7e4b2cd853395b3"; + sha256 = "ddae2ef628da81818e983df96d10e6be7b63206a24382f52fc171ffe7a712c13"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/sco/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/sco/firefox-136.0.2.tar.xz"; locale = "sco"; arch = "linux-i686"; - sha256 = "fc3d1ee1b325084f3a015a6fc3bb099d963debf4ea92f208a2297a865f554a0b"; + sha256 = "6c5a370520178dc203ff1e607035a3ac9e5da6b1e5a049a33beafb4f73ff480f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/si/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/si/firefox-136.0.2.tar.xz"; locale = "si"; arch = "linux-i686"; - sha256 = "de8ba331037a1a5a15b7d79c45ba933c12da99dc2bbc01c252fcf74bfd268688"; + sha256 = "074b18544314c02149fca5ac5068ae145cf7a93fe660c65f3fc513f18aed0c70"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/sk/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/sk/firefox-136.0.2.tar.xz"; locale = "sk"; arch = "linux-i686"; - sha256 = "dacb00177b21607c5101bf39d16b84f3744d73d57f3a8f6166f9de80acca494b"; + sha256 = "cc236d796f5f3e92b7bf187c3b446c0184e0db7f4df538e0c0dff2cc3e66cb6e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/skr/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/skr/firefox-136.0.2.tar.xz"; locale = "skr"; arch = "linux-i686"; - sha256 = "6532484f63af46cf4becf06c4b5ae796047f31b27f916130367f3f18a3d0dd32"; + sha256 = "fe44296270635863f36b57184e43cb04eec424a64a283fec33d4da3e3f253f1f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/sl/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/sl/firefox-136.0.2.tar.xz"; locale = "sl"; arch = "linux-i686"; - sha256 = "bd9da5b3c530606d15eabf992f843b34d9645055f2a5bcdd190b74c3be5a435f"; + sha256 = "0d4b702b30755a79e86073125fb8ddc0002fd6348a3b766ec71b9651e02afd86"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/son/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/son/firefox-136.0.2.tar.xz"; locale = "son"; arch = "linux-i686"; - sha256 = "d9d00ec3cdfffec4d50e217b56e6f9bfeae34b78e5e39641a76c763bcd5e665e"; + sha256 = "54760a6a9b76e903d3911f900ec9162db23cb065257c0f6acdac824df78087b8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/sq/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/sq/firefox-136.0.2.tar.xz"; locale = "sq"; arch = "linux-i686"; - sha256 = "180a4b80f371fbc1ca9806fe82d12cac1d1d5eac44d5c442003cf64c6ef9cc98"; + sha256 = "cebd39dc07f660f6d102aa4dec2026c4fee5fe22effc5eb2e258cd92b38af625"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/sr/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/sr/firefox-136.0.2.tar.xz"; locale = "sr"; arch = "linux-i686"; - sha256 = "6bad8ba2df9b076c810db172a3f5d4d412eb4c70e53debf1c299b3777da39cc8"; + sha256 = "fd2eb0a96c51e0588e13e99643d1a16317b21bec73706ef2ce7673d1c787f0c0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/sv-SE/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/sv-SE/firefox-136.0.2.tar.xz"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "f6d5d1a68ccd46437ac0c1141c786cb7c685f70682dc33488461ae60a80fcbaa"; + sha256 = "9e8272d71c37c5078c141ca2c3f109cd487ec61b14b0b56a3cb5cfb8fc2c790e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/szl/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/szl/firefox-136.0.2.tar.xz"; locale = "szl"; arch = "linux-i686"; - sha256 = "d1fec412ad8effdbbe264275eda6d635b7fafdd39d366da847567feb87a94184"; + sha256 = "fa43b0b219e827a389c8a87989366c29b79c803318255b5c979b743b61249cc5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/ta/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/ta/firefox-136.0.2.tar.xz"; locale = "ta"; arch = "linux-i686"; - sha256 = "eddffb8e2ba6aaf170e20069a5bf6ce70879cb049289ec544aedbf261d6b0e2e"; + sha256 = "a4f44b8fcda3e93b561700fb4d732b5e6066a194fdfc215ac442dd908198ae8d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/te/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/te/firefox-136.0.2.tar.xz"; locale = "te"; arch = "linux-i686"; - sha256 = "77b842f7f8d0e8660bbbfc30dbabb10051b98019e8c04e83d3d4ed9c8f2202ea"; + sha256 = "3a49ebdac85b9247a7f981124dc4601487b7c94984213967552d992c31793650"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/tg/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/tg/firefox-136.0.2.tar.xz"; locale = "tg"; arch = "linux-i686"; - sha256 = "737f573f8170396653d17f258e71c51f0a13ee65fb56b31ab84724a4e21fb9c2"; + sha256 = "5add4c1bfe8099013e20fb35141ad87c0b6c30ee5553bb66220c0e89e65ac23d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/th/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/th/firefox-136.0.2.tar.xz"; locale = "th"; arch = "linux-i686"; - sha256 = "56dd3fa1713c444cf62a5dfecc7c42629dac8500ecbf63bae194b77676126f71"; + sha256 = "64e31cf60a5b0ab7d2e226f2fea8e7b962165f1d9ffc2b9b40d751a89164fc4a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/tl/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/tl/firefox-136.0.2.tar.xz"; locale = "tl"; arch = "linux-i686"; - sha256 = "f83f1f4dfb4c30be2b38b9d2b4a1f1327dbdd46108b8ae5428324cefe99184b1"; + sha256 = "64eb36c92196b4da51b7efb2f2b28a1eb1eb23a22b9debf8404fbd1bf87bf4c8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/tr/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/tr/firefox-136.0.2.tar.xz"; locale = "tr"; arch = "linux-i686"; - sha256 = "471b00e82a3840354f59779a2f63a77c317194e25ec72c1dbe59dc29e8462001"; + sha256 = "d4556ebff0a137d2ad08d071b2b03429e246258680ff4fdb3bcd078ad5bfc120"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/trs/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/trs/firefox-136.0.2.tar.xz"; locale = "trs"; arch = "linux-i686"; - sha256 = "c9c8e38983c4e6d360380618a453ab91de1a706563f363f4d9d94778b6d66da9"; + sha256 = "c529e482f1b6dee4b857bb727a75cc4be2d9725105d662ef8cc18238dc537519"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/uk/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/uk/firefox-136.0.2.tar.xz"; locale = "uk"; arch = "linux-i686"; - sha256 = "59ce51e98d18bfb746abbb1d30ac6143482433da84d32431a95bc5b4a4050a58"; + sha256 = "4765bd05ec862f3373a700ba3fffe1d42fd45787575a060c4b43cd2bc163618e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/ur/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/ur/firefox-136.0.2.tar.xz"; locale = "ur"; arch = "linux-i686"; - sha256 = "606b18152debff68ab6c46f8606e2755b26b7d34a4d424fa6eb0b6bfa1fe691c"; + sha256 = "aa77995f8ab3fc5431d876e222f361c43d2a221aa71ee4bd01ddd64bc1ea9377"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/uz/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/uz/firefox-136.0.2.tar.xz"; locale = "uz"; arch = "linux-i686"; - sha256 = "fc1f1c2a046939576080e6bf9b3c87d62a164543f0d442f0773fa87d6c3b054f"; + sha256 = "6a3e6e5822957f89c4fddac5f161c9ab1ef6da1df0f0f4b19118aad2fb215cd0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/vi/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/vi/firefox-136.0.2.tar.xz"; locale = "vi"; arch = "linux-i686"; - sha256 = "edb566e5bf0c2295854ef105a257d1d9961819b9640e47c25ad1cef622c77dab"; + sha256 = "b2342e6df46ea1974b0e9366a259bc91f69a8602946bfc6e4d6853d9be4bfbcc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/xh/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/xh/firefox-136.0.2.tar.xz"; locale = "xh"; arch = "linux-i686"; - sha256 = "98c7038ca30a54d3833d4e59b78fff3449538db3ee3e629b1bfcc9052242c4fd"; + sha256 = "ccd9aaf9d6b5808e52a39a390a6408f94be68ac786765f98ff81aca9915bc3d9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/zh-CN/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/zh-CN/firefox-136.0.2.tar.xz"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "cfe5cb1843b4407caf8458c63b676dd7b153fadb0841782710f4688179665406"; + sha256 = "beca75f0954b47f0bf0cb5dc967e70e6fca0893d4f2c22770da5ba8e0956623b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-i686/zh-TW/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-i686/zh-TW/firefox-136.0.2.tar.xz"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "6c5bea5024f8c08e4f20539babcc85d16f09fa11da115bff778a9e9a5fb904d9"; + sha256 = "74ed7c455c8779bef68b0e4d33da129a031d931ae3a5689857e2fb70e60fd0ca"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/ach/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/ach/firefox-136.0.2.tar.xz"; locale = "ach"; arch = "linux-aarch64"; - sha256 = "40f2d351ea625a1db4c0cf3d0b8f871b1a8977fcc03d5ec2a1678a74199c3a11"; + sha256 = "f759c87c57d634d7e7eefc90ddbd63256013fa51fd96baeaa453def17c7b5e22"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/af/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/af/firefox-136.0.2.tar.xz"; locale = "af"; arch = "linux-aarch64"; - sha256 = "1e9e638643ccb323f57db908dd63dd304635e396111a2f49805642770d3a053c"; + sha256 = "c733d2075070f16d0ff0cf01552f750baed59aea6c44372f70f008fd5c086c00"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/an/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/an/firefox-136.0.2.tar.xz"; locale = "an"; arch = "linux-aarch64"; - sha256 = "edd3373f0cf3fb98e70a3f2792139419558a4a3524f9b6a2239741c806b596a7"; + sha256 = "715bf8adef811095c88f648fe9502681d5ef0ec4491aa6da7bf0badc725b643c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/ar/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/ar/firefox-136.0.2.tar.xz"; locale = "ar"; arch = "linux-aarch64"; - sha256 = "3ec0ffdb8d1962d5f991f7b32c475afbda1b85a93e2d3ef049e6b0893c196ab3"; + sha256 = "6f4f68eef67215f50f5914113c26b0c03c91987f5d18e56342cb1c6b4d527a36"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/ast/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/ast/firefox-136.0.2.tar.xz"; locale = "ast"; arch = "linux-aarch64"; - sha256 = "93144d05c8ca39c25b88665e2d3df564c8c6ab2834826e498ab3fe53046b6cd0"; + sha256 = "155e4dd056b70b072a76eee95c9c9b3facdfcc767659e1fd123d77bafcc46df8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/az/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/az/firefox-136.0.2.tar.xz"; locale = "az"; arch = "linux-aarch64"; - sha256 = "3b23767567a2a8b26bb0ef594345705e77d3ad4aea46e23997aac4debc94209e"; + sha256 = "f0ad4b1b18c40e910bed35a1cac615c8b841bfe15c2b561193b591c45c826ef6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/be/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/be/firefox-136.0.2.tar.xz"; locale = "be"; arch = "linux-aarch64"; - sha256 = "0642b4f996d21b04383564f1eaa79ead59b42768a1ba7b45ac53c3fd1e70a6e5"; + sha256 = "36821aa89819200ea52acea7a84b27ee066574dd98b279e37b9bb2e4a67a5c11"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/bg/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/bg/firefox-136.0.2.tar.xz"; locale = "bg"; arch = "linux-aarch64"; - sha256 = "c82d1ad0d1c4639b5b230c2f26981af65b0afb39e70daf03ed28020325020c9a"; + sha256 = "fff286f506d274da7d8912cc2d6490df96fee96d57c9a94a60d27d71d12777d4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/bn/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/bn/firefox-136.0.2.tar.xz"; locale = "bn"; arch = "linux-aarch64"; - sha256 = "2d8eb3285b68a745a46533b95d2174122dbad3657fd15104681239e0f85ef38a"; + sha256 = "fc16cc975181b9efdff1d5395afea5d782351d10b2c32dc8aaefcba315e85882"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/br/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/br/firefox-136.0.2.tar.xz"; locale = "br"; arch = "linux-aarch64"; - sha256 = "f9cbe2000222b857bf339e6cbe1db81c32ac740bcb21b38423eb42d15f70cec4"; + sha256 = "8ef8891b99990cf7477d70187cbf57ebad17526e90b907da20efc8a3ad911172"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/bs/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/bs/firefox-136.0.2.tar.xz"; locale = "bs"; arch = "linux-aarch64"; - sha256 = "3dda1d54aa9c2dc638d355cc401b36a91de6b09f9a57b61dd3318a93a9c9de9b"; + sha256 = "73b14dee6e0b73fcbd1b6c37e68442d206bf7919969b43587562accbcd5baa7e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/ca-valencia/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/ca-valencia/firefox-136.0.2.tar.xz"; locale = "ca-valencia"; arch = "linux-aarch64"; - sha256 = "2bad371ab236dfd32b04832940e00628fddba1bc12541a48f99db7b9e88bb7e0"; + sha256 = "895ab821bdd1213753758635c12087a72f1973dd34d95b4d5e3e3a0afe6f848a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/ca/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/ca/firefox-136.0.2.tar.xz"; locale = "ca"; arch = "linux-aarch64"; - sha256 = "87e9eb6dfa0847314abb3bbbee59e368b7da724c228d65e125c2f935c80643c0"; + sha256 = "d614b618ad81daf3dd8eb050d2d51b0f9f6762f392841c7c8e8de8c3fe8655a6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/cak/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/cak/firefox-136.0.2.tar.xz"; locale = "cak"; arch = "linux-aarch64"; - sha256 = "d4834b0b65f1786b255b8a720b13d0ea2975edd6c6372deb573a60448080c706"; + sha256 = "8ca5ce8e389e81b787ddadfd8999130151bb2eef244c4559616daa1568a28f54"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/cs/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/cs/firefox-136.0.2.tar.xz"; locale = "cs"; arch = "linux-aarch64"; - sha256 = "8f684eaf1206c43f4357151a21a23b5f4337f7e4b46b9c6f01b455ee4210c91e"; + sha256 = "47fb63c859a0f688eaf6da1c8b102b6784b9bfe94fe18cebe16f362421da6833"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/cy/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/cy/firefox-136.0.2.tar.xz"; locale = "cy"; arch = "linux-aarch64"; - sha256 = "6ecd3db8f84da42a0c501678d0820fda12b7a704589584c487757ca49c4eed83"; + sha256 = "1e2fc57528d4963ed93bd80d4df00f72685b34f1935970dc50e6eb99670fe162"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/da/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/da/firefox-136.0.2.tar.xz"; locale = "da"; arch = "linux-aarch64"; - sha256 = "de66276e15e2170e498d15d163edc14f826b6da9b305d4f69b0506dc7244a751"; + sha256 = "1f6aa1e365210cc5eee2b282e3ac59b081594add139a51ddc5edb9b569037448"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/de/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/de/firefox-136.0.2.tar.xz"; locale = "de"; arch = "linux-aarch64"; - sha256 = "77a58f3776dea5dffafceb3052eb556175d64e88ad05e1d3508e0159204d04aa"; + sha256 = "d3e2bf28bf30f06e32433bd22a2c5b6f1cb43c43d8a7e4ebc1381369caad37df"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/dsb/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/dsb/firefox-136.0.2.tar.xz"; locale = "dsb"; arch = "linux-aarch64"; - sha256 = "9cedccb3a5294ed7fad4302327dad50074585563337235c9ab79aa452c340687"; + sha256 = "db3ecf1523abe7fb0c6e74cabe09bfbd20df327abd4ddb6b3877a715b6ffe90b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/el/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/el/firefox-136.0.2.tar.xz"; locale = "el"; arch = "linux-aarch64"; - sha256 = "7b722f858e3d970415ec5370c9ca7d7e12e9620967153375649de455503285a6"; + sha256 = "79ee003b3cc94ff76322dcf446faf47ecbb3f02de87c4510a9389ff634de7796"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/en-CA/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/en-CA/firefox-136.0.2.tar.xz"; locale = "en-CA"; arch = "linux-aarch64"; - sha256 = "803e8a10260f34696fe707f59d7206f6d8068affb356b41574e191db0d7144b1"; + sha256 = "ac8a4e30588e61157cefad2a5c3c7cd5514435b7a586dc837fa809b44b1a89e9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/en-GB/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/en-GB/firefox-136.0.2.tar.xz"; locale = "en-GB"; arch = "linux-aarch64"; - sha256 = "24aea25528e911dcfa2a35507599645fd8e711f9a98ca0527025e24e984143ee"; + sha256 = "bed91119a2731d02481fc218a66d073e7bd4ed92ed5d5a969999fb81654ade07"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/en-US/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/en-US/firefox-136.0.2.tar.xz"; locale = "en-US"; arch = "linux-aarch64"; - sha256 = "030a29c8e48b84a9f87fece8ae9f64c0770aa8ce25305d1b056db7b08a59e65b"; + sha256 = "f5d1fdf3234a44b0ff03e58a845a760d11a54e89c94c285468be4553bce1cd4e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/eo/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/eo/firefox-136.0.2.tar.xz"; locale = "eo"; arch = "linux-aarch64"; - sha256 = "37f2fb90714089912a1571ecc2eb35851f3350b4607f8d06152ba71d48ee3aab"; + sha256 = "0b9ee61d05d393ba6967b56b1c4de9a076bac3571a3f3568b0b3d30f879df7de"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/es-AR/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/es-AR/firefox-136.0.2.tar.xz"; locale = "es-AR"; arch = "linux-aarch64"; - sha256 = "830629a0afab66f1204343e2f719ddb102cf1b3e4c705574f6ef8656c8ea5c9e"; + sha256 = "2ed0f5d1e403ef41d951bf23f9766c4d40629b6b875025a54f48eb34874f5c9d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/es-CL/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/es-CL/firefox-136.0.2.tar.xz"; locale = "es-CL"; arch = "linux-aarch64"; - sha256 = "2e592fa3b34ec2f893237400e96399298b3eef33188c5cf05b950537d0f7c8f9"; + sha256 = "99570c1ae8d97f29ea38776e0b1254beaaee130fe86b073acaf4cc0d45c84c0d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/es-ES/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/es-ES/firefox-136.0.2.tar.xz"; locale = "es-ES"; arch = "linux-aarch64"; - sha256 = "df9a38b43843f0057db5145ba62d6b0e4edd0cb514cc47f7dbd5d8fc0eacba2c"; + sha256 = "c9e8a20bf3a4a04da5bbb7b844f54f86d0b8dc7157e77961b23e70bc57117896"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/es-MX/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/es-MX/firefox-136.0.2.tar.xz"; locale = "es-MX"; arch = "linux-aarch64"; - sha256 = "8ed1764915fc169d84433cae5ac931868e22bfcf0efa77c1131df31e37645282"; + sha256 = "7c882786368bc4ba9c8ec155a1d2fc8d05f079ac1f4203b6242510e085ffdb30"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/et/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/et/firefox-136.0.2.tar.xz"; locale = "et"; arch = "linux-aarch64"; - sha256 = "d80a837d4512122b5cbe8f92b94a56f44d0e8b7ee1aa093d85fe43e289a7a66d"; + sha256 = "d79910327fa952ba89b49eca8595f4b46241350d68fadc6862dbe7fd50e75ccf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/eu/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/eu/firefox-136.0.2.tar.xz"; locale = "eu"; arch = "linux-aarch64"; - sha256 = "b33bdb3188837afd41e2737928be19f4fa9ff4a5308498665475af231dd54272"; + sha256 = "825e61b310b7ca8c41620c02964a7cddbd0141a881b33a5fa5697e0038169dc2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/fa/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/fa/firefox-136.0.2.tar.xz"; locale = "fa"; arch = "linux-aarch64"; - sha256 = "8b0914112a7ad2bb5f04f3566a7c843d8bbfe5772c176d38b17982668f82c3b0"; + sha256 = "31ffc80166ab22cc522c6927ade4b8473e57e877d4892cf733308971129258b9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/ff/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/ff/firefox-136.0.2.tar.xz"; locale = "ff"; arch = "linux-aarch64"; - sha256 = "b38570974e4f31cb1efb71a2e29ac7b82298f5c0c617fb609da74952767cc7d5"; + sha256 = "208313e8fc82465803ce5d839b813190666775fb1d3f1e48bef67dd5f237384b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/fi/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/fi/firefox-136.0.2.tar.xz"; locale = "fi"; arch = "linux-aarch64"; - sha256 = "39b1242d18f4597874b8fc7c5b1af9d7a23b024cb3692d24f0157dfd9b031677"; + sha256 = "04980de440a1c12dfdcc2b7debddfe37b13b6d03c396dd53d66e28a90ad66c92"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/fr/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/fr/firefox-136.0.2.tar.xz"; locale = "fr"; arch = "linux-aarch64"; - sha256 = "7cbe8a51665a567ac73f6772a1b5c61b69c3fd88c6d191e5d86bd93fb4fc2afc"; + sha256 = "784a9b4393fc7d07219d1295a796d7982921a1464c91e5c34a29c5b3a1684a02"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/fur/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/fur/firefox-136.0.2.tar.xz"; locale = "fur"; arch = "linux-aarch64"; - sha256 = "554d95cd2626f76cc1f02d02e6aa6d4eb879b407cc2c2c330c0a72498aeb4f0d"; + sha256 = "f860009bfe9712a383694b50bad66042b7d28b40d441960c93ee4988f8c94c36"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/fy-NL/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/fy-NL/firefox-136.0.2.tar.xz"; locale = "fy-NL"; arch = "linux-aarch64"; - sha256 = "6da91eec411c55278aa851d9a2e5149536ecbc6ec9bc84cb1655fea970db7eb8"; + sha256 = "f182b74b1237cdfd9a75dc595c2c730e9ef157b8897fdc53321e6d61ccc91caf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/ga-IE/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/ga-IE/firefox-136.0.2.tar.xz"; locale = "ga-IE"; arch = "linux-aarch64"; - sha256 = "e26f558982667a5158b384197d1f307a475a9cab5c8fce2fbc895b5f0a9ad249"; + sha256 = "76f8891929079aa75fa0a54c3b2c1ce3d6be44b582659711023140861b31a55a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/gd/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/gd/firefox-136.0.2.tar.xz"; locale = "gd"; arch = "linux-aarch64"; - sha256 = "8b6d84a86e5d3e432756333b9c3f2a431bc9287f4a6bcaae77eeab30b4487ba8"; + sha256 = "6cb6521148039f98eae863f0e7f55ac5be3d896c32dafc25fac5391ab178c8ef"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/gl/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/gl/firefox-136.0.2.tar.xz"; locale = "gl"; arch = "linux-aarch64"; - sha256 = "ee88163f1dc8d6fe433a93af40c5b49a94dbac4a84c03c14d4a3e95accf8039d"; + sha256 = "6fdbe1608830ae67746df1a4f53a8382af46d3bfe1b56e018f54a3ace14fa6fa"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/gn/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/gn/firefox-136.0.2.tar.xz"; locale = "gn"; arch = "linux-aarch64"; - sha256 = "d0f96ad00dae45ec8d50d099c24f2aae0a2f0774e36306f37d77abed6e9f6dcc"; + sha256 = "9e1756e0237d0c1d83d78584884224ec46341315cf16a9f23147223ed0afb86f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/gu-IN/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/gu-IN/firefox-136.0.2.tar.xz"; locale = "gu-IN"; arch = "linux-aarch64"; - sha256 = "3bfbe31ccaafafa40bd9f40c1629cf4731105ff0005dbf3d70e50e5a85380e57"; + sha256 = "fa75906f22a58e20b73928ea80726929ee173d6a0ef30dad097b7a7413646123"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/he/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/he/firefox-136.0.2.tar.xz"; locale = "he"; arch = "linux-aarch64"; - sha256 = "5ca7a3e34a03e42e8928a6959b257991b631694a42bbd6a0f598a45346fdec22"; + sha256 = "22bc1e247a769329e6e18cf1fbfeccb23da66df708893faedba3d7de66170995"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/hi-IN/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/hi-IN/firefox-136.0.2.tar.xz"; locale = "hi-IN"; arch = "linux-aarch64"; - sha256 = "c5625d4f088b294a99e0f606fa3ecaa4e9ef9a8dfecb6df8995209f9569580ff"; + sha256 = "6272e7d88f0ab169199f54a15ddbdd9ffecbb0256c4e0a316cbbf45f250f306e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/hr/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/hr/firefox-136.0.2.tar.xz"; locale = "hr"; arch = "linux-aarch64"; - sha256 = "8f0f98d7bdecfe16a64f59a2458cbabcdde09fe831d7864efea3deaffd148e3d"; + sha256 = "e062591b0688a0505e853f6ce4ec1f14166af60a4b7f89b19c14af09a44aea3f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/hsb/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/hsb/firefox-136.0.2.tar.xz"; locale = "hsb"; arch = "linux-aarch64"; - sha256 = "c6d0ca9bdadc91bb50f161100bdf32c1064218cfc7c2cd8c0b3151f8fa2688b3"; + sha256 = "97e4d85e4ec26321bfc46e4ab1f865964a45c6fd2db7b5bde82ba082bb313ff3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/hu/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/hu/firefox-136.0.2.tar.xz"; locale = "hu"; arch = "linux-aarch64"; - sha256 = "b4421f20c659efcc0443bc3dfbdcd805ef02d7b93006741edcd8152932d6ce99"; + sha256 = "80667dc6860b65255fcd12c035ac14cb5b2554835529694aa52f8ed08786fdcd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/hy-AM/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/hy-AM/firefox-136.0.2.tar.xz"; locale = "hy-AM"; arch = "linux-aarch64"; - sha256 = "b3394b841a415dedc68616365014b775d0df33c8f34f2b6516752e1c72470c47"; + sha256 = "b157394cbb2ed9203c828fd474dbb1b4397783023ef59bb3fbe0a4d73beb93b6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/ia/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/ia/firefox-136.0.2.tar.xz"; locale = "ia"; arch = "linux-aarch64"; - sha256 = "453aabe726daf5a911ad4c6dacc7476bec4890606a45e9fa57dfdfae89d0000d"; + sha256 = "88117b955d1584f8ff1612ec08adbfdbb2a8caeff1b08e91acd315454e99991c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/id/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/id/firefox-136.0.2.tar.xz"; locale = "id"; arch = "linux-aarch64"; - sha256 = "e86b73efeef2382c2515c79a3f220587d42d6baab356a2df53ce79ce860738f1"; + sha256 = "07e3be5f9a15df870829beb12069b19eb8fca034fc5da7ea75ace3399c18945c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/is/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/is/firefox-136.0.2.tar.xz"; locale = "is"; arch = "linux-aarch64"; - sha256 = "87679c18af399b3f6fa1764adac6d51c5e960964960be88f3d8e73a90a7308fa"; + sha256 = "ea22c47a65cf3635c5ead05aa3badaa61493a917745e9e36d8fe235697256436"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/it/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/it/firefox-136.0.2.tar.xz"; locale = "it"; arch = "linux-aarch64"; - sha256 = "26dfb56b25bc2bef5dccb0899f670c24f36304527180384109fa50cb14bb59bc"; + sha256 = "7882dbbaa07201be02061ce8346c82e37ca499afe0800ef7a363a7b31308989b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/ja/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/ja/firefox-136.0.2.tar.xz"; locale = "ja"; arch = "linux-aarch64"; - sha256 = "1d63880d1db6ba796aaf11a9c0de77837d034325e666375ab72cfd947a7a4d98"; + sha256 = "5ca3f905cb2dfe7da7b222f209880974990ad5f23d30ee2d747b913acf322f67"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/ka/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/ka/firefox-136.0.2.tar.xz"; locale = "ka"; arch = "linux-aarch64"; - sha256 = "36848fd562c7fad2463b55eff98a17e487dbc79a90d4c282b806689af99ba843"; + sha256 = "6cd281ae68bc7ed5d271bb9153cab65440b4993bc937d1c1a2a4217d6e447227"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/kab/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/kab/firefox-136.0.2.tar.xz"; locale = "kab"; arch = "linux-aarch64"; - sha256 = "f49751928d4831d9bfbdfeb344c9658207d06d41446c4395c57ad102965d88d4"; + sha256 = "3947e20daf1f4593e3d108832caa851f6b19e16b85d1fca9ece23100953e7f4b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/kk/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/kk/firefox-136.0.2.tar.xz"; locale = "kk"; arch = "linux-aarch64"; - sha256 = "b9063d686d462fd979d375bb31b93f7a1116ca77159ea03dcf76648d6ecabda3"; + sha256 = "bc778bffc819e80532cb5de9a4aa9e8fbd3d51b5124fbadaa52715e8e49447fd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/km/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/km/firefox-136.0.2.tar.xz"; locale = "km"; arch = "linux-aarch64"; - sha256 = "dd50f2c7c482a8af80fc30f1371b2df2542fb184cd1cb6a2d3cb5fd4b072ffce"; + sha256 = "344c685415da7ac9b078cf28b1cf1d9b62b3cdac78707019de43ebd6bd50c582"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/kn/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/kn/firefox-136.0.2.tar.xz"; locale = "kn"; arch = "linux-aarch64"; - sha256 = "706ece760088475e153ae24aa150e3c61865270e6fcc6b959ad2e4379486f084"; + sha256 = "553afe9f54445db4f3aaefaa4e28d483913c43c8e37068205ebb7d7cf7da2696"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/ko/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/ko/firefox-136.0.2.tar.xz"; locale = "ko"; arch = "linux-aarch64"; - sha256 = "06adca60f8361707a0b3bf3976258eef03af3b634e52d8d3ae0971d36bdfe50e"; + sha256 = "b8bdaf74599bc16f4e24da4a127d3c46583f9839dd72b9a7e76ab38c40e7863c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/lij/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/lij/firefox-136.0.2.tar.xz"; locale = "lij"; arch = "linux-aarch64"; - sha256 = "6c705675f4dd80122b6b751ba826c4285ca7d82d280b30f40c4d6c8a90bfa1ac"; + sha256 = "67bee42f0444640ad02e14acc7051066483e24a4581a2271ae5e7b4f5fa5efb3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/lt/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/lt/firefox-136.0.2.tar.xz"; locale = "lt"; arch = "linux-aarch64"; - sha256 = "e283067b391051d6f675231208765e6e44822275ce5401931da916a0d12e2d66"; + sha256 = "a980e479a0f0a81769bc11ab348dd051d8fc8376943d3b0a822b833adbdd82af"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/lv/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/lv/firefox-136.0.2.tar.xz"; locale = "lv"; arch = "linux-aarch64"; - sha256 = "dca7ba3cb1fdd5a775212d88ec3a4a0b762f93e036d575ef1977e4cf14c354b3"; + sha256 = "9ae0c8da90c5958076dec909cacb35315e702c40df8a4f646192f99798e1bbee"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/mk/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/mk/firefox-136.0.2.tar.xz"; locale = "mk"; arch = "linux-aarch64"; - sha256 = "72142dce1ebf5e1b3372c7fcc06012cacc0605f33672f0701a08fa34b45976be"; + sha256 = "f4fe40e87af41cb8364cade0a69decdb70840fd7fcdbd7681d01b3c2cfdf981e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/mr/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/mr/firefox-136.0.2.tar.xz"; locale = "mr"; arch = "linux-aarch64"; - sha256 = "9c2fa7031e5292450e27d8d615d4e834089990ef3377941b99f2195df8afc569"; + sha256 = "0a78ee430238a580e7bdaaa40277a3faf1a186b7ebedac3662300d1b9c3aa1f1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/ms/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/ms/firefox-136.0.2.tar.xz"; locale = "ms"; arch = "linux-aarch64"; - sha256 = "f80287a68b370b36330bc0934b339e775708f4dec34c6e92dd90f133f0c17a40"; + sha256 = "d7ad6163c61b3bec0453d5a431653bf7e00037b92905c8ec74c77c3c567a0495"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/my/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/my/firefox-136.0.2.tar.xz"; locale = "my"; arch = "linux-aarch64"; - sha256 = "2469ef4d58986cd5c64650fa4ca489c0216b667913fd977d7b64e4d8fe522678"; + sha256 = "0782dd4df40a601424736c4395b61637013763c96cd8a8e83be759fa916737b7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/nb-NO/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/nb-NO/firefox-136.0.2.tar.xz"; locale = "nb-NO"; arch = "linux-aarch64"; - sha256 = "7f6d1c45aa9acf85b8d8b90db7ad9e4bc8ee7e58ef4bb2df3c56b0012bdd4151"; + sha256 = "dbc5af87885b99533706f5652d84722c99b338944f3a5d73053acb59ee18b1e6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/ne-NP/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/ne-NP/firefox-136.0.2.tar.xz"; locale = "ne-NP"; arch = "linux-aarch64"; - sha256 = "b10895f27228f462c7f9f2eb1b466216c1dfd41769ffe1eb65885fa228479a28"; + sha256 = "5eafb7dcfdf3fcaee135325f338ca6dc73653fa79b418833c99ee12132661da4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/nl/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/nl/firefox-136.0.2.tar.xz"; locale = "nl"; arch = "linux-aarch64"; - sha256 = "204d2c058a52b73ede48ed528050fdaeb07ca37ff38141f5b0a01d3501059ad4"; + sha256 = "9bc817e177bdd33028a809136ee296f41bc98b7469950e877d1f56eca52a79b0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/nn-NO/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/nn-NO/firefox-136.0.2.tar.xz"; locale = "nn-NO"; arch = "linux-aarch64"; - sha256 = "fdae7edf2bc7671c21ac78a0d4494c10352ee02212a407cac66537e94f571469"; + sha256 = "1f609a6e4ce54ce3fa2d2b70c7673f0ecf53b6a21b7397437ef960f0f4153dbd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/oc/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/oc/firefox-136.0.2.tar.xz"; locale = "oc"; arch = "linux-aarch64"; - sha256 = "3f2c9846556bc95fb5a8d1835e40c0be63fcfee0a6d711e45aa3b61393af7756"; + sha256 = "29a64fdc4c39b66da1fcf067ef4d7fa60557833495a50ca3322aca5fdf6c6ca5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/pa-IN/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/pa-IN/firefox-136.0.2.tar.xz"; locale = "pa-IN"; arch = "linux-aarch64"; - sha256 = "4d8891daa1bf503378a9531b793d2056538dc51e7ea62bf92dd39817ce8a7215"; + sha256 = "9675786908810248b689952f12d3ce721ac56a63fb33a746dc977034013f9e48"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/pl/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/pl/firefox-136.0.2.tar.xz"; locale = "pl"; arch = "linux-aarch64"; - sha256 = "0c1e6663e3d0a62511c9791fb619b30e0ccdcac3ed67dd86a196911d34c69ec0"; + sha256 = "64c7644e70b91fe5da1251edbf032a0fc62606e74369158868ab7a731c399c81"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/pt-BR/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/pt-BR/firefox-136.0.2.tar.xz"; locale = "pt-BR"; arch = "linux-aarch64"; - sha256 = "7c792b10f7d066cc70bc144152414a2d23565a4c54eb278589562d30a4e6298d"; + sha256 = "c8e4e305f0eb409c6e42431ef70d140aee5867125c274fe4e87fa9c2d5a65178"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/pt-PT/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/pt-PT/firefox-136.0.2.tar.xz"; locale = "pt-PT"; arch = "linux-aarch64"; - sha256 = "e76fc175e4b75c01d06f5504e85034b061ecb45dc14f0de0929153e34323bcef"; + sha256 = "1444353c52e398b7ff603c79d55708b3401327358dacdd96d9a5a76c25608098"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/rm/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/rm/firefox-136.0.2.tar.xz"; locale = "rm"; arch = "linux-aarch64"; - sha256 = "a659bac3656d409157d2163ef0abe554975d740e3b6cda06b0032d7dd9c351de"; + sha256 = "f2612a53e306aeebf3d94722508af00da728088f63d6ed8e830692d6276aa278"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/ro/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/ro/firefox-136.0.2.tar.xz"; locale = "ro"; arch = "linux-aarch64"; - sha256 = "f8638748eb648cef9a50d90fb5e35fee04eabd198cad9047007b449b49983a65"; + sha256 = "011e7cd4adc056ce799c2363526740811453397b418ad380c5bbedd9fa1c8f98"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/ru/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/ru/firefox-136.0.2.tar.xz"; locale = "ru"; arch = "linux-aarch64"; - sha256 = "4b7248d191dd85b96f053f782414883c11aea38957253f34c115fbf60f297b95"; + sha256 = "9f1fc61bee2ae2270bc0154f4a4e54d341c2cadaa33d78cfacfb64483bb557c3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/sat/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/sat/firefox-136.0.2.tar.xz"; locale = "sat"; arch = "linux-aarch64"; - sha256 = "d780642171cf57fa7c4916a5d144c3f03d5b51148a2f4115269444078b3444a1"; + sha256 = "2d8616eb6fe7b95d047add947e7f929bffd8a71705ec2336fa370ff98ce1c714"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/sc/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/sc/firefox-136.0.2.tar.xz"; locale = "sc"; arch = "linux-aarch64"; - sha256 = "cbb632aadb89aa1759924f2430355d94e8466463d2a2203d77b4c9fa55601e35"; + sha256 = "c9ef8e338962b62045c28d22c654347f68d01c2a810efa1a7f847cd0a3ddebe3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/sco/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/sco/firefox-136.0.2.tar.xz"; locale = "sco"; arch = "linux-aarch64"; - sha256 = "5f6d0969547fd4fe81b95315afe34f4a9049d38154a839f2259bcf6c1a48ea84"; + sha256 = "ef74fbd5d0a1216daa3c1b716340e65faedbe2fc00ba91314c1d2a873722ea0f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/si/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/si/firefox-136.0.2.tar.xz"; locale = "si"; arch = "linux-aarch64"; - sha256 = "b17d000de11897a9544da7d2a6ff8b91fd42ac1699a8ea59a78c0693363e0427"; + sha256 = "7e1d8ac9bd8b3901493f509b70bd4b3f90dd59ce314a1465907070d5186b1b6c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/sk/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/sk/firefox-136.0.2.tar.xz"; locale = "sk"; arch = "linux-aarch64"; - sha256 = "a6ee42e4b849395e1b26cfce8c352b6d45ace925c316861f2f84eddb7c634079"; + sha256 = "30643756e313734c6f55c0d0d9a7ad4f425e0587c834ea0e36f2e25e98d676a8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/skr/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/skr/firefox-136.0.2.tar.xz"; locale = "skr"; arch = "linux-aarch64"; - sha256 = "d93c25ac8b48cb4b4d621c12d13cf6d8662a33f9c9aec35a052b2887bb586164"; + sha256 = "dc21c4301300e1a646293afb46a89e921644f1377c3afcc3c8e76032579f895b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/sl/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/sl/firefox-136.0.2.tar.xz"; locale = "sl"; arch = "linux-aarch64"; - sha256 = "2bd547d441eeb4231960012ede02ecfa5f8c777f1158dcd5710a2cb6d1059713"; + sha256 = "65b51f6919a9abdeb0a2bb15ec781219b79655632e31e544d7e0cd2d804e15cc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/son/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/son/firefox-136.0.2.tar.xz"; locale = "son"; arch = "linux-aarch64"; - sha256 = "881246a36b9ccaae7c39f351ba1997cb75f25e23e759487a728df75bf968b547"; + sha256 = "975bfbc4a449b6ab2cf38eda5b61ae2cd5f83ad2fc4fbe3e2a0ce8d94b0088f4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/sq/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/sq/firefox-136.0.2.tar.xz"; locale = "sq"; arch = "linux-aarch64"; - sha256 = "863aca42e16234cc98be20cb9605436ed6bde450a60b016e4f960bd2b7c9fd05"; + sha256 = "ddb767c6c8df3fa0ecfeb955b3d1ada1853943912e4ac671025d9570f4a3087a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/sr/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/sr/firefox-136.0.2.tar.xz"; locale = "sr"; arch = "linux-aarch64"; - sha256 = "66c27bf7dea87f46017cdcb17f1c862d8aada9acd5670d686eeddf0e8cc9cd18"; + sha256 = "9a6b0088300fcb53ac4f6af1a59926241d34490e259af292a78b259eca460783"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/sv-SE/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/sv-SE/firefox-136.0.2.tar.xz"; locale = "sv-SE"; arch = "linux-aarch64"; - sha256 = "84af91e933472ede4a68463870e38507921d0941a269691786a44feada85ac6c"; + sha256 = "84775e9829d3d4f694e356ca783e82f1fb618b59fb34fd3f01b44d6699aab4d3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/szl/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/szl/firefox-136.0.2.tar.xz"; locale = "szl"; arch = "linux-aarch64"; - sha256 = "a89115ad3214ae8fa1caaeb59f1d7014ed170d6c52dd45aeb983a4f8121ad895"; + sha256 = "e966b8028cfb7b0746cdc11eff9566f40dd259579c10b68ecf4e2c0ffd786250"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/ta/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/ta/firefox-136.0.2.tar.xz"; locale = "ta"; arch = "linux-aarch64"; - sha256 = "24563b35da7bec436e1f492059c7a14f6364a68c0162ba47ae03ada8674aeff2"; + sha256 = "aa6b39c7a6ab11653773b80bdda5c5a6513a4ef04e885beec6e6870a9ab0e2e2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/te/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/te/firefox-136.0.2.tar.xz"; locale = "te"; arch = "linux-aarch64"; - sha256 = "a07a85eed396ce9ec1074470518643a1986fcabe58d42905c96d8570d06c6081"; + sha256 = "838ee81db2391a8b918b7bb2dd553128376ee8826b39e40bafd87480bdafa38a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/tg/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/tg/firefox-136.0.2.tar.xz"; locale = "tg"; arch = "linux-aarch64"; - sha256 = "e5759fe0ae3827ac18b1d6a327fcdc7ff0ee2f023247e2c2cfa334e0d7462ec6"; + sha256 = "c4d136fe2d950df2c3c36b11c8b68ccaa5f666ce5e0517482b4e708e399fd5fe"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/th/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/th/firefox-136.0.2.tar.xz"; locale = "th"; arch = "linux-aarch64"; - sha256 = "d64b05c3e1ebf697287f94e860358dba79651b029e1cea2b42451c6e604dda88"; + sha256 = "df1a9b6ade3b3a6e2a717c7cc74284373a684aaaa748d1000c52a9e4036885c6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/tl/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/tl/firefox-136.0.2.tar.xz"; locale = "tl"; arch = "linux-aarch64"; - sha256 = "0696c94e74567617042c523a42e6964d209bca913f440dbd814c54d4dc625cfd"; + sha256 = "01c08883760c8dc56273ab29610be1329d3ba22de2d4552a2728ab09dc19c07c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/tr/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/tr/firefox-136.0.2.tar.xz"; locale = "tr"; arch = "linux-aarch64"; - sha256 = "79284ec9aa9ab1b976d257eba0dcd6e2f36c4e066b8cc157fb964116a3634caa"; + sha256 = "42419179289c3a5cbd24f8f46ef29963f81eaf2a708236b6df2dadc0787392e3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/trs/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/trs/firefox-136.0.2.tar.xz"; locale = "trs"; arch = "linux-aarch64"; - sha256 = "124804f47889d8d1ea4e4746f17990668e2a1d8e38701869c821a488cc397650"; + sha256 = "451fad02e6a2ec384527eaef6024fb429042e4f90bd5ef38e178cc2c21ba70e2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/uk/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/uk/firefox-136.0.2.tar.xz"; locale = "uk"; arch = "linux-aarch64"; - sha256 = "06f929a14549247f56c8633df20dbea289ec2a49dadd40bb1ecd729292ee4ae2"; + sha256 = "8dab9ca3edc8008a8fdce74a66b7b9e98803993ac48bec6bff56d0ac994674f5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/ur/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/ur/firefox-136.0.2.tar.xz"; locale = "ur"; arch = "linux-aarch64"; - sha256 = "4674d668a28ef68577af0bf9c6a24ca7db3a709b11848fbbaa411c987516e9a4"; + sha256 = "b3b52682e696cd47929d4c2c49b2107fb2d25a5250fa2b6c06865c734bcb1ae9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/uz/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/uz/firefox-136.0.2.tar.xz"; locale = "uz"; arch = "linux-aarch64"; - sha256 = "3c97be4fe5e22659a403e3fe339dce18b4133e8dd3507aae0962584932a44857"; + sha256 = "66cc46bc1e1df5a22145db14828646bcfd117e7497ebfdc58bb9a0af349cf6a2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/vi/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/vi/firefox-136.0.2.tar.xz"; locale = "vi"; arch = "linux-aarch64"; - sha256 = "8bbc853eb15474f0fe2a0ab3eb92793d49cd7f30132782c296d7344e0af51e0e"; + sha256 = "4508aa7e8c186b48901a204f34901d88a8e1b40bf2dab180092426f95efb6e68"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/xh/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/xh/firefox-136.0.2.tar.xz"; locale = "xh"; arch = "linux-aarch64"; - sha256 = "b71ad8e1aafa4ad6e5e665e1394305ac084c7ef0bd991707c098238482d3c81f"; + sha256 = "8802ea5e7e8e21fd820d2879db493fe096a26d7cce30939e2457e5243246dbe7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/zh-CN/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/zh-CN/firefox-136.0.2.tar.xz"; locale = "zh-CN"; arch = "linux-aarch64"; - sha256 = "5a21c67ba41899442289c527e1f48cd9deee9f8a1e7f5911fe146e1d0bb48fa0"; + sha256 = "8cdcdaff9353e9207e7902310de6f2dc6c924569dbb59a8c3c9687045b01735a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/136.0.1/linux-aarch64/zh-TW/firefox-136.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/136.0.2/linux-aarch64/zh-TW/firefox-136.0.2.tar.xz"; locale = "zh-TW"; arch = "linux-aarch64"; - sha256 = "bc980b5254f1d42bcaff922f331cfa261dd79cefab799bcc69732965897beb6e"; + sha256 = "ca06618fbd10de2be0e37d61f17cc9c3ce70867d5655325ce1eebd420b806581"; } ]; } From f1dd162055037c6c1f3c9ce696dde5050e1e9cc4 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 16 Mar 2025 11:35:13 +0000 Subject: [PATCH 055/155] linuxKernel.kernels.linux_lqx: sync kernel settings with upstream package --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 47 ++++++++++++------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index ea3bf835b8a0..94060bf4f2f2 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -8,7 +8,11 @@ }@args: let - # comments with variant added for update script + # Default priority is 100 for common kernel options (see common-config.nix + # file), we need something lower to override them, but we still want users to + # override options if they need using lib.mkForce (that has 50 priority) + mkKernelOverride = lib.mkOverride 90; + # Comments with variant added for update script variants = { # ./update-zen.py zen zen = { @@ -49,7 +53,7 @@ let # This is based on the following sources: # - zen: https://gitlab.archlinux.org/archlinux/packaging/packages/linux-zen/-/blob/main/config - # - lqx: https://github.com/damentz/liquorix-package/blob/6.8/master/linux-liquorix/debian/config/kernelarch-x86/config-arch-64 + # - lqx: https://github.com/damentz/liquorix-package/blob/6.13/master/linux-liquorix/debian/config/kernelarch-x86/config-arch-64 # - Liquorix features: https://liquorix.net/ # The list below is not exhaustive, so the kernels probably doesn't match # the upstream, but should bring most of the improvements that will be @@ -65,8 +69,8 @@ let DEFAULT_FQ_CODEL = yes; # Preempt (low-latency) - PREEMPT = lib.mkOverride 60 yes; - PREEMPT_VOLUNTARY = lib.mkOverride 60 no; + PREEMPT = mkKernelOverride yes; + PREEMPT_VOLUNTARY = mkKernelOverride no; # Preemptible tree-based hierarchical RCU TREE_RCU = yes; @@ -88,7 +92,7 @@ let RCU_DOUBLE_CHECK_CB_TIME = yes; # BFQ I/O scheduler - IOSCHED_BFQ = lib.mkOverride 60 yes; + IOSCHED_BFQ = mkKernelOverride yes; # Futex WAIT_MULTIPLE implementation for Wine / Proton Fsync. FUTEX = yes; @@ -103,6 +107,10 @@ let } // lib.optionalAttrs (isLqx) { + # https://github.com/damentz/liquorix-package/commit/07b176edc002f2a7825ae181613e1f79a3650fd2 + CMDLINE_BOOL = yes; + CMDLINE = freeform "audit=0 intel_pstate=disable amd_pstate=disable "; + # Google's BBRv3 TCP congestion Control TCP_CONG_BBR = yes; DEFAULT_BBR = yes; @@ -113,21 +121,28 @@ let # https://github.com/damentz/liquorix-package/commit/a7055b936c0f4edb8f6afd5263fe1d2f8a5cd877 RCU_BOOST = no; - RCU_LAZY = lib.mkOverride 60 no; + RCU_LAZY = mkKernelOverride no; # Swap storage is compressed with LZ4 using zswap - ZSWAP_COMPRESSOR_DEFAULT_LZ4 = lib.mkOptionDefault yes; - ZSWAP_COMPRESSOR_DEFAULT_ZSTD = lib.mkDefault no; + ZSWAP_COMPRESSOR_DEFAULT_LZ4 = yes; + ZSWAP_COMPRESSOR_DEFAULT_ZSTD = mkKernelOverride no; + + # https://github.com/damentz/liquorix-package/commit/3a82381a4db3452599e2b2a607046a379c72ad27 + SLAB_BUCKETS = mkKernelOverride (option no); + # https://github.com/damentz/liquorix-package/commit/ca7efe07abd478f3f4cbe0725a3383fd235aa5be + ENERGY_MODE = mkKernelOverride (option no); + # https://github.com/damentz/liquorix-package/commit/fdc93f5633d22c26f0994fba751a26de0cb51a17 + WQ_POWER_EFFICIENT_DEFAULT = mkKernelOverride (option no); # Fix error: unused option: XXX. - CFS_BANDWIDTH = lib.mkForce (option no); - PSI = lib.mkForce (option no); - RT_GROUP_SCHED = lib.mkForce (option no); - SCHED_AUTOGROUP = lib.mkForce (option no); - SCHED_CLASS_EXT = lib.mkForce (option no); - SCHED_CORE = lib.mkForce (option no); - UCLAMP_TASK = lib.mkForce (option no); - UCLAMP_TASK_GROUP = lib.mkForce (option no); + CFS_BANDWIDTH = mkKernelOverride (option no); + PSI = mkKernelOverride (option no); + RT_GROUP_SCHED = mkKernelOverride (option no); + SCHED_AUTOGROUP = mkKernelOverride (option no); + SCHED_CLASS_EXT = mkKernelOverride (option no); + SCHED_CORE = mkKernelOverride (option no); + UCLAMP_TASK = mkKernelOverride (option no); + UCLAMP_TASK_GROUP = mkKernelOverride (option no); }; passthru.updateScript = [ From 0cbe02b3385dbcbbf5c16942ee6d2d1391f65d80 Mon Sep 17 00:00:00 2001 From: qbisi Date: Fri, 14 Mar 2025 03:45:40 +0800 Subject: [PATCH 056/155] petsc: do not install examples by default Petsc examples take up 58M and can be found in source code. Thus we do not ship petsc with examples by default. --- pkgs/by-name/pe/petsc/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index c3a642e0656c..70a0e5e76970 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -19,6 +19,7 @@ petsc-precision ? "double", mpiSupport ? true, withPetsc4py ? false, # petsc python binding + withExamples ? false, withFullDeps ? false, # full External libraries support # External libraries options @@ -165,6 +166,8 @@ stdenv.mkDerivation rec { configureScript = "python ./configure"; + installTargets = [ (if withExamples then "install" else "install-lib") ]; + enableParallelBuilding = true; # This is needed as the checks need to compile and link the test cases with From e1b955a3a7a63369acc5be25ba3c63c5205857ed Mon Sep 17 00:00:00 2001 From: qbisi Date: Fri, 14 Mar 2025 07:26:26 +0800 Subject: [PATCH 057/155] petsc: remove redundant configureScript shebang in configure script is auto patched --- pkgs/by-name/pe/petsc/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 70a0e5e76970..391de457d789 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -164,8 +164,6 @@ stdenv.mkDerivation rec { "fortify3" ]; - configureScript = "python ./configure"; - installTargets = [ (if withExamples then "install" else "install-lib") ]; enableParallelBuilding = true; From 75773b77be2c351a342003be002c6f0dc6401c48 Mon Sep 17 00:00:00 2001 From: Neyts Zupan Date: Mon, 17 Mar 2025 22:56:10 +0000 Subject: [PATCH 058/155] paretosecurity: init at 0.0.86, nixos/paretosecurity: init --- .../manual/release-notes/rl-2505.section.md | 2 + nixos/modules/module-list.nix | 1 + .../services/security/paretosecurity.nix | 43 ++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/paretosecurity.nix | 16 +++++ pkgs/by-name/pa/paretosecurity/package.nix | 68 +++++++++++++++++++ 6 files changed, 131 insertions(+) create mode 100644 nixos/modules/services/security/paretosecurity.nix create mode 100644 nixos/tests/paretosecurity.nix create mode 100644 pkgs/by-name/pa/paretosecurity/package.nix diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index c10179dd0d65..62253f4b84c5 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -198,6 +198,8 @@ - [Orthanc](https://orthanc.uclouvain.be/) a lightweight, RESTful DICOM server for healthcare and medical research. Available as [services.orthanc](#opt-services.orthanc.enable). +- [Pareto Security](https://paretosecurity.com/) is an alternative to corporate compliance solutions for companies that care about security but know it doesn't have to be invasive. Available as [services.paretosecurity](#opt-services.paretosecurity.enable) + ## Backward Incompatibilities {#sec-release-25.05-incompatibilities} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d062381889fb..4c7bed90e69d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1401,6 +1401,7 @@ ./services/security/oauth2-proxy.nix ./services/security/oauth2-proxy-nginx.nix ./services/security/opensnitch.nix + ./services/security/paretosecurity.nix ./services/security/pass-secret-service.nix ./services/security/physlock.nix ./services/security/shibboleth-sp.nix diff --git a/nixos/modules/services/security/paretosecurity.nix b/nixos/modules/services/security/paretosecurity.nix new file mode 100644 index 000000000000..66d5258b3880 --- /dev/null +++ b/nixos/modules/services/security/paretosecurity.nix @@ -0,0 +1,43 @@ +{ + config, + lib, + pkgs, + ... +}: +{ + + options.services.paretosecurity = { + enable = lib.mkEnableOption "[ParetoSecurity](https://paretosecurity.com) [agent](https://github.com/ParetoSecurity/agent) and its root helper"; + package = lib.mkPackageOption pkgs "paretosecurity" { }; + }; + + config = lib.mkIf config.services.paretosecurity.enable { + environment.systemPackages = [ config.services.paretosecurity.package ]; + + systemd.sockets."paretosecurity" = { + wantedBy = [ "sockets.target" ]; + socketConfig = { + ListenStream = "/var/run/paretosecurity.sock"; + SocketMode = "0666"; + }; + }; + + systemd.services."paretosecurity" = { + serviceConfig = { + ExecStart = "${config.services.paretosecurity.package}/bin/paretosecurity helper"; + User = "root"; + Group = "root"; + StandardInput = "socket"; + Type = "oneshot"; + RemainAfterExit = "no"; + StartLimitInterval = "1s"; + StartLimitBurst = 100; + ProtectSystem = "full"; + ProtectHome = true; + StandardOutput = "journal"; + StandardError = "journal"; + }; + }; + + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 94656b9fe0b0..83bd0c45c6f7 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -895,6 +895,7 @@ in { pam-u2f = handleTest ./pam/pam-u2f.nix {}; pam-ussh = handleTest ./pam/pam-ussh.nix {}; pam-zfs-key = handleTest ./pam/zfs-key.nix {}; + paretosecurity = runTest ./paretosecurity.nix; pass-secret-service = handleTest ./pass-secret-service.nix {}; patroni = handleTestOn ["x86_64-linux"] ./patroni.nix {}; pantalaimon = handleTest ./matrix/pantalaimon.nix {}; diff --git a/nixos/tests/paretosecurity.nix b/nixos/tests/paretosecurity.nix new file mode 100644 index 000000000000..239ec1eff86d --- /dev/null +++ b/nixos/tests/paretosecurity.nix @@ -0,0 +1,16 @@ +{ lib, ... }: +{ + name = "paretosecurity"; + meta.maintainers = [ lib.maintainers.zupo ]; + + nodes.machine = + { config, pkgs, ... }: + { + services.paretosecurity.enable = true; + }; + + # very basic test for now, need to add output asserts + testScript = '' + machine.wait_until_succeeds("paretosecurity check") + ''; +} diff --git a/pkgs/by-name/pa/paretosecurity/package.nix b/pkgs/by-name/pa/paretosecurity/package.nix new file mode 100644 index 000000000000..95aa97478311 --- /dev/null +++ b/pkgs/by-name/pa/paretosecurity/package.nix @@ -0,0 +1,68 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + testers, + paretosecurity, + nixosTests, +}: + +buildGoModule rec { + pname = "paretosecurity"; + version = "0.0.86"; + + src = fetchFromGitHub { + owner = "ParetoSecurity"; + repo = "agent"; + rev = version; + hash = "sha256-ASWECYUfG+lmkvAwQf05mCUwwFlUrx3vI0pYbGHdbuI="; + }; + + # tests do network access, fix pending + doCheck = false; + + vendorHash = "sha256-eqwrCbDKmXOCo0+X8w6Me2aaCQ3WQljgOtzqI01FzbU="; + proxyVendor = true; + + subPackages = [ + "cmd/paretosecurity" + ]; + + ldflags = [ + "-s" + "-X=github.com/ParetoSecurity/agent/shared.Version=${version}" + "-X=github.com/ParetoSecurity/agent/shared.Commit=${src.rev}" + "-X=github.com/ParetoSecurity/agent/shared.Date=1970-01-01T00:00:00Z" + ]; + + passthru.tests = { + version = testers.testVersion { + version = "${version}"; + package = paretosecurity; + }; + integration_test = nixosTests.paretosecurity; + }; + + meta = { + description = "Pareto Security agent makes sure your laptop is correctly configured for security."; + longDescription = '' + The Pareto Security agent is a free and open source app to help you make + sure that your laptop is configured for security. + + By default, it's a CLI command that prints out a report on basic security + settings such as if you have disk encryption and firewall enabled. + + If you use the `services.paretosecurity` NixOS module, you also get a + root helper, so that you can run the checker in userspace. Some checks + require root permissions, and the checker asks the helper to run those. + + Additionally, you can run `paretosecurity link` to configure the agent + to send the status of checks to https://dash.paretosecurity.com to make + compliance people happy. No sending happens until your device is linked. + ''; + homepage = "https://github.com/ParetoSecurity/agent"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ zupo ]; + mainProgram = "paretosecurity"; + }; +} From 1bf0add4540a3062d9e53672de0ed6e6f25417b7 Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Fri, 14 Mar 2025 09:13:12 -0400 Subject: [PATCH 059/155] guile-redis: init at 2.2.0 Signed-off-by: Ethan Carter Edwards --- pkgs/by-name/gu/guile-redis/package.nix | 42 +++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 pkgs/by-name/gu/guile-redis/package.nix diff --git a/pkgs/by-name/gu/guile-redis/package.nix b/pkgs/by-name/gu/guile-redis/package.nix new file mode 100644 index 000000000000..d99a78d797dc --- /dev/null +++ b/pkgs/by-name/gu/guile-redis/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + guile, + pkg-config, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "guile-redis"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "aconchillo"; + repo = "guile-redis"; + tag = finalAttrs.version; + hash = "sha256-0lObXRBn4yZi2S+MeesT1Z/vJWb907BHknA4hOQOYzE="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + guile + pkg-config + ]; + + buildInputs = [ guile ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Redis module for Guile"; + homepage = "https://github.com/aconchillo/guile-redis"; + changelog = "https://github.com/aconchillo/guile-redis/releases/tag/${finalAttrs.version}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ ethancedwards8 ]; + platforms = guile.meta.platforms; + }; +}) From c14d5036e0f7d91160367a7453ae29ff704ef713 Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Wed, 12 Mar 2025 22:41:24 -0400 Subject: [PATCH 060/155] zvm: init at 0.8.5 Signed-off-by: Ethan Carter Edwards --- pkgs/by-name/zv/zvm/package.nix | 38 +++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pkgs/by-name/zv/zvm/package.nix diff --git a/pkgs/by-name/zv/zvm/package.nix b/pkgs/by-name/zv/zvm/package.nix new file mode 100644 index 000000000000..33ea16261403 --- /dev/null +++ b/pkgs/by-name/zv/zvm/package.nix @@ -0,0 +1,38 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +buildGoModule rec { + pname = "zvm"; + version = "0.8.5"; + + src = fetchFromGitHub { + owner = "tristanisham"; + repo = "zvm"; + tag = "v${version}"; + hash = "sha256-1m/sNthkT2+qOMGLqXFtoY2F7aFeq5xzENFIEXhp+Z8="; + }; + + vendorHash = "sha256-QiE+aqiesygClFvdjIlyaRiC1I3qybCPuMxt/3HQUyA="; + + doInstallCheck = true; + versionCheckProgramArg = "--version"; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://www.zvm.app/"; + downloadPage = "https://github.com/tristanisham/zvm"; + changelog = "https://github.com/tristanisham/zvm/releases/tag/v${version}"; + description = "Tool to manage and use different Zig versions"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ethancedwards8 ]; + platforms = lib.platforms.unix; + mainProgram = "zvm"; + }; +} From 020a8e76b14720a37f34fc8dea090308601a274a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Mar 2025 11:49:24 +0000 Subject: [PATCH 061/155] python312Packages.google-genai: 1.5.0 -> 1.6.0 --- pkgs/development/python-modules/google-genai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-genai/default.nix b/pkgs/development/python-modules/google-genai/default.nix index ff0bb2113fdf..94cdd4843467 100644 --- a/pkgs/development/python-modules/google-genai/default.nix +++ b/pkgs/development/python-modules/google-genai/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-genai"; - version = "1.5.0"; + version = "1.6.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "python-genai"; tag = "v${version}"; - hash = "sha256-kw4RUcI8ARgVXsyqyo6jysjVn35yAs9//fv60PaOrXI="; + hash = "sha256-HXLo4dmlZNXXXpchO5sRlBzzQBU4cFS5qDpka2NdLTM="; }; build-system = [ setuptools ]; From 2b77c05accc2c754396e8f334272b7760ab2a38a Mon Sep 17 00:00:00 2001 From: Dionysis Grigoropoulos Date: Thu, 6 Mar 2025 15:02:21 +0200 Subject: [PATCH 062/155] python3Packages.llm-ollama: 0.8.2 -> 0.9.1 Diff: https://github.com/taketwo/llm-ollama/compare/0.8.2...0.9.1 Changelog: https://github.com/taketwo/llm-ollama/releases/tag/0.9.1 Also add pytest-asyncio so we don't have to disable tests. --- .../python-modules/llm-ollama/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/llm-ollama/default.nix b/pkgs/development/python-modules/llm-ollama/default.nix index aebebd7543af..6c255aa76c55 100644 --- a/pkgs/development/python-modules/llm-ollama/default.nix +++ b/pkgs/development/python-modules/llm-ollama/default.nix @@ -15,18 +15,20 @@ # tests pytestCheckHook, + pytest-asyncio, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "llm-ollama"; - version = "0.8.2"; + version = "0.9.1"; pyproject = true; src = fetchFromGitHub { owner = "taketwo"; repo = "llm-ollama"; tag = version; - hash = "sha256-/WAugfkI4izIQ7PoKM9epd/4vFxYPvsiwDbEqqTdMq4="; + hash = "sha256-NAJ0tfGRQOxYVAi2X0AI2d9+wyUS3ro1bfMSViZjaR0="; }; build-system = [ @@ -43,14 +45,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ]; - - # These tests try to access the filesystem and fail - disabledTests = [ - "test_registered_model" - "test_registered_chat_models" - "test_registered_embedding_models" - "test_registered_models_when_ollama_is_down" + pytest-asyncio + writableTmpDirAsHomeHook ]; pythonImportsCheck = [ From 902559691f5b6a3105c727c6c2e1ccc2a66f8657 Mon Sep 17 00:00:00 2001 From: gs-101 <172639817+gs-101@users.noreply.github.com> Date: Tue, 18 Mar 2025 09:39:20 -0300 Subject: [PATCH 063/155] zotero: 7.0.11 -> 7.0.15 --- pkgs/by-name/zo/zotero/darwin.nix | 2 +- pkgs/by-name/zo/zotero/linux.nix | 2 +- pkgs/by-name/zo/zotero/package.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zo/zotero/darwin.nix b/pkgs/by-name/zo/zotero/darwin.nix index adfc8329a160..b6750168b529 100644 --- a/pkgs/by-name/zo/zotero/darwin.nix +++ b/pkgs/by-name/zo/zotero/darwin.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}.dmg"; - hash = "sha256-JFzzOwZUhVy7DsD6xehKhhzIKe9j8IKseJTSWhYAkfM="; + hash = "sha256-BAjf43+vihKMTtdEH32S+xLinXxbZh/wSno70U+Q2vs="; }; sourceRoot = "."; diff --git a/pkgs/by-name/zo/zotero/linux.nix b/pkgs/by-name/zo/zotero/linux.nix index 88e572a1077d..b82dd88bb6b3 100644 --- a/pkgs/by-name/zo/zotero/linux.nix +++ b/pkgs/by-name/zo/zotero/linux.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - hash = "sha256-Sldg4sR+wG0XH00mCcns5cyfYzNg7RQP4v95VNM6Ru4="; + hash = "sha256-0WqKyiNWLAJeB+J0Uk+/fMEiX2f2B1sZWOyJbutFI78="; }; dontPatchELF = true; diff --git a/pkgs/by-name/zo/zotero/package.nix b/pkgs/by-name/zo/zotero/package.nix index 4ae080c7a921..b69bac596935 100644 --- a/pkgs/by-name/zo/zotero/package.nix +++ b/pkgs/by-name/zo/zotero/package.nix @@ -6,7 +6,7 @@ let pname = "zotero"; - version = "7.0.11"; + version = "7.0.15"; meta = { homepage = "https://www.zotero.org"; description = "Collect, organize, cite, and share your research sources"; From 84a09d48d8879efe86d9a0bd6625c8ec7db58e42 Mon Sep 17 00:00:00 2001 From: qbisi Date: Sun, 16 Mar 2025 22:32:22 +0800 Subject: [PATCH 064/155] python312packages.petsc4py: replace withPetsc4py with pythonSupport pythonSupport is more commonly used in toPythonModule --- pkgs/by-name/pe/petsc/package.nix | 8 ++++---- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 391de457d789..0d0ae9cf3cc3 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -18,7 +18,7 @@ petsc-scalar-type ? "real", petsc-precision ? "double", mpiSupport ? true, - withPetsc4py ? false, # petsc python binding + pythonSupport ? false, # petsc python binding withExamples ? false, withFullDeps ? false, # full External libraries support @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { pkg-config ] ++ lib.optional mpiSupport mpi - ++ lib.optionals withPetsc4py [ + ++ lib.optionals pythonSupport [ python3Packages.setuptools python3Packages.cython ]; @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { ++ lib.optional withScalapack scalapack ++ lib.optional withMumps mumps_par; - propagatedBuildInputs = lib.optional withPetsc4py python3Packages.numpy; + propagatedBuildInputs = lib.optional pythonSupport python3Packages.numpy; patches = [ (replaceVars ./fix-petsc4py-install-prefix.patch { @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { "--with-precision=${petsc-precision}" "--with-mpi=${if mpiSupport then "1" else "0"}" ] - ++ lib.optional withPetsc4py "--with-petsc4py=1" + ++ lib.optional pythonSupport "--with-petsc4py=1" ++ lib.optionals mpiSupport [ "--CC=mpicc" "--with-cxx=mpicxx" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 85ac3492daa4..216d02868456 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10504,7 +10504,7 @@ self: super: with self; { petsc4py = toPythonModule (pkgs.petsc.override { python3 = python; python3Packages = self; - withPetsc4py = true; + pythonSupport = true; withFullDeps = true; }); From 9ced50e8f818309947726371892d0e706e49fa3e Mon Sep 17 00:00:00 2001 From: qbisi Date: Tue, 18 Mar 2025 20:48:05 +0800 Subject: [PATCH 065/155] petsc: add pythonSupport to passthru attributes --- pkgs/by-name/pe/petsc/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 0d0ae9cf3cc3..c00d34d61006 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -177,7 +177,7 @@ stdenv.mkDerivation rec { nativeInstallCheckInputs = [ mpiCheckPhaseHook ]; passthru = { - inherit mpiSupport; + inherit mpiSupport pythonSupport; }; setupHook = ./setup-hook.sh; From 887ad07236743d90e008561b2771770ccf4caf53 Mon Sep 17 00:00:00 2001 From: qbisi Date: Sat, 15 Mar 2025 16:50:24 +0800 Subject: [PATCH 066/155] python312packages.petsc4py: do not build withFullDeps The `withFullDeps` flag was used to make petsc4py meet the requirements of downstream projects like Fenics and Firedrake. However, this flag breaks the build on other platforms if any external packages of PETSc fail. Therefore, I disabled this flag in petsc4py and made PETSc bundle some commonly used external packages by default. Users can still have a minimally featured PETSc by setting `withCommonDeps = false`. --- pkgs/by-name/pe/petsc/package.nix | 10 ++++++---- pkgs/top-level/python-packages.nix | 1 - 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index c00d34d61006..69833766c963 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -21,13 +21,14 @@ pythonSupport ? false, # petsc python binding withExamples ? false, withFullDeps ? false, # full External libraries support + withCommonDeps ? true, # common External libraries support # External libraries options - withHdf5 ? true, - withMetis ? withFullDeps, - withParmetis ? false, # parmetis is unfree and should be enabled manualy - withPtscotch ? withFullDeps, + withHdf5 ? withCommonDeps, + withMetis ? withCommonDeps, withScalapack ? withFullDeps, + withParmetis ? withFullDeps, # parmetis is unfree + withPtscotch ? withFullDeps, withMumps ? withFullDeps, withP4est ? withFullDeps, @@ -41,6 +42,7 @@ pkg-config, p4est, }: +assert withFullDeps -> withCommonDeps; # This version of PETSc does not support a non-MPI p4est build assert withP4est -> (p4est.mpiSupport && mpiSupport); diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 216d02868456..6b6971212507 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10505,7 +10505,6 @@ self: super: with self; { python3 = python; python3Packages = self; pythonSupport = true; - withFullDeps = true; }); pex = callPackage ../development/python-modules/pex { }; From 9aa034835b3f711f3c9e65402ac58f832e11219f Mon Sep 17 00:00:00 2001 From: qbisi Date: Sun, 16 Mar 2025 22:43:44 +0800 Subject: [PATCH 067/155] petsc: remove unneccessary substitue of install_name_tool This substitueInplace was an old patch and will fail if use --replace-fail. --- pkgs/by-name/pe/petsc/package.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 69833766c963..cb9470b47428 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchzip, - cctools, gfortran, replaceVars, python3, @@ -98,14 +97,9 @@ stdenv.mkDerivation rec { }) ]; - postPatch = - '' - patchShebangs ./lib/petsc/bin - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace config/install.py \ - --replace /usr/bin/install_name_tool ${cctools}/bin/install_name_tool - ''; + postPatch = '' + patchShebangs ./lib/petsc/bin + ''; configureFlags = [ From e3b2cfa523cf588edf83459b23d62af8b3f1c845 Mon Sep 17 00:00:00 2001 From: qbisi Date: Tue, 18 Mar 2025 19:20:29 +0800 Subject: [PATCH 068/155] petsc: patch shebang in template string of example_template.py This patch does not fix the shebang at the begining of the example_template.py file. It only replaces the shebang in the template string of that file. --- pkgs/by-name/pe/petsc/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index cb9470b47428..8e0abca000e2 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -11,6 +11,7 @@ zlib, # propagated by p4est but required by petsc mpi, # generic mpi dependency mpiCheckPhaseHook, + bash, # Build options petsc-optimized ? true, @@ -99,6 +100,9 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs ./lib/petsc/bin + + substituteInPlace config/example_template.py \ + --replace-fail "/usr/bin/env bash" "${bash}/bin/bash" ''; configureFlags = From c47cf8cca0dde145b9e5e45050b2667107eef03e Mon Sep 17 00:00:00 2001 From: qbisi Date: Sun, 16 Mar 2025 03:27:26 +0800 Subject: [PATCH 069/155] petsc: fix and add python related tests --- pkgs/by-name/pe/petsc/package.nix | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 8e0abca000e2..9e169fa48436 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -174,7 +174,28 @@ stdenv.mkDerivation rec { # the library is installed and available. doInstallCheck = true; installCheckTarget = "check_install"; - nativeInstallCheckInputs = [ mpiCheckPhaseHook ]; + + # The PETSC4PY=no flag disables the ex100 test, + # which compiles C code to load Python modules for solving a math problem. + # This test fails on the Darwin platform but is rarely a common use case for petsc4py. + installCheckFlags = lib.optional stdenv.hostPlatform.isDarwin "PETSC4PY=no"; + + nativeInstallCheckInputs = + [ + mpiCheckPhaseHook + ] + ++ lib.optionals pythonSupport [ + python3Packages.pythonImportsCheckHook + python3Packages.unittestCheckHook + ]; + + unittestFlagsArray = [ + "-s" + "src/binding/petsc4py/test" + "-v" + ]; + + pythonImportsCheck = [ "petsc4py" ]; passthru = { inherit mpiSupport pythonSupport; From 1cde35aa8fd67e82ab67d9e96882b87cca426c18 Mon Sep 17 00:00:00 2001 From: qbisi Date: Tue, 18 Mar 2025 19:49:55 +0800 Subject: [PATCH 070/155] petsc: add meta.platforms --- pkgs/by-name/pe/petsc/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 9e169fa48436..d31359143af8 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -207,6 +207,7 @@ stdenv.mkDerivation rec { description = "Portable Extensible Toolkit for Scientific computation"; homepage = "https://petsc.org/release/"; license = licenses.bsd2; + platforms = lib.platforms.unix; maintainers = with maintainers; [ cburstedde qbisi From 05f78eb5853059125594d9f3655c8458ef0ddd8b Mon Sep 17 00:00:00 2001 From: qbisi Date: Sat, 15 Mar 2025 16:47:20 +0800 Subject: [PATCH 071/155] sowing: init at 1.1.26.12 --- pkgs/by-name/so/sowing/package.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 pkgs/by-name/so/sowing/package.nix diff --git a/pkgs/by-name/so/sowing/package.nix b/pkgs/by-name/so/sowing/package.nix new file mode 100644 index 000000000000..a81fc9fdc654 --- /dev/null +++ b/pkgs/by-name/so/sowing/package.nix @@ -0,0 +1,25 @@ +{ + lib, + stdenv, + fetchFromBitbucket, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "sowing"; + version = "1.1.26.12"; + + src = fetchFromBitbucket { + owner = "petsc"; + repo = "pkg-sowing"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ol0xNAnL7ULU1CiGCFZrV37IAV4z1bcWa0f+tuMhQC8="; + }; + + meta = { + description = "Tools for documenting and improving portability"; + homepage = "https://wgropp.cs.illinois.edu/projects/software/sowing/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ qbisi ]; + platforms = lib.platforms.unix; + }; +}) From faab78f8d71622c85f0d72dbcf0bd58ab9e7c3b0 Mon Sep 17 00:00:00 2001 From: qbisi Date: Sat, 15 Mar 2025 16:47:45 +0800 Subject: [PATCH 072/155] slepc: init at 3.22.2 --- pkgs/by-name/sl/slepc/package.nix | 119 ++++++++++++++++++++++++++++ pkgs/by-name/sl/slepc/setup-hook.sh | 1 + pkgs/top-level/python-packages.nix | 7 ++ 3 files changed, 127 insertions(+) create mode 100644 pkgs/by-name/sl/slepc/package.nix create mode 100644 pkgs/by-name/sl/slepc/setup-hook.sh diff --git a/pkgs/by-name/sl/slepc/package.nix b/pkgs/by-name/sl/slepc/package.nix new file mode 100644 index 000000000000..371cd1d15805 --- /dev/null +++ b/pkgs/by-name/sl/slepc/package.nix @@ -0,0 +1,119 @@ +{ + lib, + stdenv, + fetchFromGitLab, + sowing, + python3, + python3Packages, + arpack-mpi, + petsc, + mpi, + mpiCheckPhaseHook, + pythonSupport ? false, + withExamples ? false, + withArpack ? stdenv.hostPlatform.isLinux, +}: +assert petsc.mpiSupport; +assert pythonSupport -> petsc.pythonSupport; +stdenv.mkDerivation (finalAttrs: { + pname = "slepc"; + version = "3.22.2"; + + src = fetchFromGitLab { + owner = "slepc"; + repo = "slepc"; + tag = "v${finalAttrs.version}"; + hash = "sha256-a5DmsA7NAlhrEaS43TYPk7vtDfhXLEP+5sftu2A9Yt4="; + }; + + postPatch = '' + # Fix slepc4py install prefix + substituteInPlace config/packages/slepc4py.py \ + --replace-fail "slepc.prefixdir,'lib'" \ + "slepc.prefixdir,'${python3.sitePackages}'" + + patchShebangs lib/slepc/bin + + # Use system bfort + substituteInPlace config/packages/sowing.py \ + --replace-fail "bfort = os.path.join(archdir,'bin','bfort')" \ + "bfort = '${sowing}/bin/bfort'" + ''; + + # Usually this project is being built as part of a `petsc` build or as part of + # other projects, e.g when `petsc` is `./configure`d with + # `--download-slepc=1`. This instructs the slepc to be built as a standalone + # project. + preConfigure = '' + export SLEPC_DIR=$PWD + ''; + + nativeBuildInputs = + [ + python3 + ] + ++ lib.optionals pythonSupport [ + python3Packages.setuptools + python3Packages.cython + ]; + + configureFlags = + lib.optionals withArpack [ + "--with-arpack=1" + ] + ++ lib.optionals pythonSupport [ + "--with-slepc4py=1" + ]; + + buildInputs = + [ + mpi + ] + ++ lib.optionals withArpack [ + arpack-mpi + ]; + + propagatedBuildInputs = [ + petsc + ]; + + enableParallelBuilding = true; + + installTargets = [ (if withExamples then "install" else "install-lib") ]; + + nativeInstallCheckInputs = + [ + mpiCheckPhaseHook + ] + ++ lib.optionals pythonSupport [ + python3Packages.pythonImportsCheckHook + python3Packages.unittestCheckHook + ]; + + doInstallCheck = true; + + installCheckTarget = [ "check_install" ]; + + unittestFlagsArray = [ + "-s" + "src/binding/slepc4py/test" + "-v" + ]; + + pythonImportsCheck = [ "slepc4py" ]; + + shellHook = ./setup-hook.sh; + + meta = { + description = "Scalable Library for Eigenvalue Problem Computations"; + homepage = "https://slepc.upv.es"; + changelog = "https://gitlab.com/slepc/slepc/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = with lib.licenses; [ + bsd2 + ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ qbisi ]; + # Possible error running Fortran src/eps/tests/test7f with 1 MPI process + broken = stdenv.hostPlatform.isDarwin && withArpack; + }; +}) diff --git a/pkgs/by-name/sl/slepc/setup-hook.sh b/pkgs/by-name/sl/slepc/setup-hook.sh new file mode 100644 index 000000000000..838c82aaeee9 --- /dev/null +++ b/pkgs/by-name/sl/slepc/setup-hook.sh @@ -0,0 +1 @@ +export SLEPC_DIR=@out@ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6b6971212507..fc41fd196b00 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15350,6 +15350,13 @@ self: super: with self; { sleepyq = callPackage ../development/python-modules/sleepyq { }; + slepc4py = toPythonModule (pkgs.slepc.override { + pythonSupport = true; + python3 = self.python; + python3Packages = self; + petsc = petsc4py; + }); + sleqp = toPythonModule (pkgs.sleqp.override { pythonSupport = true; python3Packages = self; }); slicedimage = callPackage ../development/python-modules/slicedimage { }; From 3bc94ea6c4668f4fd9e1244c2666a3713b0fc474 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Mar 2025 13:08:04 +0000 Subject: [PATCH 073/155] proj: 9.5.1 -> 9.6.0 --- pkgs/development/libraries/proj/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index e9a9caff159f..42da509dce8b 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "proj"; - version = "9.5.1"; + version = "9.6.0"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; rev = finalAttrs.version; - hash = "sha256-gKfsuznAhq29sOw78gpQ7TNZ6xCgmDBad3TcqFzoWVc="; + hash = "sha256-sY3AIvsQnV2zi38nJs/U6zTsIgIv4/CaZaxinCg5nEs="; }; patches = [ From 27dfabde2abcc5e41cfc192718a8697646f824cc Mon Sep 17 00:00:00 2001 From: charain Date: Sun, 16 Mar 2025 11:24:26 +0800 Subject: [PATCH 074/155] sdl3-ttf: init at 3.2.0 Co-authored-by: Qiming Chu Co-authored-by: Anillc --- pkgs/by-name/sd/sdl3-ttf/package.nix | 76 ++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 pkgs/by-name/sd/sdl3-ttf/package.nix diff --git a/pkgs/by-name/sd/sdl3-ttf/package.nix b/pkgs/by-name/sd/sdl3-ttf/package.nix new file mode 100644 index 000000000000..917ac3c13753 --- /dev/null +++ b/pkgs/by-name/sd/sdl3-ttf/package.nix @@ -0,0 +1,76 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + nix-update-script, + testers, + validatePkgConfig, + sdl3, + cmake, + freetype, + harfbuzz, + glib, + ninja, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "sdl3-ttf"; + version = "3.2.0"; + + src = fetchFromGitHub { + owner = "libsdl-org"; + repo = "SDL_ttf"; + tag = "release-${finalAttrs.version}"; + hash = "sha256-eq7yWw7PWIeXWjuNHaQUiV+x0qng4FJNscsYRALK40I="; + }; + + # fix CMake path handling (remove on next update) + patches = [ + (fetchpatch { + url = "https://github.com/libsdl-org/SDL_ttf/commit/ad2ffa825d4535ddfb57861a7e33dff4a9bc6a94.patch?full_index=1"; + hash = "sha256-emf7UnfB6Rl1+R74lsoIvm9ezDZtjHUS/t4k/RxbaYg="; + }) + ]; + + strictDeps = true; + doCheck = true; + + nativeBuildInputs = [ + cmake + ninja + validatePkgConfig + ]; + + buildInputs = [ + sdl3 + freetype + harfbuzz + glib + ]; + + cmakeFlags = [ + (lib.cmakeBool "SDLTTF_STRICT" true) + (lib.cmakeBool "SDLTTF_HARFBUZZ" true) + # disable plutosvg (not in nixpkgs) + (lib.cmakeBool "SDLTTF_PLUTOSVG" false) + ]; + + passthru = { + updateScript = nix-update-script { }; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = { + description = "SDL TrueType font library"; + homepage = "https://github.com/libsdl-org/SDL_ttf"; + changelog = "https://github.com/libsdl-org/SDL_ttf/releases/tag/${toString finalAttrs.src.tag}"; + license = lib.licenses.zlib; + maintainers = with lib.maintainers; [ + charain + Emin017 + ]; + pkgConfigModules = [ "sdl3-ttf" ]; + platforms = lib.platforms.all; + }; +}) From 452589dc4bda5e2e7bdef11ffd69b46b7f8ad0bc Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Sun, 16 Mar 2025 13:49:13 +0100 Subject: [PATCH 075/155] gdal: fix tests for PROJ 9.6.0 --- pkgs/development/libraries/gdal/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 7b218e3fb41d..86521085307a 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -99,6 +99,12 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/OSGeo/gdal/commit/e873236abfb7885d0b987934041c6b61f6aea5d0.patch"; hash = "sha256-iThP8Dfu6k6uhb+jB5Vs5P10UVeY6rLotdDAgX1v6vE="; }) + + # Fix tests for PROJ 9.6.0 + (fetchpatch { + url = "https://github.com/OSGeo/gdal/commit/49ef64108b6875e5b90a4fb6cadd089e84fe53c1.patch"; + hash = "sha256-+HQvE5zxwCU03qRRjtzN9t7QgFfgRu4YZNZ9VRfKYEw="; + }) ]; nativeBuildInputs = From d5a490df50f807098cd86c59350c38813934561b Mon Sep 17 00:00:00 2001 From: heisfer Date: Tue, 18 Mar 2025 13:21:35 +0200 Subject: [PATCH 076/155] laravel: 5.9.2 -> 5.14.0 --- pkgs/by-name/la/laravel/composer.lock | 393 +++++++++++++------------- pkgs/by-name/la/laravel/package.nix | 17 +- pkgs/by-name/la/laravel/update.sh | 29 ++ 3 files changed, 240 insertions(+), 199 deletions(-) create mode 100755 pkgs/by-name/la/laravel/update.sh diff --git a/pkgs/by-name/la/laravel/composer.lock b/pkgs/by-name/la/laravel/composer.lock index 4c83c1ad59e1..7d64bccb8241 100644 --- a/pkgs/by-name/la/laravel/composer.lock +++ b/pkgs/by-name/la/laravel/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "399626345cd7b56932f01477c0ed926e", + "content-hash": "68e4857d05b187b0f49a9eb15dda2c5a", "packages": [ { "name": "carbonphp/carbon-doctrine-types", @@ -168,35 +168,36 @@ }, { "name": "illuminate/collections", - "version": "v11.30.0", + "version": "v12.2.0", "source": { "type": "git", "url": "https://github.com/illuminate/collections.git", - "reference": "2d99ccbb19e34450508ff3ab2f62ba90aa2e9793" + "reference": "8dae6a0e779b07ee17066652334d36ed473ccff2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/collections/zipball/2d99ccbb19e34450508ff3ab2f62ba90aa2e9793", - "reference": "2d99ccbb19e34450508ff3ab2f62ba90aa2e9793", + "url": "https://api.github.com/repos/illuminate/collections/zipball/8dae6a0e779b07ee17066652334d36ed473ccff2", + "reference": "8dae6a0e779b07ee17066652334d36ed473ccff2", "shasum": "" }, "require": { - "illuminate/conditionable": "^11.0", - "illuminate/contracts": "^11.0", - "illuminate/macroable": "^11.0", + "illuminate/conditionable": "^12.0", + "illuminate/contracts": "^12.0", + "illuminate/macroable": "^12.0", "php": "^8.2" }, "suggest": { - "symfony/var-dumper": "Required to use the dump method (^7.0)." + "symfony/var-dumper": "Required to use the dump method (^7.2)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "11.x-dev" + "dev-master": "12.x-dev" } }, "autoload": { "files": [ + "functions.php", "helpers.php" ], "psr-4": { @@ -219,29 +220,29 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-10-10T19:23:07+00:00" + "time": "2025-03-12T14:22:47+00:00" }, { "name": "illuminate/conditionable", - "version": "v11.30.0", + "version": "v12.2.0", "source": { "type": "git", "url": "https://github.com/illuminate/conditionable.git", - "reference": "362dd761b9920367bca1427a902158225e9e3a23" + "reference": "a2b3c66f3ca532e12e694bd5c9254adc303b922d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/conditionable/zipball/362dd761b9920367bca1427a902158225e9e3a23", - "reference": "362dd761b9920367bca1427a902158225e9e3a23", + "url": "https://api.github.com/repos/illuminate/conditionable/zipball/a2b3c66f3ca532e12e694bd5c9254adc303b922d", + "reference": "a2b3c66f3ca532e12e694bd5c9254adc303b922d", "shasum": "" }, "require": { - "php": "^8.0.2" + "php": "^8.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "11.x-dev" + "dev-master": "12.x-dev" } }, "autoload": { @@ -265,20 +266,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-06-28T20:10:30+00:00" + "time": "2025-02-19T19:08:33+00:00" }, { "name": "illuminate/contracts", - "version": "v11.30.0", + "version": "v12.2.0", "source": { "type": "git", "url": "https://github.com/illuminate/contracts.git", - "reference": "56312862af937bd6da8e6dc8bbd88188dfb478f8" + "reference": "6b3e6b148e814077d87a56a6f89b0e3d91e06c56" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/contracts/zipball/56312862af937bd6da8e6dc8bbd88188dfb478f8", - "reference": "56312862af937bd6da8e6dc8bbd88188dfb478f8", + "url": "https://api.github.com/repos/illuminate/contracts/zipball/6b3e6b148e814077d87a56a6f89b0e3d91e06c56", + "reference": "6b3e6b148e814077d87a56a6f89b0e3d91e06c56", "shasum": "" }, "require": { @@ -289,7 +290,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "11.x-dev" + "dev-master": "12.x-dev" } }, "autoload": { @@ -313,47 +314,47 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-09-22T15:08:08+00:00" + "time": "2025-03-05T19:37:08+00:00" }, { "name": "illuminate/filesystem", - "version": "v11.30.0", + "version": "v12.2.0", "source": { "type": "git", "url": "https://github.com/illuminate/filesystem.git", - "reference": "ce7013a350fb06bc65e8a2cf15fd2015f49e476d" + "reference": "e59cfec3c16d71be2da85cf9385ddd82f0c15857" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/filesystem/zipball/ce7013a350fb06bc65e8a2cf15fd2015f49e476d", - "reference": "ce7013a350fb06bc65e8a2cf15fd2015f49e476d", + "url": "https://api.github.com/repos/illuminate/filesystem/zipball/e59cfec3c16d71be2da85cf9385ddd82f0c15857", + "reference": "e59cfec3c16d71be2da85cf9385ddd82f0c15857", "shasum": "" }, "require": { - "illuminate/collections": "^11.0", - "illuminate/contracts": "^11.0", - "illuminate/macroable": "^11.0", - "illuminate/support": "^11.0", + "illuminate/collections": "^12.0", + "illuminate/contracts": "^12.0", + "illuminate/macroable": "^12.0", + "illuminate/support": "^12.0", "php": "^8.2", - "symfony/finder": "^7.0" + "symfony/finder": "^7.2.0" }, "suggest": { "ext-fileinfo": "Required to use the Filesystem class.", "ext-ftp": "Required to use the Flysystem FTP driver.", "ext-hash": "Required to use the Filesystem class.", - "illuminate/http": "Required for handling uploaded files (^7.0).", - "league/flysystem": "Required to use the Flysystem local driver (^3.0.16).", - "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.0).", - "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.0).", - "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.0).", + "illuminate/http": "Required for handling uploaded files (^12.0).", + "league/flysystem": "Required to use the Flysystem local driver (^3.25.1).", + "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.25.1).", + "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.25.1).", + "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.25.1).", "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).", - "symfony/filesystem": "Required to enable support for relative symbolic links (^7.0).", - "symfony/mime": "Required to enable support for guessing extensions (^7.0)." + "symfony/filesystem": "Required to enable support for relative symbolic links (^7.2).", + "symfony/mime": "Required to enable support for guessing extensions (^7.2)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "11.x-dev" + "dev-master": "12.x-dev" } }, "autoload": { @@ -380,20 +381,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-09-22T15:10:50+00:00" + "time": "2025-03-12T14:22:47+00:00" }, { "name": "illuminate/macroable", - "version": "v11.30.0", + "version": "v12.2.0", "source": { "type": "git", "url": "https://github.com/illuminate/macroable.git", - "reference": "e1cb9e51b9ed5d3c9bc1ab431d0a52fe42a990ed" + "reference": "e862e5648ee34004fa56046b746f490dfa86c613" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/macroable/zipball/e1cb9e51b9ed5d3c9bc1ab431d0a52fe42a990ed", - "reference": "e1cb9e51b9ed5d3c9bc1ab431d0a52fe42a990ed", + "url": "https://api.github.com/repos/illuminate/macroable/zipball/e862e5648ee34004fa56046b746f490dfa86c613", + "reference": "e862e5648ee34004fa56046b746f490dfa86c613", "shasum": "" }, "require": { @@ -402,7 +403,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "11.x-dev" + "dev-master": "12.x-dev" } }, "autoload": { @@ -426,20 +427,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-06-28T20:10:30+00:00" + "time": "2024-07-23T16:31:01+00:00" }, { "name": "illuminate/support", - "version": "v11.30.0", + "version": "v12.2.0", "source": { "type": "git", "url": "https://github.com/illuminate/support.git", - "reference": "69453485fa4c76589b5a1a98ebef0e8fee749220" + "reference": "57e684840518d05326cc2958bca8e3790feab3eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/support/zipball/69453485fa4c76589b5a1a98ebef0e8fee749220", - "reference": "69453485fa4c76589b5a1a98ebef0e8fee749220", + "url": "https://api.github.com/repos/illuminate/support/zipball/57e684840518d05326cc2958bca8e3790feab3eb", + "reference": "57e684840518d05326cc2958bca8e3790feab3eb", "shasum": "" }, "require": { @@ -447,13 +448,13 @@ "ext-ctype": "*", "ext-filter": "*", "ext-mbstring": "*", - "illuminate/collections": "^11.0", - "illuminate/conditionable": "^11.0", - "illuminate/contracts": "^11.0", - "illuminate/macroable": "^11.0", - "nesbot/carbon": "^2.72.2|^3.0", + "illuminate/collections": "^12.0", + "illuminate/conditionable": "^12.0", + "illuminate/contracts": "^12.0", + "illuminate/macroable": "^12.0", + "nesbot/carbon": "^3.8.4", "php": "^8.2", - "voku/portable-ascii": "^2.0" + "voku/portable-ascii": "^2.0.2" }, "conflict": { "tightenco/collect": "<5.5.33" @@ -462,19 +463,20 @@ "spatie/once": "*" }, "suggest": { - "illuminate/filesystem": "Required to use the composer class (^11.0).", - "laravel/serializable-closure": "Required to use the once function (^1.3).", - "league/commonmark": "Required to use Str::markdown() and Stringable::markdown() (^2.0.2).", + "illuminate/filesystem": "Required to use the Composer class (^12.0).", + "laravel/serializable-closure": "Required to use the once function (^1.3|^2.0).", + "league/commonmark": "Required to use Str::markdown() and Stringable::markdown() (^2.6).", + "league/uri": "Required to use the Uri class (^7.5.1).", "ramsey/uuid": "Required to use Str::uuid() (^4.7).", - "symfony/process": "Required to use the composer class (^7.0).", - "symfony/uid": "Required to use Str::ulid() (^7.0).", - "symfony/var-dumper": "Required to use the dd function (^7.0).", - "vlucas/phpdotenv": "Required to use the Env class and env helper (^5.4.1)." + "symfony/process": "Required to use the Composer class (^7.2).", + "symfony/uid": "Required to use Str::ulid() (^7.2).", + "symfony/var-dumper": "Required to use the dd function (^7.2).", + "vlucas/phpdotenv": "Required to use the Env class and env helper (^5.6.1)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "11.x-dev" + "dev-master": "12.x-dev" } }, "autoload": { @@ -502,20 +504,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-10-29T20:21:52+00:00" + "time": "2025-03-12T14:22:47+00:00" }, { "name": "laravel/prompts", - "version": "v0.3.1", + "version": "v0.3.5", "source": { "type": "git", "url": "https://github.com/laravel/prompts.git", - "reference": "0f3848a445562dac376b27968f753c65e7e1036e" + "reference": "57b8f7efe40333cdb925700891c7d7465325d3b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/prompts/zipball/0f3848a445562dac376b27968f753c65e7e1036e", - "reference": "0f3848a445562dac376b27968f753c65e7e1036e", + "url": "https://api.github.com/repos/laravel/prompts/zipball/57b8f7efe40333cdb925700891c7d7465325d3b1", + "reference": "57b8f7efe40333cdb925700891c7d7465325d3b1", "shasum": "" }, "require": { @@ -529,9 +531,9 @@ "laravel/framework": ">=10.17.0 <10.25.0" }, "require-dev": { - "illuminate/collections": "^10.0|^11.0", + "illuminate/collections": "^10.0|^11.0|^12.0", "mockery/mockery": "^1.5", - "pestphp/pest": "^2.3", + "pestphp/pest": "^2.3|^3.4", "phpstan/phpstan": "^1.11", "phpstan/phpstan-mockery": "^1.1" }, @@ -559,22 +561,22 @@ "description": "Add beautiful and user-friendly forms to your command-line applications.", "support": { "issues": "https://github.com/laravel/prompts/issues", - "source": "https://github.com/laravel/prompts/tree/v0.3.1" + "source": "https://github.com/laravel/prompts/tree/v0.3.5" }, - "time": "2024-10-09T19:42:26+00:00" + "time": "2025-02-11T13:34:40+00:00" }, { "name": "nesbot/carbon", - "version": "3.8.2", + "version": "3.8.6", "source": { "type": "git", - "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947" + "url": "https://github.com/CarbonPHP/carbon.git", + "reference": "ff2f20cf83bd4d503720632ce8a426dc747bf7fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/e1268cdbc486d97ce23fef2c666dc3c6b6de9947", - "reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947", + "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/ff2f20cf83bd4d503720632ce8a426dc747bf7fd", + "reference": "ff2f20cf83bd4d503720632ce8a426dc747bf7fd", "shasum": "" }, "require": { @@ -606,10 +608,6 @@ ], "type": "library", "extra": { - "branch-alias": { - "dev-master": "3.x-dev", - "dev-2.x": "2.x-dev" - }, "laravel": { "providers": [ "Carbon\\Laravel\\ServiceProvider" @@ -619,6 +617,10 @@ "includes": [ "extension.neon" ] + }, + "branch-alias": { + "dev-2.x": "2.x-dev", + "dev-master": "3.x-dev" } }, "autoload": { @@ -650,8 +652,8 @@ ], "support": { "docs": "https://carbon.nesbot.com/docs", - "issues": "https://github.com/briannesbitt/Carbon/issues", - "source": "https://github.com/briannesbitt/Carbon" + "issues": "https://github.com/CarbonPHP/carbon/issues", + "source": "https://github.com/CarbonPHP/carbon" }, "funding": [ { @@ -667,7 +669,7 @@ "type": "tidelift" } ], - "time": "2024-11-07T17:46:48+00:00" + "time": "2025-02-20T17:33:38+00:00" }, { "name": "psr/clock", @@ -823,16 +825,16 @@ }, { "name": "symfony/clock", - "version": "v7.1.6", + "version": "v7.2.0", "source": { "type": "git", "url": "https://github.com/symfony/clock.git", - "reference": "97bebc53548684c17ed696bc8af016880f0f098d" + "reference": "b81435fbd6648ea425d1ee96a2d8e68f4ceacd24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/clock/zipball/97bebc53548684c17ed696bc8af016880f0f098d", - "reference": "97bebc53548684c17ed696bc8af016880f0f098d", + "url": "https://api.github.com/repos/symfony/clock/zipball/b81435fbd6648ea425d1ee96a2d8e68f4ceacd24", + "reference": "b81435fbd6648ea425d1ee96a2d8e68f4ceacd24", "shasum": "" }, "require": { @@ -877,7 +879,7 @@ "time" ], "support": { - "source": "https://github.com/symfony/clock/tree/v7.1.6" + "source": "https://github.com/symfony/clock/tree/v7.2.0" }, "funding": [ { @@ -893,20 +895,20 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2024-09-25T14:21:43+00:00" }, { "name": "symfony/console", - "version": "v7.1.7", + "version": "v7.2.1", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "3284aafcac338b6e86fd955ee4d794cbe434151a" + "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/3284aafcac338b6e86fd955ee4d794cbe434151a", - "reference": "3284aafcac338b6e86fd955ee4d794cbe434151a", + "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3", + "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3", "shasum": "" }, "require": { @@ -970,7 +972,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v7.1.7" + "source": "https://github.com/symfony/console/tree/v7.2.1" }, "funding": [ { @@ -986,20 +988,20 @@ "type": "tidelift" } ], - "time": "2024-11-05T15:34:55+00:00" + "time": "2024-12-11T03:49:26+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.5.0", + "version": "v3.5.1", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1" + "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", - "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", + "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", "shasum": "" }, "require": { @@ -1007,12 +1009,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -1037,7 +1039,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1" }, "funding": [ { @@ -1053,20 +1055,20 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:32:20+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/finder", - "version": "v7.1.6", + "version": "v7.2.2", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "2cb89664897be33f78c65d3d2845954c8d7a43b8" + "reference": "87a71856f2f56e4100373e92529eed3171695cfb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/2cb89664897be33f78c65d3d2845954c8d7a43b8", - "reference": "2cb89664897be33f78c65d3d2845954c8d7a43b8", + "url": "https://api.github.com/repos/symfony/finder/zipball/87a71856f2f56e4100373e92529eed3171695cfb", + "reference": "87a71856f2f56e4100373e92529eed3171695cfb", "shasum": "" }, "require": { @@ -1101,7 +1103,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v7.1.6" + "source": "https://github.com/symfony/finder/tree/v7.2.2" }, "funding": [ { @@ -1117,7 +1119,7 @@ "type": "tidelift" } ], - "time": "2024-10-01T08:31:23+00:00" + "time": "2024-12-30T19:00:17+00:00" }, { "name": "symfony/polyfill-ctype", @@ -1145,8 +1147,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -1221,8 +1223,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -1299,8 +1301,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -1383,8 +1385,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -1457,8 +1459,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -1515,16 +1517,16 @@ }, { "name": "symfony/process", - "version": "v7.1.7", + "version": "v7.2.4", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "9b8a40b7289767aa7117e957573c2a535efe6585" + "reference": "d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/9b8a40b7289767aa7117e957573c2a535efe6585", - "reference": "9b8a40b7289767aa7117e957573c2a535efe6585", + "url": "https://api.github.com/repos/symfony/process/zipball/d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf", + "reference": "d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf", "shasum": "" }, "require": { @@ -1556,7 +1558,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v7.1.7" + "source": "https://github.com/symfony/process/tree/v7.2.4" }, "funding": [ { @@ -1572,20 +1574,20 @@ "type": "tidelift" } ], - "time": "2024-11-06T09:25:12+00:00" + "time": "2025-02-05T08:33:46+00:00" }, { "name": "symfony/service-contracts", - "version": "v3.5.0", + "version": "v3.5.1", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f" + "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", - "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/e53260aabf78fb3d63f8d79d69ece59f80d5eda0", + "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0", "shasum": "" }, "require": { @@ -1598,12 +1600,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -1639,7 +1641,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.5.0" + "source": "https://github.com/symfony/service-contracts/tree/v3.5.1" }, "funding": [ { @@ -1655,20 +1657,20 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:32:20+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/string", - "version": "v7.1.6", + "version": "v7.2.0", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "61b72d66bf96c360a727ae6232df5ac83c71f626" + "reference": "446e0d146f991dde3e73f45f2c97a9faad773c82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/61b72d66bf96c360a727ae6232df5ac83c71f626", - "reference": "61b72d66bf96c360a727ae6232df5ac83c71f626", + "url": "https://api.github.com/repos/symfony/string/zipball/446e0d146f991dde3e73f45f2c97a9faad773c82", + "reference": "446e0d146f991dde3e73f45f2c97a9faad773c82", "shasum": "" }, "require": { @@ -1726,7 +1728,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v7.1.6" + "source": "https://github.com/symfony/string/tree/v7.2.0" }, "funding": [ { @@ -1742,24 +1744,25 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2024-11-13T13:31:26+00:00" }, { "name": "symfony/translation", - "version": "v7.1.6", + "version": "v7.2.4", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "b9f72ab14efdb6b772f85041fa12f820dee8d55f" + "reference": "283856e6981286cc0d800b53bd5703e8e363f05a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/b9f72ab14efdb6b772f85041fa12f820dee8d55f", - "reference": "b9f72ab14efdb6b772f85041fa12f820dee8d55f", + "url": "https://api.github.com/repos/symfony/translation/zipball/283856e6981286cc0d800b53bd5703e8e363f05a", + "reference": "283856e6981286cc0d800b53bd5703e8e363f05a", "shasum": "" }, "require": { "php": ">=8.2", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-mbstring": "~1.0", "symfony/translation-contracts": "^2.5|^3.0" }, @@ -1820,7 +1823,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v7.1.6" + "source": "https://github.com/symfony/translation/tree/v7.2.4" }, "funding": [ { @@ -1836,20 +1839,20 @@ "type": "tidelift" } ], - "time": "2024-09-28T12:35:13+00:00" + "time": "2025-02-13T10:27:23+00:00" }, { "name": "symfony/translation-contracts", - "version": "v3.5.0", + "version": "v3.5.1", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a" + "reference": "4667ff3bd513750603a09c8dedbea942487fb07c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/b9d2189887bb6b2e0367a9fc7136c5239ab9b05a", - "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/4667ff3bd513750603a09c8dedbea942487fb07c", + "reference": "4667ff3bd513750603a09c8dedbea942487fb07c", "shasum": "" }, "require": { @@ -1857,12 +1860,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -1898,7 +1901,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v3.5.0" + "source": "https://github.com/symfony/translation-contracts/tree/v3.5.1" }, "funding": [ { @@ -1914,20 +1917,20 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:32:20+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "voku/portable-ascii", - "version": "2.0.1", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/voku/portable-ascii.git", - "reference": "b56450eed252f6801410d810c8e1727224ae0743" + "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b56450eed252f6801410d810c8e1727224ae0743", - "reference": "b56450eed252f6801410d810c8e1727224ae0743", + "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b1d923f88091c6bf09699efcd7c8a1b1bfd7351d", + "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d", "shasum": "" }, "require": { @@ -1952,7 +1955,7 @@ "authors": [ { "name": "Lars Moelleken", - "homepage": "http://www.moelleken.org/" + "homepage": "https://www.moelleken.org/" } ], "description": "Portable ASCII library - performance optimized (ascii) string functions for php.", @@ -1964,7 +1967,7 @@ ], "support": { "issues": "https://github.com/voku/portable-ascii/issues", - "source": "https://github.com/voku/portable-ascii/tree/2.0.1" + "source": "https://github.com/voku/portable-ascii/tree/2.0.3" }, "funding": [ { @@ -1988,22 +1991,22 @@ "type": "tidelift" } ], - "time": "2022-03-08T17:03:00+00:00" + "time": "2024-11-21T01:49:47+00:00" } ], "packages-dev": [ { "name": "myclabs/deep-copy", - "version": "1.12.1", + "version": "1.13.0", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845" + "reference": "024473a478be9df5fdaca2c793f2232fe788e414" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845", - "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/024473a478be9df5fdaca2c793f2232fe788e414", + "reference": "024473a478be9df5fdaca2c793f2232fe788e414", "shasum": "" }, "require": { @@ -2042,7 +2045,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1" + "source": "https://github.com/myclabs/DeepCopy/tree/1.13.0" }, "funding": [ { @@ -2050,20 +2053,20 @@ "type": "tidelift" } ], - "time": "2024-11-08T17:47:46+00:00" + "time": "2025-02-12T12:17:51+00:00" }, { "name": "nikic/php-parser", - "version": "v5.3.1", + "version": "v5.4.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b" + "reference": "447a020a1f875a434d62f2a401f53b82a396e494" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b", - "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494", + "reference": "447a020a1f875a434d62f2a401f53b82a396e494", "shasum": "" }, "require": { @@ -2106,9 +2109,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0" }, - "time": "2024-10-08T18:51:32+00:00" + "time": "2024-12-30T11:07:19+00:00" }, { "name": "phar-io/manifest", @@ -2230,20 +2233,20 @@ }, { "name": "phpstan/phpstan", - "version": "1.12.8", + "version": "2.1.8", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "f6a60a4d66142b8156c9da923f1972657bc4748c" + "reference": "f9adff3b87c03b12cc7e46a30a524648e497758f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f6a60a4d66142b8156c9da923f1972657bc4748c", - "reference": "f6a60a4d66142b8156c9da923f1972657bc4748c", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f9adff3b87c03b12cc7e46a30a524648e497758f", + "reference": "f9adff3b87c03b12cc7e46a30a524648e497758f", "shasum": "" }, "require": { - "php": "^7.2|^8.0" + "php": "^7.4|^8.0" }, "conflict": { "phpstan/phpstan-shim": "*" @@ -2284,7 +2287,7 @@ "type": "github" } ], - "time": "2024-11-06T19:06:49+00:00" + "time": "2025-03-09T09:30:48+00:00" }, { "name": "phpunit/php-code-coverage", @@ -2609,16 +2612,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.38", + "version": "10.5.45", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a86773b9e887a67bc53efa9da9ad6e3f2498c132" + "reference": "bd68a781d8e30348bc297449f5234b3458267ae8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a86773b9e887a67bc53efa9da9ad6e3f2498c132", - "reference": "a86773b9e887a67bc53efa9da9ad6e3f2498c132", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bd68a781d8e30348bc297449f5234b3458267ae8", + "reference": "bd68a781d8e30348bc297449f5234b3458267ae8", "shasum": "" }, "require": { @@ -2628,7 +2631,7 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.12.0", + "myclabs/deep-copy": "^1.12.1", "phar-io/manifest": "^2.0.4", "phar-io/version": "^3.2.1", "php": ">=8.1", @@ -2690,7 +2693,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.38" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.45" }, "funding": [ { @@ -2706,7 +2709,7 @@ "type": "tidelift" } ], - "time": "2024-10-28T13:06:21+00:00" + "time": "2025-02-06T16:08:12+00:00" }, { "name": "sebastian/cli-parser", diff --git a/pkgs/by-name/la/laravel/package.nix b/pkgs/by-name/la/laravel/package.nix index d6f6379fb74a..25228af1c66b 100644 --- a/pkgs/by-name/la/laravel/package.nix +++ b/pkgs/by-name/la/laravel/package.nix @@ -3,28 +3,37 @@ fetchFromGitHub, makeWrapper, php, + nodejs, }: php.buildComposerProject2 (finalAttrs: { pname = "laravel"; - version = "5.9.2"; + version = "5.14.0"; src = fetchFromGitHub { owner = "laravel"; repo = "installer"; tag = "v${finalAttrs.version}"; - hash = "sha256-XE1KYOlWehj1peSNj3sKNr6CKchCxRNpIjXHq7slVME="; + hash = "sha256-Ka8bgJA5zR5hWfqAyz/mKjZ22oL9yMpqWGdcCoy6wNQ="; }; nativeBuildInputs = [ makeWrapper ]; composerLock = ./composer.lock; - vendorHash = "sha256-Kid5Vp42Pme1AO9fI9e/f24Cdzi1uV8qEULFEvQDKnE="; + vendorHash = "sha256-KaPOPPDjiATBAOlEasb22poVMg6w0NEUnpclapuGhw0="; + # Adding npm (nodejs) and php composer to path postInstall = '' wrapProgram $out/bin/laravel \ - --suffix PATH : ${lib.makeBinPath [ php.packages.composer ]} + --suffix PATH : ${ + lib.makeBinPath [ + php.packages.composer + nodejs + ] + } ''; + passthru.updateScript = ./update.sh; + meta = { description = "Laravel application installer"; homepage = "https://laravel.com/docs#creating-a-laravel-project"; diff --git a/pkgs/by-name/la/laravel/update.sh b/pkgs/by-name/la/laravel/update.sh new file mode 100755 index 000000000000..e041bf63d80d --- /dev/null +++ b/pkgs/by-name/la/laravel/update.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq php.packages.composer nix-update coreutils + +set -eou pipefail + +PACKAGE_NAME="laravel" +PACKAGE_VERSION=$(nix eval --raw -f. $PACKAGE_NAME.version) +PACKAGE_DIR="$(dirname "${BASH_SOURCE[0]}")" + +# Get latest version from git +GIT_VERSION="$(curl --silent ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/laravel/installer/releases/latest" | jq '.tag_name' --raw-output)" +NEW_VERSION="${GIT_VERSION#v}" + +# Fail if package and git version are the same +if [[ "$PACKAGE_VERSION" == "$NEW_VERSION" ]]; then + echo "${PACKAGE_NAME} is up-to-date: ${PACKAGE_VERSION}" + exit 0 +fi + +# Generate composer.lock file +TMPDIR=$(mktemp -d) +trap 'rm -rf -- "${TMPDIR}"' EXIT + +git clone --depth 1 --branch "${GIT_VERSION}" https://github.com/laravel/installer.git "${TMPDIR}/laravel" +composer -d "${TMPDIR}/laravel" install +cp "${TMPDIR}/laravel/composer.lock" "${PACKAGE_DIR}/composer.lock" + +# update package.nix version, hash and vendorHash +nix-update $PACKAGE_NAME --version="${NEW_VERSION}" From 3bd9ca0e3bce46b547886514b8cd7d133c5339d8 Mon Sep 17 00:00:00 2001 From: Haylin Moore Date: Tue, 18 Mar 2025 07:32:03 -0700 Subject: [PATCH 077/155] ynetd: add pow-solver to hardened --- pkgs/by-name/yn/ynetd/hardened.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/yn/ynetd/hardened.nix b/pkgs/by-name/yn/ynetd/hardened.nix index f5188810d593..79505073feb7 100644 --- a/pkgs/by-name/yn/ynetd/hardened.nix +++ b/pkgs/by-name/yn/ynetd/hardened.nix @@ -1,5 +1,6 @@ { lib, + openssl, stdenv, fetchurl, }: @@ -12,9 +13,17 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-hUEZZEulmaV3KfKOqE1wl7y4SRUn2/HoOjVDabk5+YA="; }; + buildInputs = [ openssl ]; + + makeFlags = [ + "ynetd" + "pow-solver" + ]; + installPhase = '' runHook preInstall install -Dm755 ynetd $out/bin/ynetd + install -Dm755 pow-solver $out/bin/pow-solver runHook postInstall ''; From a3383f5fdb09b4d2d79f24f793d7784d0886c909 Mon Sep 17 00:00:00 2001 From: e2r2fx <61915524+e2r2fx@users.noreply.github.com> Date: Tue, 18 Mar 2025 10:41:51 -0400 Subject: [PATCH 078/155] expressvpn: fix daemon not able to modify resolv.conf (#379943) * fix(expressvpn): daemon not able to modify resolv.conf * update expressvpndFHS wrapper pname * remove unnecessary copying of hosts's resolv.conf --- pkgs/by-name/ex/expressvpn/package.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ex/expressvpn/package.nix b/pkgs/by-name/ex/expressvpn/package.nix index f97ec3967ee2..641edd36cb72 100644 --- a/pkgs/by-name/ex/expressvpn/package.nix +++ b/pkgs/by-name/ex/expressvpn/package.nix @@ -49,13 +49,21 @@ let }; expressvpndFHS = buildFHSEnv { - inherit pname version; + inherit version; + pname = "expressvpnd"; # When connected, it directly creates/deletes resolv.conf to change the DNS entries. # Since it's running in an FHS environment, it has no effect on actual resolv.conf. # Hence, place a watcher that updates host resolv.conf when FHS resolv.conf changes. + + # Mount the host's resolv.conf to the container's /etc/resolv.conf runScript = writeScript "${pname}-wrapper" '' - cp /host/etc/resolv.conf /etc/resolv.conf; + mkdir -p /host/etc + [ -e /host/etc/resolv.conf ] || touch /host/etc/resolv.conf + mount --bind /etc/resolv.conf /host/etc/resolv.conf + mount -o remount,rw /host/etc/resolv.conf + trap "umount /host/etc/resolv.conf" EXIT + while inotifywait /etc 2>/dev/null; do cp /etc/resolv.conf /host/etc/resolv.conf; From 6d0bfdecb49fceb17a9a328134c40a20a5d9cdfb Mon Sep 17 00:00:00 2001 From: Andrew Voynov Date: Tue, 18 Mar 2025 15:36:27 +0300 Subject: [PATCH 079/155] nixos-rebuild-ng: improve README.md --- pkgs/by-name/ni/nixos-rebuild-ng/README.md | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/README.md b/pkgs/by-name/ni/nixos-rebuild-ng/README.md index 460888b77d7b..206cfdbb4912 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/README.md +++ b/pkgs/by-name/ni/nixos-rebuild-ng/README.md @@ -6,16 +6,16 @@ Work-in-Progress rewrite of ## Why the rewrite? The current state of `nixos-rebuild` is dire: it is one of the most critical -piece of code we have in NixOS, but it has tons of issues: +pieces of code we have in NixOS, but it has tons of issues: - The code is written in Bash, and while this by itself is not necessary bad, it means that it is difficult to do refactorings due to the lack of tooling for the language - The code itself is a hacky mess. Changing even one line of code can cause - issues that affects dozens of people + issues that affect dozens of people - Lack of proper testing (we do have some integration tests, but no unit tests and coverage is probably pitiful) -- The code predates some of the improvements `nix` had over the years, e.g.: it - builds Flakes inside a temporary directory and read the resulting symlink +- The code predates some of the improvements `nix` had over the years, e.g., it + builds Flakes inside a temporary directory and reads the resulting symlink since the code seems to predate `--print-out-paths` flag Given all of those above, improvements in the `nixos-rebuild` are difficult to @@ -32,7 +32,7 @@ an attempt of the rewrite. - It is a scripting language that fits well with the scope of this project - Python's standard library is great and it means we will need a low number of external dependencies for this project. For example, `nixos-rebuild` - currently depends in `jq` for JSON parsing, while Python has `json` in + currently depends on `jq` for JSON parsing, while Python has `json` in standard library ## Do's and Don'ts @@ -44,8 +44,8 @@ an attempt of the rewrite. ## How to use -If you want to use `nixos-rebuild-ng` without replacing `nixos-rebuild`, add to -your NixOS configuration: +If you want to use `nixos-rebuild-ng` without replacing `nixos-rebuild`, add the +following to your NixOS configuration: ```nix { pkgs, ... }: @@ -57,7 +57,7 @@ your NixOS configuration: And use `nixos-rebuild-ng` instead of `nixos-rebuild`. If you want to completely replace `nixos-rebuild` with `nixos-rebuild-ng`, add -to your NixOS configuration: +the following to your NixOS configuration: ```nix { ... }: @@ -104,12 +104,12 @@ ruff format . ## Breaking changes While `nixos-rebuild-ng` tries to be as much of a clone of the original as -possible, there are still some breaking changes that were done in other to +possible, there are still some breaking changes that were done in order to improve the user experience. If they break your workflow in some way that is not possible to fix, please open an issue and we can discuss a solution. - For `--build-host` and `--target-host`, `nixos-rebuild-ng` does not allocate - a pseudo-TTY via SSH (e.g.: `ssh -t`) anymore. The reason for this is because + a pseudo-TTY via SSH (e.g., `ssh -t`) anymore. The reason for this is that pseudo-TTY breaks some expectations from SSH, like it mangles stdout and stderr, and can [break terminal output](https://github.com/NixOS/nixpkgs/issues/336967) in @@ -122,7 +122,7 @@ not possible to fix, please open an issue and we can discuss a solution. every `sudo` request. Keep in mind that there is no check, so if you type your password wrong, it will fail during activation (this can be improved though) -- When `--build-host` and `--target-host` is used together, we will use `nix +- When `--build-host` and `--target-host` are used together, we will use `nix copy` (or 2 `nix-copy-closure` if you're using Nix <2.18) instead of SSH'ing to build host and using `nix-copy-closure --to target-host`. The reason for this is documented in PR @@ -142,7 +142,7 @@ not possible to fix, please open an issue and we can discuss a solution. - Bugs in the profile manipulation can cause corruption of your profile that may be difficult to fix, so right now I only recommend using `nixos-rebuild-ng` if you are testing in a VM or in a filesystem with - snapshots like btrfs or ZFS. Those bugs are unlikely to be unfixable but the + snapshots like BTRFS or ZFS. Those bugs are unlikely to be unfixable but the errors can be difficult to understand. If you want to go anyway, `nix-collect-garbage -d` and `nix store repair` are your friends From ef1ad104c16a229b8c71ed2fb34c668fc45c043a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 18 Mar 2025 15:48:19 +0100 Subject: [PATCH 080/155] pynac: remove --- pkgs/by-name/py/pynac/package.nix | 68 ------------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 pkgs/by-name/py/pynac/package.nix diff --git a/pkgs/by-name/py/pynac/package.nix b/pkgs/by-name/py/pynac/package.nix deleted file mode 100644 index 0b9977c55906..000000000000 --- a/pkgs/by-name/py/pynac/package.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - lib, - stdenv, - fetchpatch, - fetchFromGitHub, - autoreconfHook, - pkg-config, - flint, - gmp, - python3, - singular, - ncurses, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "pynac"; - version = "0.7.29"; - - src = fetchFromGitHub { - owner = "pynac"; - repo = "pynac"; - rev = "pynac-${finalAttrs.version}"; - hash = "sha256-ocR7emXtKs+Xe2f6dh4xEDAacgiolY8mtlLnWnNBS8A="; - }; - - patches = [ - # the patch below is included in sage 9.4 and should be included - # in a future pynac release. see https://trac.sagemath.org/ticket/28357 - (fetchpatch { - name = "realpartloop.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/realpartloop.patch?h=9.4.beta5"; - hash = "sha256-1nj0xtlFN5fZKEiRLD+tiW/ZtxMQre1ziEGA0OVUGE4="; - }) - ]; - - # Python 3.11 moved this header file, but is now is imported by default - postPatch = '' - substituteInPlace ginac/numeric.cpp \ - --replace-fail "#include " "" - ''; - - buildInputs = [ - flint - gmp - singular - python3 - ncurses - ]; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - meta = with lib; { - description = "Python is Not a CAS -- modified version of Ginac"; - longDescription = '' - Pynac -- "Python is Not a CAS" is a modified version of Ginac that - replaces the depency of GiNaC on CLN by a dependency instead of Python. - It is a lite version of GiNaC as well, not implementing all the features - of the full GiNaC, and it is *only* meant to be used as a Python library. - ''; - homepage = "http://pynac.org"; - license = licenses.gpl2Plus; - maintainers = teams.sage.members; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8d7e9862cf93..741dca6e8c2b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1280,6 +1280,7 @@ mapAliases { proxmark3-rrg = proxmark3; # Added 2023-07-25 psensor = throw "'psensor' has been removed due to lack of maintenance upstream. Consider using 'mission-center', 'resources' or 'monitorets' instead"; # Added 2024-09-14 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 + pynac = throw "'pynac' has been removed as it was broken and unmaintained"; # Added 2025-03-18 pyo3-pack = maturin; pypi2nix = throw "pypi2nix has been removed due to being unmaintained"; pypolicyd-spf = spf-engine; # Added 2022-10-09 From c4cf64763b49fc1eebbe1a130cf8724c3e8ed7ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Mar 2025 15:32:35 +0000 Subject: [PATCH 081/155] woodpecker-server: 3.3.0 -> 3.4.0 --- .../tools/continuous-integration/woodpecker/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix index fd106599fcaa..8651a3094cb3 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "3.3.0"; - srcHash = "sha256-f0XQ3cbao8IM5toSkxvul7pp1L89N9oiEo3Yx3mkGhg="; + version = "3.4.0"; + srcHash = "sha256-2zKzNaNe057iJkhhLaEBfE84YkR0X5lGpB4b3WNq3ec="; # The tarball contains vendored dependencies vendorHash = null; in From 86e400b0d2b99ad50bde107fa595f837172a30a1 Mon Sep 17 00:00:00 2001 From: KSJ2000 Date: Fri, 14 Mar 2025 16:45:34 +0200 Subject: [PATCH 082/155] spider: init at 2.33.11 --- pkgs/by-name/sp/spider/package.nix | 87 ++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 pkgs/by-name/sp/spider/package.nix diff --git a/pkgs/by-name/sp/spider/package.nix b/pkgs/by-name/sp/spider/package.nix new file mode 100644 index 000000000000..f75896e4493d --- /dev/null +++ b/pkgs/by-name/sp/spider/package.nix @@ -0,0 +1,87 @@ +{ + fetchFromGitHub, + lib, + nix-update-script, + openssl, + pkg-config, + rust-jemalloc-sys, + rustPlatform, + sqlite, + stdenv, + versionCheckHook, + zstd, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "spider"; + version = "2.33.11"; + + src = fetchFromGitHub { + owner = "spider-rs"; + repo = "spider"; + tag = "v${finalAttrs.version}"; + hash = "sha256-wrtkBqq1wJWg+0K4+PILPdMQe1AFOhJ1dJHvwq2irQo="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-QxfnpiGHYYk8v0rR/eE6KHW1KdZQGuJPz1jGwtl27rs="; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + buildInputs = [ + openssl + rust-jemalloc-sys + sqlite + zstd + ]; + + env = { + OPENSSL_NO_VENDOR = true; + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + + checkFlags = + [ + # Sandbox limitation: no network or io_uring + "--skip=website::crawl" + "--skip=website::scrape" + "--skip=website::test_crawl_subdomains" + "--skip=website::test_crawl_tld" + "--skip=website::test_respect_robots_txt" + "--skip=page::parse_links" + "--skip=page::test_status_code" + "--skip=pdl_is_fresh" + "--skip=verify_revision_available" + ] + ++ lib.optionals stdenv.isDarwin [ + # Sandbox limitation: attempted to create a NULL object + "--skip=website::test_link_duplicates" + "--skip=website::not_crawl_blacklist" + "--skip=website::test_crawl_budget" + "--skip=website::test_crawl_subscription" + "--skip=website::Website::subscribe_guard" + "--skip=website::Website::subscribe" + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/spider-rs/spider/releases/tag/v${finalAttrs.version}"; + description = "Web crawler and scraper, building blocks for data curation workloads"; + homepage = "https://github.com/spider-rs/spider"; + license = lib.licenses.mit; + mainProgram = "spider"; + maintainers = with lib.maintainers; [ + j-mendez + KSJ2000 + ]; + platforms = lib.platforms.unix; + }; +}) From 8a3384dd6245c5cdb35acbac485e87c12f991098 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 18 Mar 2025 16:51:49 +0100 Subject: [PATCH 083/155] python312Packages.nutpie: 0.14.2 -> 0.14.3 Diff: https://github.com/pymc-devs/nutpie/compare/refs/tags/v0.14.2...v0.14.3 Changelog: https://github.com/pymc-devs/nutpie/blob/v0.14.3/CHANGELOG.md --- pkgs/development/python-modules/nutpie/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nutpie/default.nix b/pkgs/development/python-modules/nutpie/default.nix index ec6c6300ec2b..e88644abdd45 100644 --- a/pkgs/development/python-modules/nutpie/default.nix +++ b/pkgs/development/python-modules/nutpie/default.nix @@ -30,20 +30,20 @@ buildPythonPackage rec { pname = "nutpie"; - version = "0.14.2"; + version = "0.14.3"; pyproject = true; src = fetchFromGitHub { owner = "pymc-devs"; repo = "nutpie"; tag = "v${version}"; - hash = "sha256-9sHs2JbzVRvAJEoLcz5NxkbElbXblDzxA6oCBtb4yFE="; + hash = "sha256-l2TEGa9VVJmU4mKZwfUdhiloW6Bh41OqIQzTRvYK3eg="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-j7Vasy4BwOYzH43mWdbu+QsNCdRfvJC6ZvYU8XB5s4E="; + hash = "sha256-hPKT+YM9s7XZhI3sfnLBfokbGQhwDa9y5Fgg1TItO4M="; }; build-system = [ From b44c9da4c0624aba4d05b80e2fa3b2ca1d06df74 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Mar 2025 16:53:07 +0100 Subject: [PATCH 084/155] servo: 0-unstable-2025-03-05 -> 0-unstable-2025-03-18 --- pkgs/by-name/se/servo/package.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix index f8787f1e00b5..0f4666648a55 100644 --- a/pkgs/by-name/se/servo/package.nix +++ b/pkgs/by-name/se/servo/package.nix @@ -62,13 +62,13 @@ in rustPlatform.buildRustPackage { pname = "servo"; - version = "0-unstable-2025-03-05"; + version = "0-unstable-2025-03-18"; src = fetchFromGitHub { owner = "servo"; repo = "servo"; - rev = "69e749947910480e97ffaf22031316ebe7f67b9c"; - hash = "sha256-p06547WijlfAUgMzbCyQUFx7Xq+eUI+iB6inQguzJ1c="; + rev = "8d39d7706aee50971e848a5e31fc6bfd7ef552c1"; + hash = "sha256-PdkES7tvECVoJWa78t/K4ab+brqCLHY47c+TnDNQ3Ps="; # Breaks reproducibility depending on whether the picked commit # has other ref-names or not, which may change over time, i.e. with # "ref-names: HEAD -> main" as long this commit is the branch HEAD @@ -79,14 +79,7 @@ rustPlatform.buildRustPackage { }; useFetchCargoVendor = true; - cargoHash = "sha256-znHKck88XXjl+v3iJFCjq0Cxyxh1HrtLbK9o3y8Kelw="; - - postPatch = '' - # Remap absolute path between modules to include SEMVER - substituteInPlace ../servo-0-unstable-*-vendor/servo_atoms-0.0.1/build.rs --replace-fail \ - "../style/counter_style/predefined.rs" \ - "../style-0.0.1/counter_style/predefined.rs" - ''; + cargoHash = "sha256-mxbRqJ+ex9k1h6wOgjPHWfG8RA0vVRBAqsHtwSRI12Y="; # set `HOME` to a temp dir for write access # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328) From c5c9572f0d527656de8828d1e7cfd148552a415e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 18 Mar 2025 17:18:31 +0100 Subject: [PATCH 085/155] python312Packages.pytest-notebook: modernize --- .../pytest-notebook/default.nix | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pytest-notebook/default.nix b/pkgs/development/python-modules/pytest-notebook/default.nix index 69529207feac..73ed812f4c31 100644 --- a/pkgs/development/python-modules/pytest-notebook/default.nix +++ b/pkgs/development/python-modules/pytest-notebook/default.nix @@ -2,19 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system flit-core, + + # dependencies attrs, jsonschema, nbclient, nbdime, nbformat, + + # buildInputs pytest, + + # tests black, coverage, ipykernel, pytest-cov-stub, pytest-regressions, pytestCheckHook, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { @@ -29,7 +38,7 @@ buildPythonPackage rec { hash = "sha256-LoK0wb7rAbVbgyURCbSfckWvJDef3tPY+7V4YU1IBRU="; }; - nativeBuildInputs = [ + build-system = [ flit-core ]; @@ -38,7 +47,7 @@ buildPythonPackage rec { "nbclient" ]; - propagatedBuildInputs = [ + dependencies = [ attrs jsonschema nbclient @@ -57,26 +66,23 @@ buildPythonPackage rec { pytest-cov-stub pytest-regressions pytestCheckHook + writableTmpDirAsHomeHook ]; - preCheck = '' - export HOME="$TEMP" - ''; - disabledTests = [ + # AssertionError: FILES DIFFER: "test_diff_to_string" + + # pytest_notebook.execution.CoverageError: An error occurred while executing coverage start-up + # TypeError: expected str, bytes or os.PathLike object, not NoneType "test_execute_notebook_with_coverage" "test_regression_coverage" - "test_collection" - "test_setup_with_skip_meta" - "test_run_fail" - "test_run_pass_with_meta" ]; __darwinAllowLocalNetworking = true; meta = { - changelog = "https://github.com/chrisjsewell/pytest-notebook/blob/${src.rev}/docs/source/changelog.md"; + changelog = "https://github.com/chrisjsewell/pytest-notebook/blob/${src.tag}/docs/source/changelog.md"; description = "Pytest plugin for regression testing and regenerating Jupyter Notebooks"; homepage = "https://github.com/chrisjsewell/pytest-notebook"; license = lib.licenses.bsd3; From 7ffa866f590e1a219300504dcff3d9589fbf281b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 18 Mar 2025 17:35:30 +0100 Subject: [PATCH 086/155] python312Packages.pytest-notebook: skip failing test --- pkgs/development/python-modules/pytest-notebook/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pytest-notebook/default.nix b/pkgs/development/python-modules/pytest-notebook/default.nix index 73ed812f4c31..66543ed586b5 100644 --- a/pkgs/development/python-modules/pytest-notebook/default.nix +++ b/pkgs/development/python-modules/pytest-notebook/default.nix @@ -77,6 +77,9 @@ buildPythonPackage rec { # TypeError: expected str, bytes or os.PathLike object, not NoneType "test_execute_notebook_with_coverage" "test_regression_coverage" + + # pytest_notebook.nb_regression.NBRegressionError + "test_regression_regex_replace_pass" ]; __darwinAllowLocalNetworking = true; From 437ae0fb4ec8678769296a3cf01a4dd9ac01342a Mon Sep 17 00:00:00 2001 From: Preston Pan <135050157+ret2pop@users.noreply.github.com> Date: Tue, 18 Mar 2025 09:46:55 -0700 Subject: [PATCH 087/155] nixos/ircd-hybrid: fix bug in which fails to substitute iproute2 (#390833) --- nixos/modules/services/networking/ircd-hybrid/control.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/ircd-hybrid/control.in b/nixos/modules/services/networking/ircd-hybrid/control.in index 312dfaada329..13299bf897cc 100644 --- a/nixos/modules/services/networking/ircd-hybrid/control.in +++ b/nixos/modules/services/networking/ircd-hybrid/control.in @@ -6,7 +6,7 @@ export PATH=@coreutils@/bin if test "$1" = "start"; then if ! @procps@/bin/pgrep ircd; then if @ipv6Enabled@; then - while ! @iproute@/sbin/ip addr | + while ! @iproute2@/sbin/ip addr | @gnugrep@/bin/grep inet6 | @gnugrep@/bin/grep global; do sleep 1; From a8d0d315de94b4e41041d100bdb66ec96b5d7527 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Tue, 18 Mar 2025 17:01:57 +0000 Subject: [PATCH 088/155] Revert "lib/modules: disallow setting config, options in specialArgs of evalModules" --- lib/modules.nix | 3 --- lib/tests/modules.sh | 3 --- lib/tests/modules/specialArgs-config.nix | 18 ------------------ lib/tests/modules/specialArgs-options.nix | 18 ------------------ 4 files changed, 42 deletions(-) delete mode 100644 lib/tests/modules/specialArgs-config.nix delete mode 100644 lib/tests/modules/specialArgs-options.nix diff --git a/lib/modules.nix b/lib/modules.nix index ef6a2339895a..935ef4baabad 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -5,7 +5,6 @@ let addErrorContext all any - assertMsg attrByPath attrNames catAttrs @@ -102,8 +101,6 @@ let , # This would be remove in the future, Prefer _module.check option instead. check ? true }: - assert assertMsg (!specialArgs?config) "Do not set config in the specialArgs argument to evalModules."; - assert assertMsg (!specialArgs?options) "Do not set options in the specialArgs argument to evalModules."; let withWarnings = x: warnIf (evalModulesArgs?args) "The args argument to evalModules is deprecated. Please set config._module.args instead." diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 60f7536d0d43..1505782547f5 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -137,9 +137,6 @@ checkConfigOutput '^true$' config.result ./module-argument-default.nix # gvariant checkConfigOutput '^true$' config.assertion ./gvariant.nix -# specialArgs checks for evalModules -checkConfigError 'Do not set config in the specialArgs argument to evalModules\.' config.fail.config ./specialArgs-config.nix -checkConfigError 'Do not set options in the specialArgs argument to evalModules\.' config.fail.config ./specialArgs-options.nix checkConfigOutput '"ok"' config.result ./specialArgs-lib.nix # https://github.com/NixOS/nixpkgs/pull/131205 diff --git a/lib/tests/modules/specialArgs-config.nix b/lib/tests/modules/specialArgs-config.nix deleted file mode 100644 index a392a870a1ee..000000000000 --- a/lib/tests/modules/specialArgs-config.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, ... }: -{ - config = { - _module.freeformType = lib.types.anything; - - fail = lib.evalModules { - specialArgs = { - config = { }; - }; - modules = [ - { - options.a = lib.mkEnableOption "a"; - config.a = true; - } - ]; - }; - }; -} diff --git a/lib/tests/modules/specialArgs-options.nix b/lib/tests/modules/specialArgs-options.nix deleted file mode 100644 index 1a84770c9ef6..000000000000 --- a/lib/tests/modules/specialArgs-options.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, ... }: -{ - config = { - _module.freeformType = lib.types.anything; - - fail = lib.evalModules { - specialArgs = { - options = { }; - }; - modules = [ - { - options.a = lib.mkEnableOption "a"; - config.a = true; - } - ]; - }; - }; -} From 59425d216592ceb7dd12ed70ca85e36445a80473 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Mar 2025 15:18:53 +0000 Subject: [PATCH 089/155] git-delete-merged-branches: 7.4.2 -> 7.5.0, cleanup --- .../by-name/gi/git-delete-merged-branches/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gi/git-delete-merged-branches/package.nix b/pkgs/by-name/gi/git-delete-merged-branches/package.nix index 945cdb11f85c..8d74fed20f15 100644 --- a/pkgs/by-name/gi/git-delete-merged-branches/package.nix +++ b/pkgs/by-name/gi/git-delete-merged-branches/package.nix @@ -7,16 +7,19 @@ python3Packages.buildPythonApplication rec { pname = "git-delete-merged-branches"; - version = "7.4.2"; + version = "7.5.0"; + pyproject = true; src = fetchFromGitHub { owner = "hartwork"; repo = pname; tag = version; - sha256 = "sha256-l+R4gINZJ8bJdhcK+U9jOuIoAm2/bd5P+w9AbwPZMrk="; + sha256 = "sha256-2MSdUpToOiurtiL0Ws2dLEWqd6wj4nQ2RsEepBytgAk="; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ colorama prompt-toolkit ]; @@ -25,7 +28,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Command-line tool to delete merged Git branches"; - homepage = "https://pypi.org/project/git-delete-merged-branches/"; + homepage = "https://github.com/hartwork/git-delete-merged-branches/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ SuperSandro2000 ]; }; From 5af69717872d896c2a6a5de60d2baa964953d732 Mon Sep 17 00:00:00 2001 From: liberodark Date: Fri, 14 Mar 2025 10:04:04 +0100 Subject: [PATCH 090/155] ocsp-server: init at 0.4.1 --- pkgs/by-name/oc/ocsp-server/package.nix | 60 +++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 pkgs/by-name/oc/ocsp-server/package.nix diff --git a/pkgs/by-name/oc/ocsp-server/package.nix b/pkgs/by-name/oc/ocsp-server/package.nix new file mode 100644 index 000000000000..b5b9bbbde056 --- /dev/null +++ b/pkgs/by-name/oc/ocsp-server/package.nix @@ -0,0 +1,60 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + perl, + libmysqlclient, + mariadb, + postgresql, + mbedtls, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "ocsp-server"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "DorianCoding"; + repo = "OCSP-server"; + tag = "v${finalAttrs.version}"; + hash = "sha256-xYZ2NM+U7ZW5xDKVUhT+s66i/d7zaDLBbSbr6TDOG0o="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-RFrm2dtjJ2VvOg8ee54ps8MuWgsV0kd9rhpzOFTem2k="; + + nativeBuildInputs = [ + pkg-config + perl + libmysqlclient + ]; + + buildInputs = [ + openssl + mariadb + postgresql + mbedtls + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "OCSP responder fetching certificate status from MySQL/MariaDB database"; + homepage = "https://github.com/DorianCoding/OCSP-server"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ liberodark ]; + mainProgram = "ocsp-server"; + }; +}) From 29cdfc5cd10440f953e2ea834fc4194991d42287 Mon Sep 17 00:00:00 2001 From: Yohann Boniface Date: Tue, 18 Mar 2025 18:14:56 +0100 Subject: [PATCH 091/155] python312Packages.patchpy: init at 2.0.4 (#317377) --- .../python-modules/patchpy/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/patchpy/default.nix diff --git a/pkgs/development/python-modules/patchpy/default.nix b/pkgs/development/python-modules/patchpy/default.nix new file mode 100644 index 000000000000..e66fb6169c74 --- /dev/null +++ b/pkgs/development/python-modules/patchpy/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + hatchling, + more-itertools, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "patchpy"; + version = "2.0.4"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-q+k9vYz5crCsBjI5QH7Xz3QVpntzrIXeO456dyrzf4I="; + }; + + build-system = [ hatchling ]; + + dependencies = [ more-itertools ]; + + pythonImportsCheck = [ "patchpy" ]; + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "Modern Python library for patch file parsing"; + homepage = "https://github.com/MatthewScholefield/patchpy"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; + mainProgram = "patchpy"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fc41fd196b00..04261021c475 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10345,6 +10345,8 @@ self: super: with self; { patch-ng = callPackage ../development/python-modules/patch-ng { }; + patchpy = callPackage ../development/python-modules/patchpy { }; + path = callPackage ../development/python-modules/path { }; path-and-address = callPackage ../development/python-modules/path-and-address { }; From f403641247f3e665c516770b22c3ff70276f828f Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:11:38 +0100 Subject: [PATCH 092/155] postgresqlPackages.citus: modernize --- pkgs/servers/sql/postgresql/ext/citus.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/citus.nix index 83e300bff8d5..f0feef2f904b 100644 --- a/pkgs/servers/sql/postgresql/ext/citus.nix +++ b/pkgs/servers/sql/postgresql/ext/citus.nix @@ -1,11 +1,11 @@ { - lib, - stdenv, + buildPostgresqlExtension, curl, fetchFromGitHub, + lib, lz4, postgresql, - buildPostgresqlExtension, + stdenv, }: buildPostgresqlExtension rec { @@ -15,7 +15,7 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "citusdata"; repo = "citus"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-SuJs6OCHKO7efQagsATgn/V9rgMyuXQIHGCEP9ME7tQ="; }; @@ -24,20 +24,20 @@ buildPostgresqlExtension rec { lz4 ]; - meta = with lib; { + meta = { # "Our soft policy for Postgres version compatibility is to support Citus' # latest release with Postgres' 3 latest releases." # https://www.citusdata.com/updates/v12-0/#deprecated_features broken = - versionOlder postgresql.version "15" + lib.versionOlder postgresql.version "15" || # PostgreSQL 17 support issue upstream: https://github.com/citusdata/citus/issues/7708 # Check after next package update. - (versionAtLeast postgresql.version "17" && version == "12.1.6"); + (lib.versionAtLeast postgresql.version "17" && version == "12.1.6"); description = "Distributed PostgreSQL as an extension"; homepage = "https://www.citusdata.com/"; changelog = "https://github.com/citusdata/citus/blob/${src.rev}/CHANGELOG.md"; - license = licenses.agpl3Only; + license = lib.licenses.agpl3Only; maintainers = [ ]; inherit (postgresql.meta) platforms; }; From 07f318ab2d1e1124e250e530efa26dccf2da3db9 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:13:52 +0100 Subject: [PATCH 093/155] postgresqlPackages.citus: remove left-over broken condition --- pkgs/servers/sql/postgresql/ext/citus.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/citus.nix index f0feef2f904b..e42976419fb9 100644 --- a/pkgs/servers/sql/postgresql/ext/citus.nix +++ b/pkgs/servers/sql/postgresql/ext/citus.nix @@ -28,12 +28,7 @@ buildPostgresqlExtension rec { # "Our soft policy for Postgres version compatibility is to support Citus' # latest release with Postgres' 3 latest releases." # https://www.citusdata.com/updates/v12-0/#deprecated_features - broken = - lib.versionOlder postgresql.version "15" - || - # PostgreSQL 17 support issue upstream: https://github.com/citusdata/citus/issues/7708 - # Check after next package update. - (lib.versionAtLeast postgresql.version "17" && version == "12.1.6"); + broken = lib.versionOlder postgresql.version "15"; description = "Distributed PostgreSQL as an extension"; homepage = "https://www.citusdata.com/"; changelog = "https://github.com/citusdata/citus/blob/${src.rev}/CHANGELOG.md"; From 2bd4a4b670b715a946b1d84ef50b444ebf532279 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:14:10 +0100 Subject: [PATCH 094/155] postgresqlPackages.cstore_fdw: modernize --- pkgs/servers/sql/postgresql/ext/cstore_fdw.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix index b9223e4beecc..1d49438d08eb 100644 --- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix @@ -1,10 +1,10 @@ { - lib, - stdenv, + buildPostgresqlExtension, fetchFromGitHub, + lib, postgresql, protobufc, - buildPostgresqlExtension, + stdenv, }: buildPostgresqlExtension { @@ -18,15 +18,15 @@ buildPostgresqlExtension { owner = "citusdata"; repo = "cstore_fdw"; rev = "90e22b62fbee6852529104fdd463f532cf7a3311"; - sha256 = "sha256-02wcCqs8A5ZOZX080fgcNJTQrYQctnlwnA8+YPaRTZc="; + hash = "sha256-02wcCqs8A5ZOZX080fgcNJTQrYQctnlwnA8+YPaRTZc="; }; - meta = with lib; { - broken = versionAtLeast postgresql.version "14"; + meta = { + broken = lib.versionAtLeast postgresql.version "14"; description = "Columnar storage for PostgreSQL"; homepage = "https://github.com/citusdata/cstore_fdw"; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; - license = licenses.asl20; + license = lib.licenses.asl20; }; } From 7cad011574b4ce10d5319089286fe0d3636d8ea6 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:14:50 +0100 Subject: [PATCH 095/155] postgresqlPackages.h3-pg: modernize --- pkgs/servers/sql/postgresql/ext/h3-pg.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/h3-pg.nix b/pkgs/servers/sql/postgresql/ext/h3-pg.nix index 88435112e0dd..9f45ec8d7544 100644 --- a/pkgs/servers/sql/postgresql/ext/h3-pg.nix +++ b/pkgs/servers/sql/postgresql/ext/h3-pg.nix @@ -1,12 +1,12 @@ { - lib, - stdenv, + buildPostgresqlExtension, cmake, fetchFromGitHub, h3_4, + lib, postgresql, postgresqlTestExtension, - buildPostgresqlExtension, + stdenv, }: buildPostgresqlExtension (finalAttrs: { @@ -16,7 +16,7 @@ buildPostgresqlExtension (finalAttrs: { src = fetchFromGitHub { owner = "zachasme"; repo = "h3-pg"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2xp9gssPMTroLT/1Me0VWvtIPyouIk9MW0Rp13uYBEw="; }; @@ -50,10 +50,10 @@ buildPostgresqlExtension (finalAttrs: { ''; }; - meta = with lib; { + meta = { description = "PostgreSQL bindings for H3, a hierarchical hexagonal geospatial indexing system"; homepage = "https://github.com/zachasme/h3-pg"; - license = licenses.asl20; + license = lib.licenses.asl20; maintainers = [ ]; inherit (postgresql.meta) platforms; }; From 713a4107e3f2d69acf44dc99cd6322f3aadcccb4 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:15:56 +0100 Subject: [PATCH 096/155] postgresqlPackages.hypopg: modernize --- pkgs/servers/sql/postgresql/ext/hypopg.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/hypopg.nix b/pkgs/servers/sql/postgresql/ext/hypopg.nix index f85a743d9fca..47931377fb67 100644 --- a/pkgs/servers/sql/postgresql/ext/hypopg.nix +++ b/pkgs/servers/sql/postgresql/ext/hypopg.nix @@ -1,10 +1,10 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, - gitUpdater, buildPostgresqlExtension, + fetchFromGitHub, + gitUpdater, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -14,7 +14,7 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "HypoPG"; repo = "hypopg"; - rev = version; + tag = version; hash = "sha256-88uKPSnITRZ2VkelI56jZ9GWazG/Rn39QlyHKJKSKMM="; }; @@ -24,11 +24,11 @@ buildPostgresqlExtension rec { }; }; - meta = with lib; { + meta = { description = "Hypothetical Indexes for PostgreSQL"; homepage = "https://hypopg.readthedocs.io"; - license = licenses.postgresql; + license = lib.licenses.postgresql; platforms = postgresql.meta.platforms; - maintainers = with maintainers; [ bbigras ]; + maintainers = with lib.maintainers; [ bbigras ]; }; } From 408c32a5e4c447b40feb92a3137bb3b89210dace Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:18:09 +0100 Subject: [PATCH 097/155] postgresqlPackages.jsonb_deep_sum: modernize --- .../sql/postgresql/ext/jsonb_deep_sum.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix b/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix index 8d8ccf12e56b..bfb69e6df0f8 100644 --- a/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix +++ b/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension { @@ -14,14 +14,14 @@ buildPostgresqlExtension { owner = "furstenheim"; repo = "jsonb_deep_sum"; rev = "d9c69aa6b7da860e5522a9426467e67cb787980c"; - sha256 = "sha256-W1wNILAwTAjFPezq+grdRMA59KEnMZDz69n9xQUqdc0="; + hash = "sha256-W1wNILAwTAjFPezq+grdRMA59KEnMZDz69n9xQUqdc0="; }; - meta = with lib; { + meta = { description = "PostgreSQL extension to easily add jsonb numeric"; homepage = "https://github.com/furstenheim/jsonb_deep_sum"; - maintainers = with maintainers; [ _1000101 ]; + maintainers = with lib.maintainers; [ _1000101 ]; platforms = postgresql.meta.platforms; - license = licenses.mit; + license = lib.licenses.mit; }; } From f0a6c688a62ddda19f9aba5c88ea436b54966e39 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:18:21 +0100 Subject: [PATCH 098/155] postgresqlPackages.lantern: modernize --- pkgs/servers/sql/postgresql/ext/lantern.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/lantern.nix b/pkgs/servers/sql/postgresql/ext/lantern.nix index fcfd82e61345..51150b5e6ec6 100644 --- a/pkgs/servers/sql/postgresql/ext/lantern.nix +++ b/pkgs/servers/sql/postgresql/ext/lantern.nix @@ -1,12 +1,12 @@ { - lib, - stdenv, + buildPostgresqlExtension, cmake, fetchFromGitHub, + lib, openssl, postgresql, postgresqlTestExtension, - buildPostgresqlExtension, + stdenv, }: buildPostgresqlExtension (finalAttrs: { @@ -16,7 +16,7 @@ buildPostgresqlExtension (finalAttrs: { src = fetchFromGitHub { owner = "lanterndata"; repo = "lantern"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-IsDD/um5pVvbzin8onf45DQVszl+Id/pJSQ2iijgHmg="; fetchSubmodules = true; }; @@ -51,11 +51,11 @@ buildPostgresqlExtension (finalAttrs: { ''; }; - meta = with lib; { + meta = { description = "PostgreSQL vector database extension for building AI applications"; homepage = "https://lantern.dev/"; changelog = "https://github.com/lanterndata/lantern/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = licenses.agpl3Only; + license = lib.licenses.agpl3Only; maintainers = [ ]; platforms = postgresql.meta.platforms; }; From ebe805eedd255e3e2737c6983f879eeb25784a8f Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:18:29 +0100 Subject: [PATCH 099/155] postgresqlPackages.periods: modernize --- pkgs/servers/sql/postgresql/ext/periods.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/periods.nix b/pkgs/servers/sql/postgresql/ext/periods.nix index 343482d26c7b..422c76ae668d 100644 --- a/pkgs/servers/sql/postgresql/ext/periods.nix +++ b/pkgs/servers/sql/postgresql/ext/periods.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -12,16 +12,16 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "xocolatl"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-97v6+WNDcYb/KivlE/JBlRIZ3gYHj68AlK0fylp1cPo="; + repo = "periods"; + tag = "v${version}"; + hash = "sha256-97v6+WNDcYb/KivlE/JBlRIZ3gYHj68AlK0fylp1cPo="; }; - meta = with lib; { + meta = { description = "PostgreSQL extension implementing SQL standard functionality for PERIODs and SYSTEM VERSIONING"; homepage = "https://github.com/xocolatl/periods"; - maintainers = with maintainers; [ ivan ]; + maintainers = with lib.maintainers; [ ivan ]; platforms = postgresql.meta.platforms; - license = licenses.postgresql; + license = lib.licenses.postgresql; }; } From 8825d441ce4adaaef944602e6a9a48de5f9dc906 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:18:54 +0100 Subject: [PATCH 100/155] postgresqlPackages.pg-gvm: modernize --- pkgs/servers/sql/postgresql/ext/pg-gvm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg-gvm.nix b/pkgs/servers/sql/postgresql/ext/pg-gvm.nix index 33b6f2aa24b4..80cf0a80ae6f 100644 --- a/pkgs/servers/sql/postgresql/ext/pg-gvm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg-gvm.nix @@ -19,7 +19,7 @@ buildPostgresqlExtension (finalAttrs: { src = fetchFromGitHub { owner = "greenbone"; repo = "pg-gvm"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-D8KpOTF+vcBNIn//8Y0Hwk4B+OBF2Hh3dkWyO2KYeqw="; }; From f9fa6c8385d2662edd29cb9b3c8d4e92d3873fe2 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:19:16 +0100 Subject: [PATCH 101/155] postgresqlPackages.pg-gvm: remove mainProgram This is an extension, which doesn't have a binary to begin with. --- pkgs/servers/sql/postgresql/ext/pg-gvm.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg-gvm.nix b/pkgs/servers/sql/postgresql/ext/pg-gvm.nix index 80cf0a80ae6f..a4761bad5cd0 100644 --- a/pkgs/servers/sql/postgresql/ext/pg-gvm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg-gvm.nix @@ -42,7 +42,6 @@ buildPostgresqlExtension (finalAttrs: { changelog = "https://github.com/greenbone/pg-gvm/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ tochiaha ]; - mainProgram = "pg-gvm"; platforms = postgresql.meta.platforms; }; }) From 13ca9125caad853805931795a1313a8b1c6c00c5 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:25:49 +0100 Subject: [PATCH 102/155] postgresqlPackages.pg-semver: modernize --- pkgs/servers/sql/postgresql/ext/pg-semver.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg-semver.nix b/pkgs/servers/sql/postgresql/ext/pg-semver.nix index d379981cd0df..ea8d4c70a4a2 100644 --- a/pkgs/servers/sql/postgresql/ext/pg-semver.nix +++ b/pkgs/servers/sql/postgresql/ext/pg-semver.nix @@ -1,10 +1,10 @@ { - lib, + buildPostgresqlExtension, fetchFromGitHub, + lib, postgresql, postgresqlTestExtension, testers, - buildPostgresqlExtension, }: buildPostgresqlExtension (finalAttrs: { @@ -14,7 +14,7 @@ buildPostgresqlExtension (finalAttrs: { src = fetchFromGitHub { owner = "theory"; repo = "pg-semver"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-9f+QuGupjTUK3cQk7DFDrL7MOIwDE9SAUyVZ9RfrdDM="; }; From 29029695329826ce04b57ee73cae2d87c7e7c7e7 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:26:01 +0100 Subject: [PATCH 103/155] postgresqlPackages.pg_auto_failover: modernize --- .../sql/postgresql/ext/pg_auto_failover.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index 0d43faa7fe2e..dbb723e31049 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -12,23 +12,23 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "citusdata"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-OIWykfFbVskrkPG/zSmZtZjc+W956KSfIzK7f5QOqpI="; + repo = "pg_auto_failover"; + tag = "v${version}"; + hash = "sha256-OIWykfFbVskrkPG/zSmZtZjc+W956KSfIzK7f5QOqpI="; }; buildInputs = postgresql.buildInputs; - meta = with lib; { + meta = { description = "PostgreSQL extension and service for automated failover and high-availability"; mainProgram = "pg_autoctl"; homepage = "https://github.com/citusdata/pg_auto_failover"; changelog = "https://github.com/citusdata/pg_auto_failover/blob/v${version}/CHANGELOG.md"; maintainers = [ ]; platforms = postgresql.meta.platforms; - license = licenses.postgresql; + license = lib.licenses.postgresql; # PostgreSQL 17 support issue upstream: https://github.com/hapostgres/pg_auto_failover/issues/1048 # Check after next package update. - broken = versionAtLeast postgresql.version "17" && version == "2.1"; + broken = lib.versionAtLeast postgresql.version "17" && version == "2.1"; }; } From fdc0616a17198f0c66715764aaefef21ad460c09 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:28:59 +0100 Subject: [PATCH 104/155] postgresqlPackages.pg_bigm: modernize --- pkgs/servers/sql/postgresql/ext/pg_bigm.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix index e4c12f676d07..68daf6bcb3d0 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix @@ -1,8 +1,8 @@ { - lib, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, }: buildPostgresqlExtension rec { @@ -12,17 +12,17 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "pgbigm"; repo = "pg_bigm"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-5Uy1DmGZR4WdtRUvNdZ5b9zBHJUb9idcEzW20rkreBs="; }; makeFlags = [ "USE_PGXS=1" ]; - meta = with lib; { + meta = { description = "Text similarity measurement and index searching based on bigrams"; homepage = "https://pgbigm.osdn.jp/"; maintainers = [ ]; platforms = postgresql.meta.platforms; - license = licenses.postgresql; + license = lib.licenses.postgresql; }; } From a79b661577734b2f25e61c4f3f2b968c45c1a9dc Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:29:12 +0100 Subject: [PATCH 105/155] postgresqlPackages.pg_cron: modernize --- pkgs/servers/sql/postgresql/ext/pg_cron.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix index 124f58fababf..28befb93aacc 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -12,17 +12,17 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "citusdata"; - repo = pname; - rev = "v${version}"; + repo = "pg_cron"; + tag = "v${version}"; hash = "sha256-Llksil7Fk7jvJJmCpfCN0Qm2b2I4J1VOA7/ibytO+KM="; }; - meta = with lib; { + meta = { description = "Run Cron jobs through PostgreSQL"; homepage = "https://github.com/citusdata/pg_cron"; changelog = "https://github.com/citusdata/pg_cron/releases/tag/v${version}"; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; - license = licenses.postgresql; + license = lib.licenses.postgresql; }; } From 1fe9671159f70d5c6f7a5e521b40b6258a4ba3d1 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:29:22 +0100 Subject: [PATCH 106/155] postgresqlPackages.pg_ed25519: modernize --- pkgs/servers/sql/postgresql/ext/pg_ed25519.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix index 6e823f82b560..4eb97283b5b2 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitLab, - postgresql, buildPostgresqlExtension, + fetchFromGitLab, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -13,16 +13,16 @@ buildPostgresqlExtension rec { src = fetchFromGitLab { owner = "dwagin"; repo = "pg_ed25519"; - rev = version; - sha256 = "16w3qx3wj81bzfhydl2pjhn8b1jak6h7ja9wq1kc626g0siggqi0"; + tag = version; + hash = "sha256-IOL3ogbPCMNmwDwpeaCZSoaFLJRX0Oah+ysgyUfHg5s="; }; - meta = with lib; { + meta = { description = "PostgreSQL extension for signing and verifying ed25519 signatures"; homepage = "https://gitlab.com/dwagin/pg_ed25519"; - maintainers = [ maintainers.renzo ]; + maintainers = with lib.maintainers; [ renzo ]; platforms = postgresql.meta.platforms; - license = licenses.mit; + license = lib.licenses.mit; # Broken with no upstream fix available. broken = lib.versionAtLeast postgresql.version "16"; }; From db0b636cffbcb5ab2fb424d53f429d3168839013 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:29:44 +0100 Subject: [PATCH 107/155] postgresqlPackages.pg_hint_plan: modernize --- pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix index 20d31530164e..4f4e4ddd8882 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: let @@ -44,7 +44,7 @@ buildPostgresqlExtension { src = fetchFromGitHub { owner = "ossc-db"; repo = "pg_hint_plan"; - rev = "REL${lib.versions.major postgresql.version}_${ + tag = "REL${lib.versions.major postgresql.version}_${ builtins.replaceStrings [ "." ] [ "_" ] source.version }"; inherit (source) hash; @@ -57,11 +57,11 @@ buildPostgresqlExtension { enableUpdateScript = false; - meta = with lib; { + meta = { description = "Extension to tweak PostgreSQL execution plans using so-called 'hints' in SQL comments"; homepage = "https://github.com/ossc-db/pg_hint_plan"; - maintainers = with maintainers; [ _1000101 ]; + maintainers = with lib.maintainers; [ _1000101 ]; platforms = postgresql.meta.platforms; - license = licenses.bsd3; + license = lib.licenses.bsd3; }; } From 1201a679319da22c8660f8d7732bcbaddb074115 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:30:07 +0100 Subject: [PATCH 108/155] postgresqlPackages.pg_hint_plan: remove hash for v12 v12 had been removed from nixpkgs a while ago. --- pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix index 4f4e4ddd8882..4b4a8c07bc89 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix @@ -29,10 +29,6 @@ let version = "1.3.9"; hash = "sha256-KGcHDwk8CgNHPZARfLBfS8r7TRCP9LPjT+m4fNSnnW0="; }; - "12" = { - version = "1.3.9"; - hash = "sha256-64/dlm6e4flCxMQ8efsxfKSlja+Tko0zsghTgLatN+Y="; - }; } .${lib.versions.major postgresql.version} or (throw "Source for pg_hint_plan is not available for ${postgresql.version}"); From 35b7e2c03109c7f78332fa2903dd3180f71bc193 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:32:33 +0100 Subject: [PATCH 109/155] postgresqlPackages.pg_hll: modernize --- pkgs/servers/sql/postgresql/ext/pg_hll.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix index 709424365e7c..4f817d799aeb 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -13,16 +13,16 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "citusdata"; repo = "postgresql-hll"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-Latdxph1Ura8yKEokEjalJ+/GY+pAKOT3GXjuLprj6c="; }; - meta = with lib; { + meta = { description = "HyperLogLog for PostgreSQL"; homepage = "https://github.com/citusdata/postgresql-hll"; changelog = "https://github.com/citusdata/postgresql-hll/blob/v${version}/CHANGELOG.md"; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; - license = licenses.asl20; + license = lib.licenses.asl20; }; } From f7761b09ac5e77f55c68883e7916ed586ea7e120 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:32:43 +0100 Subject: [PATCH 110/155] postgresqlPackages.pg_ivm: modernize --- pkgs/servers/sql/postgresql/ext/pg_ivm.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix index 675eab8fee5c..c652d50dfe89 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -12,18 +12,18 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "sraoss"; - repo = pname; - rev = "v${version}"; + repo = "pg_ivm"; + tag = "v${version}"; hash = "sha256-Qcie7sbXcMbQkMoFIYBfttmvlYooESdSk2DyebHKPlk="; }; - meta = with lib; { + meta = { description = "Materialized views with IVM (Incremental View Maintenance) for PostgreSQL"; homepage = "https://github.com/sraoss/pg_ivm"; changelog = "https://github.com/sraoss/pg_ivm/releases/tag/v${version}"; - maintainers = with maintainers; [ ivan ]; + maintainers = with lib.maintainers; [ ivan ]; platforms = postgresql.meta.platforms; - license = licenses.postgresql; - broken = versionOlder postgresql.version "13"; + license = lib.licenses.postgresql; + broken = lib.versionOlder postgresql.version "13"; }; } From 329750763e3d9e599e0cc94580ca8cc154f384c4 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:32:53 +0100 Subject: [PATCH 111/155] postgresqlPackages.pg_libversion: modernize --- .../servers/sql/postgresql/ext/pg_libversion.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_libversion.nix b/pkgs/servers/sql/postgresql/ext/pg_libversion.nix index 2360944e555d..979a48128bb1 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_libversion.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_libversion.nix @@ -1,12 +1,12 @@ { - lib, - stdenv, + buildPostgresqlExtension, fetchFromGitHub, gitUpdater, + lib, + libversion, pkg-config, postgresql, - libversion, - buildPostgresqlExtension, + stdenv, }: buildPostgresqlExtension (finalAttrs: { @@ -16,7 +16,7 @@ buildPostgresqlExtension (finalAttrs: { src = fetchFromGitHub { owner = "repology"; repo = "postgresql-libversion"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-3nqXaBwPRUSo6wUY5YMjJ/nFFKmhgP1zFKapD+RqSDw="; }; @@ -30,11 +30,11 @@ buildPostgresqlExtension (finalAttrs: { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { description = "PostgreSQL extension with support for version string comparison"; homepage = "https://github.com/repology/postgresql-libversion"; - license = licenses.mit; - maintainers = [ maintainers.jopejoe1 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jopejoe1 ]; platforms = postgresql.meta.platforms; }; }) From df033d0eef073b769f97268736b06631ea32eb25 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:33:01 +0100 Subject: [PATCH 112/155] postgresqlPackages.pg_net: modernize --- pkgs/servers/sql/postgresql/ext/pg_net.nix | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix index 61ee9572467e..fbc8d213a235 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_net.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix @@ -1,33 +1,33 @@ { - lib, - stdenv, - fetchFromGitHub, - curl, - postgresql, buildPostgresqlExtension, + curl, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { pname = "pg_net"; version = "0.14.0"; - buildInputs = [ curl ]; - src = fetchFromGitHub { owner = "supabase"; - repo = pname; - rev = "refs/tags/v${version}"; + repo = "pg_net"; + tag = "v${version}"; hash = "sha256-c1pxhTyrE5j6dY+M5eKAboQNofIORS+Dccz+7HKEKQI="; }; + buildInputs = [ curl ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; - meta = with lib; { + meta = { description = "Async networking for Postgres"; homepage = "https://github.com/supabase/pg_net"; changelog = "https://github.com/supabase/pg_net/releases/tag/v${version}"; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; - license = licenses.postgresql; + license = lib.licenses.postgresql; }; } From c8acb21179f09bca51cdcee68fe6f7db676cb468 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:33:45 +0100 Subject: [PATCH 113/155] postgresqlPackages.pg_partman: modernize --- .../servers/sql/postgresql/ext/pg_partman.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index c3ffbbe2ce7d..af06311a5d3d 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -12,18 +12,18 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "pgpartman"; - repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "sha256-i/o+JZEXnJRO17kfdTw87aca28+I8pvuFZsPMA/kf+w="; + repo = "pg_partman"; + tag = "v${version}"; + hash = "sha256-i/o+JZEXnJRO17kfdTw87aca28+I8pvuFZsPMA/kf+w="; }; - meta = with lib; { + meta = { description = "Partition management extension for PostgreSQL"; homepage = "https://github.com/pgpartman/pg_partman"; changelog = "https://github.com/pgpartman/pg_partman/blob/v${version}/CHANGELOG.md"; - maintainers = with maintainers; [ ggpeti ]; + maintainers = with lib.maintainers; [ ggpeti ]; platforms = postgresql.meta.platforms; - license = licenses.postgresql; - broken = versionOlder postgresql.version "14"; + license = lib.licenses.postgresql; + broken = lib.versionOlder postgresql.version "14"; }; } From 5c1b9628b841230012a65fe5a4f8dfe063e4728e Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:34:36 +0100 Subject: [PATCH 114/155] postgresqlPackages.pg_rational: modernize --- pkgs/servers/sql/postgresql/ext/pg_rational.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_rational.nix b/pkgs/servers/sql/postgresql/ext/pg_rational.nix index d2131b9f8c78..a557006142ec 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_rational.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_rational.nix @@ -1,9 +1,8 @@ { - stdenv, + buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, - buildPostgresqlExtension, }: buildPostgresqlExtension rec { @@ -13,15 +12,15 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "begriffs"; repo = "pg_rational"; - rev = "v${version}"; - sha256 = "sha256-Sp5wuX2nP3KGyWw7MFa11rI1CPIKIWBt8nvBSsASIEw="; + tag = "v${version}"; + hash = "sha256-Sp5wuX2nP3KGyWw7MFa11rI1CPIKIWBt8nvBSsASIEw="; }; - meta = with lib; { + meta = { description = "Precise fractional arithmetic for PostgreSQL"; homepage = "https://github.com/begriffs/pg_rational"; - maintainers = with maintainers; [ netcrns ]; + maintainers = with lib.maintainers; [ netcrns ]; platforms = postgresql.meta.platforms; - license = licenses.mit; + license = lib.licenses.mit; }; } From 06bcba6c00ff5fc51d98d0ce52bedbd4a1e768bc Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:54:32 +0100 Subject: [PATCH 115/155] postgresqlPackages.pg_relusage: modernize --- .../sql/postgresql/ext/pg_relusage.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_relusage.nix b/pkgs/servers/sql/postgresql/ext/pg_relusage.nix index 4379dc1ffdc9..a7666c046247 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_relusage.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_relusage.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -12,16 +12,16 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "adept"; - repo = pname; - rev = "refs/tags/${version}"; - sha256 = "8hJNjQ9MaBk3J9a73l+yQMwMW/F2N8vr5PO2o+5GvYs="; + repo = "pg_relusage"; + tag = "${version}"; + hash = "sha256-8hJNjQ9MaBk3J9a73l+yQMwMW/F2N8vr5PO2o+5GvYs="; }; - meta = with lib; { + meta = { description = "pg_relusage extension for PostgreSQL: discover and log the relations used in your statements"; homepage = "https://github.com/adept/pg_relusage"; - maintainers = with maintainers; [ thenonameguy ]; + maintainers = with lib.maintainers; [ thenonameguy ]; platforms = postgresql.meta.platforms; - license = licenses.postgresql; + license = lib.licenses.postgresql; }; } From 494501473064537488e9391b3df03b4a8769d110 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:55:49 +0100 Subject: [PATCH 116/155] postgresqlPackages.pg_repack: modernize --- pkgs/servers/sql/postgresql/ext/pg_repack.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix index 388a82cb29cb..8368b2ffd672 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix @@ -1,12 +1,12 @@ { - lib, - stdenv, + buildPostgresqlExtension, fetchFromGitHub, + gitUpdater, + lib, postgresql, postgresqlTestExtension, + stdenv, testers, - buildPostgresqlExtension, - gitUpdater, }: buildPostgresqlExtension (finalAttrs: { @@ -18,8 +18,8 @@ buildPostgresqlExtension (finalAttrs: { src = fetchFromGitHub { owner = "reorg"; repo = "pg_repack"; - rev = "ver_${finalAttrs.version}"; - sha256 = "sha256-wfjiLkx+S3zVrAynisX1GdazueVJ3EOwQEPcgUQt7eA="; + tag = "ver_${finalAttrs.version}"; + hash = "sha256-wfjiLkx+S3zVrAynisX1GdazueVJ3EOwQEPcgUQt7eA="; }; passthru.updateScript = gitUpdater { @@ -36,7 +36,7 @@ buildPostgresqlExtension (finalAttrs: { }; }; - meta = with lib; { + meta = { description = "Reorganize tables in PostgreSQL databases with minimal locks"; longDescription = '' pg_repack is a PostgreSQL extension which lets you remove bloat from tables and indexes, and optionally restore @@ -45,8 +45,8 @@ buildPostgresqlExtension (finalAttrs: { with performance comparable to using CLUSTER directly. ''; homepage = "https://github.com/reorg/pg_repack"; - license = licenses.bsd3; - maintainers = with maintainers; [ danbst ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ danbst ]; inherit (postgresql.meta) platforms; mainProgram = "pg_repack"; }; From 0861a93e92e9c4f2c54cbdcbb234a4e046a9fbb1 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:56:06 +0100 Subject: [PATCH 117/155] postgresqlPackages.pg_roaringbitmap: modernize --- pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix b/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix index eeade122d1e1..8ffe3ed2c13d 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix @@ -1,10 +1,10 @@ { - lib, - stdenv, + buildPostgresqlExtension, fetchFromGitHub, + lib, postgresql, postgresqlTestHook, - buildPostgresqlExtension, + stdenv, }: buildPostgresqlExtension (finalAttrs: { @@ -14,15 +14,15 @@ buildPostgresqlExtension (finalAttrs: { src = fetchFromGitHub { owner = "ChenHuajun"; repo = "pg_roaringbitmap"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-E6vqawnsRsAIajGDgJcTUWV1H8GFFboTjhmVfemUGbs="; }; - meta = with lib; { + meta = { description = "RoaringBitmap extension for PostgreSQL"; homepage = "https://github.com/ChenHuajun/pg_roaringbitmap"; changelog = "https://github.com/ChenHuajun/pg_roaringbitmap/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = licenses.asl20; + license = lib.licenses.asl20; maintainers = [ ]; inherit (postgresql.meta) platforms; }; From ea10eb7f6d9fec3f1e668aba72f1965bc4cef51c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:56:37 +0100 Subject: [PATCH 118/155] postgresqlPackages.pg_safeupdate: modernize --- .../sql/postgresql/ext/pg_safeupdate.nix | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix index 17ffa9a67203..b3cca02a3a25 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: with { @@ -13,23 +13,23 @@ with { }; "13" = { version = "1.4"; - sha256 = "sha256-1cyvVEC9MQGMr7Tg6EUbsVBrMc8ahdFS3+CmDkmAq4Y="; + hash = "sha256-1cyvVEC9MQGMr7Tg6EUbsVBrMc8ahdFS3+CmDkmAq4Y="; }; "14" = { version = "1.5"; - sha256 = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; + hash = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; }; "15" = { version = "1.5"; - sha256 = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; + hash = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; }; "16" = { version = "1.5"; - sha256 = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; + hash = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; }; "17" = { version = "1.5"; - sha256 = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; + hash = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; }; } ."${lib.versions.major postgresql.version}" @@ -41,17 +41,17 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "eradman"; - repo = pname; - rev = version; - inherit sha256; + repo = "pg-safeupdate"; + tag = version; + inherit hash; }; - meta = with lib; { + meta = { description = "Simple extension to PostgreSQL that requires criteria for UPDATE and DELETE"; homepage = "https://github.com/eradman/pg-safeupdate"; changelog = "https://github.com/eradman/pg-safeupdate/raw/${src.rev}/NEWS"; platforms = postgresql.meta.platforms; - maintainers = with maintainers; [ wolfgangwalther ]; - license = licenses.postgresql; + maintainers = with lib.maintainers; [ wolfgangwalther ]; + license = lib.licenses.postgresql; }; } From aefde28f058cbf9bd96a53bcea7ba86dc7959433 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:57:03 +0100 Subject: [PATCH 119/155] postgresqlPackages.pg_safeupdate: remove hash for v12 v12 had been removed from nixpkgs a while ago. --- pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix index b3cca02a3a25..c551aca7df8f 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix @@ -7,10 +7,6 @@ }: with { - "12" = { - version = "1.4"; - sha256 = "sha256-1cyvVEC9MQGMr7Tg6EUbsVBrMc8ahdFS3+CmDkmAq4Y="; - }; "13" = { version = "1.4"; hash = "sha256-1cyvVEC9MQGMr7Tg6EUbsVBrMc8ahdFS3+CmDkmAq4Y="; From 0308b7191304e1922290aa70bf2fc93869946ce6 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:57:14 +0100 Subject: [PATCH 120/155] postgresqlPackages.pg_similarity: modernize --- pkgs/servers/sql/postgresql/ext/pg_similarity.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix index 41b663864ba2..ab6d97637231 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix @@ -1,10 +1,10 @@ { - stdenv, - lib, + buildPostgresqlExtension, fetchFromGitHub, fetchpatch, + lib, postgresql, - buildPostgresqlExtension, + stdenv, }: buildPostgresqlExtension { @@ -15,7 +15,7 @@ buildPostgresqlExtension { owner = "eulerto"; repo = "pg_similarity"; rev = "b9cb0a2d501b91e33cd1ef550b05483ca3563f71"; - sha256 = "sha256-L04ANvyfzHgW7fINeJEY6T77Vojq3SI8P1TWiCRSPs0="; + hash = "sha256-L04ANvyfzHgW7fINeJEY6T77Vojq3SI8P1TWiCRSPs0="; }; patches = [ From 72ac83aaddeb64f39db043bf3fc434b667b4e54d Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:57:28 +0100 Subject: [PATCH 121/155] postgresqlPackages.pg_squeeze: modernize --- pkgs/servers/sql/postgresql/ext/pg_squeeze.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix index 13bbd7a330b7..9dfef6a1322a 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix @@ -1,11 +1,11 @@ { - lib, - stdenv, + buildPostgresqlExtension, fetchFromGitHub, + lib, + nix-update-script, postgresql, postgresqlTestExtension, - buildPostgresqlExtension, - nix-update-script, + stdenv, }: buildPostgresqlExtension (finalAttrs: { @@ -17,7 +17,7 @@ buildPostgresqlExtension (finalAttrs: { src = fetchFromGitHub { owner = "cybertec-postgresql"; repo = "pg_squeeze"; - rev = "REL1_7_0"; + tag = "REL1_7_0"; hash = "sha256-Kh1wSOvV5Rd1CG/na3yzbWzvaR8SJ6wmTZOnM+lbgik="; }; @@ -41,11 +41,11 @@ buildPostgresqlExtension (finalAttrs: { ''; }; - meta = with lib; { + meta = { description = "PostgreSQL extension for automatic bloat cleanup"; homepage = "https://github.com/cybertec-postgresql/pg_squeeze"; changelog = "https://github.com/cybertec-postgresql/pg_squeeze/blob/${finalAttrs.src.rev}/NEWS"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; platforms = postgresql.meta.platforms; }; From 4d8242ed1b080b785441dacfe034636d561c684e Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:57:43 +0100 Subject: [PATCH 122/155] postgresqlPackages.pg_topn: modernize --- pkgs/servers/sql/postgresql/ext/pg_topn.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix index 3271c6ac7a68..a6ac3c5ea70e 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -13,16 +13,16 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "citusdata"; repo = "postgresql-topn"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-lP6Iil/BUv4ga+co+oBpKv1FBqFuBGfNjueEolM6png="; + tag = "v${version}"; + hash = "sha256-lP6Iil/BUv4ga+co+oBpKv1FBqFuBGfNjueEolM6png="; }; - meta = with lib; { + meta = { description = "Efficient querying of 'top values' for PostgreSQL"; homepage = "https://github.com/citusdata/postgresql-topn"; changelog = "https://github.com/citusdata/postgresql-topn/raw/v${version}/CHANGELOG.md"; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; - license = licenses.agpl3Only; + license = lib.licenses.agpl3Only; }; } From bdadf795833bfec8522589493f6b5f2ea0375ee3 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:58:07 +0100 Subject: [PATCH 123/155] postgresqlPackages.pg_uuidv7: modernize --- pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix index a11332dd6192..9f3f766d29ed 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -13,17 +13,17 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "fboulnois"; repo = "pg_uuidv7"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-lG6dCnbLALnfQc4uclqXXXfYjK/WXLV0lo5I8l1E5p4="; }; - meta = with lib; { + meta = { description = "Tiny Postgres extension to create version 7 UUIDs"; homepage = "https://github.com/fboulnois/pg_uuidv7"; changelog = "https://github.com/fboulnois/pg_uuidv7/blob/main/CHANGELOG.md"; - maintainers = with maintainers; [ gaelreyrol ]; + maintainers = with lib.maintainers; [ gaelreyrol ]; platforms = postgresql.meta.platforms; - license = licenses.mpl20; - broken = versionOlder postgresql.version "13"; + license = lib.licenses.mpl20; + broken = lib.versionOlder postgresql.version "13"; }; } From d271d2ac406f3cd3f35f15c46ca06a151043e0f6 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:58:25 +0100 Subject: [PATCH 124/155] postgresqlPackages.pgaudit: modernize --- pkgs/servers/sql/postgresql/ext/pgaudit.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/pgaudit.nix index 13e5ad29ff4a..f9ca1b485eba 100644 --- a/pkgs/servers/sql/postgresql/ext/pgaudit.nix +++ b/pkgs/servers/sql/postgresql/ext/pgaudit.nix @@ -1,11 +1,11 @@ { - lib, - stdenv, + buildPostgresqlExtension, fetchFromGitHub, + lib, libkrb5, openssl, postgresql, - buildPostgresqlExtension, + stdenv, }: let @@ -46,7 +46,7 @@ buildPostgresqlExtension { src = fetchFromGitHub { owner = "pgaudit"; repo = "pgaudit"; - rev = source.version; + tag = source.version; hash = source.hash; }; @@ -59,12 +59,12 @@ buildPostgresqlExtension { enableUpdateScript = false; - meta = with lib; { + meta = { description = "Open Source PostgreSQL Audit Logging"; homepage = "https://github.com/pgaudit/pgaudit"; changelog = "https://github.com/pgaudit/pgaudit/releases/tag/${source.version}"; - maintainers = with maintainers; [ idontgetoutmuch ]; + maintainers = with lib.maintainers; [ idontgetoutmuch ]; platforms = postgresql.meta.platforms; - license = licenses.postgresql; + license = lib.licenses.postgresql; }; } From 5279e64bb94adfe8c0824343e98ced4f17ce614a Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:58:42 +0100 Subject: [PATCH 125/155] postgresqlPackages.pgaudit: remove hash for v12 v12 had been removed from nixpkgs a while ago. --- pkgs/servers/sql/postgresql/ext/pgaudit.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/pgaudit.nix index f9ca1b485eba..43e76c182529 100644 --- a/pkgs/servers/sql/postgresql/ext/pgaudit.nix +++ b/pkgs/servers/sql/postgresql/ext/pgaudit.nix @@ -31,10 +31,6 @@ let version = "1.5.2"; hash = "sha256-fyf2Ym0fAAXjc28iFCGDEftPAyDLXmEgi/0DaTJJiIg="; }; - "12" = { - version = "1.4.3"; - hash = "sha256-c8/xUFIHalu2bMCs57DeylK0oW0VnQwmUCpdp+tYqk4="; - }; } .${lib.versions.major postgresql.version} or (throw "Source for pgaudit is not available for ${postgresql.version}"); From 6873ba7f2d7717f7ef56ced029b6e8db6a4e4ca2 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:58:57 +0100 Subject: [PATCH 126/155] postgresqlPackages.pgjwt: modernize --- pkgs/servers/sql/postgresql/ext/pgjwt.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix index 9b3afd821dbd..a21ac25e333e 100644 --- a/pkgs/servers/sql/postgresql/ext/pgjwt.nix +++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix @@ -1,12 +1,12 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, - unstableGitUpdater, - nixosTests, - postgresqlTestExtension, buildPostgresqlExtension, + fetchFromGitHub, + lib, + nixosTests, + postgresql, + postgresqlTestExtension, + stdenv, + unstableGitUpdater, }: buildPostgresqlExtension (finalAttrs: { @@ -17,7 +17,7 @@ buildPostgresqlExtension (finalAttrs: { owner = "michelp"; repo = "pgjwt"; rev = "f3d82fd30151e754e19ce5d6a06c71c20689ce3d"; - sha256 = "sha256-nDZEDf5+sFc1HDcG2eBNQj+kGcdAYRXJseKi9oww+JU="; + hash = "sha256-nDZEDf5+sFc1HDcG2eBNQj+kGcdAYRXJseKi9oww+JU="; }; passthru.updateScript = unstableGitUpdater { }; @@ -34,13 +34,13 @@ buildPostgresqlExtension (finalAttrs: { }; }; - meta = with lib; { + meta = { description = "PostgreSQL implementation of JSON Web Tokens"; longDescription = '' sign() and verify() functions to create and verify JSON Web Tokens. ''; - license = licenses.mit; + license = lib.licenses.mit; platforms = postgresql.meta.platforms; - maintainers = with maintainers; [ spinus ]; + maintainers = with lib.maintainers; [ spinus ]; }; }) From b1a9540b3938ab4c92e2a0f1317d53e2756a5e05 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:59:07 +0100 Subject: [PATCH 127/155] postgresqlPackages.pgmq: modernize --- pkgs/servers/sql/postgresql/ext/pgmq.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgmq.nix b/pkgs/servers/sql/postgresql/ext/pgmq.nix index 375bc7fa28d4..c2f1a3559dc5 100644 --- a/pkgs/servers/sql/postgresql/ext/pgmq.nix +++ b/pkgs/servers/sql/postgresql/ext/pgmq.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -13,7 +13,7 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "tembo-io"; repo = "pgmq"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-iFIHkqL9w7Bw1dxmmL1i0D5Xxq+ljFLf24M9vHArwvE="; }; From f29a6d41a61473c259db75e62866b9439d9ccb9a Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:59:18 +0100 Subject: [PATCH 128/155] postgresqlPackages.pgroonga: modernize --- pkgs/servers/sql/postgresql/ext/pgroonga.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 6ea65c6a5ccd..68a3da58a1fb 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -1,12 +1,12 @@ { - lib, - stdenv, + buildPostgresqlExtension, fetchFromGitHub, + groonga, + lib, + msgpack-c, pkg-config, postgresql, - msgpack-c, - groonga, - buildPostgresqlExtension, + stdenv, xxHash, }: @@ -17,7 +17,7 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "pgroonga"; repo = "pgroonga"; - rev = "${version}"; + tag = "${version}"; hash = "sha256-a5nNtlUiFBuuqWAjIN0gU/FaoV3VpJh+/fab8R/77dw="; }; @@ -34,7 +34,7 @@ buildPostgresqlExtension rec { "MSGPACK_PACKAGE_NAME=msgpack-c" ]; - meta = with lib; { + meta = { description = "PostgreSQL extension to use Groonga as the index"; longDescription = '' PGroonga is a PostgreSQL extension to use Groonga as the index. @@ -44,8 +44,8 @@ buildPostgresqlExtension rec { ''; homepage = "https://pgroonga.github.io/"; changelog = "https://github.com/pgroonga/pgroonga/releases/tag/${version}"; - license = licenses.postgresql; + license = lib.licenses.postgresql; platforms = postgresql.meta.platforms; - maintainers = with maintainers; [ DerTim1 ]; + maintainers = with lib.maintainers; [ DerTim1 ]; }; } From e05060a735ba5760448d2587110efe6c3952b872 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:59:27 +0100 Subject: [PATCH 129/155] postgresqlPackages.pgrouting: modernize --- pkgs/servers/sql/postgresql/ext/pgrouting.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 4aef42af2579..47aadc39a81f 100644 --- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -1,12 +1,12 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, - perl, - cmake, boost, buildPostgresqlExtension, + cmake, + fetchFromGitHub, + lib, + perl, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -22,16 +22,16 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "pgRouting"; repo = "pgrouting"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-jaevnDCJ6hRQeDhdAkvMTvnnFWElMNvo9gZRW53proQ="; }; - meta = with lib; { + meta = { description = "PostgreSQL/PostGIS extension that provides geospatial routing functionality"; homepage = "https://pgrouting.org/"; changelog = "https://github.com/pgRouting/pgrouting/releases/tag/v${version}"; - maintainers = with maintainers; teams.geospatial.members ++ [ steve-chavez ]; + maintainers = with lib.maintainers; lib.teams.geospatial.members ++ [ steve-chavez ]; platforms = postgresql.meta.platforms; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } From 671cda525b853f85f61efea677f460822dddbbfe Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:59:43 +0100 Subject: [PATCH 130/155] postgresqlPackages.pgsodium: modernize --- pkgs/servers/sql/postgresql/ext/pgsodium.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgsodium.nix b/pkgs/servers/sql/postgresql/ext/pgsodium.nix index 8525fd81947a..d072c1c75b6c 100644 --- a/pkgs/servers/sql/postgresql/ext/pgsodium.nix +++ b/pkgs/servers/sql/postgresql/ext/pgsodium.nix @@ -1,12 +1,12 @@ { - lib, - stdenv, - fetchFromGitHub, bash, + buildPostgresqlExtension, + fetchFromGitHub, + lib, libsodium, postgresql, postgresqlTestExtension, - buildPostgresqlExtension, + stdenv, }: buildPostgresqlExtension (finalAttrs: { @@ -16,7 +16,7 @@ buildPostgresqlExtension (finalAttrs: { src = fetchFromGitHub { owner = "michelp"; repo = "pgsodium"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Y8xL3PxF1GQV1JIgolMI1e8oGcUvWAgrPv84om7wKP8="; }; @@ -45,11 +45,11 @@ buildPostgresqlExtension (finalAttrs: { ''; }; - meta = with lib; { + meta = { description = "Modern cryptography for PostgreSQL using libsodium"; homepage = "https://github.com/michelp/pgsodium"; changelog = "https://github.com/michelp/pgsodium/releases/tag/v${finalAttrs.version}"; - license = licenses.postgresql; + license = lib.licenses.postgresql; maintainers = [ ]; platforms = postgresql.meta.platforms; }; From c22f751e95a704126be325fe80f2a18ae0849221 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 20:59:52 +0100 Subject: [PATCH 131/155] postgresqlPackages.pgsql-http: modernize --- pkgs/servers/sql/postgresql/ext/pgsql-http.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix index 151cd92173eb..3b8b744e5cee 100644 --- a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix +++ b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix @@ -1,10 +1,10 @@ { - lib, - stdenv, - fetchFromGitHub, - curl, - postgresql, buildPostgresqlExtension, + curl, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -14,19 +14,19 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "pramsey"; repo = "pgsql-http"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-Ij8BaNj2SOwDfjgLxrpLFvvPCzSahXyyckRPGmcqKtE="; }; buildInputs = [ curl ]; nativeBuildInputs = [ curl ]; - meta = with lib; { + meta = { description = "HTTP client for PostgreSQL, retrieve a web page from inside the database"; homepage = "https://github.com/pramsey/pgsql-http"; changelog = "https://github.com/pramsey/pgsql-http/releases/tag/v${version}"; maintainers = [ ]; platforms = postgresql.meta.platforms; - license = licenses.mit; + license = lib.licenses.mit; }; } From b2daf5353cb7fa6b41c9bb3afbd7059f3a3d3bf0 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:00:00 +0100 Subject: [PATCH 132/155] postgresqlPackages.pgtap: modernize --- pkgs/servers/sql/postgresql/ext/pgtap.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix index 0dd670a0b4b3..3e0907eaef3b 100644 --- a/pkgs/servers/sql/postgresql/ext/pgtap.nix +++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix @@ -1,12 +1,12 @@ { - lib, - stdenv, buildPostgresqlExtension, fetchFromGitHub, + lib, perl, perlPackages, postgresql, postgresqlTestHook, + stdenv, which, }: @@ -17,8 +17,8 @@ buildPostgresqlExtension (finalAttrs: { src = fetchFromGitHub { owner = "theory"; repo = "pgtap"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-YgvfLGF7pLVcCKD66NnWAydDxtoYHH1DpLiYTEKHJ0E="; + tag = "v${finalAttrs.version}"; + hash = "sha256-YgvfLGF7pLVcCKD66NnWAydDxtoYHH1DpLiYTEKHJ0E="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ buildPostgresqlExtension (finalAttrs: { installPhase = "touch $out"; }; - meta = with lib; { + meta = { description = "Unit testing framework for PostgreSQL"; longDescription = '' pgTAP is a unit testing framework for PostgreSQL written in PL/pgSQL and PL/SQL. @@ -62,9 +62,9 @@ buildPostgresqlExtension (finalAttrs: { as well as the ability to integrate with other TAP-emitting test frameworks. It can also be used in the xUnit testing style. ''; - maintainers = with maintainers; [ willibutz ]; + maintainers = with lib.maintainers; [ willibutz ]; homepage = "https://pgtap.org"; inherit (postgresql.meta) platforms; - license = licenses.mit; + license = lib.licenses.mit; }; }) From 9e3ad80ed5c042530f9ef4f855e51ed7ce809a68 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:00:08 +0100 Subject: [PATCH 133/155] postgresqlPackages.pgvector: modernize --- pkgs/servers/sql/postgresql/ext/pgvector.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix index 3eb06fc9b06c..45986b31cbb9 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvector.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvector.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -13,15 +13,15 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "pgvector"; repo = "pgvector"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-JsZV+I4eRMypXTjGmjCtMBXDVpqTIPHQa28ogXncE/Q="; }; - meta = with lib; { + meta = { description = "Open-source vector similarity search for PostgreSQL"; homepage = "https://github.com/pgvector/pgvector"; changelog = "https://github.com/pgvector/pgvector/raw/v${version}/CHANGELOG.md"; - license = licenses.postgresql; + license = lib.licenses.postgresql; platforms = postgresql.meta.platforms; maintainers = [ ]; }; From d3a7181b5edc03185b582236e545d3aeb6e6bcd2 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:00:21 +0100 Subject: [PATCH 134/155] postgresqlPackages.plpgsql_check: modernize --- pkgs/servers/sql/postgresql/ext/plpgsql_check.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index 4ca7244ba407..e660dc5ee614 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -1,10 +1,10 @@ { - lib, - stdenv, + buildPostgresqlExtension, fetchFromGitHub, + lib, postgresql, postgresqlTestExtension, - buildPostgresqlExtension, + stdenv, }: buildPostgresqlExtension (finalAttrs: { @@ -14,7 +14,7 @@ buildPostgresqlExtension (finalAttrs: { src = fetchFromGitHub { owner = "okbob"; repo = "plpgsql_check"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-JF0aTYakoHMRdiWcA70mYFvzTiwMhOJZfqRj+6JC6n0="; }; @@ -23,12 +23,12 @@ buildPostgresqlExtension (finalAttrs: { sql = "CREATE EXTENSION plpgsql_check;"; }; - meta = with lib; { + meta = { description = "Linter tool for language PL/pgSQL"; homepage = "https://github.com/okbob/plpgsql_check"; changelog = "https://github.com/okbob/plpgsql_check/releases/tag/v${finalAttrs.version}"; platforms = postgresql.meta.platforms; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; }; }) From e3960931e47aa0c04bcba9256575f54b0e348e5f Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:00:28 +0100 Subject: [PATCH 135/155] postgresqlPackages.plr: modernize --- pkgs/servers/sql/postgresql/ext/plr.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/plr.nix b/pkgs/servers/sql/postgresql/ext/plr.nix index c1148bf92c39..b55812c3f3ce 100644 --- a/pkgs/servers/sql/postgresql/ext/plr.nix +++ b/pkgs/servers/sql/postgresql/ext/plr.nix @@ -1,11 +1,11 @@ { - lib, - stdenv, - fetchFromGitHub, - pkg-config, R, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + pkg-config, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -15,8 +15,8 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "postgres-plr"; repo = "plr"; - rev = "REL8_4_7"; - sha256 = "sha256-PdvFEmtKfLT/xfaf6obomPR5hKC9F+wqpfi1heBphRk="; + tag = "REL8_4_7"; + hash = "sha256-PdvFEmtKfLT/xfaf6obomPR5hKC9F+wqpfi1heBphRk="; }; nativeBuildInputs = [ pkg-config ]; @@ -24,12 +24,12 @@ buildPostgresqlExtension rec { makeFlags = [ "USE_PGXS=1" ]; - meta = with lib; { + meta = { description = "PL/R - R Procedural Language for PostgreSQL"; homepage = "https://github.com/postgres-plr/plr"; changelog = "https://github.com/postgres-plr/plr/blob/${src.rev}/changelog.md"; - maintainers = with maintainers; [ qoelet ]; + maintainers = with lib.maintainers; [ qoelet ]; platforms = postgresql.meta.platforms; - license = licenses.gpl2Only; + license = lib.licenses.gpl2Only; }; } From 8f6d6a274c41bf01e1ee55325c0b94ea21533a76 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:00:42 +0100 Subject: [PATCH 136/155] postgresqlPackages.postgis: modernize --- pkgs/servers/sql/postgresql/ext/postgis.nix | 59 +++++++++++---------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 556bfd030de7..9a4e46fc2680 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -1,33 +1,34 @@ { - fetchFromGitHub, - lib, - stdenv, - perl, - libxml2, - postgresql, - postgresqlTestHook, - geos, - proj, - gdalMinimal, - json_c, - pkg-config, - file, - protobufc, - libiconv, - libxslt, - docbook5, - cunit, - pcre2, - postgresqlTestExtension, - jitSupport, - llvm, - buildPostgresqlExtension, autoconf, automake, + buildPostgresqlExtension, + cunit, + docbook5, + fetchFromGitHub, + file, + gdalMinimal, + geos, + jitSupport, + json_c, + lib, + libiconv, libtool, + libxml2, + libxslt, + llvm, + pcre2, + perl, + pkg-config, + postgresql, + postgresqlTestExtension, + postgresqlTestHook, + proj, + protobufc, + stdenv, which, - sfcgal, + withSfcgal ? false, + sfcgal, }: let @@ -45,7 +46,7 @@ buildPostgresqlExtension (finalAttrs: { src = fetchFromGitHub { owner = "postgis"; repo = "postgis"; - rev = "${finalAttrs.version}"; + tag = "${finalAttrs.version}"; hash = "sha256-1kOLtG6AMavbWQ1lHG2ABuvIcyTYhgcbjuVmqMR4X+g="; }; @@ -60,6 +61,7 @@ buildPostgresqlExtension (finalAttrs: { ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv ++ lib.optional withSfcgal sfcgal; + nativeBuildInputs = [ autoconf automake @@ -70,6 +72,7 @@ buildPostgresqlExtension (finalAttrs: { protobufc which ] ++ lib.optional jitSupport llvm; + dontDisableStatic = true; nativeCheckInputs = [ @@ -158,12 +161,12 @@ buildPostgresqlExtension (finalAttrs: { ''; }; - meta = with lib; { + meta = { description = "Geographic Objects for PostgreSQL"; homepage = "https://postgis.net/"; changelog = "https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${finalAttrs.version}/NEWS"; - license = licenses.gpl2Plus; - maintainers = with maintainers; teams.geospatial.members ++ [ marcweber ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; lib.teams.geospatial.members ++ [ marcweber ]; inherit (postgresql.meta) platforms; }; }) From f95649327f16f9ecddafc8578dfd289e1e524a86 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:00:53 +0100 Subject: [PATCH 137/155] postgresqlPackages.repmgr: modernize --- pkgs/servers/sql/postgresql/ext/repmgr.nix | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/repmgr.nix index a80ac369b7d4..39087deb9599 100644 --- a/pkgs/servers/sql/postgresql/ext/repmgr.nix +++ b/pkgs/servers/sql/postgresql/ext/repmgr.nix @@ -1,12 +1,12 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, - flex, - curl, - json_c, buildPostgresqlExtension, + curl, + fetchFromGitHub, + flex, + json_c, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -16,8 +16,8 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "EnterpriseDB"; repo = "repmgr"; - rev = "v${version}"; - sha256 = "sha256-8G2CzzkWTKEglpUt1Gr7d/DuHJvCIEjsbYDMl3Zt3cs="; + tag = "v${version}"; + hash = "sha256-8G2CzzkWTKEglpUt1Gr7d/DuHJvCIEjsbYDMl3Zt3cs="; }; nativeBuildInputs = [ flex ]; @@ -27,11 +27,11 @@ buildPostgresqlExtension rec { json_c ]; - meta = with lib; { + meta = { homepage = "https://repmgr.org/"; description = "Replication manager for PostgreSQL cluster"; - license = licenses.postgresql; + license = lib.licenses.postgresql; platforms = postgresql.meta.platforms; - maintainers = with maintainers; [ zimbatm ]; + maintainers = with lib.maintainers; [ zimbatm ]; }; } From ab69634d94ce8c8ed592ca87991e0b0961b17575 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:01:00 +0100 Subject: [PATCH 138/155] postgresqlPackages.rum: modernize --- pkgs/servers/sql/postgresql/ext/rum.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/rum.nix b/pkgs/servers/sql/postgresql/ext/rum.nix index f681efd5b9df..71db60cd5406 100644 --- a/pkgs/servers/sql/postgresql/ext/rum.nix +++ b/pkgs/servers/sql/postgresql/ext/rum.nix @@ -1,10 +1,10 @@ { - lib, - stdenv, + buildPostgresqlExtension, fetchFromGitHub, + lib, postgresql, postgresqlTestHook, - buildPostgresqlExtension, + stdenv, }: buildPostgresqlExtension (finalAttrs: { @@ -14,7 +14,7 @@ buildPostgresqlExtension (finalAttrs: { src = fetchFromGitHub { owner = "postgrespro"; repo = "rum"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-VsfpxQqRBu9bIAP+TfMRXd+B3hSjuhU2NsutocNiCt8="; }; @@ -48,11 +48,11 @@ buildPostgresqlExtension (finalAttrs: { installPhase = "touch $out"; }; - meta = with lib; { + meta = { description = "Full text search index method for PostgreSQL"; homepage = "https://github.com/postgrespro/rum"; - license = licenses.postgresql; + license = lib.licenses.postgresql; platforms = postgresql.meta.platforms; - maintainers = with maintainers; [ DeeUnderscore ]; + maintainers = with lib.maintainers; [ DeeUnderscore ]; }; }) From 87dcf8ebd095698f249840a2663cbd293b07d8e7 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:01:07 +0100 Subject: [PATCH 139/155] postgresqlPackages.smlar: modernize --- pkgs/servers/sql/postgresql/ext/smlar.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/smlar.nix b/pkgs/servers/sql/postgresql/ext/smlar.nix index e7b26482cd72..6906d028fb11 100644 --- a/pkgs/servers/sql/postgresql/ext/smlar.nix +++ b/pkgs/servers/sql/postgresql/ext/smlar.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchgit, - postgresql, buildPostgresqlExtension, + fetchgit, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension { @@ -18,11 +18,11 @@ buildPostgresqlExtension { makeFlags = [ "USE_PGXS=1" ]; - meta = with lib; { + meta = { description = "Compute similary of any one-dimensional arrays"; homepage = "http://sigaev.ru/git/gitweb.cgi?p=smlar.git"; platforms = postgresql.meta.platforms; - license = licenses.bsd2; + license = lib.licenses.bsd2; maintainers = [ ]; # Broken with no upstream fix available. broken = lib.versionAtLeast postgresql.version "16"; From 7cf6a754321ab98d924bfa926697e3d1cbb5c06f Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:01:18 +0100 Subject: [PATCH 140/155] postgresqlPackages.sqlite_fdw: modernize --- pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix b/pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix index bb25a600ecef..efac33fa7759 100644 --- a/pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix @@ -1,9 +1,9 @@ { - lib, - fetchFromGitHub, - sqlite, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + sqlite, }: buildPostgresqlExtension rec { @@ -13,7 +13,7 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "pgspider"; repo = "sqlite_fdw"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-zPVIFzUv6UFFHq0Zi5MeQOcvgsfZAKGkkNIGxkTJ+oo="; }; From 1acb5189176107416697d3ac9cff4444d0be9d05 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:01:29 +0100 Subject: [PATCH 141/155] postgresqlPackages.systems_stats: modernize --- pkgs/servers/sql/postgresql/ext/system_stats.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/system_stats.nix b/pkgs/servers/sql/postgresql/ext/system_stats.nix index bf2930807417..5bedbb758df6 100644 --- a/pkgs/servers/sql/postgresql/ext/system_stats.nix +++ b/pkgs/servers/sql/postgresql/ext/system_stats.nix @@ -1,9 +1,9 @@ { + buildPostgresqlExtension, fetchFromGitHub, lib, - stdenv, postgresql, - buildPostgresqlExtension, + stdenv, }: buildPostgresqlExtension rec { pname = "system_stats"; @@ -12,18 +12,18 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "EnterpriseDB"; repo = "system_stats"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-/xXnui0S0ZjRw7P8kMAgttHVv8T41aOhM3pM8P0OTig="; }; buildFlags = [ "PG_CFLAGS=-Wno-error=vla" ]; - meta = with lib; { - description = "A Postgres extension for exposing system metrics such as CPU, memory and disk information"; + meta = { + description = "Postgres extension for exposing system metrics such as CPU, memory and disk information"; homepage = "https://github.com/EnterpriseDB/system_stats"; changelog = "https://github.com/EnterpriseDB/system_stats/raw/v${version}/CHANGELOG.md"; - maintainers = with maintainers; [ shivaraj-bh ]; + maintainers = with lib.maintainers; [ shivaraj-bh ]; platforms = postgresql.meta.platforms; - license = licenses.postgresql; + license = lib.licenses.postgresql; }; } From 83ed279f0e73ae867f2d4808b88661abbacbcf9b Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:01:40 +0100 Subject: [PATCH 142/155] postgresqlPackages.tds_fdw: modernize --- pkgs/servers/sql/postgresql/ext/tds_fdw.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix index 56b9c164d74a..35e4a4811c6e 100644 --- a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix @@ -1,11 +1,11 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, - freetds, - unstableGitUpdater, buildPostgresqlExtension, + fetchFromGitHub, + freetds, + lib, + postgresql, + stdenv, + unstableGitUpdater, }: buildPostgresqlExtension rec { @@ -17,16 +17,16 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "tds-fdw"; repo = "tds_fdw"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-ruelOHueaHx1royLPvDM8Abd1rQD62R4KXgtHY9qqTw="; }; - meta = with lib; { + meta = { description = "PostgreSQL foreign data wrapper to connect to TDS databases (Sybase and Microsoft SQL Server)"; homepage = "https://github.com/tds-fdw/tds_fdw"; changelog = "https://github.com/tds-fdw/tds_fdw/releases/tag/v${version}"; - maintainers = [ maintainers.steve-chavez ]; + maintainers = with lib.maintainers; [ steve-chavez ]; platforms = postgresql.meta.platforms; - license = licenses.postgresql; + license = lib.licenses.postgresql; }; } From a117e894b3abfc613f6b57667c897f73b3cf4d71 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:01:51 +0100 Subject: [PATCH 143/155] postgresqlPackages.temporal_tables: modernize --- .../sql/postgresql/ext/temporal_tables.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix index 03692a3ad7b6..5374607808a3 100644 --- a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix +++ b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix @@ -1,9 +1,9 @@ { - lib, - stdenv, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, + stdenv, }: buildPostgresqlExtension rec { @@ -13,15 +13,15 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "arkhipov"; repo = "temporal_tables"; - rev = "v${version}"; - sha256 = "sha256-7+DCSPAPhsokWDq/5IXNhd7jY6FfzxxUjlsg/VJeD3k="; + tag = "v${version}"; + hash = "sha256-7+DCSPAPhsokWDq/5IXNhd7jY6FfzxxUjlsg/VJeD3k="; }; - meta = with lib; { + meta = { description = "Temporal Tables PostgreSQL Extension"; homepage = "https://github.com/arkhipov/temporal_tables"; - maintainers = with maintainers; [ ggpeti ]; + maintainers = with lib.maintainers; [ ggpeti ]; platforms = postgresql.meta.platforms; - license = licenses.bsd2; + license = lib.licenses.bsd2; }; } From 07fff4ea84642cb616cda03bdc7be7665903a5c1 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:02:06 +0100 Subject: [PATCH 144/155] postgresqlPackages.timescaledb: modernize --- .../sql/postgresql/ext/timescaledb.nix | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 8f93c32aed78..db4cf085b1cf 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -1,7 +1,6 @@ { buildPostgresqlExtension, cmake, - enableUnfree ? true, fetchFromGitHub, lib, libkrb5, @@ -9,25 +8,27 @@ openssl, postgresql, stdenv, + + enableUnfree ? true, }: buildPostgresqlExtension rec { pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}"; version = "2.18.2"; + src = fetchFromGitHub { + owner = "timescale"; + repo = "timescaledb"; + tag = version; + hash = "sha256-/PKk8/cS6jqL+mhSqFU6gybqDx3ld77RLF/uB+1XJCQ="; + }; + nativeBuildInputs = [ cmake ]; buildInputs = [ openssl libkrb5 ]; - src = fetchFromGitHub { - owner = "timescale"; - repo = "timescaledb"; - rev = version; - hash = "sha256-/PKk8/cS6jqL+mhSqFU6gybqDx3ld77RLF/uB+1XJCQ="; - }; - cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" @@ -53,13 +54,13 @@ buildPostgresqlExtension rec { passthru.tests = nixosTests.postgresql.timescaledb.passthru.override postgresql; - meta = with lib; { + meta = { description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space"; homepage = "https://www.timescale.com/"; changelog = "https://github.com/timescale/timescaledb/blob/${version}/CHANGELOG.md"; - maintainers = [ maintainers.kirillrdy ]; + maintainers = with lib.maintainers; [ kirillrdy ]; platforms = postgresql.meta.platforms; - license = with licenses; if enableUnfree then tsl else asl20; - broken = versionOlder postgresql.version "14"; + license = with lib.licenses; if enableUnfree then tsl else asl20; + broken = lib.versionOlder postgresql.version "14"; }; } From 43ace7386f86e35a67dbb80f3c87cba69f9ae142 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:02:16 +0100 Subject: [PATCH 145/155] postgresqlPackages.timescaledb_toolkit: modernize --- .../sql/postgresql/ext/timescaledb_toolkit.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix index a82c73e84337..3c294a0338a7 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix @@ -1,11 +1,11 @@ { - lib, - fetchFromGitHub, buildPgrxExtension, - postgresql, - nixosTests, cargo-pgrx_0_12_6, + fetchFromGitHub, + lib, nix-update-script, + nixosTests, + postgresql, }: (buildPgrxExtension.override { cargo-pgrx = cargo-pgrx_0_12_6; }) rec { @@ -17,7 +17,7 @@ src = fetchFromGitHub { owner = "timescale"; repo = "timescaledb-toolkit"; - rev = version; + tag = version; hash = "sha256-7yUbtWbYL4AnuUX8OXG4OVqYCY2Lf0pISSTlcFdPqog="; }; @@ -33,11 +33,11 @@ # tests take really long doCheck = false; - meta = with lib; { + meta = { description = "Provide additional tools to ease all things analytic when using TimescaleDB"; homepage = "https://github.com/timescale/timescaledb-toolkit"; - maintainers = with maintainers; [ typetetris ]; + maintainers = with lib.maintainers; [ typetetris ]; platforms = postgresql.meta.platforms; - license = licenses.tsl; + license = lib.licenses.tsl; }; } From 5018714b3183beafb38a6b6cb4a44758292be0c0 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:02:25 +0100 Subject: [PATCH 146/155] postgresqlPackages.tsja: modernize --- pkgs/servers/sql/postgresql/ext/tsja.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/tsja.nix b/pkgs/servers/sql/postgresql/ext/tsja.nix index 15df1763e2bf..0aafc6772363 100644 --- a/pkgs/servers/sql/postgresql/ext/tsja.nix +++ b/pkgs/servers/sql/postgresql/ext/tsja.nix @@ -1,10 +1,10 @@ { - lib, fetchzip, - nixosTests, - stdenv, + lib, mecab, + nixosTests, postgresql, + stdenv, }: stdenv.mkDerivation rec { @@ -37,12 +37,12 @@ stdenv.mkDerivation rec { passthru.tests = nixosTests.postgresql.tsja.passthru.override postgresql; - meta = with lib; { + meta = { description = "PostgreSQL extension implementing Japanese text search"; homepage = "https://www.amris.jp/tsja/index.html"; - maintainers = with maintainers; [ chayleaf ]; + maintainers = with lib.maintainers; [ chayleaf ]; # GNU-specific linker options are used - platforms = platforms.gnu; - license = licenses.gpl2Only; + platforms = lib.platforms.gnu; + license = lib.licenses.gpl2Only; }; } From d14917c317a01d85edf755b30ff36251335be7a8 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:02:35 +0100 Subject: [PATCH 147/155] postgresqlPackages.wal2json: modernize --- pkgs/servers/sql/postgresql/ext/wal2json.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/wal2json.nix b/pkgs/servers/sql/postgresql/ext/wal2json.nix index 9562c738eb1f..2ec7d3c44e74 100644 --- a/pkgs/servers/sql/postgresql/ext/wal2json.nix +++ b/pkgs/servers/sql/postgresql/ext/wal2json.nix @@ -1,9 +1,9 @@ { - lib, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, nixosTests, + postgresql, }: buildPostgresqlExtension rec { @@ -15,20 +15,20 @@ buildPostgresqlExtension rec { src = fetchFromGitHub { owner = "eulerto"; repo = "wal2json"; - rev = "wal2json_2_6"; - sha256 = "sha256-+QoACPCKiFfuT2lJfSUmgfzC5MXf75KpSoc2PzPxKyM="; + tag = "wal2json_2_6"; + hash = "sha256-+QoACPCKiFfuT2lJfSUmgfzC5MXf75KpSoc2PzPxKyM="; }; makeFlags = [ "USE_PGXS=1" ]; passthru.tests = nixosTests.postgresql.wal2json.passthru.override postgresql; - meta = with lib; { + meta = { description = "PostgreSQL JSON output plugin for changeset extraction"; homepage = "https://github.com/eulerto/wal2json"; changelog = "https://github.com/eulerto/wal2json/releases/tag/${src.rev}"; - maintainers = with maintainers; [ euank ]; + maintainers = with lib.maintainers; [ euank ]; platforms = postgresql.meta.platforms; - license = licenses.bsd3; + license = lib.licenses.bsd3; }; } From e0aaaa79ea9180e008704d65e30b7b3f3b4fbfc8 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:24:13 +0100 Subject: [PATCH 148/155] postgresqlPackages.pgddl: sort arguments --- pkgs/servers/sql/postgresql/ext/pgddl.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgddl.nix b/pkgs/servers/sql/postgresql/ext/pgddl.nix index b29e78c02725..fef7a6ef27d7 100644 --- a/pkgs/servers/sql/postgresql/ext/pgddl.nix +++ b/pkgs/servers/sql/postgresql/ext/pgddl.nix @@ -1,10 +1,10 @@ { - lib, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, - postgresqlTestExtension, + fetchFromGitHub, + lib, perl, + postgresql, + postgresqlTestExtension, }: buildPostgresqlExtension (finalAttrs: { pname = "pgddl"; From 53fc911cbd36848f921c38108d803f0675525387 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:25:26 +0100 Subject: [PATCH 149/155] postgresqlPackages.pgx_ulid: sort arguments --- pkgs/servers/sql/postgresql/ext/pgx_ulid.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix b/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix index a063dd82ee46..3db15229739a 100644 --- a/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix +++ b/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix @@ -1,7 +1,7 @@ { - lib, buildPgrxExtension, fetchFromGitHub, + lib, nix-update-script, postgresql, util-linux, From a01c1012003c4101f566e83060dbb233d8f96aac Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:28:51 +0100 Subject: [PATCH 150/155] postgresqlPackages.pg_tle: sort arguments --- pkgs/servers/sql/postgresql/ext/pg_tle.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_tle.nix b/pkgs/servers/sql/postgresql/ext/pg_tle.nix index 299771b12769..1d7913aa2f59 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_tle.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_tle.nix @@ -1,8 +1,8 @@ { - lib, - fetchFromGitHub, - postgresql, buildPostgresqlExtension, + fetchFromGitHub, + lib, + postgresql, }: buildPostgresqlExtension rec { From 6e0738b8c275988969f1fbb4b7ad343d940563bf Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:16:47 +0100 Subject: [PATCH 151/155] postgresqlPackages: load automatically from ext/ folder No need to manually put them in the default.nix file anymore. --- pkgs/servers/sql/postgresql/ext.nix | 14 ++ pkgs/servers/sql/postgresql/ext/default.nix | 127 ------------------ .../pgvecto-rs/{default.nix => package.nix} | 0 .../ext/plv8/{default.nix => package.nix} | 0 pkgs/servers/sql/postgresql/generic.nix | 2 +- 5 files changed, 15 insertions(+), 128 deletions(-) create mode 100644 pkgs/servers/sql/postgresql/ext.nix delete mode 100644 pkgs/servers/sql/postgresql/ext/default.nix rename pkgs/servers/sql/postgresql/ext/pgvecto-rs/{default.nix => package.nix} (100%) rename pkgs/servers/sql/postgresql/ext/plv8/{default.nix => package.nix} (100%) diff --git a/pkgs/servers/sql/postgresql/ext.nix b/pkgs/servers/sql/postgresql/ext.nix new file mode 100644 index 000000000000..5095275a423d --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext.nix @@ -0,0 +1,14 @@ +self: super: +let + inherit (self) lib config; +in +(lib.packagesFromDirectoryRecursive { + inherit (super) callPackage; + directory = ./ext; +}) +// { + timescaledb-apache = super.callPackage ./ext/timescaledb.nix { enableUnfree = false; }; +} +// lib.optionalAttrs config.allowAliases { + pg_embedding = throw "PostgreSQL extension `pg_embedding` has been removed since the project has been abandoned. Upstream's recommendation is to use pgvector instead (https://neon.tech/docs/extensions/pg_embedding#migrate-from-pg_embedding-to-pgvector)"; +} diff --git a/pkgs/servers/sql/postgresql/ext/default.nix b/pkgs/servers/sql/postgresql/ext/default.nix deleted file mode 100644 index 1c65255d056f..000000000000 --- a/pkgs/servers/sql/postgresql/ext/default.nix +++ /dev/null @@ -1,127 +0,0 @@ -self: super: let - inherit (self) lib config; -in { - - age = super.callPackage ./age.nix { }; - - anonymizer = super.callPackage ./anonymizer.nix { }; - - apache_datasketches = super.callPackage ./apache_datasketches.nix { }; - - citus = super.callPackage ./citus.nix { }; - - h3-pg = super.callPackage ./h3-pg.nix { }; - - hypopg = super.callPackage ./hypopg.nix { }; - - jsonb_deep_sum = super.callPackage ./jsonb_deep_sum.nix { }; - - lantern = super.callPackage ./lantern.nix { }; - - periods = super.callPackage ./periods.nix { }; - - postgis = super.callPackage ./postgis.nix { }; - - pg_auto_failover = super.callPackage ./pg_auto_failover.nix { }; - - pg_byteamagic = super.callPackage ./pg_byteamagic.nix { }; - - pg_bigm = super.callPackage ./pg_bigm.nix { }; - - pg_ed25519 = super.callPackage ./pg_ed25519.nix { }; - - pg_hint_plan = super.callPackage ./pg_hint_plan.nix { }; - - pg_ivm = super.callPackage ./pg_ivm.nix { }; - - pg_libversion = super.callPackage ./pg_libversion.nix { }; - - pg_rational = super.callPackage ./pg_rational.nix { }; - - pg_repack = super.callPackage ./pg_repack.nix { }; - - pg_similarity = super.callPackage ./pg_similarity.nix { }; - - pgaudit = super.callPackage ./pgaudit.nix { }; - - pgmq = super.callPackage ./pgmq.nix { }; - - pgroonga = super.callPackage ./pgroonga.nix { }; - - pgsodium = super.callPackage ./pgsodium.nix { }; - - pgsql-http = super.callPackage ./pgsql-http.nix { }; - - pgvecto-rs = super.callPackage ./pgvecto-rs { }; - - pgvector = super.callPackage ./pgvector.nix { }; - - plpgsql_check = super.callPackage ./plpgsql_check.nix { }; - - plr = super.callPackage ./plr.nix { }; - - plv8 = super.callPackage ./plv8 { }; - - pgjwt = super.callPackage ./pgjwt.nix { }; - - cstore_fdw = super.callPackage ./cstore_fdw.nix { }; - - pg_hll = super.callPackage ./pg_hll.nix { }; - - pg_cron = super.callPackage ./pg_cron.nix { }; - - pg_tle = super.callPackage ./pg_tle.nix { }; - - pg_topn = super.callPackage ./pg_topn.nix { }; - - pg_net = super.callPackage ./pg_net.nix { }; - - pg-gvm = super.callPackage ./pg-gvm.nix { }; - - pg-semver = super.callPackage ./pg-semver.nix { }; - - pgtap = super.callPackage ./pgtap.nix { }; - - smlar = super.callPackage ./smlar.nix { }; - - system_stats = super.callPackage ./system_stats.nix { }; - - temporal_tables = super.callPackage ./temporal_tables.nix { }; - - timescaledb = super.callPackage ./timescaledb.nix { }; - timescaledb-apache = super.callPackage ./timescaledb.nix { enableUnfree = false; }; - - timescaledb_toolkit = super.callPackage ./timescaledb_toolkit.nix { }; - - tds_fdw = super.callPackage ./tds_fdw.nix { }; - - pgrouting = super.callPackage ./pgrouting.nix { }; - - pgx_ulid = super.callPackage ./pgx_ulid.nix { }; - - pg_partman = super.callPackage ./pg_partman.nix { }; - - pg_relusage = super.callPackage ./pg_relusage.nix { }; - - pg_roaringbitmap = super.callPackage ./pg_roaringbitmap.nix { }; - - pg_safeupdate = super.callPackage ./pg_safeupdate.nix { }; - - pg_squeeze = super.callPackage ./pg_squeeze.nix { }; - - pg_uuidv7 = super.callPackage ./pg_uuidv7.nix { }; - - repmgr = super.callPackage ./repmgr.nix { }; - - rum = super.callPackage ./rum.nix { }; - - sqlite_fdw = super.callPackage ./sqlite_fdw.nix { }; - - tsja = super.callPackage ./tsja.nix { }; - - wal2json = super.callPackage ./wal2json.nix { }; - - pgddl = super.callPackage ./pgddl.nix {}; -} // lib.optionalAttrs config.allowAliases { - pg_embedding = throw "PostgreSQL extension `pg_embedding` has been removed since the project has been abandoned. Upstream's recommendation is to use pgvector instead (https://neon.tech/docs/extensions/pg_embedding#migrate-from-pg_embedding-to-pgvector)"; -} diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix rename to pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix diff --git a/pkgs/servers/sql/postgresql/ext/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/plv8/package.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/plv8/default.nix rename to pkgs/servers/sql/postgresql/ext/plv8/package.nix diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index ca157411536e..ee3e2936b8fe 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -459,7 +459,7 @@ let callPackage = newScope (scope // this.pkgs); }; in - import ./ext newSelf newSuper; + import ./ext.nix newSelf newSuper; withPackages = postgresqlWithPackages { inherit buildEnv; From 72b8186ff7bbb914573d5e52c8326b8a12e44c1f Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:28:21 +0100 Subject: [PATCH 152/155] postgresqlPackages: rename buildPostgresqlExtension to postgresqlBuildExtension This is for consistency with postgresqlTestExtension and postgresqlTestHook. Everything that is passed via postgresql's generic.nix "packages scope" now is prefixed with "postgresql". --- pkgs/servers/sql/postgresql/ext/age.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/anonymizer.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/apache_datasketches.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/citus.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/cstore_fdw.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/h3-pg.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/hypopg.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/lantern.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/periods.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg-gvm.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg-semver.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_bigm.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_byteamagic.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_cron.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_ed25519.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_hll.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_ivm.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_libversion.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_net.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_partman.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_rational.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_relusage.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_repack.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_similarity.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_squeeze.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_tle.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_topn.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pgaudit.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pgddl.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pgjwt.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pgmq.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pgroonga.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pgrouting.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pgsodium.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pgsql-http.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pgtap.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/pgvector.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/plpgsql_check.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/plr.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/plv8/package.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/postgis.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/repmgr.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/rum.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/smlar.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/system_stats.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/tds_fdw.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/temporal_tables.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/timescaledb.nix | 4 ++-- pkgs/servers/sql/postgresql/ext/wal2json.nix | 4 ++-- pkgs/servers/sql/postgresql/generic.nix | 2 +- ...ldPostgresqlExtension.nix => postgresqlBuildExtension.nix} | 4 ++-- 58 files changed, 115 insertions(+), 115 deletions(-) rename pkgs/servers/sql/postgresql/{buildPostgresqlExtension.nix => postgresqlBuildExtension.nix} (98%) diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix index ddd93d953313..6c8b5fbd3f57 100644 --- a/pkgs/servers/sql/postgresql/ext/age.nix +++ b/pkgs/servers/sql/postgresql/ext/age.nix @@ -1,11 +1,11 @@ { bison, - buildPostgresqlExtension, fetchFromGitHub, flex, lib, perl, postgresql, + postgresqlBuildExtension, stdenv, }: @@ -19,7 +19,7 @@ let "13" = "sha256-HR6nnWt/V2a0rD5eHHUsFIZ1y7lmvLz36URt9pPJnCw="; }; in -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "age"; version = "1.5.0-rc0"; diff --git a/pkgs/servers/sql/postgresql/ext/anonymizer.nix b/pkgs/servers/sql/postgresql/ext/anonymizer.nix index 3fdb9e3b78b4..71e7624d2677 100644 --- a/pkgs/servers/sql/postgresql/ext/anonymizer.nix +++ b/pkgs/servers/sql/postgresql/ext/anonymizer.nix @@ -1,16 +1,16 @@ { - buildPostgresqlExtension, jitSupport, lib, llvm, nixosTests, pg-dump-anon, postgresql, + postgresqlBuildExtension, runtimeShell, stdenv, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "postgresql_anonymizer"; inherit (pg-dump-anon) version src; diff --git a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix index 142e6aa6ce3a..fa7200198277 100644 --- a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix +++ b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix @@ -1,9 +1,9 @@ { boost186, - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, postgresqlTestExtension, stdenv, }: @@ -28,7 +28,7 @@ let }; in -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "apache_datasketches"; inherit version; diff --git a/pkgs/servers/sql/postgresql/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/citus.nix index e42976419fb9..c28a505310bd 100644 --- a/pkgs/servers/sql/postgresql/ext/citus.nix +++ b/pkgs/servers/sql/postgresql/ext/citus.nix @@ -1,14 +1,14 @@ { - buildPostgresqlExtension, curl, fetchFromGitHub, lib, lz4, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "citus"; version = "13.0.2"; diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix index 1d49438d08eb..d6abe6b3e8dd 100644 --- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix @@ -1,13 +1,13 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, protobufc, stdenv, }: -buildPostgresqlExtension { +postgresqlBuildExtension { pname = "cstore_fdw"; version = "1.7.0-unstable-2021-03-08"; diff --git a/pkgs/servers/sql/postgresql/ext/h3-pg.nix b/pkgs/servers/sql/postgresql/ext/h3-pg.nix index 9f45ec8d7544..3defcde5699f 100644 --- a/pkgs/servers/sql/postgresql/ext/h3-pg.nix +++ b/pkgs/servers/sql/postgresql/ext/h3-pg.nix @@ -1,15 +1,15 @@ { - buildPostgresqlExtension, cmake, fetchFromGitHub, h3_4, lib, postgresql, + postgresqlBuildExtension, postgresqlTestExtension, stdenv, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "h3-pg"; version = "4.2.2"; diff --git a/pkgs/servers/sql/postgresql/ext/hypopg.nix b/pkgs/servers/sql/postgresql/ext/hypopg.nix index 47931377fb67..84a47bb9dac0 100644 --- a/pkgs/servers/sql/postgresql/ext/hypopg.nix +++ b/pkgs/servers/sql/postgresql/ext/hypopg.nix @@ -1,13 +1,13 @@ { - buildPostgresqlExtension, fetchFromGitHub, gitUpdater, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "hypopg"; version = "1.4.1"; diff --git a/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix b/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix index bfb69e6df0f8..fb6acd607466 100644 --- a/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix +++ b/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension { +postgresqlBuildExtension { pname = "jsonb_deep_sum"; version = "0-unstable-2021-12-24"; diff --git a/pkgs/servers/sql/postgresql/ext/lantern.nix b/pkgs/servers/sql/postgresql/ext/lantern.nix index 51150b5e6ec6..3a6275c66686 100644 --- a/pkgs/servers/sql/postgresql/ext/lantern.nix +++ b/pkgs/servers/sql/postgresql/ext/lantern.nix @@ -1,15 +1,15 @@ { - buildPostgresqlExtension, cmake, fetchFromGitHub, lib, openssl, postgresql, + postgresqlBuildExtension, postgresqlTestExtension, stdenv, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "postgresql-lantern"; version = "0.5.0"; diff --git a/pkgs/servers/sql/postgresql/ext/periods.nix b/pkgs/servers/sql/postgresql/ext/periods.nix index 422c76ae668d..db170862a7ba 100644 --- a/pkgs/servers/sql/postgresql/ext/periods.nix +++ b/pkgs/servers/sql/postgresql/ext/periods.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "periods"; version = "1.2.3"; diff --git a/pkgs/servers/sql/postgresql/ext/pg-gvm.nix b/pkgs/servers/sql/postgresql/ext/pg-gvm.nix index a4761bad5cd0..679374aae167 100644 --- a/pkgs/servers/sql/postgresql/ext/pg-gvm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg-gvm.nix @@ -1,5 +1,4 @@ { - buildPostgresqlExtension, cmake, fetchFromGitHub, glib, @@ -10,9 +9,10 @@ pcre2, pkg-config, postgresql, + postgresqlBuildExtension, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "pg-gvm"; version = "22.6.8"; diff --git a/pkgs/servers/sql/postgresql/ext/pg-semver.nix b/pkgs/servers/sql/postgresql/ext/pg-semver.nix index ea8d4c70a4a2..005e7f46bdbc 100644 --- a/pkgs/servers/sql/postgresql/ext/pg-semver.nix +++ b/pkgs/servers/sql/postgresql/ext/pg-semver.nix @@ -1,13 +1,13 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, postgresqlTestExtension, testers, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "pg-semver"; version = "0.40.0"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index dbb723e31049..d041e3dc5863 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pg_auto_failover"; version = "2.1"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix index 68daf6bcb3d0..246110923737 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix @@ -1,11 +1,11 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pg_bigm"; version = "1.2-20240606"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_byteamagic.nix b/pkgs/servers/sql/postgresql/ext/pg_byteamagic.nix index 1fdc86a7e9a2..8de8850d04eb 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_byteamagic.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_byteamagic.nix @@ -1,13 +1,13 @@ { - buildPostgresqlExtension, fetchFromGitHub, file, lib, postgresql, + postgresqlBuildExtension, postgresqlTestExtension, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "pg_byteamagic"; version = "0.2.4"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix index 28befb93aacc..d4cbd3839d79 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pg_cron"; version = "1.6.5"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix index 4eb97283b5b2..cb975af46a44 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitLab, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pg_ed25519"; version = "0.2"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix index 4b4a8c07bc89..4081d5b35f89 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix @@ -1,8 +1,8 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: @@ -33,7 +33,7 @@ let .${lib.versions.major postgresql.version} or (throw "Source for pg_hint_plan is not available for ${postgresql.version}"); in -buildPostgresqlExtension { +postgresqlBuildExtension { pname = "pg_hint_plan"; inherit (source) version; diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix index 4f817d799aeb..429319faa801 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pg_hll"; version = "2.18"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix index c652d50dfe89..3ebcf0c57086 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pg_ivm"; version = "1.9"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_libversion.nix b/pkgs/servers/sql/postgresql/ext/pg_libversion.nix index 979a48128bb1..4b5dbd34b12c 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_libversion.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_libversion.nix @@ -1,15 +1,15 @@ { - buildPostgresqlExtension, fetchFromGitHub, gitUpdater, lib, libversion, pkg-config, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "pg_libversion"; version = "2.0.1"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix index fbc8d213a235..698e76de4f50 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_net.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix @@ -1,13 +1,13 @@ { - buildPostgresqlExtension, curl, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pg_net"; version = "0.14.0"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index af06311a5d3d..6e06529be058 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pg_partman"; version = "5.2.4"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_rational.nix b/pkgs/servers/sql/postgresql/ext/pg_rational.nix index a557006142ec..add5ed477aed 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_rational.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_rational.nix @@ -1,11 +1,11 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pg_rational"; version = "0.0.2"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_relusage.nix b/pkgs/servers/sql/postgresql/ext/pg_relusage.nix index a7666c046247..b1195b514140 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_relusage.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_relusage.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pg_relusage"; version = "0.0.1"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix index 8368b2ffd672..a785635d0e7d 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix @@ -1,15 +1,15 @@ { - buildPostgresqlExtension, fetchFromGitHub, gitUpdater, lib, postgresql, + postgresqlBuildExtension, postgresqlTestExtension, stdenv, testers, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "pg_repack"; version = "1.5.2"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix b/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix index 8ffe3ed2c13d..8810a6710227 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix @@ -1,13 +1,13 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, postgresqlTestHook, stdenv, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "pg_roaringbitmap"; version = "0.5.4"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix index c551aca7df8f..8722a7ff7f31 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix @@ -1,8 +1,8 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: @@ -31,7 +31,7 @@ with { ."${lib.versions.major postgresql.version}" or (throw "pg_safeupdate: version specification for pg ${postgresql.version} missing."); -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pg-safeupdate"; inherit version; diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix index ab6d97637231..c0fb92f09f2f 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix @@ -1,13 +1,13 @@ { - buildPostgresqlExtension, fetchFromGitHub, fetchpatch, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension { +postgresqlBuildExtension { pname = "pg_similarity"; version = "pg_similarity_1_0-unstable-2021-01-12"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix index 9dfef6a1322a..a0c88f6c66b2 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix @@ -1,14 +1,14 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, nix-update-script, postgresql, + postgresqlBuildExtension, postgresqlTestExtension, stdenv, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "pg_squeeze"; version = "${builtins.replaceStrings [ "_" ] [ "." ] ( lib.strings.removePrefix "REL" finalAttrs.src.rev diff --git a/pkgs/servers/sql/postgresql/ext/pg_tle.nix b/pkgs/servers/sql/postgresql/ext/pg_tle.nix index 1d7913aa2f59..e8c45d2a026a 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_tle.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_tle.nix @@ -1,11 +1,11 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pg_tle"; version = "1.4.0"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix index a6ac3c5ea70e..1c14a028ce12 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pg_topn"; version = "2.7.0"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix index 9f3f766d29ed..157d40e6bc5c 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pg_uuidv7"; version = "1.6.0"; diff --git a/pkgs/servers/sql/postgresql/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/pgaudit.nix index 43e76c182529..6036cf42447f 100644 --- a/pkgs/servers/sql/postgresql/ext/pgaudit.nix +++ b/pkgs/servers/sql/postgresql/ext/pgaudit.nix @@ -1,10 +1,10 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, libkrb5, openssl, postgresql, + postgresqlBuildExtension, stdenv, }: @@ -35,7 +35,7 @@ let .${lib.versions.major postgresql.version} or (throw "Source for pgaudit is not available for ${postgresql.version}"); in -buildPostgresqlExtension { +postgresqlBuildExtension { pname = "pgaudit"; inherit (source) version; diff --git a/pkgs/servers/sql/postgresql/ext/pgddl.nix b/pkgs/servers/sql/postgresql/ext/pgddl.nix index fef7a6ef27d7..56b4f617df04 100644 --- a/pkgs/servers/sql/postgresql/ext/pgddl.nix +++ b/pkgs/servers/sql/postgresql/ext/pgddl.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, perl, postgresql, + postgresqlBuildExtension, postgresqlTestExtension, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "pgddl"; version = "0.29"; diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix index a21ac25e333e..f32eaf7687ed 100644 --- a/pkgs/servers/sql/postgresql/ext/pgjwt.nix +++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix @@ -1,15 +1,15 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, nixosTests, postgresql, + postgresqlBuildExtension, postgresqlTestExtension, stdenv, unstableGitUpdater, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "pgjwt"; version = "0-unstable-2023-03-02"; diff --git a/pkgs/servers/sql/postgresql/ext/pgmq.nix b/pkgs/servers/sql/postgresql/ext/pgmq.nix index c2f1a3559dc5..ea301fb51c3b 100644 --- a/pkgs/servers/sql/postgresql/ext/pgmq.nix +++ b/pkgs/servers/sql/postgresql/ext/pgmq.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pgmq"; version = "1.5.0"; diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 68a3da58a1fb..cffadd4cc61f 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -1,16 +1,16 @@ { - buildPostgresqlExtension, fetchFromGitHub, groonga, lib, msgpack-c, pkg-config, postgresql, + postgresqlBuildExtension, stdenv, xxHash, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pgroonga"; version = "4.0.1"; diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 47aadc39a81f..2702bd676a42 100644 --- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -1,15 +1,15 @@ { boost, - buildPostgresqlExtension, cmake, fetchFromGitHub, lib, perl, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pgrouting"; version = "3.7.3"; diff --git a/pkgs/servers/sql/postgresql/ext/pgsodium.nix b/pkgs/servers/sql/postgresql/ext/pgsodium.nix index d072c1c75b6c..d4abb4b32aee 100644 --- a/pkgs/servers/sql/postgresql/ext/pgsodium.nix +++ b/pkgs/servers/sql/postgresql/ext/pgsodium.nix @@ -1,15 +1,15 @@ { bash, - buildPostgresqlExtension, fetchFromGitHub, lib, libsodium, postgresql, + postgresqlBuildExtension, postgresqlTestExtension, stdenv, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "pgsodium"; version = "3.1.9"; diff --git a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix index 3b8b744e5cee..227a1680f8ca 100644 --- a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix +++ b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix @@ -1,13 +1,13 @@ { - buildPostgresqlExtension, curl, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pgsql-http"; version = "1.6.3"; diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix index 3e0907eaef3b..55d8613adce0 100644 --- a/pkgs/servers/sql/postgresql/ext/pgtap.nix +++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix @@ -1,16 +1,16 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, perl, perlPackages, postgresql, + postgresqlBuildExtension, postgresqlTestHook, stdenv, which, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "pgtap"; version = "1.3.3"; diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix index 45986b31cbb9..5741e06a7756 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvector.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvector.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "pgvector"; version = "0.8.0"; diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index e660dc5ee614..8a03799cf1c6 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -1,13 +1,13 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, postgresqlTestExtension, stdenv, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "plpgsql-check"; version = "2.7.15"; diff --git a/pkgs/servers/sql/postgresql/ext/plr.nix b/pkgs/servers/sql/postgresql/ext/plr.nix index b55812c3f3ce..891a461040ab 100644 --- a/pkgs/servers/sql/postgresql/ext/plr.nix +++ b/pkgs/servers/sql/postgresql/ext/plr.nix @@ -1,14 +1,14 @@ { R, - buildPostgresqlExtension, fetchFromGitHub, lib, pkg-config, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "plr"; version = "${builtins.replaceStrings [ "_" ] [ "." ] (lib.strings.removePrefix "REL" src.rev)}"; diff --git a/pkgs/servers/sql/postgresql/ext/plv8/package.nix b/pkgs/servers/sql/postgresql/ext/plv8/package.nix index 7ab270d50f04..be8935f42357 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8/package.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8/package.nix @@ -1,11 +1,11 @@ { - buildPostgresqlExtension, fetchFromGitHub, jitSupport, lib, nodejs_20, perl, postgresql, + postgresqlBuildExtension, stdenv, # For test coreutils, @@ -16,7 +16,7 @@ let libv8 = nodejs_20.libv8; in -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "plv8"; version = "3.2.3"; diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 9a4e46fc2680..ceeebabe76d7 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -1,7 +1,6 @@ { autoconf, automake, - buildPostgresqlExtension, cunit, docbook5, fetchFromGitHub, @@ -20,6 +19,7 @@ perl, pkg-config, postgresql, + postgresqlBuildExtension, postgresqlTestExtension, postgresqlTestHook, proj, @@ -34,7 +34,7 @@ let gdal = gdalMinimal; in -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "postgis"; version = "3.5.2"; diff --git a/pkgs/servers/sql/postgresql/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/repmgr.nix index 39087deb9599..dd977bf376f1 100644 --- a/pkgs/servers/sql/postgresql/ext/repmgr.nix +++ b/pkgs/servers/sql/postgresql/ext/repmgr.nix @@ -1,15 +1,15 @@ { - buildPostgresqlExtension, curl, fetchFromGitHub, flex, json_c, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "repmgr"; version = "5.5.0"; diff --git a/pkgs/servers/sql/postgresql/ext/rum.nix b/pkgs/servers/sql/postgresql/ext/rum.nix index 71db60cd5406..1124ab9a445a 100644 --- a/pkgs/servers/sql/postgresql/ext/rum.nix +++ b/pkgs/servers/sql/postgresql/ext/rum.nix @@ -1,13 +1,13 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, postgresqlTestHook, stdenv, }: -buildPostgresqlExtension (finalAttrs: { +postgresqlBuildExtension (finalAttrs: { pname = "rum"; version = "1.3.14"; diff --git a/pkgs/servers/sql/postgresql/ext/smlar.nix b/pkgs/servers/sql/postgresql/ext/smlar.nix index 6906d028fb11..3a2b8e0f930f 100644 --- a/pkgs/servers/sql/postgresql/ext/smlar.nix +++ b/pkgs/servers/sql/postgresql/ext/smlar.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchgit, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension { +postgresqlBuildExtension { pname = "smlar-unstable"; version = "2021-11-08"; diff --git a/pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix b/pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix index efac33fa7759..710fb5472042 100644 --- a/pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, sqlite, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "sqlite_fdw"; version = "2.5.0"; diff --git a/pkgs/servers/sql/postgresql/ext/system_stats.nix b/pkgs/servers/sql/postgresql/ext/system_stats.nix index 5bedbb758df6..88d92d4b547c 100644 --- a/pkgs/servers/sql/postgresql/ext/system_stats.nix +++ b/pkgs/servers/sql/postgresql/ext/system_stats.nix @@ -1,11 +1,11 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "system_stats"; version = "3.2"; diff --git a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix index 35e4a4811c6e..955131db9425 100644 --- a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix @@ -1,14 +1,14 @@ { - buildPostgresqlExtension, fetchFromGitHub, freetds, lib, postgresql, + postgresqlBuildExtension, stdenv, unstableGitUpdater, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "tds_fdw"; version = "2.0.4"; diff --git a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix index 5374607808a3..150f66fde899 100644 --- a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix +++ b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, postgresql, + postgresqlBuildExtension, stdenv, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "temporal_tables"; version = "1.2.2"; diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index db4cf085b1cf..a9dcd5cbe07c 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -1,5 +1,4 @@ { - buildPostgresqlExtension, cmake, fetchFromGitHub, lib, @@ -7,12 +6,13 @@ nixosTests, openssl, postgresql, + postgresqlBuildExtension, stdenv, enableUnfree ? true, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}"; version = "2.18.2"; diff --git a/pkgs/servers/sql/postgresql/ext/wal2json.nix b/pkgs/servers/sql/postgresql/ext/wal2json.nix index 2ec7d3c44e74..b40e1f5f21e2 100644 --- a/pkgs/servers/sql/postgresql/ext/wal2json.nix +++ b/pkgs/servers/sql/postgresql/ext/wal2json.nix @@ -1,12 +1,12 @@ { - buildPostgresqlExtension, fetchFromGitHub, lib, nixosTests, postgresql, + postgresqlBuildExtension, }: -buildPostgresqlExtension rec { +postgresqlBuildExtension rec { pname = "wal2json"; version = "${builtins.replaceStrings [ "_" ] [ "." ] ( lib.strings.removePrefix "wal2json_" src.rev diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index ee3e2936b8fe..0a2dee57c66a 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -452,7 +452,7 @@ let } // extraArgs ); - buildPostgresqlExtension = newSuper.callPackage ./buildPostgresqlExtension.nix { }; + postgresqlBuildExtension = newSuper.callPackage ./postgresqlBuildExtension.nix { }; }; newSelf = self // scope; newSuper = { diff --git a/pkgs/servers/sql/postgresql/buildPostgresqlExtension.nix b/pkgs/servers/sql/postgresql/postgresqlBuildExtension.nix similarity index 98% rename from pkgs/servers/sql/postgresql/buildPostgresqlExtension.nix rename to pkgs/servers/sql/postgresql/postgresqlBuildExtension.nix index a427b7f88053..9ea82fb80f84 100644 --- a/pkgs/servers/sql/postgresql/buildPostgresqlExtension.nix +++ b/pkgs/servers/sql/postgresql/postgresqlBuildExtension.nix @@ -66,7 +66,7 @@ args: let - buildPostgresqlExtension = + postgresqlBuildExtension = finalAttrs: { enableUpdateScript ? true, @@ -146,4 +146,4 @@ let + prevAttrs.postInstall or ""; }; in -stdenv.mkDerivation (lib.extends buildPostgresqlExtension (lib.toFunction args)) +stdenv.mkDerivation (lib.extends postgresqlBuildExtension (lib.toFunction args)) From 259b4ff913bf374dfd7029636db6b8d8c5611900 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 16 Mar 2025 21:34:03 +0100 Subject: [PATCH 153/155] postgresql: split postgresqlTestExtension into separate file --- pkgs/servers/sql/postgresql/generic.nix | 28 +--------------- .../postgresql/postgresqlTestExtension.nix | 32 +++++++++++++++++++ 2 files changed, 33 insertions(+), 27 deletions(-) create mode 100644 pkgs/servers/sql/postgresql/postgresqlTestExtension.nix diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 0a2dee57c66a..9c487a14ea93 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -425,33 +425,7 @@ let inherit (llvmPackages) llvm; postgresql = this; stdenv = stdenv'; - postgresqlTestExtension = - { - finalPackage, - withPackages ? [ ], - ... - }@extraArgs: - stdenvNoCC.mkDerivation ( - { - name = "${finalPackage.name}-test-extension"; - dontUnpack = true; - doCheck = true; - nativeCheckInputs = [ - postgresqlTestHook - (this.withPackages (ps: [ finalPackage ] ++ (map (p: ps."${p}") withPackages))) - ]; - failureHook = "postgresqlStop"; - postgresqlTestUserOptions = "LOGIN SUPERUSER"; - passAsFile = [ "sql" ]; - checkPhase = '' - runHook preCheck - psql -a -v ON_ERROR_STOP=1 -f "$sqlPath" - runHook postCheck - ''; - installPhase = "touch $out"; - } - // extraArgs - ); + postgresqlTestExtension = newSuper.callPackage ./postgresqlTestExtension.nix { }; postgresqlBuildExtension = newSuper.callPackage ./postgresqlBuildExtension.nix { }; }; newSelf = self // scope; diff --git a/pkgs/servers/sql/postgresql/postgresqlTestExtension.nix b/pkgs/servers/sql/postgresql/postgresqlTestExtension.nix new file mode 100644 index 000000000000..468a89a3b2e2 --- /dev/null +++ b/pkgs/servers/sql/postgresql/postgresqlTestExtension.nix @@ -0,0 +1,32 @@ +{ + postgresql, + postgresqlTestHook, + stdenvNoCC, +}: + +{ + finalPackage, + withPackages ? [ ], + ... +}@extraArgs: +stdenvNoCC.mkDerivation ( + { + name = "${finalPackage.name}-test-extension"; + dontUnpack = true; + doCheck = true; + nativeCheckInputs = [ + postgresqlTestHook + (postgresql.withPackages (ps: [ finalPackage ] ++ (map (p: ps."${p}") withPackages))) + ]; + failureHook = "postgresqlStop"; + postgresqlTestUserOptions = "LOGIN SUPERUSER"; + passAsFile = [ "sql" ]; + checkPhase = '' + runHook preCheck + psql -a -v ON_ERROR_STOP=1 -f "$sqlPath" + runHook postCheck + ''; + installPhase = "touch $out"; + } + // extraArgs +) From 65cee89d7e3647758604aa30447e3df6983835b8 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 17 Mar 2025 20:04:34 +0100 Subject: [PATCH 154/155] postgresqlPackages.citus: fix build on darwin The build on darwin was broken for v16 and v17 only. This was fixed upstream a while ago, but somehow the fix has not been released, yet. --- pkgs/servers/sql/postgresql/ext/citus.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/servers/sql/postgresql/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/citus.nix index c28a505310bd..c20accfbbacd 100644 --- a/pkgs/servers/sql/postgresql/ext/citus.nix +++ b/pkgs/servers/sql/postgresql/ext/citus.nix @@ -1,6 +1,7 @@ { curl, fetchFromGitHub, + fetchpatch, lib, lz4, postgresql, @@ -19,6 +20,16 @@ postgresqlBuildExtension rec { hash = "sha256-SuJs6OCHKO7efQagsATgn/V9rgMyuXQIHGCEP9ME7tQ="; }; + patches = [ + # Even though this commit is on main since Sep 2023, it hasn't made its way to the release-13.0 branch, yet. + # https://github.com/citusdata/citus/pull/7221 + # Fixes build for PG 16 + 17 on darwin + (fetchpatch { + url = "https://github.com/citusdata/citus/commit/0f28a69f12418d211ffba5f7ddd222fd0c47daeb.patch"; + hash = "sha256-8JAM+PUswzbdlAZUpRApgO0eBsMbUHFdFGsdATsG88I="; + }) + ]; + buildInputs = [ curl lz4 From 7407020674efdaef0a41b830fad033b499cd1b13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20M=C3=A9meint?= Date: Mon, 17 Mar 2025 18:50:47 +0100 Subject: [PATCH 155/155] authelia: 4.38.19 -> 4.39.1 --- nixos/doc/manual/release-notes/rl-2505.section.md | 8 ++++++++ pkgs/servers/authelia/sources.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 62253f4b84c5..dacb855e8cf1 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -392,6 +392,10 @@ [v1.8.0](https://github.com/jtroo/kanata/releases/tag/v1.8.0) for more information. +- `authelia` version 4.39.0 has made changes on the default claims for ID Tokens, to mirror the standard claims from the specification. + This change may affect some clients in unexpected ways, so manual intervention may be required. + Read the [release notes](https://www.authelia.com/blog/4.39-release-notes/), along with [the guide](https://www.authelia.com/integration/openid-connect/openid-connect-1.0-claims/#restore-functionality-prior-to-claims-parameter) to work around issues that may be encountered. + - `ags` was updated to v2, which is just a CLI for Astal now. Components are available as a different package set `astal.*`. If you want to use v1, it is available as `ags_1` package. @@ -639,6 +643,10 @@ [is removed](https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c01f664e4ca210823b7594b50669bbd9b0a3c3b0) in Linux 6.13. +- `authelia` version 4.39.0 has made some changes which deprecate older configurations. + They are still expected to be working until future version 5.0.0, but will generate warnings in logs. + Read the [release notes](https://www.authelia.com/blog/4.39-release-notes/) for human readable summaries of the changes. + - `programs.fzf.keybindings` now supports the fish shell. - `gerbera` now has wavpack support. diff --git a/pkgs/servers/authelia/sources.nix b/pkgs/servers/authelia/sources.nix index 457836b104b5..be8ec5069ca3 100644 --- a/pkgs/servers/authelia/sources.nix +++ b/pkgs/servers/authelia/sources.nix @@ -1,14 +1,14 @@ { fetchFromGitHub }: rec { pname = "authelia"; - version = "4.38.19"; + version = "4.39.1"; src = fetchFromGitHub { owner = "authelia"; repo = "authelia"; rev = "v${version}"; - hash = "sha256-VqdSDrvsue8NqUNN5H++psxAyvvSyFNqt2U8yUXhTo8="; + hash = "sha256-Q/NGjJphuZ7MMnOSTAukzEg4iAQWc/VDFWs0jj4e0dY="; }; - vendorHash = "sha256-NONSCqRalxZq1n0Q3fXKVXpkALkoyIl3+Fsx7Xb3M2w="; - pnpmDepsHash = "sha256-9ZqAoktMS28GTqbOsWDYUsS1H0unWSEPO0Z2b5xXV54="; + vendorHash = "sha256-FE4YABsWKhifVjdzJSnjWPesjuSe/hWDa6oTg8MZjo8="; + pnpmDepsHash = "sha256-TJ/Uz7Q+mXfvZ/Zu12Pv1O8LKTzEPJ+Pa+3vrKghPks="; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ea15c45003e..1763ccc11e24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1637,7 +1637,7 @@ with pkgs; }; authelia = callPackage ../servers/authelia { - buildGoModule = buildGo123Module; + buildGoModule = buildGo124Module; pnpm = pnpm_10; };