From d8e8916c2c294ab6c163e83b673e8144d286b12a Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 9 Feb 2025 12:40:16 +0000 Subject: [PATCH 001/101] doc/stdenv: reword `trivialautovarinit` section to reduce confusion this paragraph makes more sense if the order of the sentences is changed to be problem -> solution --- doc/stdenv/stdenv.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 3a98c7f7d4fd..ea5495a22e4a 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -1558,7 +1558,7 @@ This breaks some code that does advanced stack management or exception handling. #### `trivialautovarinit` {#trivialautovarinit} -Adds the `-ftrivial-auto-var-init=pattern` compiler option. This causes "trivially-initializable" uninitialized stack variables to be forcibly initialized with a nonzero value that is likely to cause a crash (and therefore be noticed). Uninitialized variables generally take on their values based on fragments of previous program state, and attackers can carefully manipulate that state to craft malicious initial values for these variables. +Adds the `-ftrivial-auto-var-init=pattern` compiler option. Uninitialized variables generally take on their values based on fragments of previous program state, and attackers can carefully manipulate that state to craft malicious initial values for these variables. This flag causes "trivially-initializable" uninitialized stack variables to be forcibly initialized with a nonzero value that is likely to cause a crash (and therefore be noticed). Use of this flag is controversial as it can prevent tools that detect uninitialized variable use (such as valgrind) from operating correctly. From decd67f9ce221514e83056825728506db496335d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Mar 2025 15:27:36 +0000 Subject: [PATCH 002/101] python312Packages.graph-tool: 2.92 -> 2.96 --- pkgs/development/python-modules/graph-tool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graph-tool/default.nix b/pkgs/development/python-modules/graph-tool/default.nix index 1e84e17e9b23..a4bc599eb0ef 100644 --- a/pkgs/development/python-modules/graph-tool/default.nix +++ b/pkgs/development/python-modules/graph-tool/default.nix @@ -32,12 +32,12 @@ let in buildPythonPackage rec { pname = "graph-tool"; - version = "2.92"; + version = "2.96"; format = "other"; src = fetchurl { url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - hash = "sha256-BBtWpWgmZV+R8EAu6eROrVe3jOTINDfi9HN5ZMt5r44="; + hash = "sha256-kNW09I/5U2kwKFOCWRdsedoXtIdnZhg9Bjy1GOw1rVc="; }; postPatch = '' From 09c539a75c133cb254cc9b4c71bce875c2f7a3e4 Mon Sep 17 00:00:00 2001 From: Tanya Date: Wed, 2 Apr 2025 20:00:38 +0530 Subject: [PATCH 003/101] nix-prefetch-github: add nix to dependencies --- .../development/python-modules/nix-prefetch-github/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index de23fe6548bd..ee006549aaa0 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -10,6 +10,7 @@ sphinx-argparse, parameterized, setuptools, + nix, }: buildPythonPackage rec { @@ -30,6 +31,8 @@ buildPythonPackage rec { hash = "sha256-eQd/MNlnuzXzgFzvwUMchvHoIvkIrbpGKV7iknO14Cc="; }; + dependencies = [ nix ]; + nativeBuildInputs = [ sphinxHook sphinx-argparse From 8e2340b11a63ab76e7019eee6981497407f2be2f Mon Sep 17 00:00:00 2001 From: Anna Aurora Date: Sat, 5 Apr 2025 13:36:37 +0200 Subject: [PATCH 004/101] rectangle-packer: 2.0.2 -> 2.0.4 --- .../python-modules/rectangle-packer/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/rectangle-packer/default.nix b/pkgs/development/python-modules/rectangle-packer/default.nix index 53a58f1246b6..186a11a10676 100644 --- a/pkgs/development/python-modules/rectangle-packer/default.nix +++ b/pkgs/development/python-modules/rectangle-packer/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "rectangle-packer"; - version = "2.0.2"; + version = "2.0.4"; pyproject = true; src = fetchFromGitHub { owner = "Penlect"; repo = "rectangle-packer"; rev = version; - hash = "sha256-YsMLB9jfAC5yB8TnlY9j6ybXM2ILireOgQ8m8wYo4ts="; + hash = "sha256-Tm1ZkWTecmQDGsTOa1AP2GtjdxVgxklLIYSBlTSfSiY="; }; build-system = [ @@ -24,11 +24,6 @@ buildPythonPackage rec { setuptools ]; - postPatch = '' - substituteInPlace setup.py \ - --replace-fail 'Cython<3.0.0' 'Cython' - ''; - pythonImportsCheck = [ "rpack" ]; nativeCheckInputs = [ pytestCheckHook ]; From afdd737c95e9672997280860099fcef960ffa102 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Fri, 4 Apr 2025 18:15:12 -0400 Subject: [PATCH 005/101] nixos/tests: Fix systemd-shutdown Since 459ddaec261ae40149601e5bb487bd52936b4e50, stdout of PID 1 and children such as systemd generators and systemd-shutdown scripts goes to `tty0` instead of `ttyS0`. This is because systemd's stdout is `/dev/console`, which represents only one tty at a time, as explained here: https://docs.kernel.org/admin-guide/serial-console.html The reason PID 1's own output makes it to both consoles is because it uses kmsg as its log target both before journald has started and once the `systemd-shutdown` executable takes control. Unlike `/dev/console`, kmsg output makes it to one console *of each type*, i.e. one VT and one serial console. --- nixos/tests/systemd-shutdown.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/systemd-shutdown.nix b/nixos/tests/systemd-shutdown.nix index 1f072086bdd1..602ead50639e 100644 --- a/nixos/tests/systemd-shutdown.nix +++ b/nixos/tests/systemd-shutdown.nix @@ -17,7 +17,7 @@ import ./make-test-python.nix ( imports = [ ../modules/profiles/minimal.nix ]; systemd.shutdownRamfs.contents."/etc/systemd/system-shutdown/shutdown-message".source = pkgs.writeShellScript "shutdown-message" '' - echo "${msg}" + echo "${msg}" > /dev/kmsg ''; boot.initrd.systemd.enable = systemdStage1; }; From 1047e4bcad790b1edbc998361439dbf4d9de9cd8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Apr 2025 06:45:29 +0000 Subject: [PATCH 006/101] quarkus: 3.19.4 -> 3.21.1 --- pkgs/by-name/qu/quarkus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/quarkus/package.nix b/pkgs/by-name/qu/quarkus/package.nix index 9c3a110d5823..38baf0ed9b65 100644 --- a/pkgs/by-name/qu/quarkus/package.nix +++ b/pkgs/by-name/qu/quarkus/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "quarkus-cli"; - version = "3.19.4"; + version = "3.21.1"; src = fetchurl { url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz"; - hash = "sha256-18sfx0z06JqdYFfSNT62X9Io6awPxUNzjKmG/PeaDB0="; + hash = "sha256-5RQsGznVMVR24v0hxIWKV+Hs6SR0g0tsY7tpgFp8sps="; }; nativeBuildInputs = [ makeWrapper ]; From bb11d476f50aa93f4129bbdc58cb004bbc601971 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Tue, 8 Apr 2025 18:49:16 +0200 Subject: [PATCH 007/101] nodejs: skip tests that are failing on macOS 15.4 --- pkgs/development/web/nodejs/nodejs.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 6155ce4d4f9d..4362164664cf 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -429,6 +429,12 @@ let "test-macos-app-sandbox" "test-os" "test-os-process-priority" + + # Debugger tests failing on macOS 15.4 + "test-debugger-extract-function-name" + "test-debugger-random-port-with-inspect-port" + "test-debugger-launch" + "test-debugger-pid" ] ++ lib.optionals (stdenv.buildPlatform.isDarwin && stdenv.buildPlatform.isx86_64) [ # These tests fail on x86_64-darwin (even without sandbox). From 8db7fcd13536658fc4c453498beb5e2dc4600daa Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Wed, 9 Apr 2025 09:44:56 -0700 Subject: [PATCH 008/101] python312Packages.condense-json: init at 0.1.2 --- .../python-modules/condense-json/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/condense-json/default.nix diff --git a/pkgs/development/python-modules/condense-json/default.nix b/pkgs/development/python-modules/condense-json/default.nix new file mode 100644 index 000000000000..422aa5dacf2d --- /dev/null +++ b/pkgs/development/python-modules/condense-json/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, +}: +buildPythonPackage rec { + pname = "condense-json"; + version = "0.1.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "simonw"; + repo = "condense-json"; + tag = version; + hash = "sha256-eZ8d8N7k8VL7dFkORHmp7JmHM1/11Km8BCriWw/LiwE="; + }; + + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "condense_json" ]; + + meta = { + description = "Python function for condensing JSON using replacement strings"; + homepage = "https://github.com/simonw/condense-json"; + changelog = "https://github.com/simonw/condense-json/releases/tag/${src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ josh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9bd03dc24f39..88c00408d298 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2737,6 +2737,8 @@ self: super: with self; { conda-package-streaming = callPackage ../development/python-modules/conda-package-streaming { }; + condense-json = callPackage ../development/python-modules/condense-json { }; + conduit = callPackage ../development/python-modules/conduit { }; conduit-mpi = callPackage ../development/python-modules/conduit { mpiSupport = true; }; From 33e3ab818aa21372fdb74c57db1a1483d9e257f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 9 Apr 2025 16:22:12 -0700 Subject: [PATCH 009/101] python313Packages.pymodbus-repl: init at 2.0.5 --- .../python-modules/pymodbus-repl/default.nix | 66 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 68 insertions(+) create mode 100644 pkgs/development/python-modules/pymodbus-repl/default.nix diff --git a/pkgs/development/python-modules/pymodbus-repl/default.nix b/pkgs/development/python-modules/pymodbus-repl/default.nix new file mode 100644 index 000000000000..be7d58e3a980 --- /dev/null +++ b/pkgs/development/python-modules/pymodbus-repl/default.nix @@ -0,0 +1,66 @@ +{ + aiohttp, + buildPythonPackage, + doCheck ? false, # cyclic dependency with pymodbus + fetchFromGitHub, + lib, + poetry-core, + prompt-toolkit, + pygments, + pymodbus, + pymodbus-repl, + pytest-cov-stub, + pytestCheckHook, + tabulate, + typer, +}: + +buildPythonPackage rec { + pname = "pymodbus-repl"; + version = "2.0.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pymodbus-dev"; + repo = "repl"; + tag = version; + hash = "sha256-jGoYp2nDWMWMX8n0aaG/YP+rQcj2npFbhdy7T1qxByc="; + }; + + build-system = [ poetry-core ]; + + pythonRelaxDeps = [ + "typer" + ]; + + dependencies = [ + aiohttp + prompt-toolkit + pygments + tabulate + typer + ]; + + pythonImportsCheck = [ "pymodbus_repl" ]; + + inherit doCheck; + + nativeCheckInputs = [ + pymodbus + pytest-cov-stub + pytestCheckHook + ]; + + passthru.tests = { + # currently expected to fail: https://github.com/pymodbus-dev/repl/pull/26 + pytest = pymodbus-repl.override { doCheck = true; }; + }; + + meta = { + changelog = "https://github.com/pymodbus-dev/repl/releases/tag/${src.tag}"; + description = "REPL client and server for pymodbus"; + homepage = "https://github.com/pymodbus-dev/repl"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9bd03dc24f39..545b7951fbc3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12637,6 +12637,8 @@ self: super: with self; { pymodbus = callPackage ../development/python-modules/pymodbus { }; + pymodbus-repl = callPackage ../development/python-modules/pymodbus-repl { }; + pymodes = callPackage ../development/python-modules/pymodes { }; pymonctl = callPackage ../development/python-modules/pymonctl { }; From 9ce020f2e82c21d55e43cef74215819c30c94615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 9 Apr 2025 16:13:46 -0700 Subject: [PATCH 010/101] python313Packages.pymodbus: 3.9.0 -> 3.9.1 Diff: https://github.com/pymodbus-dev/pymodbus/compare/refs/tags/v3.9.0...v3.9.1 Changelog: https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.9.1 --- .../python-modules/pymodbus/default.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index 25c768fb9def..a776ccd96aa9 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -6,12 +6,12 @@ fetchFromGitHub, prompt-toolkit, pygments, + pymodbus-repl, pyserial, pytest-asyncio, pytest-cov-stub, pytest-xdist, pytestCheckHook, - pythonOlder, redis, setuptools, sqlalchemy, @@ -21,29 +21,22 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "3.9.0"; + version = "3.9.1"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "pymodbus-dev"; repo = "pymodbus"; tag = "v${version}"; - hash = "sha256-8v48+wnxVBIXJhCn7/oHyoxPN8smWWNY/i5LMHhKUVk="; + hash = "sha256-O64r8/3AGZYr449FANo3wQCUiIJkIjN5eQ+VoTrvUHo="; }; build-system = [ setuptools ]; optional-dependencies = { - repl = [ - aiohttp - typer - prompt-toolkit - pygments - click - ]; + repl = [ pymodbus-repl ]; serial = [ pyserial ]; + simulator = [ aiohttp ]; }; nativeCheckInputs = [ From 7c15838a82db3c98f57d8fa4ad656c0d9ea05ef6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 14:21:12 +0000 Subject: [PATCH 011/101] librewolf-unwrapped: 137.0-3 -> 137.0.1-1 --- .../networking/browsers/librewolf/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index ca549a1b0f3f..3d1ddbbc8bf1 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "137.0-3", + "packageVersion": "137.0.1-1", "source": { - "rev": "137.0-3", - "hash": "sha256-3E8xjruyAHoOklvSt4sH6DY6cIzcOEFy8v3UhqKSpdI=" + "rev": "137.0.1-1", + "hash": "sha256-4C9RcdkNOYX215uom94yOi9ZQM0zEVgETNFFTsgkPns=" }, "firefox": { - "version": "137.0", - "hash": "sha512-gaLAzBT/wuSeSTeebCq1bPtuE7ZmZqZPOr/0SkO7Ln3BcnTTJdHCCvBi1Av/gGPXiNSy+TGnpkbbiwcgTKa0gQ==" + "version": "137.0.1", + "hash": "sha512-zCy+PdZWloScGxl7kIiHwREIP6i1CJqk6ubzPuQE2ynFZmGcSLd/tJWtf53JSi2dkQ5bKq+GRNsdADaAkfnctg==" } } From 97e0a92081211986c534c1b27197cf8fa50ab0c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 19:54:47 +0000 Subject: [PATCH 012/101] go-dnscollector: 1.5.0 -> 1.6.0 --- pkgs/by-name/go/go-dnscollector/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/go-dnscollector/package.nix b/pkgs/by-name/go/go-dnscollector/package.nix index 8f5eb3c77d01..1d602c6e24fd 100644 --- a/pkgs/by-name/go/go-dnscollector/package.nix +++ b/pkgs/by-name/go/go-dnscollector/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "go-dnscollector"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "dmachard"; repo = "go-dnscollector"; rev = "v${version}"; - sha256 = "sha256-rJHU/hDmnANziJj/K2FGccZjWFe8eyggtjIc2nt0pgo="; + sha256 = "sha256-/jc9OEWxwcMFIdihlyxADHgZKumc/uOqkhjjN1mLw1U="; }; - vendorHash = "sha256-bAqr2ZVR6x1hJ80oZogA5ZXEuoz5A7yp5rxry1rIhSY="; + vendorHash = "sha256-koWDlmlabDiwnlx+BTTtSQglu2lpccoTh17fRUC3pvg="; subPackages = [ "." ]; From 59f339b4810dfe7c6d732400073828d096d8d227 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Apr 2025 01:30:54 +0000 Subject: [PATCH 013/101] manifest-tool: 2.1.9 -> 2.2.0 --- pkgs/by-name/ma/manifest-tool/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/manifest-tool/package.nix b/pkgs/by-name/ma/manifest-tool/package.nix index 4880edc5d18b..9d3de5a520f9 100644 --- a/pkgs/by-name/ma/manifest-tool/package.nix +++ b/pkgs/by-name/ma/manifest-tool/package.nix @@ -10,14 +10,14 @@ buildGoModule rec { pname = "manifest-tool"; - version = "2.1.9"; + version = "2.2.0"; modRoot = "v2"; src = fetchFromGitHub { owner = "estesp"; repo = "manifest-tool"; rev = "v${version}"; - hash = "sha256-tehdgYH73tmzjhJmTQuMWvciGYIyc6VeIMS2fFO7YP4="; + hash = "sha256-tEUsqrJGRhyirI8TEgG6r9crHX58webHO5v7JLLRQ30="; leaveDotGit = true; postFetch = '' git -C $out rev-parse HEAD > $out/.git-revision From 821d2fe81d89d9bc26d12a0aaae9b93edcbacd5b Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Fri, 11 Apr 2025 11:49:51 +0200 Subject: [PATCH 014/101] perl: apply patch for CVE-2024-56406 --- .../interpreters/perl/CVE-2024-56406.patch | 26 +++++++++++++++++++ .../interpreters/perl/interpreter.nix | 4 ++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/interpreters/perl/CVE-2024-56406.patch diff --git a/pkgs/development/interpreters/perl/CVE-2024-56406.patch b/pkgs/development/interpreters/perl/CVE-2024-56406.patch new file mode 100644 index 000000000000..3960d17e6519 --- /dev/null +++ b/pkgs/development/interpreters/perl/CVE-2024-56406.patch @@ -0,0 +1,26 @@ +commit 385e8759c3ff1e7f7f996bd4ea391074d61d48c1 +Author: Karl Williamson +AuthorDate: 2024-12-18 18:25:29 -0700 +Commit: Steve Hay +CommitDate: 2025-03-30 11:59:51 +0100 + + CVE-2024-56406: Heap-buffer-overflow with tr// + + This was due to underallocating needed space. If the translation forces + something to become UTF-8 that is initially bytes, that UTF-8 could + now require two bytes where previously a single one would do. + + (cherry picked from commit f93109c8a6950aafbd7488d98e112552033a3686) + +diff --git a/op.c b/op.c +index 3fc23eca49a..aeee88e0335 100644 +--- a/op.c ++++ b/op.c +@@ -6649,6 +6649,7 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *repl) + * same time. But otherwise one crosses before the other */ + if (t_cp < 256 && r_cp_end > 255 && r_cp != t_cp) { + can_force_utf8 = TRUE; ++ max_expansion = MAX(2, max_expansion); + } + } + diff --git a/pkgs/development/interpreters/perl/interpreter.nix b/pkgs/development/interpreters/perl/interpreter.nix index 6fea82501c06..0c9586fe1273 100644 --- a/pkgs/development/interpreters/perl/interpreter.nix +++ b/pkgs/development/interpreters/perl/interpreter.nix @@ -71,7 +71,9 @@ stdenv.mkDerivation ( disallowedReferences = [ stdenv.cc ]; patches = - [ ] + [ + ./CVE-2024-56406.patch + ] # Do not look in /usr etc. for dependencies. ++ lib.optional ((lib.versions.majorMinor version) == "5.38") ./no-sys-dirs-5.38.0.patch ++ lib.optional ((lib.versions.majorMinor version) == "5.40") ./no-sys-dirs-5.40.0.patch From b4bccfaaa4a0a3b0f2dd389f2d75d5937b0345c6 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 11 Apr 2025 14:12:50 +0400 Subject: [PATCH 015/101] =?UTF-8?q?pvs-studio:=207.33.85330.89=20=E2=86=92?= =?UTF-8?q?=207.36.91321.455?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/pv/pvs-studio/package.nix | 33 +++++++++++++++++--------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/pv/pvs-studio/package.nix b/pkgs/by-name/pv/pvs-studio/package.nix index d6157bab9918..626b4e16f7d1 100644 --- a/pkgs/by-name/pv/pvs-studio/package.nix +++ b/pkgs/by-name/pv/pvs-studio/package.nix @@ -3,6 +3,7 @@ stdenv, fetchzip, + installShellFiles, makeWrapper, perl, strace, @@ -14,7 +15,7 @@ # nixpkgs-update: no auto update stdenv.mkDerivation rec { pname = "pvs-studio"; - version = "7.33.85330.89"; + version = "7.36.91321.455"; src = let @@ -23,27 +24,36 @@ stdenv.mkDerivation rec { in fetchzip { url = selectSystem { - x86_64-darwin = "https://web.archive.org/web/20241115155106/https://cdn.pvs-studio.com/pvs-studio-7.33.85330.89-macos.tgz"; - x86_64-linux = "https://web.archive.org/web/20241115155538/https://cdn.pvs-studio.com/pvs-studio-7.33.85330.89-x86_64.tgz"; + aarch64-darwin = "https://web.archive.org/web/20250411093324/https://files.pvs-studio.com/pvs-studio-${version}-macos-arm64.tgz"; + x86_64-darwin = "https://web.archive.org/web/20250411092440/https://files.pvs-studio.com/pvs-studio-${version}-macos-x86_64.tgz"; + x86_64-linux = "https://web.archive.org/web/20250411091929/https://files.pvs-studio.com/pvs-studio-${version}-x86_64.tgz"; }; hash = selectSystem { - x86_64-darwin = "sha256-jhfW+uBexzYzzf3JVqRYqtDjE5+OoT3RcuRPJEOEs18="; - x86_64-linux = "sha256-rJQc8B2B7J0bcEI00auwIO/4PH2YMkuzSK/OyAnhdBA="; + aarch64-darwin = "sha256-KEDKsWXg+CRwsEi7hNKlC3CWldBtvf9Jw79vuLMKSOE="; + x86_64-darwin = "sha256-Esf+pohienMAkWs1q5fYZ+0RzzK/WxOGljRXYJ0AtFI="; + x86_64-linux = "sha256-Be4IGFA+307zuMnhXBZko6T27TYeBZHX/zxaXBWVPHo="; }; }; - nativeBuildInputs = [ makeWrapper ]; - - nativeRuntimeInputs = lib.makeBinPath [ - perl - strace + nativeBuildInputs = [ + installShellFiles + makeWrapper ]; + nativeRuntimeInputs = lib.makeBinPath ( + [ + perl + ] + ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform strace) [ + strace + ] + ); + installPhase = '' runHook preInstall install -D -m 0755 bin/* -t $out/bin - install -D -m 0644 etc/bash_completion.d/* -t $out/etc/bash_completion.d + installShellCompletion --bash etc/bash_completion.d/* runHook postInstall ''; @@ -62,6 +72,7 @@ stdenv.mkDerivation rec { homepage = "https://pvs-studio.com/en/pvs-studio"; license = lib.licenses.unfreeRedistributable; platforms = [ + "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; From 91e0456b89d350de73e0bf5632982ef970118808 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Apr 2025 12:47:20 +0000 Subject: [PATCH 016/101] trytond: 7.4.8 -> 7.4.9 --- pkgs/development/python-modules/trytond/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 4104379858c6..9b36ce309eb5 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "trytond"; - version = "7.4.8"; + version = "7.4.9"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-o/VMPW5nh8zci82I80sFnythW7Z7A6DV6Nfl4Cnp2OE="; + hash = "sha256-yH0dIRVBPKOjzk+36HGHN13ffhD4y+ZCC123s33YfMA="; }; build-system = [ setuptools ]; From af7cb9954d9cefd568826ee8b8945de53d2bddec Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Fri, 11 Apr 2025 14:51:01 +0200 Subject: [PATCH 017/101] proxmox-auto-install-assistant: 8.3.3 -> 8.4.6 Signed-off-by: Christoph Heiss --- .../proxmox-auto-install-assistant/Cargo.lock | 427 ++++++++++-------- .../locale-info.json | 2 + .../package.nix | 26 +- 3 files changed, 247 insertions(+), 208 deletions(-) create mode 100644 pkgs/by-name/pr/proxmox-auto-install-assistant/locale-info.json diff --git a/pkgs/by-name/pr/proxmox-auto-install-assistant/Cargo.lock b/pkgs/by-name/pr/proxmox-auto-install-assistant/Cargo.lock index df8651a1334d..79825deab4ba 100644 --- a/pkgs/by-name/pr/proxmox-auto-install-assistant/Cargo.lock +++ b/pkgs/by-name/pr/proxmox-auto-install-assistant/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "adler2" @@ -15,7 +15,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", - "getrandom", + "getrandom 0.2.15", "once_cell", "version_check", "zerocopy", @@ -71,19 +71,20 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "3.0.6" +version = "3.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" +checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" dependencies = [ "anstyle", + "once_cell", "windows-sys 0.59.0", ] [[package]] name = "anyhow" -version = "1.0.93" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" +checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f" [[package]] name = "autocfg" @@ -99,15 +100,9 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "bitflags" -version = "1.3.2" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" [[package]] name = "block-buffer" @@ -129,9 +124,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.1" +version = "1.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" +checksum = "525046617d8376e3db1deffb079e91cef90a89fc3ca5c185bbf8c9ecdd15cd5c" dependencies = [ "shlex", ] @@ -144,9 +139,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.21" +version = "4.5.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" +checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944" dependencies = [ "clap_builder", "clap_derive", @@ -154,9 +149,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.21" +version = "4.5.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" +checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9" dependencies = [ "anstream", "anstyle", @@ -166,9 +161,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.18" +version = "4.5.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" dependencies = [ "heck", "proc-macro2", @@ -178,9 +173,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "colorchoice" @@ -190,9 +185,9 @@ checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "compact_str" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6050c3a16ddab2e412160b31f2c871015704239bca62f72f6e5f0be631d3f644" +checksum = "3b79c4069c6cad78e2e0cdfcbd26275770669fb39fd308a752dc110e83b9af32" dependencies = [ "castaway", "cfg-if", @@ -220,9 +215,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" dependencies = [ "libc", ] @@ -238,18 +233,18 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.13" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crossterm" @@ -257,11 +252,11 @@ version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" dependencies = [ - "bitflags 2.6.0", + "bitflags", "crossterm_winapi", "mio", "parking_lot", - "rustix", + "rustix 0.38.44", "signal-hook", "signal-hook-mio", "winapi", @@ -339,9 +334,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.10" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" dependencies = [ "darling_core", "darling_macro", @@ -349,9 +344,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.10" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" dependencies = [ "fnv", "ident_case", @@ -362,9 +357,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.10" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ "darling_core", "quote", @@ -373,13 +368,19 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.11" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" dependencies = [ "powerfmt", ] +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + [[package]] name = "digest" version = "0.10.7" @@ -444,31 +445,31 @@ dependencies = [ [[package]] name = "equivalent" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "fastrand" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "flate2" -version = "1.0.35" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" +checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece" dependencies = [ "crc32fast", "miniz_oxide", @@ -522,14 +523,26 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasi 0.14.2+wasi-0.2.4", ] [[package]] name = "glob" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" [[package]] name = "hashbrown" @@ -543,12 +556,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - [[package]] name = "hex" version = "0.4.3" @@ -596,9 +603,9 @@ dependencies = [ [[package]] name = "icu_locid_transform_data" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" +checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d" [[package]] name = "icu_normalizer" @@ -620,9 +627,9 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" +checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7" [[package]] name = "icu_properties" @@ -641,9 +648,9 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" +checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2" [[package]] name = "icu_provider" @@ -702,9 +709,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.6.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" dependencies = [ "equivalent", "hashbrown", @@ -718,9 +725,9 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itoa" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "lazy_static" @@ -730,21 +737,27 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.164" +version = "0.2.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" +checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" [[package]] name = "linux-raw-sys" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" + +[[package]] +name = "linux-raw-sys" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" [[package]] name = "litemap" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" +checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856" [[package]] name = "lock_api" @@ -758,9 +771,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "memchr" @@ -768,42 +781,32 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - [[package]] name = "miniz_oxide" -version = "0.8.0" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" dependencies = [ "adler2", ] [[package]] name = "mio" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ - "hermit-abi", "libc", "log", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.52.0", ] [[package]] name = "native-tls" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" dependencies = [ "libc", "log", @@ -816,19 +819,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset", - "pin-utils", -] - [[package]] name = "num" version = "0.4.3" @@ -907,17 +897,17 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.2" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "openssl" -version = "0.10.68" +version = "0.10.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" +checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da" dependencies = [ - "bitflags 2.6.0", + "bitflags", "cfg-if", "foreign-types", "libc", @@ -939,15 +929,15 @@ dependencies = [ [[package]] name = "openssl-probe" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openssl-sys" -version = "0.9.104" +version = "0.9.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" +checksum = "8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07" dependencies = [ "cc", "libc", @@ -984,17 +974,11 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - [[package]] name = "pkg-config" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "powerfmt" @@ -1003,17 +987,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] -name = "proc-macro2" -version = "1.0.92" +name = "pretty_assertions" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d" +dependencies = [ + "diff", + "yansi", +] + +[[package]] +name = "proc-macro2" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" dependencies = [ "unicode-ident", ] [[package]] name = "proxmox-auto-install-assistant" -version = "8.3.3" +version = "8.4.6" dependencies = [ "anyhow", "clap", @@ -1029,12 +1023,13 @@ dependencies = [ [[package]] name = "proxmox-auto-installer" -version = "0.1.0" +version = "8.4.6" dependencies = [ "anyhow", "clap", "glob", "log", + "pretty_assertions", "proxmox-installer-common", "serde", "serde_json", @@ -1044,11 +1039,10 @@ dependencies = [ [[package]] name = "proxmox-chroot" -version = "0.1.0" +version = "8.4.6" dependencies = [ "anyhow", "clap", - "nix", "proxmox-installer-common", "regex", "serde_json", @@ -1056,7 +1050,7 @@ dependencies = [ [[package]] name = "proxmox-fetch-answer" -version = "0.1.0" +version = "8.4.6" dependencies = [ "anyhow", "log", @@ -1069,11 +1063,12 @@ dependencies = [ [[package]] name = "proxmox-installer-common" -version = "0.1.0" +version = "8.4.6" dependencies = [ "anyhow", "hex", "native-tls", + "pretty_assertions", "regex", "rustls", "rustls-native-certs", @@ -1086,7 +1081,7 @@ dependencies = [ [[package]] name = "proxmox-post-hook" -version = "0.1.0" +version = "8.4.6" dependencies = [ "anyhow", "proxmox-auto-installer", @@ -1097,7 +1092,7 @@ dependencies = [ [[package]] name = "proxmox-tui-installer" -version = "0.1.0" +version = "8.4.6" dependencies = [ "cursive", "proxmox-installer-common", @@ -1108,20 +1103,26 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] [[package]] -name = "redox_syscall" -version = "0.5.7" +name = "r-efi" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" + +[[package]] +name = "redox_syscall" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3" dependencies = [ - "bitflags 2.6.0", + "bitflags", ] [[package]] @@ -1155,30 +1156,42 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "ring" -version = "0.17.8" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if", - "getrandom", + "getrandom 0.2.15", "libc", - "spin", "untrusted", "windows-sys 0.52.0", ] [[package]] name = "rustix" -version = "0.38.41" +version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.6.0", + "bitflags", "errno", "libc", - "linux-raw-sys", - "windows-sys 0.52.0", + "linux-raw-sys 0.4.15", + "windows-sys 0.59.0", +] + +[[package]] +name = "rustix" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf" +dependencies = [ + "bitflags", + "errno", + "libc", + "linux-raw-sys 0.9.4", + "windows-sys 0.59.0", ] [[package]] @@ -1226,15 +1239,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" +checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" [[package]] name = "ryu" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "schannel" @@ -1267,7 +1280,7 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.6.0", + "bitflags", "core-foundation", "core-foundation-sys", "libc", @@ -1276,9 +1289,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.12.1" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" +checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" dependencies = [ "core-foundation-sys", "libc", @@ -1286,18 +1299,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.215" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.215" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", @@ -1306,9 +1319,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.133" +version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" dependencies = [ "itoa", "memchr", @@ -1383,15 +1396,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.2" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" [[package]] name = "stable_deref_trait" @@ -1413,9 +1420,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.89" +version = "2.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" +checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" dependencies = [ "proc-macro2", "quote", @@ -1435,22 +1442,22 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.14.0" +version = "3.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" +checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf" dependencies = [ - "cfg-if", "fastrand", + "getrandom 0.3.2", "once_cell", - "rustix", + "rustix 1.0.5", "windows-sys 0.59.0", ] [[package]] name = "time" -version = "0.3.36" +version = "0.3.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" dependencies = [ "deranged", "itoa", @@ -1465,15 +1472,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" +checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" dependencies = [ "num-conv", "time-core", @@ -1491,9 +1498,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148" dependencies = [ "serde", "serde_spanned", @@ -1512,9 +1519,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.22" +version = "0.22.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" dependencies = [ "indexmap", "serde", @@ -1525,15 +1532,15 @@ dependencies = [ [[package]] name = "typenum" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" [[package]] name = "unicode-ident" -version = "1.0.14" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] name = "unicode-segmentation" @@ -1618,6 +1625,15 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasi" +version = "0.14.2+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +dependencies = [ + "wit-bindgen-rt", +] + [[package]] name = "webpki-roots" version = "0.25.4" @@ -1730,13 +1746,22 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.20" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" +checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10" dependencies = [ "memchr", ] +[[package]] +name = "wit-bindgen-rt" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" +dependencies = [ + "bitflags", +] + [[package]] name = "write16" version = "1.0.0" @@ -1755,6 +1780,12 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" +[[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" + [[package]] name = "yoke" version = "0.7.5" @@ -1801,18 +1832,18 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/by-name/pr/proxmox-auto-install-assistant/locale-info.json b/pkgs/by-name/pr/proxmox-auto-install-assistant/locale-info.json new file mode 100644 index 000000000000..dc371827ddba --- /dev/null +++ b/pkgs/by-name/pr/proxmox-auto-install-assistant/locale-info.json @@ -0,0 +1,2 @@ +{"cczones":{"ad":{"Europe/Andorra":1},"ae":{"Asia/Dubai":1},"af":{"Asia/Kabul":1},"ag":{"America/Antigua":1},"ai":{"America/Anguilla":1},"al":{"Europe/Tirane":1},"am":{"Asia/Yerevan":1},"ao":{"Africa/Luanda":1},"aq":{"Antarctica/Casey":1,"Antarctica/Davis":1,"Antarctica/DumontDUrville":1,"Antarctica/Mawson":1,"Antarctica/McMurdo":1,"Antarctica/Palmer":1,"Antarctica/Rothera":1,"Antarctica/Syowa":1,"Antarctica/Troll":1,"Antarctica/Vostok":1},"ar":{"America/Argentina/Buenos_Aires":1,"America/Argentina/Catamarca":1,"America/Argentina/Cordoba":1,"America/Argentina/Jujuy":1,"America/Argentina/La_Rioja":1,"America/Argentina/Mendoza":1,"America/Argentina/Rio_Gallegos":1,"America/Argentina/Salta":1,"America/Argentina/San_Juan":1,"America/Argentina/San_Luis":1,"America/Argentina/Tucuman":1,"America/Argentina/Ushuaia":1},"as":{"Pacific/Pago_Pago":1},"at":{"Europe/Vienna":1},"au":{"Antarctica/Macquarie":1,"Australia/Adelaide":1,"Australia/Brisbane":1,"Australia/Broken_Hill":1,"Australia/Darwin":1,"Australia/Eucla":1,"Australia/Hobart":1,"Australia/Lindeman":1,"Australia/Lord_Howe":1,"Australia/Melbourne":1,"Australia/Perth":1,"Australia/Sydney":1},"aw":{"America/Aruba":1},"ax":{"Europe/Mariehamn":1},"az":{"Asia/Baku":1},"ba":{"Europe/Sarajevo":1},"bb":{"America/Barbados":1},"bd":{"Asia/Dhaka":1},"be":{"Europe/Brussels":1},"bf":{"Africa/Ouagadougou":1},"bg":{"Europe/Sofia":1},"bh":{"Asia/Bahrain":1},"bi":{"Africa/Bujumbura":1},"bj":{"Africa/Porto-Novo":1},"bl":{"America/St_Barthelemy":1},"bm":{"Atlantic/Bermuda":1},"bn":{"Asia/Brunei":1},"bo":{"America/La_Paz":1},"bq":{"America/Kralendijk":1},"br":{"America/Araguaina":1,"America/Bahia":1,"America/Belem":1,"America/Boa_Vista":1,"America/Campo_Grande":1,"America/Cuiaba":1,"America/Eirunepe":1,"America/Fortaleza":1,"America/Maceio":1,"America/Manaus":1,"America/Noronha":1,"America/Porto_Velho":1,"America/Recife":1,"America/Rio_Branco":1,"America/Santarem":1,"America/Sao_Paulo":1},"bs":{"America/Nassau":1},"bt":{"Asia/Thimphu":1},"bw":{"Africa/Gaborone":1},"by":{"Europe/Minsk":1},"bz":{"America/Belize":1},"ca":{"America/Atikokan":1,"America/Blanc-Sablon":1,"America/Cambridge_Bay":1,"America/Creston":1,"America/Dawson":1,"America/Dawson_Creek":1,"America/Edmonton":1,"America/Fort_Nelson":1,"America/Glace_Bay":1,"America/Goose_Bay":1,"America/Halifax":1,"America/Inuvik":1,"America/Iqaluit":1,"America/Moncton":1,"America/Rankin_Inlet":1,"America/Regina":1,"America/Resolute":1,"America/St_Johns":1,"America/Swift_Current":1,"America/Toronto":1,"America/Vancouver":1,"America/Whitehorse":1,"America/Winnipeg":1},"cc":{"Indian/Cocos":1},"cd":{"Africa/Kinshasa":1,"Africa/Lubumbashi":1},"cf":{"Africa/Bangui":1},"cg":{"Africa/Brazzaville":1},"ch":{"Europe/Zurich":1},"ci":{"Africa/Abidjan":1},"ck":{"Pacific/Rarotonga":1},"cl":{"America/Punta_Arenas":1,"America/Santiago":1,"Pacific/Easter":1},"cm":{"Africa/Douala":1},"cn":{"Asia/Shanghai":1,"Asia/Urumqi":1},"co":{"America/Bogota":1},"cr":{"America/Costa_Rica":1},"cu":{"America/Havana":1},"cv":{"Atlantic/Cape_Verde":1},"cw":{"America/Curacao":1},"cx":{"Indian/Christmas":1},"cy":{"Asia/Famagusta":1,"Asia/Nicosia":1},"cz":{"Europe/Prague":1},"de":{"Europe/Berlin":1,"Europe/Busingen":1},"dj":{"Africa/Djibouti":1},"dk":{"Europe/Copenhagen":1},"dm":{"America/Dominica":1},"do":{"America/Santo_Domingo":1},"dz":{"Africa/Algiers":1},"ec":{"America/Guayaquil":1,"Pacific/Galapagos":1},"ee":{"Europe/Tallinn":1},"eg":{"Africa/Cairo":1},"eh":{"Africa/El_Aaiun":1},"er":{"Africa/Asmara":1},"es":{"Africa/Ceuta":1,"Atlantic/Canary":1,"Europe/Madrid":1},"et":{"Africa/Addis_Ababa":1},"fi":{"Europe/Helsinki":1},"fj":{"Pacific/Fiji":1},"fk":{"Atlantic/Stanley":1},"fm":{"Pacific/Chuuk":1,"Pacific/Kosrae":1,"Pacific/Pohnpei":1},"fo":{"Atlantic/Faroe":1},"fr":{"Europe/Paris":1},"ga":{"Africa/Libreville":1},"gb":{"Europe/London":1},"gd":{"America/Grenada":1},"ge":{"Asia/Tbilisi":1},"gf":{"America/Cayenne":1},"gg":{"Europe/Guernsey":1},"gh":{"Africa/Accra":1},"gi":{"Europe/Gibraltar":1},"gl":{"America/Danmarkshavn":1,"America/Nuuk":1,"America/Scoresbysund":1,"America/Thule":1},"gm":{"Africa/Banjul":1},"gn":{"Africa/Conakry":1},"gp":{"America/Guadeloupe":1},"gq":{"Africa/Malabo":1},"gr":{"Europe/Athens":1},"gs":{"Atlantic/South_Georgia":1},"gt":{"America/Guatemala":1},"gu":{"Pacific/Guam":1},"gw":{"Africa/Bissau":1},"gy":{"America/Guyana":1},"hk":{"Asia/Hong_Kong":1},"hn":{"America/Tegucigalpa":1},"hr":{"Europe/Zagreb":1},"ht":{"America/Port-au-Prince":1},"hu":{"Europe/Budapest":1},"id":{"Asia/Jakarta":1,"Asia/Jayapura":1,"Asia/Makassar":1,"Asia/Pontianak":1},"ie":{"Europe/Dublin":1},"il":{"Asia/Jerusalem":1},"im":{"Europe/Isle_of_Man":1},"in":{"Asia/Kolkata":1},"io":{"Indian/Chagos":1},"iq":{"Asia/Baghdad":1},"ir":{"Asia/Tehran":1},"is":{"Atlantic/Reykjavik":1},"it":{"Europe/Rome":1},"je":{"Europe/Jersey":1},"jm":{"America/Jamaica":1},"jo":{"Asia/Amman":1},"jp":{"Asia/Tokyo":1},"ke":{"Africa/Nairobi":1},"kg":{"Asia/Bishkek":1},"kh":{"Asia/Phnom_Penh":1},"ki":{"Pacific/Kanton":1,"Pacific/Kiritimati":1,"Pacific/Tarawa":1},"km":{"Indian/Comoro":1},"kn":{"America/St_Kitts":1},"kp":{"Asia/Pyongyang":1},"kr":{"Asia/Seoul":1},"kw":{"Asia/Kuwait":1},"ky":{"America/Cayman":1},"kz":{"Asia/Almaty":1,"Asia/Aqtau":1,"Asia/Aqtobe":1,"Asia/Atyrau":1,"Asia/Oral":1,"Asia/Qostanay":1,"Asia/Qyzylorda":1},"la":{"Asia/Vientiane":1},"lb":{"Asia/Beirut":1},"lc":{"America/St_Lucia":1},"li":{"Europe/Vaduz":1},"lk":{"Asia/Colombo":1},"lr":{"Africa/Monrovia":1},"ls":{"Africa/Maseru":1},"lt":{"Europe/Vilnius":1},"lu":{"Europe/Luxembourg":1},"lv":{"Europe/Riga":1},"ly":{"Africa/Tripoli":1},"ma":{"Africa/Casablanca":1},"mc":{"Europe/Monaco":1},"md":{"Europe/Chisinau":1},"me":{"Europe/Podgorica":1},"mf":{"America/Marigot":1},"mg":{"Indian/Antananarivo":1},"mh":{"Pacific/Kwajalein":1,"Pacific/Majuro":1},"mk":{"Europe/Skopje":1},"ml":{"Africa/Bamako":1},"mm":{"Asia/Yangon":1},"mn":{"Asia/Choibalsan":1,"Asia/Hovd":1,"Asia/Ulaanbaatar":1},"mo":{"Asia/Macau":1},"mp":{"Pacific/Saipan":1},"mq":{"America/Martinique":1},"mr":{"Africa/Nouakchott":1},"ms":{"America/Montserrat":1},"mt":{"Europe/Malta":1},"mu":{"Indian/Mauritius":1},"mv":{"Indian/Maldives":1},"mw":{"Africa/Blantyre":1},"mx":{"America/Bahia_Banderas":1,"America/Cancun":1,"America/Chihuahua":1,"America/Ciudad_Juarez":1,"America/Hermosillo":1,"America/Matamoros":1,"America/Mazatlan":1,"America/Merida":1,"America/Mexico_City":1,"America/Monterrey":1,"America/Ojinaga":1,"America/Tijuana":1},"my":{"Asia/Kuala_Lumpur":1,"Asia/Kuching":1},"mz":{"Africa/Maputo":1},"na":{"Africa/Windhoek":1},"nc":{"Pacific/Noumea":1},"ne":{"Africa/Niamey":1},"nf":{"Pacific/Norfolk":1},"ng":{"Africa/Lagos":1},"ni":{"America/Managua":1},"nl":{"Europe/Amsterdam":1},"no":{"Europe/Oslo":1},"np":{"Asia/Kathmandu":1},"nr":{"Pacific/Nauru":1},"nu":{"Pacific/Niue":1},"nz":{"Pacific/Auckland":1,"Pacific/Chatham":1},"om":{"Asia/Muscat":1},"pa":{"America/Panama":1},"pe":{"America/Lima":1},"pf":{"Pacific/Gambier":1,"Pacific/Marquesas":1,"Pacific/Tahiti":1},"pg":{"Pacific/Bougainville":1,"Pacific/Port_Moresby":1},"ph":{"Asia/Manila":1},"pk":{"Asia/Karachi":1},"pl":{"Europe/Warsaw":1},"pm":{"America/Miquelon":1},"pn":{"Pacific/Pitcairn":1},"pr":{"America/Puerto_Rico":1},"ps":{"Asia/Gaza":1,"Asia/Hebron":1},"pt":{"Atlantic/Azores":1,"Atlantic/Madeira":1,"Europe/Lisbon":1},"pw":{"Pacific/Palau":1},"py":{"America/Asuncion":1},"qa":{"Asia/Qatar":1},"re":{"Indian/Reunion":1},"ro":{"Europe/Bucharest":1},"rs":{"Europe/Belgrade":1},"ru":{"Asia/Anadyr":1,"Asia/Barnaul":1,"Asia/Chita":1,"Asia/Irkutsk":1,"Asia/Kamchatka":1,"Asia/Khandyga":1,"Asia/Krasnoyarsk":1,"Asia/Magadan":1,"Asia/Novokuznetsk":1,"Asia/Novosibirsk":1,"Asia/Omsk":1,"Asia/Sakhalin":1,"Asia/Srednekolymsk":1,"Asia/Tomsk":1,"Asia/Ust-Nera":1,"Asia/Vladivostok":1,"Asia/Yakutsk":1,"Asia/Yekaterinburg":1,"Europe/Astrakhan":1,"Europe/Kaliningrad":1,"Europe/Kirov":1,"Europe/Moscow":1,"Europe/Samara":1,"Europe/Saratov":1,"Europe/Ulyanovsk":1,"Europe/Volgograd":1},"rw":{"Africa/Kigali":1},"sa":{"Asia/Riyadh":1},"sb":{"Pacific/Guadalcanal":1},"sc":{"Indian/Mahe":1},"sd":{"Africa/Khartoum":1},"se":{"Europe/Stockholm":1},"sg":{"Asia/Singapore":1},"sh":{"Atlantic/St_Helena":1},"si":{"Europe/Ljubljana":1},"sj":{"Arctic/Longyearbyen":1},"sk":{"Europe/Bratislava":1},"sl":{"Africa/Freetown":1},"sm":{"Europe/San_Marino":1},"sn":{"Africa/Dakar":1},"so":{"Africa/Mogadishu":1},"sr":{"America/Paramaribo":1},"ss":{"Africa/Juba":1},"st":{"Africa/Sao_Tome":1},"sv":{"America/El_Salvador":1},"sx":{"America/Lower_Princes":1},"sy":{"Asia/Damascus":1},"sz":{"Africa/Mbabane":1},"tc":{"America/Grand_Turk":1},"td":{"Africa/Ndjamena":1},"tf":{"Indian/Kerguelen":1},"tg":{"Africa/Lome":1},"th":{"Asia/Bangkok":1},"tj":{"Asia/Dushanbe":1},"tk":{"Pacific/Fakaofo":1},"tl":{"Asia/Dili":1},"tm":{"Asia/Ashgabat":1},"tn":{"Africa/Tunis":1},"to":{"Pacific/Tongatapu":1},"tr":{"Europe/Istanbul":1},"tt":{"America/Port_of_Spain":1},"tv":{"Pacific/Funafuti":1},"tw":{"Asia/Taipei":1},"tz":{"Africa/Dar_es_Salaam":1},"ua":{"Europe/Kyiv":1,"Europe/Simferopol":1},"ug":{"Africa/Kampala":1},"um":{"Pacific/Midway":1,"Pacific/Wake":1},"us":{"America/Adak":1,"America/Anchorage":1,"America/Boise":1,"America/Chicago":1,"America/Denver":1,"America/Detroit":1,"America/Indiana/Indianapolis":1,"America/Indiana/Knox":1,"America/Indiana/Marengo":1,"America/Indiana/Petersburg":1,"America/Indiana/Tell_City":1,"America/Indiana/Vevay":1,"America/Indiana/Vincennes":1,"America/Indiana/Winamac":1,"America/Juneau":1,"America/Kentucky/Louisville":1,"America/Kentucky/Monticello":1,"America/Los_Angeles":1,"America/Menominee":1,"America/Metlakatla":1,"America/New_York":1,"America/Nome":1,"America/North_Dakota/Beulah":1,"America/North_Dakota/Center":1,"America/North_Dakota/New_Salem":1,"America/Phoenix":1,"America/Sitka":1,"America/Yakutat":1,"Pacific/Honolulu":1},"uy":{"America/Montevideo":1},"uz":{"Asia/Samarkand":1,"Asia/Tashkent":1},"va":{"Europe/Vatican":1},"vc":{"America/St_Vincent":1},"ve":{"America/Caracas":1},"vg":{"America/Tortola":1},"vi":{"America/St_Thomas":1},"vn":{"Asia/Ho_Chi_Minh":1},"vu":{"Pacific/Efate":1},"wf":{"Pacific/Wallis":1},"ws":{"Pacific/Apia":1},"ye":{"Asia/Aden":1},"yt":{"Indian/Mayotte":1},"za":{"Africa/Johannesburg":1},"zm":{"Africa/Lusaka":1},"zw":{"Africa/Harare":1}},"country":{"ad":{"kmap":"","mirror":"","name":"Andorra","zone":"Europe/Andorra"},"ae":{"kmap":"","mirror":"","name":"United Arab Emirates","zone":"Asia/Dubai"},"af":{"kmap":"","mirror":"","name":"Afghanistan","zone":"Asia/Kabul"},"ag":{"kmap":"","mirror":"","name":"Antigua and Barbuda","zone":"America/Antigua"},"ai":{"kmap":"","mirror":"","name":"Anguilla","zone":"America/Anguilla"},"al":{"kmap":"","mirror":"","name":"Albania","zone":"Europe/Tirane"},"am":{"kmap":"","mirror":"","name":"Armenia","zone":"Asia/Yerevan"},"ao":{"kmap":"","mirror":"","name":"Angola","zone":"Africa/Luanda"},"aq":{"kmap":"","mirror":"","name":"Antarctica","zone":"Antarctica/McMurdo"},"ar":{"kmap":"","mirror":"","name":"Argentina","zone":"America/Argentina/Buenos_Aires"},"as":{"kmap":"","mirror":"","name":"American Samoa","zone":"Pacific/Pago_Pago"},"at":{"kmap":"de","mirror":"ftp.at.debian.org","name":"Austria","zone":"Europe/Vienna"},"au":{"kmap":"","mirror":"ftp.au.debian.org","name":"Australia","zone":"Australia/Lord_Howe"},"aw":{"kmap":"","mirror":"","name":"Aruba","zone":"America/Aruba"},"ax":{"kmap":"","mirror":"","name":"Åland Islands","zone":"Europe/Mariehamn"},"az":{"kmap":"","mirror":"","name":"Azerbaijan","zone":"Asia/Baku"},"ba":{"kmap":"","mirror":"","name":"Bosnia and Herzegovina","zone":"Europe/Sarajevo"},"bb":{"kmap":"","mirror":"","name":"Barbados","zone":"America/Barbados"},"bd":{"kmap":"","mirror":"","name":"Bangladesh","zone":"Asia/Dhaka"},"be":{"kmap":"fr-be","mirror":"ftp.be.debian.org","name":"Belgium","zone":"Europe/Brussels"},"bf":{"kmap":"","mirror":"","name":"Burkina Faso","zone":"Africa/Ouagadougou"},"bg":{"kmap":"","mirror":"ftp.bg.debian.org","name":"Bulgaria","zone":"Europe/Sofia"},"bh":{"kmap":"","mirror":"","name":"Bahrain","zone":"Asia/Bahrain"},"bi":{"kmap":"","mirror":"","name":"Burundi","zone":"Africa/Bujumbura"},"bj":{"kmap":"","mirror":"","name":"Benin","zone":"Africa/Porto-Novo"},"bl":{"kmap":"","mirror":"","name":"Saint Barthélemy","zone":"America/St_Barthelemy"},"bm":{"kmap":"","mirror":"","name":"Bermuda","zone":"Atlantic/Bermuda"},"bn":{"kmap":"","mirror":"","name":"Brunei Darussalam","zone":"Asia/Brunei"},"bo":{"kmap":"","mirror":"","name":"Bolivia","zone":"America/La_Paz"},"bq":{"kmap":"","mirror":"","name":"Bonaire, Sint Eustatius and Saba","zone":"America/Kralendijk"},"br":{"kmap":"pt-br","mirror":"ftp.br.debian.org","name":"Brazil","zone":"America/Noronha"},"bs":{"kmap":"","mirror":"","name":"Bahamas","zone":"America/Nassau"},"bt":{"kmap":"","mirror":"","name":"Bhutan","zone":"Asia/Thimphu"},"bv":{"kmap":"","mirror":"","name":"Bouvet Island"},"bw":{"kmap":"","mirror":"","name":"Botswana","zone":"Africa/Gaborone"},"by":{"kmap":"","mirror":"","name":"Belarus","zone":"Europe/Minsk"},"bz":{"kmap":"","mirror":"","name":"Belize","zone":"America/Belize"},"ca":{"kmap":"en-us","mirror":"ftp.ca.debian.org","name":"Canada","zone":"America/St_Johns"},"cc":{"kmap":"","mirror":"","name":"Cocos (Keeling) Islands","zone":"Indian/Cocos"},"cd":{"kmap":"","mirror":"","name":"Congo, The Democratic Republic of the","zone":"Africa/Kinshasa"},"cf":{"kmap":"","mirror":"","name":"Central African Republic","zone":"Africa/Bangui"},"cg":{"kmap":"","mirror":"","name":"Congo","zone":"Africa/Brazzaville"},"ch":{"kmap":"de-ch","mirror":"ftp.ch.debian.org","name":"Switzerland","zone":"Europe/Zurich"},"ci":{"kmap":"","mirror":"","name":"Côte d'Ivoire","zone":"Africa/Abidjan"},"ck":{"kmap":"","mirror":"","name":"Cook Islands","zone":"Pacific/Rarotonga"},"cl":{"kmap":"","mirror":"ftp.cl.debian.org","name":"Chile","zone":"America/Santiago"},"cm":{"kmap":"","mirror":"","name":"Cameroon","zone":"Africa/Douala"},"cn":{"kmap":"","mirror":"","name":"China","zone":"Asia/Shanghai"},"co":{"kmap":"","mirror":"","name":"Colombia","zone":"America/Bogota"},"cr":{"kmap":"","mirror":"","name":"Costa Rica","zone":"America/Costa_Rica"},"cu":{"kmap":"","mirror":"","name":"Cuba","zone":"America/Havana"},"cv":{"kmap":"","mirror":"","name":"Cabo Verde","zone":"Atlantic/Cape_Verde"},"cw":{"kmap":"","mirror":"","name":"Curaçao","zone":"America/Curacao"},"cx":{"kmap":"","mirror":"","name":"Christmas Island","zone":"Indian/Christmas"},"cy":{"kmap":"","mirror":"","name":"Cyprus","zone":"Asia/Nicosia"},"cz":{"kmap":"","mirror":"ftp.cz.debian.org","name":"Czechia","zone":"Europe/Prague"},"de":{"kmap":"de","mirror":"ftp.de.debian.org","name":"Germany","zone":"Europe/Berlin"},"dj":{"kmap":"","mirror":"","name":"Djibouti","zone":"Africa/Djibouti"},"dk":{"kmap":"dk","mirror":"ftp.dk.debian.org","name":"Denmark","zone":"Europe/Copenhagen"},"dm":{"kmap":"","mirror":"","name":"Dominica","zone":"America/Dominica"},"do":{"kmap":"","mirror":"","name":"Dominican Republic","zone":"America/Santo_Domingo"},"dz":{"kmap":"","mirror":"","name":"Algeria","zone":"Africa/Algiers"},"ec":{"kmap":"","mirror":"","name":"Ecuador","zone":"America/Guayaquil"},"ee":{"kmap":"","mirror":"ftp.ee.debian.org","name":"Estonia","zone":"Europe/Tallinn"},"eg":{"kmap":"","mirror":"","name":"Egypt","zone":"Africa/Cairo"},"eh":{"kmap":"","mirror":"","name":"Western Sahara","zone":"Africa/El_Aaiun"},"er":{"kmap":"","mirror":"","name":"Eritrea","zone":"Africa/Asmara"},"es":{"kmap":"es","mirror":"ftp.es.debian.org","name":"Spain","zone":"Europe/Madrid"},"et":{"kmap":"","mirror":"","name":"Ethiopia","zone":"Africa/Addis_Ababa"},"fi":{"kmap":"fi","mirror":"ftp.fi.debian.org","name":"Finland","zone":"Europe/Helsinki"},"fj":{"kmap":"","mirror":"","name":"Fiji","zone":"Pacific/Fiji"},"fk":{"kmap":"","mirror":"","name":"Falkland Islands (Malvinas)","zone":"Atlantic/Stanley"},"fm":{"kmap":"","mirror":"","name":"Micronesia, Federated States of","zone":"Pacific/Chuuk"},"fo":{"kmap":"","mirror":"","name":"Faroe Islands","zone":"Atlantic/Faroe"},"fr":{"kmap":"fr","mirror":"ftp.fr.debian.org","name":"France","zone":"Europe/Paris"},"ga":{"kmap":"","mirror":"","name":"Gabon","zone":"Africa/Libreville"},"gb":{"kmap":"en-gb","mirror":"ftp.uk.debian.org","name":"United Kingdom","zone":"Europe/London"},"gd":{"kmap":"","mirror":"","name":"Grenada","zone":"America/Grenada"},"ge":{"kmap":"","mirror":"","name":"Georgia","zone":"Asia/Tbilisi"},"gf":{"kmap":"","mirror":"","name":"French Guiana","zone":"America/Cayenne"},"gg":{"kmap":"","mirror":"","name":"Guernsey","zone":"Europe/Guernsey"},"gh":{"kmap":"","mirror":"","name":"Ghana","zone":"Africa/Accra"},"gi":{"kmap":"es","mirror":"","name":"Gibraltar","zone":"Europe/Gibraltar"},"gl":{"kmap":"","mirror":"","name":"Greenland","zone":"America/Nuuk"},"gm":{"kmap":"","mirror":"","name":"Gambia","zone":"Africa/Banjul"},"gn":{"kmap":"","mirror":"","name":"Guinea","zone":"Africa/Conakry"},"gp":{"kmap":"","mirror":"","name":"Guadeloupe","zone":"America/Guadeloupe"},"gq":{"kmap":"","mirror":"","name":"Equatorial Guinea","zone":"Africa/Malabo"},"gr":{"kmap":"","mirror":"ftp.gr.debian.org","name":"Greece","zone":"Europe/Athens"},"gs":{"kmap":"","mirror":"","name":"South Georgia and the South Sandwich Islands","zone":"Atlantic/South_Georgia"},"gt":{"kmap":"","mirror":"","name":"Guatemala","zone":"America/Guatemala"},"gu":{"kmap":"","mirror":"","name":"Guam","zone":"Pacific/Guam"},"gw":{"kmap":"","mirror":"","name":"Guinea-Bissau","zone":"Africa/Bissau"},"gy":{"kmap":"","mirror":"","name":"Guyana","zone":"America/Guyana"},"hk":{"kmap":"","mirror":"ftp.hk.debian.org","name":"Hong Kong","zone":"Asia/Hong_Kong"},"hm":{"kmap":"","mirror":"","name":"Heard Island and McDonald Islands"},"hn":{"kmap":"","mirror":"","name":"Honduras","zone":"America/Tegucigalpa"},"hr":{"kmap":"","mirror":"ftp.hr.debian.org","name":"Croatia","zone":"Europe/Zagreb"},"ht":{"kmap":"","mirror":"","name":"Haiti","zone":"America/Port-au-Prince"},"hu":{"kmap":"hu","mirror":"ftp.hu.debian.org","name":"Hungary","zone":"Europe/Budapest"},"id":{"kmap":"","mirror":"","name":"Indonesia","zone":"Asia/Jakarta"},"ie":{"kmap":"","mirror":"ftp.ie.debian.org","name":"Ireland","zone":"Europe/Dublin"},"il":{"kmap":"","mirror":"","name":"Israel","zone":"Asia/Jerusalem"},"im":{"kmap":"","mirror":"","name":"Isle of Man","zone":"Europe/Isle_of_Man"},"in":{"kmap":"","mirror":"","name":"India","zone":"Asia/Kolkata"},"io":{"kmap":"","mirror":"","name":"British Indian Ocean Territory","zone":"Indian/Chagos"},"iq":{"kmap":"","mirror":"","name":"Iraq","zone":"Asia/Baghdad"},"ir":{"kmap":"","mirror":"","name":"Iran","zone":"Asia/Tehran"},"is":{"kmap":"is","mirror":"ftp.is.debian.org","name":"Iceland","zone":"Atlantic/Reykjavik"},"it":{"kmap":"it","mirror":"ftp.it.debian.org","name":"Italy","zone":"Europe/Rome"},"je":{"kmap":"","mirror":"","name":"Jersey","zone":"Europe/Jersey"},"jm":{"kmap":"","mirror":"","name":"Jamaica","zone":"America/Jamaica"},"jo":{"kmap":"","mirror":"","name":"Jordan","zone":"Asia/Amman"},"jp":{"kmap":"jp","mirror":"ftp.jp.debian.org","name":"Japan","zone":"Asia/Tokyo"},"ke":{"kmap":"","mirror":"","name":"Kenya","zone":"Africa/Nairobi"},"kg":{"kmap":"","mirror":"","name":"Kyrgyzstan","zone":"Asia/Bishkek"},"kh":{"kmap":"","mirror":"","name":"Cambodia","zone":"Asia/Phnom_Penh"},"ki":{"kmap":"","mirror":"","name":"Kiribati","zone":"Pacific/Tarawa"},"km":{"kmap":"","mirror":"","name":"Comoros","zone":"Indian/Comoro"},"kn":{"kmap":"","mirror":"","name":"Saint Kitts and Nevis","zone":"America/St_Kitts"},"kp":{"kmap":"","mirror":"","name":"North Korea","zone":"Asia/Pyongyang"},"kr":{"kmap":"","mirror":"ftp.kr.debian.org","name":"South Korea","zone":"Asia/Seoul"},"kw":{"kmap":"","mirror":"","name":"Kuwait","zone":"Asia/Kuwait"},"ky":{"kmap":"","mirror":"","name":"Cayman Islands","zone":"America/Cayman"},"kz":{"kmap":"","mirror":"","name":"Kazakhstan","zone":"Asia/Almaty"},"la":{"kmap":"","mirror":"","name":"Laos","zone":"Asia/Vientiane"},"lb":{"kmap":"","mirror":"","name":"Lebanon","zone":"Asia/Beirut"},"lc":{"kmap":"","mirror":"","name":"Saint Lucia","zone":"America/St_Lucia"},"li":{"kmap":"de-ch","mirror":"","name":"Liechtenstein","zone":"Europe/Vaduz"},"lk":{"kmap":"","mirror":"","name":"Sri Lanka","zone":"Asia/Colombo"},"lr":{"kmap":"","mirror":"","name":"Liberia","zone":"Africa/Monrovia"},"ls":{"kmap":"","mirror":"","name":"Lesotho","zone":"Africa/Maseru"},"lt":{"kmap":"lt","mirror":"","name":"Lithuania","zone":"Europe/Vilnius"},"lu":{"kmap":"fr-ch","mirror":"","name":"Luxembourg","zone":"Europe/Luxembourg"},"lv":{"kmap":"","mirror":"","name":"Latvia","zone":"Europe/Riga"},"ly":{"kmap":"","mirror":"","name":"Libya","zone":"Africa/Tripoli"},"ma":{"kmap":"","mirror":"","name":"Morocco","zone":"Africa/Casablanca"},"mc":{"kmap":"","mirror":"","name":"Monaco","zone":"Europe/Monaco"},"md":{"kmap":"","mirror":"","name":"Moldova","zone":"Europe/Chisinau"},"me":{"kmap":"","mirror":"","name":"Montenegro","zone":"Europe/Podgorica"},"mf":{"kmap":"","mirror":"","name":"Saint Martin (French part)","zone":"America/Marigot"},"mg":{"kmap":"","mirror":"","name":"Madagascar","zone":"Indian/Antananarivo"},"mh":{"kmap":"","mirror":"","name":"Marshall Islands","zone":"Pacific/Majuro"},"mk":{"kmap":"mk","mirror":"","name":"North Macedonia","zone":"Europe/Skopje"},"ml":{"kmap":"","mirror":"","name":"Mali","zone":"Africa/Bamako"},"mm":{"kmap":"","mirror":"","name":"Myanmar","zone":"Asia/Yangon"},"mn":{"kmap":"","mirror":"","name":"Mongolia","zone":"Asia/Ulaanbaatar"},"mo":{"kmap":"","mirror":"","name":"Macao","zone":"Asia/Macau"},"mp":{"kmap":"","mirror":"","name":"Northern Mariana Islands","zone":"Pacific/Saipan"},"mq":{"kmap":"","mirror":"","name":"Martinique","zone":"America/Martinique"},"mr":{"kmap":"","mirror":"","name":"Mauritania","zone":"Africa/Nouakchott"},"ms":{"kmap":"","mirror":"","name":"Montserrat","zone":"America/Montserrat"},"mt":{"kmap":"","mirror":"","name":"Malta","zone":"Europe/Malta"},"mu":{"kmap":"","mirror":"","name":"Mauritius","zone":"Indian/Mauritius"},"mv":{"kmap":"","mirror":"","name":"Maldives","zone":"Indian/Maldives"},"mw":{"kmap":"","mirror":"","name":"Malawi","zone":"Africa/Blantyre"},"mx":{"kmap":"","mirror":"ftp.mx.debian.org","name":"Mexico","zone":"America/Mexico_City"},"my":{"kmap":"","mirror":"","name":"Malaysia","zone":"Asia/Kuala_Lumpur"},"mz":{"kmap":"","mirror":"","name":"Mozambique","zone":"Africa/Maputo"},"na":{"kmap":"","mirror":"","name":"Namibia","zone":"Africa/Windhoek"},"nc":{"kmap":"","mirror":"","name":"New Caledonia","zone":"Pacific/Noumea"},"ne":{"kmap":"","mirror":"","name":"Niger","zone":"Africa/Niamey"},"nf":{"kmap":"","mirror":"","name":"Norfolk Island","zone":"Pacific/Norfolk"},"ng":{"kmap":"","mirror":"","name":"Nigeria","zone":"Africa/Lagos"},"ni":{"kmap":"","mirror":"","name":"Nicaragua","zone":"America/Managua"},"nl":{"kmap":"en-us","mirror":"ftp.nl.debian.org","name":"Netherlands","zone":"Europe/Amsterdam"},"no":{"kmap":"no","mirror":"ftp.no.debian.org","name":"Norway","zone":"Europe/Oslo"},"np":{"kmap":"","mirror":"","name":"Nepal","zone":"Asia/Kathmandu"},"nr":{"kmap":"","mirror":"","name":"Nauru","zone":"Pacific/Nauru"},"nu":{"kmap":"","mirror":"","name":"Niue","zone":"Pacific/Niue"},"nz":{"kmap":"","mirror":"ftp.nz.debian.org","name":"New Zealand","zone":"Pacific/Auckland"},"om":{"kmap":"","mirror":"","name":"Oman","zone":"Asia/Muscat"},"pa":{"kmap":"","mirror":"","name":"Panama","zone":"America/Panama"},"pe":{"kmap":"","mirror":"","name":"Peru","zone":"America/Lima"},"pf":{"kmap":"","mirror":"","name":"French Polynesia","zone":"Pacific/Tahiti"},"pg":{"kmap":"","mirror":"","name":"Papua New Guinea","zone":"Pacific/Port_Moresby"},"ph":{"kmap":"","mirror":"","name":"Philippines","zone":"Asia/Manila"},"pk":{"kmap":"","mirror":"","name":"Pakistan","zone":"Asia/Karachi"},"pl":{"kmap":"pl","mirror":"ftp.pl.debian.org","name":"Poland","zone":"Europe/Warsaw"},"pm":{"kmap":"","mirror":"","name":"Saint Pierre and Miquelon","zone":"America/Miquelon"},"pn":{"kmap":"","mirror":"","name":"Pitcairn","zone":"Pacific/Pitcairn"},"pr":{"kmap":"","mirror":"","name":"Puerto Rico","zone":"America/Puerto_Rico"},"ps":{"kmap":"","mirror":"","name":"Palestine, State of","zone":"Asia/Gaza"},"pt":{"kmap":"pt","mirror":"ftp.pt.debian.org","name":"Portugal","zone":"Europe/Lisbon"},"pw":{"kmap":"","mirror":"","name":"Palau","zone":"Pacific/Palau"},"py":{"kmap":"","mirror":"","name":"Paraguay","zone":"America/Asuncion"},"qa":{"kmap":"","mirror":"","name":"Qatar","zone":"Asia/Qatar"},"re":{"kmap":"","mirror":"","name":"Réunion","zone":"Indian/Reunion"},"ro":{"kmap":"","mirror":"ftp.ro.debian.org","name":"Romania","zone":"Europe/Bucharest"},"rs":{"kmap":"","mirror":"","name":"Serbia","zone":"Europe/Belgrade"},"ru":{"kmap":"","mirror":"ftp.ru.debian.org","name":"Russian Federation","zone":"Europe/Kaliningrad"},"rw":{"kmap":"","mirror":"","name":"Rwanda","zone":"Africa/Kigali"},"sa":{"kmap":"","mirror":"","name":"Saudi Arabia","zone":"Asia/Riyadh"},"sb":{"kmap":"","mirror":"","name":"Solomon Islands","zone":"Pacific/Guadalcanal"},"sc":{"kmap":"","mirror":"","name":"Seychelles","zone":"Indian/Mahe"},"sd":{"kmap":"","mirror":"","name":"Sudan","zone":"Africa/Khartoum"},"se":{"kmap":"","mirror":"ftp.se.debian.org","name":"Sweden","zone":"Europe/Stockholm"},"sg":{"kmap":"","mirror":"","name":"Singapore","zone":"Asia/Singapore"},"sh":{"kmap":"","mirror":"","name":"Saint Helena, Ascension and Tristan da Cunha","zone":"Atlantic/St_Helena"},"si":{"kmap":"si","mirror":"ftp.si.debian.org","name":"Slovenia","zone":"Europe/Ljubljana"},"sj":{"kmap":"","mirror":"","name":"Svalbard and Jan Mayen","zone":"Arctic/Longyearbyen"},"sk":{"kmap":"","mirror":"ftp.sk.debian.org","name":"Slovakia","zone":"Europe/Bratislava"},"sl":{"kmap":"","mirror":"","name":"Sierra Leone","zone":"Africa/Freetown"},"sm":{"kmap":"","mirror":"","name":"San Marino","zone":"Europe/San_Marino"},"sn":{"kmap":"","mirror":"","name":"Senegal","zone":"Africa/Dakar"},"so":{"kmap":"","mirror":"","name":"Somalia","zone":"Africa/Mogadishu"},"sr":{"kmap":"","mirror":"","name":"Suriname","zone":"America/Paramaribo"},"ss":{"kmap":"","mirror":"","name":"South Sudan","zone":"Africa/Juba"},"st":{"kmap":"","mirror":"","name":"Sao Tome and Principe","zone":"Africa/Sao_Tome"},"sv":{"kmap":"","mirror":"","name":"El Salvador","zone":"America/El_Salvador"},"sx":{"kmap":"","mirror":"","name":"Sint Maarten (Dutch part)","zone":"America/Lower_Princes"},"sy":{"kmap":"","mirror":"","name":"Syria","zone":"Asia/Damascus"},"sz":{"kmap":"","mirror":"","name":"Eswatini","zone":"Africa/Mbabane"},"tc":{"kmap":"","mirror":"","name":"Turks and Caicos Islands","zone":"America/Grand_Turk"},"td":{"kmap":"","mirror":"","name":"Chad","zone":"Africa/Ndjamena"},"tf":{"kmap":"","mirror":"","name":"French Southern Territories","zone":"Indian/Kerguelen"},"tg":{"kmap":"","mirror":"","name":"Togo","zone":"Africa/Lome"},"th":{"kmap":"","mirror":"","name":"Thailand","zone":"Asia/Bangkok"},"tj":{"kmap":"","mirror":"","name":"Tajikistan","zone":"Asia/Dushanbe"},"tk":{"kmap":"","mirror":"","name":"Tokelau","zone":"Pacific/Fakaofo"},"tl":{"kmap":"","mirror":"","name":"Timor-Leste","zone":"Asia/Dili"},"tm":{"kmap":"","mirror":"","name":"Turkmenistan","zone":"Asia/Ashgabat"},"tn":{"kmap":"","mirror":"","name":"Tunisia","zone":"Africa/Tunis"},"to":{"kmap":"","mirror":"","name":"Tonga","zone":"Pacific/Tongatapu"},"tr":{"kmap":"","mirror":"ftp.tr.debian.org","name":"Türkiye","zone":"Europe/Istanbul"},"tt":{"kmap":"","mirror":"","name":"Trinidad and Tobago","zone":"America/Port_of_Spain"},"tv":{"kmap":"","mirror":"","name":"Tuvalu","zone":"Pacific/Funafuti"},"tw":{"kmap":"","mirror":"ftp.tw.debian.org","name":"Taiwan","zone":"Asia/Taipei"},"tz":{"kmap":"","mirror":"","name":"Tanzania","zone":"Africa/Dar_es_Salaam"},"ua":{"kmap":"","mirror":"","name":"Ukraine","zone":"Europe/Simferopol"},"ug":{"kmap":"","mirror":"","name":"Uganda","zone":"Africa/Kampala"},"um":{"kmap":"","mirror":"","name":"United States Minor Outlying Islands","zone":"Pacific/Midway"},"us":{"kmap":"en-us","mirror":"ftp.us.debian.org","name":"United States","zone":"America/New_York"},"uy":{"kmap":"","mirror":"","name":"Uruguay","zone":"America/Montevideo"},"uz":{"kmap":"","mirror":"","name":"Uzbekistan","zone":"Asia/Samarkand"},"va":{"kmap":"it","mirror":"","name":"Holy See (Vatican City State)","zone":"Europe/Vatican"},"vc":{"kmap":"","mirror":"","name":"Saint Vincent and the Grenadines","zone":"America/St_Vincent"},"ve":{"kmap":"","mirror":"","name":"Venezuela","zone":"America/Caracas"},"vg":{"kmap":"","mirror":"","name":"Virgin Islands, British","zone":"America/Tortola"},"vi":{"kmap":"","mirror":"","name":"Virgin Islands, U.S.","zone":"America/St_Thomas"},"vn":{"kmap":"","mirror":"","name":"Vietnam","zone":"Asia/Ho_Chi_Minh"},"vu":{"kmap":"","mirror":"","name":"Vanuatu","zone":"Pacific/Efate"},"wf":{"kmap":"","mirror":"","name":"Wallis and Futuna","zone":"Pacific/Wallis"},"ws":{"kmap":"","mirror":"","name":"Samoa","zone":"Pacific/Apia"},"ye":{"kmap":"","mirror":"","name":"Yemen","zone":"Asia/Aden"},"yt":{"kmap":"","mirror":"","name":"Mayotte","zone":"Indian/Mayotte"},"za":{"kmap":"","mirror":"","name":"South Africa","zone":"Africa/Johannesburg"},"zm":{"kmap":"","mirror":"","name":"Zambia","zone":"Africa/Lusaka"},"zw":{"kmap":"","mirror":"","name":"Zimbabwe","zone":"Africa/Harare"}},"countryhash":{"afghanistan":"af","albania":"al","algeria":"dz","american samoa":"as","andorra":"ad","angola":"ao","anguilla":"ai","antarctica":"aq","antigua and barbuda":"ag","argentina":"ar","armenia":"am","aruba":"aw","australia":"au","austria":"at","azerbaijan":"az","bahamas":"bs","bahrain":"bh","bangladesh":"bd","barbados":"bb","belarus":"by","belgium":"be","belize":"bz","benin":"bj","bermuda":"bm","bhutan":"bt","bolivia":"bo","bonaire, sint eustatius and saba":"bq","bosnia and herzegovina":"ba","botswana":"bw","bouvet island":"bv","brazil":"br","british indian ocean territory":"io","brunei darussalam":"bn","bulgaria":"bg","burkina faso":"bf","burundi":"bi","cabo verde":"cv","cambodia":"kh","cameroon":"cm","canada":"ca","cayman islands":"ky","central african republic":"cf","chad":"td","chile":"cl","china":"cn","christmas island":"cx","cocos (keeling) islands":"cc","colombia":"co","comoros":"km","congo":"cg","congo, the democratic republic of the":"cd","cook islands":"ck","costa rica":"cr","croatia":"hr","cuba":"cu","curaçao":"cw","cyprus":"cy","czechia":"cz","côte d'ivoire":"ci","denmark":"dk","djibouti":"dj","dominica":"dm","dominican republic":"do","ecuador":"ec","egypt":"eg","el salvador":"sv","equatorial guinea":"gq","eritrea":"er","estonia":"ee","eswatini":"sz","ethiopia":"et","falkland islands (malvinas)":"fk","faroe islands":"fo","fiji":"fj","finland":"fi","france":"fr","french guiana":"gf","french polynesia":"pf","french southern territories":"tf","gabon":"ga","gambia":"gm","georgia":"ge","germany":"de","ghana":"gh","gibraltar":"gi","greece":"gr","greenland":"gl","grenada":"gd","guadeloupe":"gp","guam":"gu","guatemala":"gt","guernsey":"gg","guinea":"gn","guinea-bissau":"gw","guyana":"gy","haiti":"ht","heard island and mcdonald islands":"hm","holy see (vatican city state)":"va","honduras":"hn","hong kong":"hk","hungary":"hu","iceland":"is","india":"in","indonesia":"id","iran":"ir","iraq":"iq","ireland":"ie","isle of man":"im","israel":"il","italy":"it","jamaica":"jm","japan":"jp","jersey":"je","jordan":"jo","kazakhstan":"kz","kenya":"ke","kiribati":"ki","kuwait":"kw","kyrgyzstan":"kg","laos":"la","latvia":"lv","lebanon":"lb","lesotho":"ls","liberia":"lr","libya":"ly","liechtenstein":"li","lithuania":"lt","luxembourg":"lu","macao":"mo","madagascar":"mg","malawi":"mw","malaysia":"my","maldives":"mv","mali":"ml","malta":"mt","marshall islands":"mh","martinique":"mq","mauritania":"mr","mauritius":"mu","mayotte":"yt","mexico":"mx","micronesia, federated states of":"fm","moldova":"md","monaco":"mc","mongolia":"mn","montenegro":"me","montserrat":"ms","morocco":"ma","mozambique":"mz","myanmar":"mm","namibia":"na","nauru":"nr","nepal":"np","netherlands":"nl","new caledonia":"nc","new zealand":"nz","nicaragua":"ni","niger":"ne","nigeria":"ng","niue":"nu","norfolk island":"nf","north korea":"kp","north macedonia":"mk","northern mariana islands":"mp","norway":"no","oman":"om","pakistan":"pk","palau":"pw","palestine, state of":"ps","panama":"pa","papua new guinea":"pg","paraguay":"py","peru":"pe","philippines":"ph","pitcairn":"pn","poland":"pl","portugal":"pt","puerto rico":"pr","qatar":"qa","romania":"ro","russian federation":"ru","rwanda":"rw","réunion":"re","saint barthélemy":"bl","saint helena, ascension and tristan da cunha":"sh","saint kitts and nevis":"kn","saint lucia":"lc","saint martin (french part)":"mf","saint pierre and miquelon":"pm","saint vincent and the grenadines":"vc","samoa":"ws","san marino":"sm","sao tome and principe":"st","saudi arabia":"sa","senegal":"sn","serbia":"rs","seychelles":"sc","sierra leone":"sl","singapore":"sg","sint maarten (dutch part)":"sx","slovakia":"sk","slovenia":"si","solomon islands":"sb","somalia":"so","south africa":"za","south georgia and the south sandwich islands":"gs","south korea":"kr","south sudan":"ss","spain":"es","sri lanka":"lk","sudan":"sd","suriname":"sr","svalbard and jan mayen":"sj","sweden":"se","switzerland":"ch","syria":"sy","taiwan":"tw","tajikistan":"tj","tanzania":"tz","thailand":"th","timor-leste":"tl","togo":"tg","tokelau":"tk","tonga":"to","trinidad and tobago":"tt","tunisia":"tn","turkmenistan":"tm","turks and caicos islands":"tc","tuvalu":"tv","türkiye":"tr","uganda":"ug","ukraine":"ua","united arab emirates":"ae","united kingdom":"gb","united states":"us","united states minor outlying islands":"um","uruguay":"uy","uzbekistan":"uz","vanuatu":"vu","venezuela":"ve","vietnam":"vn","virgin islands, british":"vg","virgin islands, u.s.":"vi","wallis and futuna":"wf","western sahara":"eh","yemen":"ye","zambia":"zm","zimbabwe":"zw","åland islands":"ax"},"kmap":{"de":{"console":"qwertz/de-latin1-nodeadkeys.kmap.gz","kvm":"de","name":"German","x11":"de","x11var":"nodeadkeys"},"de-ch":{"console":"qwertz/sg-latin1.kmap.gz","kvm":"de-ch","name":"Swiss-German","x11":"ch","x11var":"de_nodeadkeys"},"dk":{"console":"qwerty/dk-latin1.kmap.gz","kvm":"da","name":"Danish","x11":"dk","x11var":"nodeadkeys"},"en-gb":{"console":"qwerty/uk.kmap.gz","kvm":"en-gb","name":"United Kingdom","x11":"gb","x11var":""},"en-us":{"console":"qwerty/us-latin1.kmap.gz","kvm":"en-us","name":"U.S. English","x11":"us","x11var":""},"es":{"console":"qwerty/es.kmap.gz","kvm":"es","name":"Spanish","x11":"es","x11var":"nodeadkeys"},"fi":{"console":"qwerty/fi-latin1.kmap.gz","kvm":"fi","name":"Finnish","x11":"fi","x11var":"nodeadkeys"},"fr":{"console":"azerty/fr-latin1.kmap.gz","kvm":"fr","name":"French","x11":"fr","x11var":"nodeadkeys"},"fr-be":{"console":"azerty/be2-latin1.kmap.gz","kvm":"fr-be","name":"Belgium-French","x11":"be","x11var":"nodeadkeys"},"fr-ca":{"console":"qwerty/cf.kmap.gz","kvm":"fr-ca","name":"Canada-French","x11":"ca","x11var":"fr-legacy"},"fr-ch":{"console":"qwertz/fr_CH-latin1.kmap.gz","kvm":"fr-ch","name":"Swiss-French","x11":"ch","x11var":"fr_nodeadkeys"},"hu":{"console":"qwertz/hu.kmap.gz","kvm":"hu","name":"Hungarian","x11":"hu","x11var":""},"is":{"console":"qwerty/is-latin1.kmap.gz","kvm":"is","name":"Icelandic","x11":"is","x11var":"nodeadkeys"},"it":{"console":"qwerty/it2.kmap.gz","kvm":"it","name":"Italian","x11":"it","x11var":"nodeadkeys"},"jp":{"console":"qwerty/jp106.kmap.gz","kvm":"ja","name":"Japanese","x11":"jp","x11var":""},"lt":{"console":"qwerty/lt.kmap.gz","kvm":"lt","name":"Lithuanian","x11":"lt","x11var":"std"},"mk":{"console":"qwerty/mk.kmap.gz","kvm":"mk","name":"Macedonian","x11":"mk","x11var":"nodeadkeys"},"nl":{"console":"qwerty/nl.kmap.gz","kvm":"nl","name":"Dutch","x11":"nl","x11var":""},"no":{"console":"qwerty/no-latin1.kmap.gz","kvm":"no","name":"Norwegian","x11":"no","x11var":"nodeadkeys"},"pl":{"console":"qwerty/pl.kmap.gz","kvm":"pl","name":"Polish","x11":"pl","x11var":""},"pt":{"console":"qwerty/pt-latin1.kmap.gz","kvm":"pt","name":"Portuguese","x11":"pt","x11var":"nodeadkeys"},"pt-br":{"console":"qwerty/br-latin1.kmap.gz","kvm":"pt-br","name":"Brazil-Portuguese","x11":"br","x11var":"nodeadkeys"},"se":{"console":"qwerty/se-latin1.kmap.gz","kvm":"sv","name":"Swedish","x11":"se","x11var":"nodeadkeys"},"si":{"console":"qwertz/slovene.kmap.gz","kvm":"sl","name":"Slovenian","x11":"si","x11var":""},"tr":{"console":"qwerty/trq.kmap.gz","kvm":"tr","name":"Turkish","x11":"tr","x11var":""}},"kmaphash":{"Belgium-French":"fr-be","Brazil-Portuguese":"pt-br","Canada-French":"fr-ca","Danish":"dk","Dutch":"nl","Finnish":"fi","French":"fr","German":"de","Hungarian":"hu","Icelandic":"is","Italian":"it","Japanese":"jp","Lithuanian":"lt","Macedonian":"mk","Norwegian":"no","Polish":"pl","Portuguese":"pt","Slovenian":"si","Spanish":"es","Swedish":"se","Swiss-French":"fr-ch","Swiss-German":"de-ch","Turkish":"tr","U.S. English":"en-us","United Kingdom":"en-gb"},"zones":{"Africa/Abidjan":1,"Africa/Accra":1,"Africa/Addis_Ababa":1,"Africa/Algiers":1,"Africa/Asmara":1,"Africa/Bamako":1,"Africa/Bangui":1,"Africa/Banjul":1,"Africa/Bissau":1,"Africa/Blantyre":1,"Africa/Brazzaville":1,"Africa/Bujumbura":1,"Africa/Cairo":1,"Africa/Casablanca":1,"Africa/Ceuta":1,"Africa/Conakry":1,"Africa/Dakar":1,"Africa/Dar_es_Salaam":1,"Africa/Djibouti":1,"Africa/Douala":1,"Africa/El_Aaiun":1,"Africa/Freetown":1,"Africa/Gaborone":1,"Africa/Harare":1,"Africa/Johannesburg":1,"Africa/Juba":1,"Africa/Kampala":1,"Africa/Khartoum":1,"Africa/Kigali":1,"Africa/Kinshasa":1,"Africa/Lagos":1,"Africa/Libreville":1,"Africa/Lome":1,"Africa/Luanda":1,"Africa/Lubumbashi":1,"Africa/Lusaka":1,"Africa/Malabo":1,"Africa/Maputo":1,"Africa/Maseru":1,"Africa/Mbabane":1,"Africa/Mogadishu":1,"Africa/Monrovia":1,"Africa/Nairobi":1,"Africa/Ndjamena":1,"Africa/Niamey":1,"Africa/Nouakchott":1,"Africa/Ouagadougou":1,"Africa/Porto-Novo":1,"Africa/Sao_Tome":1,"Africa/Tripoli":1,"Africa/Tunis":1,"Africa/Windhoek":1,"America/Adak":1,"America/Anchorage":1,"America/Anguilla":1,"America/Antigua":1,"America/Araguaina":1,"America/Argentina/Buenos_Aires":1,"America/Argentina/Catamarca":1,"America/Argentina/Cordoba":1,"America/Argentina/Jujuy":1,"America/Argentina/La_Rioja":1,"America/Argentina/Mendoza":1,"America/Argentina/Rio_Gallegos":1,"America/Argentina/Salta":1,"America/Argentina/San_Juan":1,"America/Argentina/San_Luis":1,"America/Argentina/Tucuman":1,"America/Argentina/Ushuaia":1,"America/Aruba":1,"America/Asuncion":1,"America/Atikokan":1,"America/Bahia":1,"America/Bahia_Banderas":1,"America/Barbados":1,"America/Belem":1,"America/Belize":1,"America/Blanc-Sablon":1,"America/Boa_Vista":1,"America/Bogota":1,"America/Boise":1,"America/Cambridge_Bay":1,"America/Campo_Grande":1,"America/Cancun":1,"America/Caracas":1,"America/Cayenne":1,"America/Cayman":1,"America/Chicago":1,"America/Chihuahua":1,"America/Ciudad_Juarez":1,"America/Costa_Rica":1,"America/Creston":1,"America/Cuiaba":1,"America/Curacao":1,"America/Danmarkshavn":1,"America/Dawson":1,"America/Dawson_Creek":1,"America/Denver":1,"America/Detroit":1,"America/Dominica":1,"America/Edmonton":1,"America/Eirunepe":1,"America/El_Salvador":1,"America/Fort_Nelson":1,"America/Fortaleza":1,"America/Glace_Bay":1,"America/Goose_Bay":1,"America/Grand_Turk":1,"America/Grenada":1,"America/Guadeloupe":1,"America/Guatemala":1,"America/Guayaquil":1,"America/Guyana":1,"America/Halifax":1,"America/Havana":1,"America/Hermosillo":1,"America/Indiana/Indianapolis":1,"America/Indiana/Knox":1,"America/Indiana/Marengo":1,"America/Indiana/Petersburg":1,"America/Indiana/Tell_City":1,"America/Indiana/Vevay":1,"America/Indiana/Vincennes":1,"America/Indiana/Winamac":1,"America/Inuvik":1,"America/Iqaluit":1,"America/Jamaica":1,"America/Juneau":1,"America/Kentucky/Louisville":1,"America/Kentucky/Monticello":1,"America/Kralendijk":1,"America/La_Paz":1,"America/Lima":1,"America/Los_Angeles":1,"America/Lower_Princes":1,"America/Maceio":1,"America/Managua":1,"America/Manaus":1,"America/Marigot":1,"America/Martinique":1,"America/Matamoros":1,"America/Mazatlan":1,"America/Menominee":1,"America/Merida":1,"America/Metlakatla":1,"America/Mexico_City":1,"America/Miquelon":1,"America/Moncton":1,"America/Monterrey":1,"America/Montevideo":1,"America/Montserrat":1,"America/Nassau":1,"America/New_York":1,"America/Nome":1,"America/Noronha":1,"America/North_Dakota/Beulah":1,"America/North_Dakota/Center":1,"America/North_Dakota/New_Salem":1,"America/Nuuk":1,"America/Ojinaga":1,"America/Panama":1,"America/Paramaribo":1,"America/Phoenix":1,"America/Port-au-Prince":1,"America/Port_of_Spain":1,"America/Porto_Velho":1,"America/Puerto_Rico":1,"America/Punta_Arenas":1,"America/Rankin_Inlet":1,"America/Recife":1,"America/Regina":1,"America/Resolute":1,"America/Rio_Branco":1,"America/Santarem":1,"America/Santiago":1,"America/Santo_Domingo":1,"America/Sao_Paulo":1,"America/Scoresbysund":1,"America/Sitka":1,"America/St_Barthelemy":1,"America/St_Johns":1,"America/St_Kitts":1,"America/St_Lucia":1,"America/St_Thomas":1,"America/St_Vincent":1,"America/Swift_Current":1,"America/Tegucigalpa":1,"America/Thule":1,"America/Tijuana":1,"America/Toronto":1,"America/Tortola":1,"America/Vancouver":1,"America/Whitehorse":1,"America/Winnipeg":1,"America/Yakutat":1,"Antarctica/Casey":1,"Antarctica/Davis":1,"Antarctica/DumontDUrville":1,"Antarctica/Macquarie":1,"Antarctica/Mawson":1,"Antarctica/McMurdo":1,"Antarctica/Palmer":1,"Antarctica/Rothera":1,"Antarctica/Syowa":1,"Antarctica/Troll":1,"Antarctica/Vostok":1,"Arctic/Longyearbyen":1,"Asia/Aden":1,"Asia/Almaty":1,"Asia/Amman":1,"Asia/Anadyr":1,"Asia/Aqtau":1,"Asia/Aqtobe":1,"Asia/Ashgabat":1,"Asia/Atyrau":1,"Asia/Baghdad":1,"Asia/Bahrain":1,"Asia/Baku":1,"Asia/Bangkok":1,"Asia/Barnaul":1,"Asia/Beirut":1,"Asia/Bishkek":1,"Asia/Brunei":1,"Asia/Chita":1,"Asia/Choibalsan":1,"Asia/Colombo":1,"Asia/Damascus":1,"Asia/Dhaka":1,"Asia/Dili":1,"Asia/Dubai":1,"Asia/Dushanbe":1,"Asia/Famagusta":1,"Asia/Gaza":1,"Asia/Hebron":1,"Asia/Ho_Chi_Minh":1,"Asia/Hong_Kong":1,"Asia/Hovd":1,"Asia/Irkutsk":1,"Asia/Jakarta":1,"Asia/Jayapura":1,"Asia/Jerusalem":1,"Asia/Kabul":1,"Asia/Kamchatka":1,"Asia/Karachi":1,"Asia/Kathmandu":1,"Asia/Khandyga":1,"Asia/Kolkata":1,"Asia/Krasnoyarsk":1,"Asia/Kuala_Lumpur":1,"Asia/Kuching":1,"Asia/Kuwait":1,"Asia/Macau":1,"Asia/Magadan":1,"Asia/Makassar":1,"Asia/Manila":1,"Asia/Muscat":1,"Asia/Nicosia":1,"Asia/Novokuznetsk":1,"Asia/Novosibirsk":1,"Asia/Omsk":1,"Asia/Oral":1,"Asia/Phnom_Penh":1,"Asia/Pontianak":1,"Asia/Pyongyang":1,"Asia/Qatar":1,"Asia/Qostanay":1,"Asia/Qyzylorda":1,"Asia/Riyadh":1,"Asia/Sakhalin":1,"Asia/Samarkand":1,"Asia/Seoul":1,"Asia/Shanghai":1,"Asia/Singapore":1,"Asia/Srednekolymsk":1,"Asia/Taipei":1,"Asia/Tashkent":1,"Asia/Tbilisi":1,"Asia/Tehran":1,"Asia/Thimphu":1,"Asia/Tokyo":1,"Asia/Tomsk":1,"Asia/Ulaanbaatar":1,"Asia/Urumqi":1,"Asia/Ust-Nera":1,"Asia/Vientiane":1,"Asia/Vladivostok":1,"Asia/Yakutsk":1,"Asia/Yangon":1,"Asia/Yekaterinburg":1,"Asia/Yerevan":1,"Atlantic/Azores":1,"Atlantic/Bermuda":1,"Atlantic/Canary":1,"Atlantic/Cape_Verde":1,"Atlantic/Faroe":1,"Atlantic/Madeira":1,"Atlantic/Reykjavik":1,"Atlantic/South_Georgia":1,"Atlantic/St_Helena":1,"Atlantic/Stanley":1,"Australia/Adelaide":1,"Australia/Brisbane":1,"Australia/Broken_Hill":1,"Australia/Darwin":1,"Australia/Eucla":1,"Australia/Hobart":1,"Australia/Lindeman":1,"Australia/Lord_Howe":1,"Australia/Melbourne":1,"Australia/Perth":1,"Australia/Sydney":1,"Europe/Amsterdam":1,"Europe/Andorra":1,"Europe/Astrakhan":1,"Europe/Athens":1,"Europe/Belgrade":1,"Europe/Berlin":1,"Europe/Bratislava":1,"Europe/Brussels":1,"Europe/Bucharest":1,"Europe/Budapest":1,"Europe/Busingen":1,"Europe/Chisinau":1,"Europe/Copenhagen":1,"Europe/Dublin":1,"Europe/Gibraltar":1,"Europe/Guernsey":1,"Europe/Helsinki":1,"Europe/Isle_of_Man":1,"Europe/Istanbul":1,"Europe/Jersey":1,"Europe/Kaliningrad":1,"Europe/Kirov":1,"Europe/Kyiv":1,"Europe/Lisbon":1,"Europe/Ljubljana":1,"Europe/London":1,"Europe/Luxembourg":1,"Europe/Madrid":1,"Europe/Malta":1,"Europe/Mariehamn":1,"Europe/Minsk":1,"Europe/Monaco":1,"Europe/Moscow":1,"Europe/Oslo":1,"Europe/Paris":1,"Europe/Podgorica":1,"Europe/Prague":1,"Europe/Riga":1,"Europe/Rome":1,"Europe/Samara":1,"Europe/San_Marino":1,"Europe/Sarajevo":1,"Europe/Saratov":1,"Europe/Simferopol":1,"Europe/Skopje":1,"Europe/Sofia":1,"Europe/Stockholm":1,"Europe/Tallinn":1,"Europe/Tirane":1,"Europe/Ulyanovsk":1,"Europe/Vaduz":1,"Europe/Vatican":1,"Europe/Vienna":1,"Europe/Vilnius":1,"Europe/Volgograd":1,"Europe/Warsaw":1,"Europe/Zagreb":1,"Europe/Zurich":1,"Indian/Antananarivo":1,"Indian/Chagos":1,"Indian/Christmas":1,"Indian/Cocos":1,"Indian/Comoro":1,"Indian/Kerguelen":1,"Indian/Mahe":1,"Indian/Maldives":1,"Indian/Mauritius":1,"Indian/Mayotte":1,"Indian/Reunion":1,"Pacific/Apia":1,"Pacific/Auckland":1,"Pacific/Bougainville":1,"Pacific/Chatham":1,"Pacific/Chuuk":1,"Pacific/Easter":1,"Pacific/Efate":1,"Pacific/Fakaofo":1,"Pacific/Fiji":1,"Pacific/Funafuti":1,"Pacific/Galapagos":1,"Pacific/Gambier":1,"Pacific/Guadalcanal":1,"Pacific/Guam":1,"Pacific/Honolulu":1,"Pacific/Kanton":1,"Pacific/Kiritimati":1,"Pacific/Kosrae":1,"Pacific/Kwajalein":1,"Pacific/Majuro":1,"Pacific/Marquesas":1,"Pacific/Midway":1,"Pacific/Nauru":1,"Pacific/Niue":1,"Pacific/Norfolk":1,"Pacific/Noumea":1,"Pacific/Pago_Pago":1,"Pacific/Palau":1,"Pacific/Pitcairn":1,"Pacific/Pohnpei":1,"Pacific/Port_Moresby":1,"Pacific/Rarotonga":1,"Pacific/Saipan":1,"Pacific/Tahiti":1,"Pacific/Tarawa":1,"Pacific/Tongatapu":1,"Pacific/Wake":1,"Pacific/Wallis":1}} + diff --git a/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix b/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix index e11f8f551eb7..fae2af442143 100644 --- a/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix +++ b/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix @@ -2,7 +2,6 @@ lib, fetchgit, rustPlatform, - testers, pkg-config, openssl, versionCheckHook, @@ -10,20 +9,20 @@ rustPlatform.buildRustPackage rec { pname = "proxmox-auto-install-assistant"; - version = "8.3.3"; + version = "8.4.6"; src = fetchgit { url = "git://git.proxmox.com/git/pve-installer.git"; - rev = "cf6df4a23491071d207dcc8b00af8ddf310ae0b0"; - hash = "sha256-n4mn8VF84QyJiUNubgoxkbMEbuyj8n5KeIdVB3Xz5iY="; + rev = "fcd13b1503bec573da9db4bfad42b2478e97d9ce"; + hash = "sha256-fPl6qxWTaqumtnAFUfEBTChTIe+94fWCZv8s7Sq9zSk="; }; postPatch = '' rm -v .cargo/config.toml cp -v ${./Cargo.lock} Cargo.lock - # fix up hard-coded version number to match that of the debian package - substituteInPlace proxmox-auto-install-assistant/Cargo.toml \ - --replace-fail 'version = "0.1.0"' 'version = "${version}"' + # pre-generated using `make locale-info.json` + # depends on non-packaged perl modules and debian-specific files + cp -v ${./locale-info.json} locale-info.json ''; buildAndTestSubdir = "proxmox-auto-install-assistant"; @@ -34,10 +33,17 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl.dev ]; postFixup = '' - # openssl is not actually necessary, only pulled in through a feature (unfortunately) - patchelf --remove-needed libssl.so.3 $out/bin/proxmox-auto-install-assistant + # these libraries are not actually necessary, only linked in by cargo + # through crate dependencies (unfortunately) + patchelf \ + --remove-needed libcrypto.so.3 \ + --remove-needed libssl.so.3 \ + $out/bin/proxmox-auto-install-assistant + patchelf --shrink-rpath $out/bin/proxmox-auto-install-assistant ''; + disallowedReferences = [ openssl.out ]; + doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; @@ -47,7 +53,7 @@ rustPlatform.buildRustPackage rec { longDescription = '' This tool can be used to prepare a Proxmox installation ISO for automated installations. Additional uses are to validate the format of an answer file or to test match filters and - print information on the properties to match against for the current hardware + print information on the properties to match against for the current hardware. ''; homepage = "https://pve.proxmox.com/wiki/Automated_Installation"; changelog = "https://git.proxmox.com/?p=pve-installer.git;a=blob;f=debian/changelog"; From b2ccfe0b9df58128c525926028c6e41d32d2110c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Apr 2025 14:55:00 +0000 Subject: [PATCH 018/101] rssguard: 4.8.2 -> 4.8.3 --- pkgs/by-name/rs/rssguard/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rs/rssguard/package.nix b/pkgs/by-name/rs/rssguard/package.nix index 70c1f17bcfd1..881e7a97605e 100644 --- a/pkgs/by-name/rs/rssguard/package.nix +++ b/pkgs/by-name/rs/rssguard/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "4.8.2"; + version = "4.8.3"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; tag = version; - sha256 = "sha256-C5iA5qK8+FhCUeFtyskY/vd4evaYS3TY1SHAc83/36w="; + sha256 = "sha256-1y3hmAuIOhh1L+x4ZOPy7ixAizVNPtQjxL3mgNWgx9A="; }; buildInputs = [ From 8a3d17d500002e06a9425ebe5af4fa7b6dc432dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Apr 2025 14:58:09 +0000 Subject: [PATCH 019/101] spicedb: 1.42.0 -> 1.42.1 --- pkgs/servers/spicedb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix index 731b6c43b759..414466335bb5 100644 --- a/pkgs/servers/spicedb/default.nix +++ b/pkgs/servers/spicedb/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "spicedb"; - version = "1.42.0"; + version = "1.42.1"; src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; rev = "v${version}"; - hash = "sha256-7E9wbPi82F9mqqEsnK96a376QRu9NnpdZRAFB0pe1Lc="; + hash = "sha256-mgVJtMqLVLShWbv3FqzGovWD3O/xHn+noDvrbQa6XrA="; }; vendorHash = "sha256-mjzVMtTLJiimzQcXntd2JTIDQS7ndRqosxCVorzcn54="; From 3a21f46889c4f1012829545c301330888f80b28b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Apr 2025 15:30:20 +0000 Subject: [PATCH 020/101] python312Packages.ultralytics: 8.3.99 -> 8.3.107 --- pkgs/development/python-modules/ultralytics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ultralytics/default.nix b/pkgs/development/python-modules/ultralytics/default.nix index 0321f44d9af8..5ca6d9153ce7 100644 --- a/pkgs/development/python-modules/ultralytics/default.nix +++ b/pkgs/development/python-modules/ultralytics/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "ultralytics"; - version = "8.3.99"; + version = "8.3.107"; pyproject = true; src = fetchFromGitHub { owner = "ultralytics"; repo = "ultralytics"; tag = "v${version}"; - hash = "sha256-k3YoW7XrfhVrUJPEyrJ0PPEssfkaOVl/Ls/sIro2P7I="; + hash = "sha256-WRoRll21yxmZLz6Qj1i+MfV+haQPV9HKS77lY3zeZOU="; }; build-system = [ setuptools ]; From cea47c608ff5e8ee5c4c58bbe1fc536d9a900c3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Apr 2025 16:25:50 +0000 Subject: [PATCH 021/101] python312Packages.sharkiq: 1.0.2 -> 1.1.0 --- pkgs/development/python-modules/sharkiq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sharkiq/default.nix b/pkgs/development/python-modules/sharkiq/default.nix index 210820060ab8..0e338a979482 100644 --- a/pkgs/development/python-modules/sharkiq/default.nix +++ b/pkgs/development/python-modules/sharkiq/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sharkiq"; - version = "1.0.2"; + version = "1.1.0"; format = "setuptools"; src = fetchFromGitHub { owner = "JeffResc"; repo = pname; tag = "v${version}"; - hash = "sha256-UG460uEv1U/KTuVEcXMZlVbK/7REFpotkUk4U7z7KpA="; + hash = "sha256-adSBFH5nGVPo7OBMak6rN5HA5uMKZCqnIVXBnR7REgQ="; }; propagatedBuildInputs = [ From e02f3ae472ae697174518714852a0753a03399e1 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 11 Apr 2025 14:01:34 -0400 Subject: [PATCH 022/101] python313Packages.spatial-image: 1.1.0 -> 1.2.1 --- .../python-modules/spatial-image/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/spatial-image/default.nix b/pkgs/development/python-modules/spatial-image/default.nix index b826246f8148..bd50198af431 100644 --- a/pkgs/development/python-modules/spatial-image/default.nix +++ b/pkgs/development/python-modules/spatial-image/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - flit-core, + hatchling, pytestCheckHook, numpy, xarray, @@ -12,21 +12,21 @@ buildPythonPackage rec { pname = "spatial-image"; - version = "1.1.0"; + version = "1.2.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "spatial-image"; repo = "spatial-image"; tag = "v${version}"; - hash = "sha256-yIAqHhq2naTA8PdLOdrNSrhEOhRwlFD6x9dH4xDVt9Y="; + hash = "sha256-PGc2uey2xcfE0PcYDaCp7U0lgeGL1I6MMP3vbTN+Alk="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ numpy xarray xarray-dataclasses @@ -36,11 +36,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "spatial_image" ]; - meta = with lib; { + meta = { description = "Multi-dimensional spatial image data structure for scientific Python"; homepage = "https://github.com/spatial-image/spatial-image"; changelog = "https://github.com/spatial-image/spatial-image/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; }; } From e10c7dd6a9b217c5fefcfca4d6f1f6c25c765421 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Apr 2025 18:24:26 +0000 Subject: [PATCH 023/101] silx: 2.2.1 -> 2.2.2 --- pkgs/by-name/si/silx/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/silx/package.nix b/pkgs/by-name/si/silx/package.nix index a61610896abb..29d1faa9df37 100644 --- a/pkgs/by-name/si/silx/package.nix +++ b/pkgs/by-name/si/silx/package.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "silx"; - version = "2.2.1"; + version = "2.2.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-9di3TNjhhoOT4bRwPfaM/jTbVW5+V9b8V2V6ZBwXZjo="; + hash = "sha256-XZujZ7VxXMTLkBE4jz1xIA1763Z2yRCVL9E1CjQsVx8="; }; build-system = with python3Packages; [ From 20fb935272acc19b5ce7fc7828072f65cbb4eedc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 11 Apr 2025 11:35:04 -0700 Subject: [PATCH 024/101] python313Packages.pytibber: 0.30.8 -> 0.31.0 Diff: https://github.com/Danielhiversen/pyTibber/compare/refs/tags/0.30.8...0.31.0 Changelog: https://github.com/Danielhiversen/pyTibber/releases/tag/0.31.0 --- .../python-modules/pytibber/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index ef4eeecbb3eb..35dd27c37979 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.30.8"; + version = "0.31.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; tag = version; - hash = "sha256-lUxID4D9wxKvDF3epEznTof9lHYKFniTDYv7/gvW7Z4="; + hash = "sha256-NCzgh/hPbbKgJLvfOzXSkOCrV53w/F0F5TglQ2gOAJk="; }; build-system = [ setuptools ]; @@ -36,18 +36,16 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "test/test.py" ]; - # Tests access network doCheck = false; pythonImportsCheck = [ "tibber" ]; - meta = with lib; { + meta = { description = "Python library to communicate with Tibber"; homepage = "https://github.com/Danielhiversen/pyTibber"; - changelog = "https://github.com/Danielhiversen/pyTibber/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; + changelog = "https://github.com/Danielhiversen/pyTibber/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; }; } From 882234af1745350bddeec1fba95766a9aa32aa41 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Apr 2025 19:05:43 +0000 Subject: [PATCH 025/101] revive: 1.8.0 -> 1.9.0 --- pkgs/by-name/re/revive/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/revive/package.nix b/pkgs/by-name/re/revive/package.nix index ae8df4a81188..8fe71fa96d2d 100644 --- a/pkgs/by-name/re/revive/package.nix +++ b/pkgs/by-name/re/revive/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "revive"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "mgechev"; repo = pname; rev = "v${version}"; - hash = "sha256-lu5zbZXTaLJ5m2sVOG1Y7I/bbJ7kwqbfL1ebwPJ+C0o="; + hash = "sha256-mHyXymMJZeHXYOB6JB5VTqeP1flOACnNE/dLApAenH4="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -24,7 +24,7 @@ buildGoModule rec { rm -rf $out/.git ''; }; - vendorHash = "sha256-sGvD8CdTFE+TqMjerPSjg7EY9VXPA/EKjY9Ncy+UKTo="; + vendorHash = "sha256-oRhex0WC0MUxX1luKJeMvA7NpN7aS/9ecXkrfRYEnvM="; ldflags = [ "-s" From 377c3c88c4e3ae42e78bfb44bd25bdb8b5ca6183 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Apr 2025 19:27:47 +0000 Subject: [PATCH 026/101] lint-staged: 15.5.0 -> 15.5.1 --- pkgs/by-name/li/lint-staged/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/lint-staged/package.nix b/pkgs/by-name/li/lint-staged/package.nix index 493ce3831e51..debd5bd842d1 100644 --- a/pkgs/by-name/li/lint-staged/package.nix +++ b/pkgs/by-name/li/lint-staged/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "lint-staged"; - version = "15.5.0"; + version = "15.5.1"; src = fetchFromGitHub { owner = "okonet"; repo = "lint-staged"; rev = "v${version}"; - hash = "sha256-xZ4fKwryGHVD1AhSKJVvBGIDJin10YejKxDp1yMi8Pg="; + hash = "sha256-oVSWAst7owEEpC7NsfkKmg2I71aMNNWCWywQu1eFrOU="; }; - npmDepsHash = "sha256-KIZgJaVGwPAsMtKMINqSnqSuD3iJIqRmoUDkU4iPh/s="; + npmDepsHash = "sha256-H1exOO4BzKJ4jnL6vwUbxbWnfd7fcTmzNgYmMj9EHGQ="; dontNpmBuild = true; From 8515a9a0d5936d84645cd573eb11687164b10512 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Apr 2025 20:26:10 +0000 Subject: [PATCH 027/101] ashuffle: 3.14.8 -> 3.14.9 --- pkgs/by-name/as/ashuffle/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/as/ashuffle/package.nix b/pkgs/by-name/as/ashuffle/package.nix index e809869b43e6..80bd69bf6256 100644 --- a/pkgs/by-name/as/ashuffle/package.nix +++ b/pkgs/by-name/as/ashuffle/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "ashuffle"; - version = "3.14.8"; + version = "3.14.9"; src = fetchFromGitHub { owner = "joshkunz"; repo = "ashuffle"; rev = "v${version}"; - hash = "sha256-XnibLlwUspI2aveWfMg/TOe59vK6Z2WEnF7gafUmx6E="; + hash = "sha256-HQ4+vyTvX0mhfuRclbiC+MvllV3300ztAwL0IxrUiC8="; fetchSubmodules = true; }; From cbbdd6d8c9923d7a3e29056f9433e98a73484ffc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Apr 2025 22:05:19 +0000 Subject: [PATCH 028/101] python312Packages.boolean-py: 4.0 -> 5.0 --- pkgs/development/python-modules/boolean-py/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/boolean-py/default.nix b/pkgs/development/python-modules/boolean-py/default.nix index fde29936132f..6b279372e97d 100644 --- a/pkgs/development/python-modules/boolean-py/default.nix +++ b/pkgs/development/python-modules/boolean-py/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "boolean-py"; - version = "4.0"; + version = "5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bastikr"; repo = "boolean.py"; - rev = "v${version}"; - hash = "sha256-i6aNzGDhZip9YHXLiuh9crGm2qT2toBU2xze4PDLleg="; + tag = "v${version}"; + hash = "sha256-h5iHcdN77ZRGMJnSJLoYkRTY1TeJ3yQ1eF193HKsNqU="; }; nativeCheckInputs = [ pytestCheckHook ]; From 836c30a46a6512f92347fa92a502efd8699dd89e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Apr 2025 22:08:32 +0000 Subject: [PATCH 029/101] python312Packages.scripttest: 2.0 -> 2.0.post1 --- pkgs/development/python-modules/scripttest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scripttest/default.nix b/pkgs/development/python-modules/scripttest/default.nix index d85fd6f5bd5b..800c669a8c07 100644 --- a/pkgs/development/python-modules/scripttest/default.nix +++ b/pkgs/development/python-modules/scripttest/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "scripttest"; - version = "2.0"; + version = "2.0.post1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-xbFdNcRlwLxjcCvYS6Q2U+EXl+rtx31er4bvwgEpk2A="; + sha256 = "sha256-pgZ/H+rfSy7T5ZSwsy5BWJZA5/o5dHZapj1QhSDAv9w="; }; buildInputs = [ pytest ]; From 65ec02aaec9dc268a31cc7e6770fb9df9184c9fa Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 12 Apr 2025 01:08:11 +0200 Subject: [PATCH 030/101] python313Packages.granian: 2.2.3 -> 2.2.4 --- pkgs/development/python-modules/granian/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/granian/default.nix b/pkgs/development/python-modules/granian/default.nix index 38c0097966de..a208a090471d 100644 --- a/pkgs/development/python-modules/granian/default.nix +++ b/pkgs/development/python-modules/granian/default.nix @@ -19,19 +19,19 @@ buildPythonPackage rec { pname = "granian"; - version = "2.2.3"; + version = "2.2.4"; pyproject = true; src = fetchFromGitHub { owner = "emmett-framework"; repo = "granian"; tag = "v${version}"; - hash = "sha256-E0ooMXqR6PR6JVHEjiqsVaxsMs5ZIoR5YAmExF73ljI="; + hash = "sha256-DZFTQLZx+p2SoR1/7atAqxjVqDGgJBkz3fmXGF0iojA="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-XXgg2HW4SNINeoG1zU/bqpplP6UdQOE2z68rvB4vA/0="; + hash = "sha256-4MwIQTjS+SH0d+wPB4wfRXzo3f8CBMOAUy/3tf2uXYo="; }; nativeBuildInputs = with rustPlatform; [ From b17712bcc89437429ebb54ec555271b21157986d Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Fri, 11 Apr 2025 20:02:34 -0400 Subject: [PATCH 031/101] signalbackup-tools: 20250406-1 -> 20250410-2 Diff: https://github.com/bepaald/signalbackup-tools/compare/20250406-1...20250410-2 --- pkgs/by-name/si/signalbackup-tools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index 5ef262012d3c..bfbf1a63929f 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20250406-1"; + version = "20250410-2"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; rev = version; - hash = "sha256-PdbZxDmaM1kdc5IHkWf8RcJcT5cmfRAvUl76VYnqFXc="; + hash = "sha256-VnxqaZH9jTRnVgGOcUd8SaT+SndFGOWzNGZyFVa7Tlk="; }; nativeBuildInputs = From 2d1ed7f9762ae035434aed64de5998aab1a7ac89 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Apr 2025 00:24:22 +0000 Subject: [PATCH 032/101] wpaperd: 1.2.0 -> 1.2.1 --- pkgs/by-name/wp/wpaperd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wp/wpaperd/package.nix b/pkgs/by-name/wp/wpaperd/package.nix index 5e7ad8d457bf..f2cf041a677b 100644 --- a/pkgs/by-name/wp/wpaperd/package.nix +++ b/pkgs/by-name/wp/wpaperd/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "wpaperd"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "danyspin97"; repo = "wpaperd"; rev = version; - hash = "sha256-L3xoEhVjbJoPsGgie95SIxpRDCV5ZZcrfL01TPAffZc="; + hash = "sha256-mBdrOmS+e+Npei5+RmtbTkBCGR8L5O83hulNU1z0Akk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-F4u+d0HZBC5JWS25EGyWoeLV7wkmI0n4/pVjp61qSu0="; + cargoHash = "sha256-d8jzoNCn9J36SE4tQZ1orgOfFGbhVtHaaO940b3JxmQ="; nativeBuildInputs = [ pkg-config From eef462a1ec79da19f408ee3c56f2765d676d4687 Mon Sep 17 00:00:00 2001 From: Qiming Chu Date: Sat, 12 Apr 2025 12:21:58 +0800 Subject: [PATCH 033/101] circt: 1.112.0 -> 1.113.0 Signed-off-by: Qiming Chu --- pkgs/by-name/ci/circt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix index 5f2e46b344db..3ab99086930d 100644 --- a/pkgs/by-name/ci/circt/package.nix +++ b/pkgs/by-name/ci/circt/package.nix @@ -19,12 +19,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.112.0"; + version = "1.113.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-yh7/2QsUO2/sCyrgT8QTBC/BENEZNmXoHTIiz5abngw="; + hash = "sha256-hzS9ztX2/n4PJIerwQ5DNIuV6975KgyitOvG2jHNM/w="; fetchSubmodules = true; }; From d671437ad2e2a087ce6d6cfab8a4dccdcb62f25a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Apr 2025 04:30:20 +0000 Subject: [PATCH 034/101] python312Packages.pysilero-vad: 2.0.1 -> 2.1.0 --- pkgs/development/python-modules/pysilero-vad/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pysilero-vad/default.nix b/pkgs/development/python-modules/pysilero-vad/default.nix index c91a605ea0b9..98e2fa1b8a37 100644 --- a/pkgs/development/python-modules/pysilero-vad/default.nix +++ b/pkgs/development/python-modules/pysilero-vad/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pysilero-vad"; - version = "2.0.1"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "pysilero-vad"; tag = "v${version}"; - hash = "sha256-v6Ok0JWhdp0oM6I87BVojJgMikdomUX/Vk2ZVje0z+w="; + hash = "sha256-h49AD3ICh0NYyh2EDogynQ0qgkKCAQTVKS9rbXbrqPE="; }; build-system = [ setuptools ]; @@ -45,7 +45,7 @@ buildPythonPackage rec { broken = stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux; description = "Pre-packaged voice activity detector using silero-vad"; homepage = "https://github.com/rhasspy/pysilero-vad"; - changelog = "https://github.com/rhasspy/pysilero-vad/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/rhasspy/pysilero-vad/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; From ff2e5c0fa564fcf4978ace1653db7f2848396920 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 12 Apr 2025 06:31:42 +0100 Subject: [PATCH 035/101] rust-analyzer-unwrapped: 2025-03-31 -> 2025-04-07 Changes: https://github.com/rust-lang/rust-analyzer/releases/tag/2025-04-07 --- pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix index 4271b93eb79b..be2f44777db8 100644 --- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix +++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2025-03-31"; + version = "2025-04-07"; useFetchCargoVendor = true; cargoHash = "sha256-sOuswCnF5y/L8x586PpcrLQj19+5x8COi9xBE2SRLYY="; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - hash = "sha256-GLefofvDqIcyZ/S8rcF6cuKoSPJOVkm7TSK23MGT3Kk="; + hash = "sha256-3lJ0W+mzfuR5FZM7JS7EfCJ5wBhu44fRBFu2/gKORzc="; }; cargoBuildFlags = [ From 016bcdd58239106421d0b5e9448f05fd042c5b41 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Apr 2025 08:12:37 +0000 Subject: [PATCH 036/101] python312Packages.metakernel: 0.30.2 -> 0.30.3 --- pkgs/development/python-modules/metakernel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/metakernel/default.nix b/pkgs/development/python-modules/metakernel/default.nix index 81d8e852dd52..2e823b7ef137 100644 --- a/pkgs/development/python-modules/metakernel/default.nix +++ b/pkgs/development/python-modules/metakernel/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "metakernel"; - version = "0.30.2"; + version = "0.30.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Siff2FO4SfASgkLFUgTuWXpajYZClPJghLry+8gU1aQ="; + hash = "sha256-nryNTYciAq16xkpW4HIm2NPFzkW1tCDQQB9UfHUKR10="; }; build-system = [ hatchling ]; From 7ed483f6a335d3d8746bf458f9dd650c521e8999 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Apr 2025 08:37:05 +0000 Subject: [PATCH 037/101] cloudfoundry-cli: 8.12.0 -> 8.13.0 --- pkgs/by-name/cl/cloudfoundry-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/cloudfoundry-cli/package.nix b/pkgs/by-name/cl/cloudfoundry-cli/package.nix index 90db90e6abed..03d61fa358d2 100644 --- a/pkgs/by-name/cl/cloudfoundry-cli/package.nix +++ b/pkgs/by-name/cl/cloudfoundry-cli/package.nix @@ -8,15 +8,15 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "8.12.0"; + version = "8.13.0"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-W9hshsq02AiDVNFYMoIWCei04b7pPTmIP2+fMyLgcDY="; + sha256 = "sha256-WljZBnDRC606/w7qIUwvkOhF9EaMYmWZE1Wax20IqEE="; }; - vendorHash = "sha256-6pAcDdCCp64o6VuSSLyLtnLPD5OxSt4o3eUpRhJzXTI="; + vendorHash = "sha256-qOZABuHQlk7UnuxvFUPbRMv8TNnw2CHyRiWtXxD58Eo="; subPackages = [ "." ]; From 6a5c94b4e455cee94001a0e500736a3689a56848 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Apr 2025 08:39:40 +0000 Subject: [PATCH 038/101] balena-cli: 21.1.3 -> 21.1.9 --- pkgs/by-name/ba/balena-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix index 2672e0fb03db..d9826326d930 100644 --- a/pkgs/by-name/ba/balena-cli/package.nix +++ b/pkgs/by-name/ba/balena-cli/package.nix @@ -22,16 +22,16 @@ let in buildNpmPackage' rec { pname = "balena-cli"; - version = "21.1.3"; + version = "21.1.9"; src = fetchFromGitHub { owner = "balena-io"; repo = "balena-cli"; rev = "v${version}"; - hash = "sha256-44r0dbcX/KRmfucNy4p/OMrKFC2J8P9eQpwTOTOmwS4="; + hash = "sha256-oeOhE4cgN/u9zLEXoiMbbE+onNJvrX8wNjoydh20Wdk="; }; - npmDepsHash = "sha256-wEshPXXpFVOYzaqh6c5z47OccBEWMP5aarZP42PYgzk="; + npmDepsHash = "sha256-ggdCry0MtA/UZIlm8mrC7TdcAoj2pTgq7kWSqMN5siM="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json From d9aa8951979089e19edd97efaf82b1aafead71c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Apr 2025 08:45:43 +0000 Subject: [PATCH 039/101] pscale: 0.236.0 -> 0.239.0 --- pkgs/by-name/ps/pscale/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ps/pscale/package.nix b/pkgs/by-name/ps/pscale/package.nix index 702777675622..bf234bc22bda 100644 --- a/pkgs/by-name/ps/pscale/package.nix +++ b/pkgs/by-name/ps/pscale/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.236.0"; + version = "0.239.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-sL/TBcUtHYqZuUp5JlcKshwlyVSf0t0XukMmRkWRyvk="; + sha256 = "sha256-y7SIZ/upQrzHQbncEyJM5OrJDXDuh7It3lOWSn3Y7hI="; }; - vendorHash = "sha256-Uw4A6RBq0OiBHWRfmj9wKI2FenDN6C8CWEsKicGS/1Q="; + vendorHash = "sha256-qcv5pFCibYSJvekSmj4iLeQWunW9+U/mbzbaGTp1sso="; ldflags = [ "-s" From bba31063f72634b5a2256afc65d49b16a73366a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Apr 2025 10:02:07 +0000 Subject: [PATCH 040/101] arduino-ide: 2.3.5 -> 2.3.6 --- pkgs/by-name/ar/arduino-ide/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/arduino-ide/package.nix b/pkgs/by-name/ar/arduino-ide/package.nix index 84dceea635f4..8c55748c2182 100644 --- a/pkgs/by-name/ar/arduino-ide/package.nix +++ b/pkgs/by-name/ar/arduino-ide/package.nix @@ -6,11 +6,11 @@ let pname = "arduino-ide"; - version = "2.3.5"; + version = "2.3.6"; src = fetchurl { url = "https://github.com/arduino/arduino-ide/releases/download/${version}/arduino-ide_${version}_Linux_64bit.AppImage"; - hash = "sha256-U1yMxqL+XfJpb7i7DsEzE2CpCAPJptrjLPm5JVntO8I="; + hash = "sha256-3Zx6XRhkvAt1Erv13wF3p3lm3guRDYreh+ATBzoO6pk="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From 524bceaae30a10ceed92aa5460740098f5e9c1cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Apr 2025 10:04:29 +0000 Subject: [PATCH 041/101] python312Packages.btrfs: 14.1 -> 15 --- pkgs/development/python-modules/btrfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/btrfs/default.nix b/pkgs/development/python-modules/btrfs/default.nix index 18a68282c4bc..f758cada9f2d 100644 --- a/pkgs/development/python-modules/btrfs/default.nix +++ b/pkgs/development/python-modules/btrfs/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "btrfs"; - version = "14.1"; + version = "15"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-BPKPwT33i8fQYJkUZbnJ8nQNbmKw0Dq6ekb9mr7awEY="; + hash = "sha256-FBmRT/FB3+nhb9BHfZVI1L6nM+zXdYjoy3JVzhetoQs="; }; # no tests (in v12) From ab9f6cc941de036c4afcab2361c21ac8778e82a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Apr 2025 11:26:37 +0000 Subject: [PATCH 042/101] python312Packages.pyorthanc: 1.19.1 -> 1.20.0 --- pkgs/development/python-modules/pyorthanc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyorthanc/default.nix b/pkgs/development/python-modules/pyorthanc/default.nix index 3e84ec6edf34..17505d1b37a9 100644 --- a/pkgs/development/python-modules/pyorthanc/default.nix +++ b/pkgs/development/python-modules/pyorthanc/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyorthanc"; - version = "1.19.1"; + version = "1.20.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "gacou54"; repo = "pyorthanc"; tag = "v${version}"; - hash = "sha256-97i341NXb7QsgN0X808mtz1rSKYSP+SMoGJy43Tkwug="; + hash = "sha256-AWYu/JVL1Hs/aEZXgSRc/y4rN22VRrgn6pINDTogPPs="; }; build-system = [ poetry-core ]; @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = { description = "Python library that wraps the Orthanc REST API"; homepage = "https://github.com/gacou54/pyorthanc"; - changelog = "https://github.com/gacou54/pyorthanc/releases/tag/v${version}"; + changelog = "https://github.com/gacou54/pyorthanc/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bcdarwin ]; }; From 7debdbc921f8d00f8858e5dd8f2609afc79e8735 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 12 Apr 2025 20:09:26 +0800 Subject: [PATCH 043/101] xfce.xfce4-pulseaudio-plugin: 0.4.9 -> 0.5.0 https://gitlab.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/-/compare/xfce4-pulseaudio-plugin-0.4.9...xfce4-pulseaudio-plugin-0.5.0 --- .../xfce4-pulseaudio-plugin/default.nix | 41 +++++++++++++++---- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix index 6e8680685604..f6f1748a32b8 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix @@ -1,6 +1,7 @@ { + stdenv, lib, - mkXfceDerivation, + fetchFromGitLab, exo, gtk3, libcanberra, @@ -9,17 +10,36 @@ libxfce4ui, libxfce4util, libxfce4windowing, + meson, + ninja, + pkg-config, xfce4-panel, xfconf, keybinder3, glib, + gitUpdater, }: -mkXfceDerivation { - category = "panel-plugins"; +stdenv.mkDerivation (finalAttrs: { pname = "xfce4-pulseaudio-plugin"; - version = "0.4.9"; - sha256 = "sha256-bJp4HicAFPuRATDHus0DfJFy1c6gw6Tkpd2UN7SXqsI="; + version = "0.5.0"; + + src = fetchFromGitLab { + domain = "gitlab.xfce.org"; + owner = "panel-plugins"; + repo = "xfce4-pulseaudio-plugin"; + tag = "xfce4-pulseaudio-plugin-${finalAttrs.version}"; + hash = "sha256-FIEV99AV5UiGLTXi9rU4DKK//SolkrOQfpENXQcy64E="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + glib # glib-compile-resources + meson + ninja + pkg-config + ]; buildInputs = [ exo @@ -36,8 +56,13 @@ mkXfceDerivation { xfconf ]; - meta = with lib; { + passthru.updateScript = gitUpdater { rev-prefix = "xfce4-pulseaudio-plugin-"; }; + + meta = { description = "Adjust the audio volume of the PulseAudio sound system"; - maintainers = with maintainers; [ ] ++ teams.xfce.members; + homepage = "https://gitlab.xfce.org/panel-plugins/xfce4-pulseaudio-plugin"; + license = lib.licenses.gpl2Plus; + maintainers = lib.teams.xfce.members; + platforms = lib.platforms.linux; }; -} +}) From a34bc1d4fb90af6fe4b0db6102abcd9e6aecc544 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Apr 2025 12:39:39 +0000 Subject: [PATCH 044/101] vault-ssh-plus: 0.7.7 -> 0.7.8 --- pkgs/by-name/va/vault-ssh-plus/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/va/vault-ssh-plus/package.nix b/pkgs/by-name/va/vault-ssh-plus/package.nix index 56d8a92197f4..f624f915bb76 100644 --- a/pkgs/by-name/va/vault-ssh-plus/package.nix +++ b/pkgs/by-name/va/vault-ssh-plus/package.nix @@ -9,16 +9,16 @@ }: buildGoModule rec { pname = "vault-ssh-plus"; - version = "0.7.7"; + version = "0.7.8"; src = fetchFromGitHub { owner = "isometry"; repo = pname; rev = "v${version}"; - hash = "sha256-l2Gr4AxikPWbSGeZqmkZa1wTRXNZ0l6fTSAcjl+6P8s="; + hash = "sha256-5rajB4pSRp7Pw4yx0u6MoOLxfkWWjhB7T2JGGb8ICRU="; }; - vendorHash = "sha256-AYScvuhsK6GUzOhONBl1C89yvu85SntoW7CxCr7wWmo="; + vendorHash = "sha256-IfT8F8zqWSfGh/XlISDTTZju8i3dEHG33lrZqJz1nX8="; nativeBuildInputs = [ makeWrapper ]; From 026ceae23cd96262d16c8610b1df5f9f9ad146e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Apr 2025 12:46:33 +0000 Subject: [PATCH 045/101] asymptote: 3.01 -> 3.02 --- pkgs/tools/graphics/asymptote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index a5574cf8303d..95ee6d5f141f 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -36,7 +36,7 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "3.01"; + version = "3.02"; pname = "asymptote"; outputs = [ @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://sourceforge/asymptote/${finalAttrs.version}/asymptote-${finalAttrs.version}.src.tgz"; - hash = "sha256-egUACsP2vwYx2uvSCZ8H/jLU9f17Siz8gFWwCNSXsIQ="; + hash = "sha256-Z5bec53elWwwxon7DPOSenEUe0lho32IOTPgJxM/xwo="; }; # override with TeX Live containers to avoid building sty, docs from source From d8b8e6d422cb3dff292f7441ebcaffb350ec88b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Apr 2025 14:03:58 +0000 Subject: [PATCH 046/101] stripe-cli: 1.26.0 -> 1.26.1 --- pkgs/by-name/st/stripe-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stripe-cli/package.nix b/pkgs/by-name/st/stripe-cli/package.nix index 58e61329b4b9..4c6ba70ed241 100644 --- a/pkgs/by-name/st/stripe-cli/package.nix +++ b/pkgs/by-name/st/stripe-cli/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.26.0"; + version = "1.26.1"; src = fetchFromGitHub { owner = "stripe"; repo = "stripe-cli"; rev = "v${version}"; - hash = "sha256-gnV7BPHtbv6wFcgVUhKfIrskfAZIyZq6LtQwQYAkFCQ="; + hash = "sha256-21KkeGbvI3QVT3G8Mn7y710waLhNoPtlDFz5Ji5lhhI="; }; vendorHash = "sha256-T8vrEbR240ihkLDG4vu0s+MxKJ5nOLm0aseDgK9EPPE="; From fca759c560fc4798f6fd91697b592f28079379fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Apr 2025 15:09:02 +0000 Subject: [PATCH 047/101] whisparr: 2.0.0.891 -> 2.0.0.987 --- pkgs/by-name/wh/whisparr/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/wh/whisparr/package.nix b/pkgs/by-name/wh/whisparr/package.nix index 46f5c7f8f9f4..157ae52dede6 100644 --- a/pkgs/by-name/wh/whisparr/package.nix +++ b/pkgs/by-name/wh/whisparr/package.nix @@ -29,16 +29,16 @@ let ."${system}" or (throw "Unsupported system: ${system}"); hash = { - arm64-linux-hash = "sha256-GQSDButJqPmWbxhDIYqIZxhL2Bn4IpFP8Vinv6OsI9Q="; - arm64-osx-hash = "sha256-6e2Pqb/V02I+9ZTxR2er+zMLEBE4ZnJcwkVEgqO04eU="; - x64-linux-hash = "sha256-KZ24XPz1WwL4dK1wFT7x6jH2WU3NgFYLiSx2QfmstkA="; - x64-osx-hash = "sha256-p749/sc7aAzuvwwlCOx+pNh4J7DIJIZlvsFRa/mIlMk="; + arm64-linux-hash = "sha256-sMhZ2QPIkuomUdgKYMoPwyQH5k0ziqdJSoCvV51tVNQ="; + arm64-osx-hash = "sha256-uubRkA6ER/kQeUXys9Jcf4Aii7FFkrKPgh/niK/3jO0="; + x64-linux-hash = "sha256-S2Ow+5AdvFZ10lA0xnvT5egdi1QbFTy97XzvSI5FtRk="; + x64-osx-hash = "sha256-7PvYkhJ9Tlulk0t/s8qAJUAHguUeilAQsQ0qU+DBVQM="; } ."${arch}-${os}-hash"; in stdenv.mkDerivation rec { pname = "whisparr"; - version = "2.0.0.891"; + version = "2.0.0.987"; src = fetchurl { name = "${pname}-${arch}-${os}-${version}.tar.gz"; From 3f2c7c43b1f49f4be814ceed9e2079ebed04c975 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Apr 2025 17:47:57 +0000 Subject: [PATCH 048/101] frei: 0.2.0 -> 0.3.0 --- pkgs/by-name/fr/frei/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fr/frei/package.nix b/pkgs/by-name/fr/frei/package.nix index 8ad8cf1a7f5c..4aa13565c2b6 100644 --- a/pkgs/by-name/fr/frei/package.nix +++ b/pkgs/by-name/fr/frei/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "frei"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "alexcoder04"; repo = "frei"; rev = "v${version}"; - sha256 = "sha256-jCUr3fREawA0J8Q0U07wCpBQrjPyH0l/6tih6C9kJWc="; + sha256 = "sha256-C70c/uADy/D2YARRYROkc6Bs/VtYH3SIXUjSF3+qVjY="; }; vendorHash = null; From 3bb5824d7f6d025bf723a42f81cdf6b80afd45a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Apr 2025 17:48:43 +0000 Subject: [PATCH 049/101] mctc-lib: 0.4.0 -> 0.4.1 --- pkgs/by-name/mc/mctc-lib/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mc/mctc-lib/package.nix b/pkgs/by-name/mc/mctc-lib/package.nix index 9f65bd075fe7..2f85e6912070 100644 --- a/pkgs/by-name/mc/mctc-lib/package.nix +++ b/pkgs/by-name/mc/mctc-lib/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mctc-lib"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "grimme-lab"; repo = "mctc-lib"; rev = "v${version}"; - hash = "sha256-zR4J9gOKwUIfDZsHMdX/t+mKdTpHKYTZQBYxQMWC8Vk="; + hash = "sha256-AMRHvzL6CUPItCs07LLOB6Al3yfs8WgrPKRhuNbXiGw="; }; nativeBuildInputs = [ From ed5c2e34dda55c28603cafc9f7979c8ba3029c80 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Apr 2025 18:36:07 +0000 Subject: [PATCH 050/101] python312Packages.yolink-api: 0.5.0 -> 0.5.2 --- pkgs/development/python-modules/yolink-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yolink-api/default.nix b/pkgs/development/python-modules/yolink-api/default.nix index 7da9f5c0eea9..87cdeef0883a 100644 --- a/pkgs/development/python-modules/yolink-api/default.nix +++ b/pkgs/development/python-modules/yolink-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "yolink-api"; - version = "0.5.0"; + version = "0.5.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "YoSmart-Inc"; repo = "yolink-api"; tag = "v${version}"; - hash = "sha256-04Hx1Rl15yH0VB5sCyDymRXBSOQ1wnmZOfy6PUKTGWg="; + hash = "sha256-ZFEEFYCA5hBtQTe1G80wxIOF6sR+gbaqpjm9oqyyvE8="; }; build-system = [ setuptools ]; From 54d293fc50564787db8252c2468d97aa44655ead Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 12 Apr 2025 21:02:01 +0200 Subject: [PATCH 051/101] postgresqlPackages: use lib.extendMkDerivation in postgresqlBuildExtension --- .../sql/postgresql/postgresqlBuildExtension.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/sql/postgresql/postgresqlBuildExtension.nix b/pkgs/servers/sql/postgresql/postgresqlBuildExtension.nix index 9ea82fb80f84..e328a0783993 100644 --- a/pkgs/servers/sql/postgresql/postgresqlBuildExtension.nix +++ b/pkgs/servers/sql/postgresql/postgresqlBuildExtension.nix @@ -63,10 +63,14 @@ nix-update-script, }: -args: +lib.extendMkDerivation { + constructDrv = stdenv.mkDerivation; -let - postgresqlBuildExtension = + excludeDrvArgNames = [ + "enableUpdateScript" + ]; + + extendDrvArgs = finalAttrs: { enableUpdateScript ? true, @@ -145,5 +149,4 @@ let '' + prevAttrs.postInstall or ""; }; -in -stdenv.mkDerivation (lib.extends postgresqlBuildExtension (lib.toFunction args)) +} From 052547291ebc8fd4931fa9dac9a9982dc3caf3b2 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 12 Apr 2025 21:02:29 +0200 Subject: [PATCH 052/101] postgresqlPackages: use finalAttrs pattern where possible --- pkgs/servers/sql/postgresql/ext/age.nix | 12 ++++++------ pkgs/servers/sql/postgresql/ext/citus.nix | 8 ++++---- pkgs/servers/sql/postgresql/ext/hypopg.nix | 6 +++--- pkgs/servers/sql/postgresql/ext/periods.nix | 6 +++--- pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix | 8 ++++---- pkgs/servers/sql/postgresql/ext/pg_bigm.nix | 6 +++--- pkgs/servers/sql/postgresql/ext/pg_cron.nix | 8 ++++---- pkgs/servers/sql/postgresql/ext/pg_ed25519.nix | 6 +++--- pkgs/servers/sql/postgresql/ext/pg_hll.nix | 8 ++++---- pkgs/servers/sql/postgresql/ext/pg_ivm.nix | 8 ++++---- pkgs/servers/sql/postgresql/ext/pg_net.nix | 8 ++++---- pkgs/servers/sql/postgresql/ext/pg_partman.nix | 8 ++++---- pkgs/servers/sql/postgresql/ext/pg_rational.nix | 6 +++--- pkgs/servers/sql/postgresql/ext/pg_relusage.nix | 6 +++--- pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix | 6 +++--- pkgs/servers/sql/postgresql/ext/pgmq.nix | 10 +++++----- pkgs/servers/sql/postgresql/ext/pgroonga.nix | 8 ++++---- pkgs/servers/sql/postgresql/ext/pgrouting.nix | 8 ++++---- pkgs/servers/sql/postgresql/ext/pgsql-http.nix | 8 ++++---- pkgs/servers/sql/postgresql/ext/pgvector.nix | 8 ++++---- pkgs/servers/sql/postgresql/ext/plr.nix | 10 ++++++---- pkgs/servers/sql/postgresql/ext/repmgr.nix | 6 +++--- pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix | 8 ++++---- pkgs/servers/sql/postgresql/ext/system_stats.nix | 8 ++++---- pkgs/servers/sql/postgresql/ext/tds_fdw.nix | 8 ++++---- pkgs/servers/sql/postgresql/ext/temporal_tables.nix | 6 +++--- pkgs/servers/sql/postgresql/ext/timescaledb.nix | 8 ++++---- pkgs/servers/sql/postgresql/ext/tsja.nix | 6 +++--- pkgs/servers/sql/postgresql/ext/wal2json.nix | 8 ++++---- 29 files changed, 111 insertions(+), 109 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix index 6c8b5fbd3f57..ff441a8851da 100644 --- a/pkgs/servers/sql/postgresql/ext/age.nix +++ b/pkgs/servers/sql/postgresql/ext/age.nix @@ -19,7 +19,7 @@ let "13" = "sha256-HR6nnWt/V2a0rD5eHHUsFIZ1y7lmvLz36URt9pPJnCw="; }; in -postgresqlBuildExtension rec { +postgresqlBuildExtension (finalAttrs: { pname = "age"; version = "1.5.0-rc0"; @@ -27,7 +27,7 @@ postgresqlBuildExtension rec { owner = "apache"; repo = "age"; tag = "PG${lib.versions.major postgresql.version}/v${ - builtins.replaceStrings [ "." ] [ "_" ] version + builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version }"; hash = hashes.${lib.versions.major postgresql.version} @@ -42,7 +42,7 @@ postgresqlBuildExtension rec { enableUpdateScript = false; passthru.tests = stdenv.mkDerivation { - inherit version src; + inherit (finalAttrs) version src; pname = "age-regression"; @@ -50,7 +50,7 @@ postgresqlBuildExtension rec { buildPhase = let - postgresqlAge = postgresql.withPackages (ps: [ ps.age ]); + postgresqlAge = postgresql.withPackages (_: [ finalAttrs.finalPackage ]); in '' # The regression tests need to be run in the order specified in the Makefile. @@ -76,9 +76,9 @@ postgresqlBuildExtension rec { 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"; + changelog = "https://github.com/apache/age/raw/v${finalAttrs.src.rev}/RELEASE"; maintainers = [ ]; platforms = postgresql.meta.platforms; license = lib.licenses.asl20; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/citus.nix index dbae69e02e58..9298156aacd5 100644 --- a/pkgs/servers/sql/postgresql/ext/citus.nix +++ b/pkgs/servers/sql/postgresql/ext/citus.nix @@ -9,14 +9,14 @@ stdenv, }: -postgresqlBuildExtension rec { +postgresqlBuildExtension (finalAttrs: { pname = "citus"; version = "13.0.3"; src = fetchFromGitHub { owner = "citusdata"; repo = "citus"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tQ2YkMUeziz+dhfXtfuK0x8PWH3vfoJiVbE+YvQ/Gzc="; }; @@ -42,9 +42,9 @@ postgresqlBuildExtension rec { 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"; + changelog = "https://github.com/citusdata/citus/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.agpl3Only; maintainers = [ ]; inherit (postgresql.meta) platforms; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/hypopg.nix b/pkgs/servers/sql/postgresql/ext/hypopg.nix index 84a47bb9dac0..8b4deada9b7a 100644 --- a/pkgs/servers/sql/postgresql/ext/hypopg.nix +++ b/pkgs/servers/sql/postgresql/ext/hypopg.nix @@ -7,14 +7,14 @@ stdenv, }: -postgresqlBuildExtension rec { +postgresqlBuildExtension (finalAttrs: { pname = "hypopg"; version = "1.4.1"; src = fetchFromGitHub { owner = "HypoPG"; repo = "hypopg"; - tag = version; + tag = finalAttrs.version; hash = "sha256-88uKPSnITRZ2VkelI56jZ9GWazG/Rn39QlyHKJKSKMM="; }; @@ -31,4 +31,4 @@ postgresqlBuildExtension rec { platforms = postgresql.meta.platforms; maintainers = with lib.maintainers; [ bbigras ]; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/periods.nix b/pkgs/servers/sql/postgresql/ext/periods.nix index db170862a7ba..21d2f8cd92a1 100644 --- a/pkgs/servers/sql/postgresql/ext/periods.nix +++ b/pkgs/servers/sql/postgresql/ext/periods.nix @@ -6,14 +6,14 @@ stdenv, }: -postgresqlBuildExtension rec { +postgresqlBuildExtension (finalAttrs: { pname = "periods"; version = "1.2.3"; src = fetchFromGitHub { owner = "xocolatl"; repo = "periods"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-97v6+WNDcYb/KivlE/JBlRIZ3gYHj68AlK0fylp1cPo="; }; @@ -24,4 +24,4 @@ postgresqlBuildExtension rec { platforms = postgresql.meta.platforms; license = lib.licenses.postgresql; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index f6769715e8e9..efcfa3932de2 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -6,14 +6,14 @@ stdenv, }: -postgresqlBuildExtension rec { +postgresqlBuildExtension (finalAttrs: { pname = "pg_auto_failover"; version = "2.2"; src = fetchFromGitHub { owner = "citusdata"; repo = "pg_auto_failover"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-lsnVry+5n08kLOun8u0B7XFvI5ijTKJtFJ84fixMHe4="; }; @@ -23,9 +23,9 @@ postgresqlBuildExtension rec { 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"; + changelog = "https://github.com/citusdata/pg_auto_failover/blob/v${finalAttrs.version}/CHANGELOG.md"; maintainers = [ ]; platforms = postgresql.meta.platforms; license = lib.licenses.postgresql; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix index 246110923737..9db198216bb6 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix @@ -5,14 +5,14 @@ postgresqlBuildExtension, }: -postgresqlBuildExtension rec { +postgresqlBuildExtension (finalAttrs: { pname = "pg_bigm"; version = "1.2-20240606"; src = fetchFromGitHub { owner = "pgbigm"; repo = "pg_bigm"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-5Uy1DmGZR4WdtRUvNdZ5b9zBHJUb9idcEzW20rkreBs="; }; @@ -25,4 +25,4 @@ postgresqlBuildExtension rec { platforms = postgresql.meta.platforms; license = lib.licenses.postgresql; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix index d4cbd3839d79..d05131da5309 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix @@ -6,23 +6,23 @@ stdenv, }: -postgresqlBuildExtension rec { +postgresqlBuildExtension (finalAttrs: { pname = "pg_cron"; version = "1.6.5"; src = fetchFromGitHub { owner = "citusdata"; repo = "pg_cron"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Llksil7Fk7jvJJmCpfCN0Qm2b2I4J1VOA7/ibytO+KM="; }; 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}"; + changelog = "https://github.com/citusdata/pg_cron/releases/tag/v${finalAttrs.version}"; maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; license = lib.licenses.postgresql; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix index cb975af46a44..1e361343c739 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix @@ -6,14 +6,14 @@ stdenv, }: -postgresqlBuildExtension rec { +postgresqlBuildExtension (finalAttrs: { pname = "pg_ed25519"; version = "0.2"; src = fetchFromGitLab { owner = "dwagin"; repo = "pg_ed25519"; - tag = version; + tag = finalAttrs.version; hash = "sha256-IOL3ogbPCMNmwDwpeaCZSoaFLJRX0Oah+ysgyUfHg5s="; }; @@ -26,4 +26,4 @@ postgresqlBuildExtension rec { # Broken with no upstream fix available. broken = lib.versionAtLeast postgresql.version "16"; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix index 429319faa801..daa0e4a43942 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix @@ -6,23 +6,23 @@ stdenv, }: -postgresqlBuildExtension rec { +postgresqlBuildExtension (finalAttrs: { pname = "pg_hll"; version = "2.18"; src = fetchFromGitHub { owner = "citusdata"; repo = "postgresql-hll"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Latdxph1Ura8yKEokEjalJ+/GY+pAKOT3GXjuLprj6c="; }; meta = { description = "HyperLogLog for PostgreSQL"; homepage = "https://github.com/citusdata/postgresql-hll"; - changelog = "https://github.com/citusdata/postgresql-hll/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/citusdata/postgresql-hll/blob/v${finalAttrs.version}/CHANGELOG.md"; maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; license = lib.licenses.asl20; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix index 8b2c2173d48b..0b3d3ad0e313 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix @@ -6,24 +6,24 @@ stdenv, }: -postgresqlBuildExtension rec { +postgresqlBuildExtension (finalAttrs: { pname = "pg_ivm"; version = "1.10"; src = fetchFromGitHub { owner = "sraoss"; repo = "pg_ivm"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-4/ftJkm2ZInm9lkjJG7y4ZULwlyVC19lP0wGXu56SGw="; }; 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}"; + changelog = "https://github.com/sraoss/pg_ivm/releases/tag/v${finalAttrs.version}"; maintainers = with lib.maintainers; [ ivan ]; platforms = postgresql.meta.platforms; license = lib.licenses.postgresql; broken = lib.versionOlder postgresql.version "13"; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix index 698e76de4f50..aef805590a1c 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_net.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix @@ -7,14 +7,14 @@ stdenv, }: -postgresqlBuildExtension rec { +postgresqlBuildExtension (finalAttrs: { pname = "pg_net"; version = "0.14.0"; src = fetchFromGitHub { owner = "supabase"; repo = "pg_net"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-c1pxhTyrE5j6dY+M5eKAboQNofIORS+Dccz+7HKEKQI="; }; @@ -25,9 +25,9 @@ postgresqlBuildExtension rec { meta = { description = "Async networking for Postgres"; homepage = "https://github.com/supabase/pg_net"; - changelog = "https://github.com/supabase/pg_net/releases/tag/v${version}"; + changelog = "https://github.com/supabase/pg_net/releases/tag/v${finalAttrs.version}"; maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; license = lib.licenses.postgresql; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index 6e06529be058..5ac097aa8547 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -6,24 +6,24 @@ stdenv, }: -postgresqlBuildExtension rec { +postgresqlBuildExtension (finalAttrs: { pname = "pg_partman"; version = "5.2.4"; src = fetchFromGitHub { owner = "pgpartman"; repo = "pg_partman"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-i/o+JZEXnJRO17kfdTw87aca28+I8pvuFZsPMA/kf+w="; }; 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"; + changelog = "https://github.com/pgpartman/pg_partman/blob/v${finalAttrs.version}/CHANGELOG.md"; maintainers = with lib.maintainers; [ ggpeti ]; platforms = postgresql.meta.platforms; license = lib.licenses.postgresql; broken = lib.versionOlder postgresql.version "14"; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/pg_rational.nix b/pkgs/servers/sql/postgresql/ext/pg_rational.nix index add5ed477aed..db3fdd340ac9 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_rational.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_rational.nix @@ -5,14 +5,14 @@ postgresqlBuildExtension, }: -postgresqlBuildExtension rec { +postgresqlBuildExtension (finalAttrs: { pname = "pg_rational"; version = "0.0.2"; src = fetchFromGitHub { owner = "begriffs"; repo = "pg_rational"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Sp5wuX2nP3KGyWw7MFa11rI1CPIKIWBt8nvBSsASIEw="; }; @@ -23,4 +23,4 @@ postgresqlBuildExtension rec { platforms = postgresql.meta.platforms; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/pg_relusage.nix b/pkgs/servers/sql/postgresql/ext/pg_relusage.nix index b1195b514140..3245f03fe226 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_relusage.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_relusage.nix @@ -6,14 +6,14 @@ stdenv, }: -postgresqlBuildExtension rec { +postgresqlBuildExtension (finalAttrs: { pname = "pg_relusage"; version = "0.0.1"; src = fetchFromGitHub { owner = "adept"; repo = "pg_relusage"; - tag = "${version}"; + tag = "${finalAttrs.version}"; hash = "sha256-8hJNjQ9MaBk3J9a73l+yQMwMW/F2N8vr5PO2o+5GvYs="; }; @@ -24,4 +24,4 @@ postgresqlBuildExtension rec { platforms = postgresql.meta.platforms; license = lib.licenses.postgresql; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix index 157d40e6bc5c..a4ec95bbe077 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix @@ -6,14 +6,14 @@ stdenv, }: -postgresqlBuildExtension rec { +postgresqlBuildExtension (finalAttrs: { pname = "pg_uuidv7"; version = "1.6.0"; src = fetchFromGitHub { owner = "fboulnois"; repo = "pg_uuidv7"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-lG6dCnbLALnfQc4uclqXXXfYjK/WXLV0lo5I8l1E5p4="; }; @@ -26,4 +26,4 @@ postgresqlBuildExtension rec { license = lib.licenses.mpl20; broken = lib.versionOlder postgresql.version "13"; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/pgmq.nix b/pkgs/servers/sql/postgresql/ext/pgmq.nix index 91424a157e84..f55fd6044020 100644 --- a/pkgs/servers/sql/postgresql/ext/pgmq.nix +++ b/pkgs/servers/sql/postgresql/ext/pgmq.nix @@ -6,27 +6,27 @@ stdenv, }: -postgresqlBuildExtension rec { +postgresqlBuildExtension (finalAttrs: { pname = "pgmq"; version = "1.5.1"; src = fetchFromGitHub { owner = "tembo-io"; repo = "pgmq"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-IU+i6ONPwtgsFKdzya6E+222ualR66gkbb0lDr+7Rb8="; }; - sourceRoot = "${src.name}/pgmq-extension"; + sourceRoot = "${finalAttrs.src.name}/pgmq-extension"; dontConfigure = true; meta = { description = "Lightweight message queue like AWS SQS and RSMQ but on Postgres"; homepage = "https://tembo.io/pgmq"; - changelog = "https://github.com/tembo-io/pgmq/releases/tag/v${version}"; + changelog = "https://github.com/tembo-io/pgmq/releases/tag/v${finalAttrs.version}"; maintainers = with lib.maintainers; [ takeda ]; platforms = postgresql.meta.platforms; license = lib.licenses.postgresql; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index cffadd4cc61f..49f5d750df97 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -10,14 +10,14 @@ xxHash, }: -postgresqlBuildExtension rec { +postgresqlBuildExtension (finalAttrs: { pname = "pgroonga"; version = "4.0.1"; src = fetchFromGitHub { owner = "pgroonga"; repo = "pgroonga"; - tag = "${version}"; + tag = "${finalAttrs.version}"; hash = "sha256-a5nNtlUiFBuuqWAjIN0gU/FaoV3VpJh+/fab8R/77dw="; }; @@ -43,9 +43,9 @@ postgresqlBuildExtension rec { You can use super fast full text search feature against all languages by installing PGroonga into your PostgreSQL. ''; homepage = "https://pgroonga.github.io/"; - changelog = "https://github.com/pgroonga/pgroonga/releases/tag/${version}"; + changelog = "https://github.com/pgroonga/pgroonga/releases/tag/${finalAttrs.version}"; license = lib.licenses.postgresql; platforms = postgresql.meta.platforms; maintainers = with lib.maintainers; [ DerTim1 ]; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 2702bd676a42..d4239072b1ee 100644 --- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -9,7 +9,7 @@ stdenv, }: -postgresqlBuildExtension rec { +postgresqlBuildExtension (finalAttrs: { pname = "pgrouting"; version = "3.7.3"; @@ -22,16 +22,16 @@ postgresqlBuildExtension rec { src = fetchFromGitHub { owner = "pgRouting"; repo = "pgrouting"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jaevnDCJ6hRQeDhdAkvMTvnnFWElMNvo9gZRW53proQ="; }; meta = { description = "PostgreSQL/PostGIS extension that provides geospatial routing functionality"; homepage = "https://pgrouting.org/"; - changelog = "https://github.com/pgRouting/pgrouting/releases/tag/v${version}"; + changelog = "https://github.com/pgRouting/pgrouting/releases/tag/v${finalAttrs.version}"; maintainers = with lib.maintainers; lib.teams.geospatial.members ++ [ steve-chavez ]; platforms = postgresql.meta.platforms; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix index 227a1680f8ca..b351da399867 100644 --- a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix +++ b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix @@ -7,14 +7,14 @@ stdenv, }: -postgresqlBuildExtension rec { +postgresqlBuildExtension (finalAttrs: { pname = "pgsql-http"; version = "1.6.3"; src = fetchFromGitHub { owner = "pramsey"; repo = "pgsql-http"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Ij8BaNj2SOwDfjgLxrpLFvvPCzSahXyyckRPGmcqKtE="; }; @@ -24,9 +24,9 @@ postgresqlBuildExtension rec { 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}"; + changelog = "https://github.com/pramsey/pgsql-http/releases/tag/v${finalAttrs.version}"; maintainers = [ ]; platforms = postgresql.meta.platforms; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix index 5741e06a7756..e8b761be0a47 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvector.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvector.nix @@ -6,23 +6,23 @@ stdenv, }: -postgresqlBuildExtension rec { +postgresqlBuildExtension (finalAttrs: { pname = "pgvector"; version = "0.8.0"; src = fetchFromGitHub { owner = "pgvector"; repo = "pgvector"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-JsZV+I4eRMypXTjGmjCtMBXDVpqTIPHQa28ogXncE/Q="; }; 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"; + changelog = "https://github.com/pgvector/pgvector/raw/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.postgresql; platforms = postgresql.meta.platforms; maintainers = [ ]; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/plr.nix b/pkgs/servers/sql/postgresql/ext/plr.nix index 891a461040ab..876c5e262e72 100644 --- a/pkgs/servers/sql/postgresql/ext/plr.nix +++ b/pkgs/servers/sql/postgresql/ext/plr.nix @@ -8,9 +8,11 @@ stdenv, }: -postgresqlBuildExtension rec { +postgresqlBuildExtension (finalAttrs: { pname = "plr"; - version = "${builtins.replaceStrings [ "_" ] [ "." ] (lib.strings.removePrefix "REL" src.rev)}"; + version = "${builtins.replaceStrings [ "_" ] [ "." ] ( + lib.strings.removePrefix "REL" finalAttrs.src.rev + )}"; src = fetchFromGitHub { owner = "postgres-plr"; @@ -27,9 +29,9 @@ postgresqlBuildExtension rec { 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"; + changelog = "https://github.com/postgres-plr/plr/blob/${finalAttrs.src.rev}/changelog.md"; maintainers = with lib.maintainers; [ qoelet ]; platforms = postgresql.meta.platforms; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/repmgr.nix index dd977bf376f1..2c2eb6fc9390 100644 --- a/pkgs/servers/sql/postgresql/ext/repmgr.nix +++ b/pkgs/servers/sql/postgresql/ext/repmgr.nix @@ -9,14 +9,14 @@ stdenv, }: -postgresqlBuildExtension rec { +postgresqlBuildExtension (finalAttrs: { pname = "repmgr"; version = "5.5.0"; src = fetchFromGitHub { owner = "EnterpriseDB"; repo = "repmgr"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8G2CzzkWTKEglpUt1Gr7d/DuHJvCIEjsbYDMl3Zt3cs="; }; @@ -34,4 +34,4 @@ postgresqlBuildExtension rec { platforms = postgresql.meta.platforms; maintainers = with lib.maintainers; [ zimbatm ]; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix b/pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix index 710fb5472042..1ade4b6e90fa 100644 --- a/pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix @@ -6,14 +6,14 @@ sqlite, }: -postgresqlBuildExtension rec { +postgresqlBuildExtension (finalAttrs: { pname = "sqlite_fdw"; version = "2.5.0"; src = fetchFromGitHub { owner = "pgspider"; repo = "sqlite_fdw"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-zPVIFzUv6UFFHq0Zi5MeQOcvgsfZAKGkkNIGxkTJ+oo="; }; @@ -24,9 +24,9 @@ postgresqlBuildExtension rec { meta = { description = "SQLite Foreign Data Wrapper for PostgreSQL"; homepage = "https://github.com/pgspider/sqlite_fdw"; - changelog = "https://github.com/pgspider/sqlite_fdw/releases/tag/v${version}"; + changelog = "https://github.com/pgspider/sqlite_fdw/releases/tag/v${finalAttrs.version}"; maintainers = with lib.maintainers; [ apfelkuchen6 ]; platforms = lib.platforms.unix; license = lib.licenses.postgresql; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/system_stats.nix b/pkgs/servers/sql/postgresql/ext/system_stats.nix index 88d92d4b547c..c6a4a3d98686 100644 --- a/pkgs/servers/sql/postgresql/ext/system_stats.nix +++ b/pkgs/servers/sql/postgresql/ext/system_stats.nix @@ -5,14 +5,14 @@ postgresqlBuildExtension, stdenv, }: -postgresqlBuildExtension rec { +postgresqlBuildExtension (finalAttrs: { pname = "system_stats"; version = "3.2"; src = fetchFromGitHub { owner = "EnterpriseDB"; repo = "system_stats"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/xXnui0S0ZjRw7P8kMAgttHVv8T41aOhM3pM8P0OTig="; }; @@ -21,9 +21,9 @@ postgresqlBuildExtension rec { 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"; + changelog = "https://github.com/EnterpriseDB/system_stats/raw/v${finalAttrs.version}/CHANGELOG.md"; maintainers = with lib.maintainers; [ shivaraj-bh ]; platforms = postgresql.meta.platforms; license = lib.licenses.postgresql; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix index 955131db9425..fe67b203cece 100644 --- a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix @@ -8,7 +8,7 @@ unstableGitUpdater, }: -postgresqlBuildExtension rec { +postgresqlBuildExtension (finalAttrs: { pname = "tds_fdw"; version = "2.0.4"; @@ -17,16 +17,16 @@ postgresqlBuildExtension rec { src = fetchFromGitHub { owner = "tds-fdw"; repo = "tds_fdw"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ruelOHueaHx1royLPvDM8Abd1rQD62R4KXgtHY9qqTw="; }; 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}"; + changelog = "https://github.com/tds-fdw/tds_fdw/releases/tag/v${finalAttrs.version}"; maintainers = with lib.maintainers; [ steve-chavez ]; platforms = postgresql.meta.platforms; license = lib.licenses.postgresql; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix index 150f66fde899..412638d51fe1 100644 --- a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix +++ b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix @@ -6,14 +6,14 @@ stdenv, }: -postgresqlBuildExtension rec { +postgresqlBuildExtension (finalAttrs: { pname = "temporal_tables"; version = "1.2.2"; src = fetchFromGitHub { owner = "arkhipov"; repo = "temporal_tables"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7+DCSPAPhsokWDq/5IXNhd7jY6FfzxxUjlsg/VJeD3k="; }; @@ -24,4 +24,4 @@ postgresqlBuildExtension rec { platforms = postgresql.meta.platforms; license = lib.licenses.bsd2; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 32712ab6fc74..c19590b6ea77 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -12,14 +12,14 @@ enableUnfree ? true, }: -postgresqlBuildExtension rec { +postgresqlBuildExtension (finalAttrs: { pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}"; version = "2.19.2"; src = fetchFromGitHub { owner = "timescale"; repo = "timescaledb"; - tag = version; + tag = finalAttrs.version; hash = "sha256-H46lhvM6rA9J4nLRLeFArCc7tqmVmpWztsGFAboSM0k="; }; @@ -55,10 +55,10 @@ postgresqlBuildExtension rec { 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"; + changelog = "https://github.com/timescale/timescaledb/blob/${finalAttrs.version}/CHANGELOG.md"; maintainers = with lib.maintainers; [ kirillrdy ]; platforms = postgresql.meta.platforms; license = with lib.licenses; if enableUnfree then tsl else asl20; broken = lib.versionOlder postgresql.version "14"; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/tsja.nix b/pkgs/servers/sql/postgresql/ext/tsja.nix index 0aafc6772363..74517651b4b7 100644 --- a/pkgs/servers/sql/postgresql/ext/tsja.nix +++ b/pkgs/servers/sql/postgresql/ext/tsja.nix @@ -7,12 +7,12 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tsja"; version = "0.5.0"; src = fetchzip { - url = "https://www.amris.jp/tsja/tsja-${version}.tar.xz"; + url = "https://www.amris.jp/tsja/tsja-${finalAttrs.version}.tar.xz"; hash = "sha256-h59UhUG/7biN8NaDiGK6kXDqfhR9uMzt8CpwbJ+PpEM="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.gnu; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/wal2json.nix b/pkgs/servers/sql/postgresql/ext/wal2json.nix index b40e1f5f21e2..1427ebc54ec1 100644 --- a/pkgs/servers/sql/postgresql/ext/wal2json.nix +++ b/pkgs/servers/sql/postgresql/ext/wal2json.nix @@ -6,10 +6,10 @@ postgresqlBuildExtension, }: -postgresqlBuildExtension rec { +postgresqlBuildExtension (finalAttrs: { pname = "wal2json"; version = "${builtins.replaceStrings [ "_" ] [ "." ] ( - lib.strings.removePrefix "wal2json_" src.rev + lib.strings.removePrefix "wal2json_" finalAttrs.src.rev )}"; src = fetchFromGitHub { @@ -26,9 +26,9 @@ postgresqlBuildExtension rec { 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}"; + changelog = "https://github.com/eulerto/wal2json/releases/tag/${finalAttrs.src.rev}"; maintainers = with lib.maintainers; [ euank ]; platforms = postgresql.meta.platforms; license = lib.licenses.bsd3; }; -} +}) From 52d1aad09a92c36c9de74fa1406cd6b111439761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Apr 2025 13:27:40 -0700 Subject: [PATCH 053/101] libdeltachat: 1.159.0 -> 1.159.1 Diff: https://github.com/chatmail/core/compare/refs/tags/v1.159.0...v1.159.1 Changelog: https://github.com/chatmail/core/blob/v1.159.1/CHANGELOG.md --- pkgs/by-name/li/libdeltachat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index 95822525c670..c8e922edf339 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.159.0"; + version = "1.159.1"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${version}"; - hash = "sha256-Pdrb2A4OhW2+XsBuwTQfIjZms9byaMg/KV2fGWD35/w="; + hash = "sha256-ASEGwcmSlUgR69wqc3h53abmKObowuVC6CFP2G+H/0s="; }; patches = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { pname = "deltachat-core-rust"; inherit version src; - hash = "sha256-5xihycfIdZ/DINoKZ7kiRB46xKyEB4aAQz2OkejoXJc="; + hash = "sha256-gu0Cxaw+Lpu2mGqX0lFTmK1MWHt0icM8BbA1yiKVpzs="; }; nativeBuildInputs = From 866256598423577f891cdfa59c4c9096e0d7d131 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Apr 2025 21:06:30 +0000 Subject: [PATCH 054/101] python312Packages.bthome-ble: 3.12.4 -> 3.12.5 --- pkgs/development/python-modules/bthome-ble/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index 3481cd99924b..b93d14b3b9c8 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "3.12.4"; + version = "3.12.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bthome-ble"; tag = "v${version}"; - hash = "sha256-1Kr+KKL8o1qsu/ncwclsokPcO1QHYadul/f+/Nnv6SQ="; + hash = "sha256-SuGmNcx+z/4GOxgAsupY7NW+2ni7vLaAEC3EKn6ctpw="; }; build-system = [ poetry-core ]; @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for BThome BLE devices"; homepage = "https://github.com/Bluetooth-Devices/bthome-ble"; - changelog = "https://github.com/bluetooth-devices/bthome-ble/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/bluetooth-devices/bthome-ble/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From a8ab9dbad7dd24f619b57b208d0beb492946ae48 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Apr 2025 21:28:55 +0000 Subject: [PATCH 055/101] python312Packages.unearth: 0.17.3 -> 0.17.5 --- pkgs/development/python-modules/unearth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unearth/default.nix b/pkgs/development/python-modules/unearth/default.nix index 6572eebdbb97..e94d9c6cbbad 100644 --- a/pkgs/development/python-modules/unearth/default.nix +++ b/pkgs/development/python-modules/unearth/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "unearth"; - version = "0.17.3"; + version = "0.17.5"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-MulsnfY8VjoRjUEd+0+cZy8YGkEJd/Z2XA7UMLDTJ4Q="; + hash = "sha256-oZ4cAuZLQFGNCIB5x0FvxBtFpki4GkEoqsAllyNO5ro="; }; build-system = [ pdm-backend ]; From b8d1267b6a4acdfdec01248689d5cfddf1177dc0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Apr 2025 21:57:12 +0000 Subject: [PATCH 056/101] python312Packages.django-anymail: 12.0 -> 13.0 --- pkgs/development/python-modules/django-anymail/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix index ccc2ef7b9c1e..a01df2135750 100644 --- a/pkgs/development/python-modules/django-anymail/default.nix +++ b/pkgs/development/python-modules/django-anymail/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "django-anymail"; - version = "12.0"; + version = "13.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "anymail"; repo = "django-anymail"; tag = "v${version}"; - hash = "sha256-TuEEwxwgZVv97Ns4sRWdQjaNymE03nj8CTiU9S6ynZ8="; + hash = "sha256-0KqpgS71QwTfLp4I8p1An6sCnGcvxTNB4xy4LaFFl8E="; }; build-system = [ hatchling ]; @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Django email backends and webhooks for Mailgun"; homepage = "https://github.com/anymail/django-anymail"; - changelog = "https://github.com/anymail/django-anymail/blob/v${version}/CHANGELOG.rst"; + changelog = "https://github.com/anymail/django-anymail/blob/${src.tag}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = with maintainers; [ onny ]; }; From e504d4870d2ab08e3059726b7713009629be4064 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Apr 2025 22:52:26 +0000 Subject: [PATCH 057/101] python312Packages.dohq-artifactory: 1.0.0 -> 1.0.1 --- pkgs/development/python-modules/dohq-artifactory/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dohq-artifactory/default.nix b/pkgs/development/python-modules/dohq-artifactory/default.nix index d728ef481caf..4b09ed199fb8 100644 --- a/pkgs/development/python-modules/dohq-artifactory/default.nix +++ b/pkgs/development/python-modules/dohq-artifactory/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "dohq-artifactory"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "devopshq"; repo = "artifactory"; tag = version; - hash = "sha256-g6FozwSieurnXS76+yu/lBeL4yIWXdoyl9cUyUpMJx0="; + hash = "sha256-oGv7sZWi/e9WWa5W82pJ6d8S2d2e9gaoGZ3P/97IWoI="; }; # https://github.com/devopshq/artifactory/issues/470 From 09fdd1beadeb60a7f87711e896290791dce97c6d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Apr 2025 23:32:46 +0000 Subject: [PATCH 058/101] python312Packages.qpsolvers: 4.5.0 -> 4.5.1 --- pkgs/development/python-modules/qpsolvers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qpsolvers/default.nix b/pkgs/development/python-modules/qpsolvers/default.nix index d4ceeedd7872..d975ab138d12 100644 --- a/pkgs/development/python-modules/qpsolvers/default.nix +++ b/pkgs/development/python-modules/qpsolvers/default.nix @@ -23,14 +23,14 @@ }: buildPythonPackage rec { pname = "qpsolvers"; - version = "4.5.0"; + version = "4.5.1"; pyproject = true; src = fetchFromGitHub { owner = "qpsolvers"; repo = "qpsolvers"; tag = "v${version}"; - hash = "sha256-6oqCUya0ObY51zPtJl8BFK7UeX5X2SUx6p3bGQSN/gQ="; + hash = "sha256-BPjuc1RyN4qy2LJCIpsUVooP+cmHaLtaYRG2Mp/+ETc="; }; build-system = [ flit-core ]; From 95996af043441fbaded10d64e6e6a39f9f4edb73 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Apr 2025 23:59:01 +0000 Subject: [PATCH 059/101] python312Packages.troposphere: 4.9.0 -> 4.9.1 --- pkgs/development/python-modules/troposphere/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/troposphere/default.nix b/pkgs/development/python-modules/troposphere/default.nix index c1d955b53820..bce921388e81 100644 --- a/pkgs/development/python-modules/troposphere/default.nix +++ b/pkgs/development/python-modules/troposphere/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "troposphere"; - version = "4.9.0"; + version = "4.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cloudtools"; repo = pname; tag = version; - hash = "sha256-1Qq1vV3DsslnwJq0d0MZ9bCadYD08gxLsM3tQmti4Pw="; + hash = "sha256-P2in05PJ8JubX7bvQbqyW7QkjK4BGBdysFclya7pxpE="; }; propagatedBuildInputs = [ cfn-flip ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to create AWS CloudFormation descriptions"; homepage = "https://github.com/cloudtools/troposphere"; - changelog = "https://github.com/cloudtools/troposphere/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/cloudtools/troposphere/blob/${src.tag}/CHANGELOG.rst"; license = licenses.bsd2; maintainers = with maintainers; [ jlesquembre ]; }; From 5e21ad6ba9988caac20f94e5b0b36fab86baca4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Apr 2025 17:19:09 -0700 Subject: [PATCH 060/101] python313Packages.hahomematic: 2025.4.0 -> 2025.4.1 Diff: https://github.com/SukramJ/hahomematic/compare/refs/tags/2025.4.0...2025.4.1 Changelog: https://github.com/SukramJ/hahomematic/blob/2025.4.1/changelog.md --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 354f6882e641..df23cbae5af0 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2025.4.0"; + version = "2025.4.1"; pyproject = true; disabled = pythonOlder "3.13"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "SukramJ"; repo = "hahomematic"; tag = version; - hash = "sha256-bEMGt53tXJdGIpjP8sZ1VkKH/ky+VVnIF6t+oS/YYlY="; + hash = "sha256-cJpt5OjC2zXsKIxYZ+5TQORDuhLsQ+6MBzXD9ygG5Os="; }; __darwinAllowLocalNetworking = true; From 05318b2d320afb34f83beead1d2c06ea2d1ad830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Apr 2025 17:19:17 -0700 Subject: [PATCH 061/101] home-assistant-custom-components.homematicip_local: 1.82.1 -> 1.83.0 Diff: https://github.com/SukramJ/custom_homematic/compare/refs/tags/1.82.1...1.83.0 Changelog: https://github.com/SukramJ/custom_homematic/blob/1.83.0/changelog.md --- .../custom-components/homematicip_local/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix index ebeaa5dcf334..fc2440562dcc 100644 --- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix +++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix @@ -9,13 +9,13 @@ buildHomeAssistantComponent rec { owner = "SukramJ"; domain = "homematicip_local"; - version = "1.82.1"; + version = "1.83.0"; src = fetchFromGitHub { owner = "SukramJ"; repo = "custom_homematic"; tag = version; - hash = "sha256-/ZUSPYdjHZ/qHucKgxPLjvktr0LEYRdHPn/iypf3Y44="; + hash = "sha256-F26Q7nfikw5NSa84L0LKwTSQDmqEdxwYyyzBNzSMWPw="; }; postPatch = '' From 001227a8271d0275ec4353db9459842a2d001583 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Apr 2025 00:21:47 +0000 Subject: [PATCH 062/101] python312Packages.chispa: 0.11.0 -> 0.11.1 --- pkgs/development/python-modules/chispa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chispa/default.nix b/pkgs/development/python-modules/chispa/default.nix index b6e48ea15149..466aa6047ff1 100644 --- a/pkgs/development/python-modules/chispa/default.nix +++ b/pkgs/development/python-modules/chispa/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "chispa"; - version = "0.11.0"; + version = "0.11.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "MrPowers"; repo = "chispa"; tag = "v${version}"; - hash = "sha256-P9b/HabHckq6FWAgCYB/YLQqtu8M6NB536p4tByNF5Y="; + hash = "sha256-M4iYKWXI0wBSHt1tWd0vGvQ6FLRRE9TB2u6sTJnkFpY="; }; build-system = [ poetry-core ]; From 2c7fb269ca7fe0a8062d3c5ed6cfeed3adde1c45 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Apr 2025 01:12:14 +0000 Subject: [PATCH 063/101] gosmee: 0.23.2 -> 0.23.4 --- pkgs/by-name/go/gosmee/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/gosmee/package.nix b/pkgs/by-name/go/gosmee/package.nix index f64a23db5df7..085ee18b5edc 100644 --- a/pkgs/by-name/go/gosmee/package.nix +++ b/pkgs/by-name/go/gosmee/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gosmee"; - version = "0.23.2"; + version = "0.23.4"; src = fetchFromGitHub { owner = "chmouel"; repo = "gosmee"; rev = "v${version}"; - hash = "sha256-B+0Qod9U7bTQKXkbZJ0eQ6DkPdq56EI2tf/3i8wP/TI="; + hash = "sha256-orQDLuEbfxWWXmothxfTgeaMiqzJeTOFeNnPNDHwnYU="; }; vendorHash = null; From b61af501e61135fab9fd1956e83f30e770242b8f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Apr 2025 01:13:33 +0000 Subject: [PATCH 064/101] svdtools: 0.4.5 -> 0.4.6 --- pkgs/by-name/sv/svdtools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sv/svdtools/package.nix b/pkgs/by-name/sv/svdtools/package.nix index 0380316c7377..86f0059cca56 100644 --- a/pkgs/by-name/sv/svdtools/package.nix +++ b/pkgs/by-name/sv/svdtools/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "svdtools"; - version = "0.4.5"; + version = "0.4.6"; src = fetchCrate { inherit version pname; - hash = "sha256-XwgDjSn19qbmh/yX4h5vG0C4rTRxd9tT1ZzUm1Y1ckg="; + hash = "sha256-AfRFtybGEpArLGKp4AkGlokfNFMK8Ez5VA5Fu5GUhRI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-h99NTKW1Re680GNsmKTW35OpJVlfYFj05QVZ9rHXgYY="; + cargoHash = "sha256-0GR9pbrevb0USu8de1oFHePJH1hGTvcVh3Gc9WKP0uA="; meta = with lib; { description = "Tools to handle vendor-supplied, often buggy SVD files"; From 378b75d29bc0d7d5809091f2eb99f4bb4a4d841f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Apr 2025 02:04:09 +0000 Subject: [PATCH 065/101] serie: 0.4.4 -> 0.4.5 --- pkgs/by-name/se/serie/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix index 2b14244649ad..4f6840a43f06 100644 --- a/pkgs/by-name/se/serie/package.nix +++ b/pkgs/by-name/se/serie/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "serie"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "lusingander"; repo = "serie"; rev = "v${version}"; - hash = "sha256-Uf7HYcN/lJc2TSl2dZQcOKyEeLHMb2RTQwSzXWZnBkw="; + hash = "sha256-JTrXsakXsDuEzRs7y3OgdvfWw8vvF1IvajHi7KueoPI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-NbBF747sSxmjlTbcYknNZFFsaIVZ6+wHhjMJ6akg4BU="; + cargoHash = "sha256-+5mUMB4rqLePimfgWlV7UP8B1lPoKzfWCXBBN1q2WIU="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; From 9be0612c3c3a022ed83979d520e36eae8c736214 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Apr 2025 02:14:45 +0000 Subject: [PATCH 066/101] python312Packages.extract-msg: 0.54.0 -> 0.54.1 --- pkgs/development/python-modules/extract-msg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/extract-msg/default.nix b/pkgs/development/python-modules/extract-msg/default.nix index a995c01e5c49..6d935b617774 100644 --- a/pkgs/development/python-modules/extract-msg/default.nix +++ b/pkgs/development/python-modules/extract-msg/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "extract-msg"; - version = "0.54.0"; + version = "0.54.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "TeamMsgExtractor"; repo = "msg-extractor"; tag = "v${version}"; - hash = "sha256-R02rhwIbXGMynYXqE8TYLG4YvmyEW2Yt8N0hm/dPTv0="; + hash = "sha256-ISrMt9dK/WfTp8YD3xSwOCsKAa13g+l6I1SZ5hySOSg="; }; pythonRelaxDeps = [ @@ -56,7 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Extracts emails and attachments saved in Microsoft Outlook's .msg files"; homepage = "https://github.com/TeamMsgExtractor/msg-extractor"; - changelog = "https://github.com/TeamMsgExtractor/msg-extractor/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/TeamMsgExtractor/msg-extractor/blob/${src.tag}/CHANGELOG.md"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; }; From 6ca286a0a669a32b9017be97d5a274daa49a17b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Apr 2025 03:46:53 +0000 Subject: [PATCH 067/101] python312Packages.django-admin-datta: 1.0.17 -> 1.0.18 --- .../development/python-modules/django-admin-datta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-admin-datta/default.nix b/pkgs/development/python-modules/django-admin-datta/default.nix index 45380c06be7a..9c4c289736b1 100644 --- a/pkgs/development/python-modules/django-admin-datta/default.nix +++ b/pkgs/development/python-modules/django-admin-datta/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "django-admin-datta"; - version = "1.0.17"; + version = "1.0.18"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1POh1ii6sITt2rqn+2S2B/kK1tsKsSlgxc1fEnCvSCM="; + hash = "sha256-9gQHtdmDjeoyCNjp+HG9nNh2xyGTwASHUyg77GvEHGM="; }; propagatedBuildInputs = [ django ]; From 2872ee7484f5c78387d232ad1cda3d6418fdcdb4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Apr 2025 05:14:44 +0000 Subject: [PATCH 068/101] gtree: 1.11.0 -> 1.11.3 --- pkgs/by-name/gt/gtree/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gt/gtree/package.nix b/pkgs/by-name/gt/gtree/package.nix index c3425c3bfd1c..03a40721b2f5 100644 --- a/pkgs/by-name/gt/gtree/package.nix +++ b/pkgs/by-name/gt/gtree/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gtree"; - version = "1.11.0"; + version = "1.11.3"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-d+cFESWQyu2laj1pLepEWoHnFHaSKytfWkmD4yuFf78="; + hash = "sha256-VGlSc0NMl1yMoqLyIwxJn1s24Uw2DAv4BO2hM/7ffXA="; }; - vendorHash = "sha256-jx+F8FfFMMU4I61O0ERXp5OLC9SdQculYoa+3CgVL2w="; + vendorHash = "sha256-F4obYTU8LNsrNZtgFSf1A1a2N5aG2U94cXr91uVJT4s="; subPackages = [ "cmd/gtree" From 4098dde2ae5aa95ed806f0bf60dc3291afc53a64 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Apr 2025 06:31:46 +0000 Subject: [PATCH 069/101] cdncheck: 1.1.13 -> 1.1.14 --- pkgs/by-name/cd/cdncheck/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix index 008fedf7eb1a..8b03704f2353 100644 --- a/pkgs/by-name/cd/cdncheck/package.nix +++ b/pkgs/by-name/cd/cdncheck/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cdncheck"; - version = "1.1.13"; + version = "1.1.14"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cdncheck"; tag = "v${version}"; - hash = "sha256-jHUFHmVVugshheRjz5ztIVK1jsrW7kSWSgEjZj9OVQw="; + hash = "sha256-VbFpZilrPR7Ajs1FY0a+qlkBnwvh+F18fmIf2oYlIFE="; }; vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4="; From 05f707c404a0256d2b9dcb6c546279c8b17036b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Apr 2025 07:52:23 +0000 Subject: [PATCH 070/101] quill-log: 9.0.0 -> 9.0.1 --- pkgs/by-name/qu/quill-log/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/quill-log/package.nix b/pkgs/by-name/qu/quill-log/package.nix index 1b7d1aeb4f52..18330dd65404 100644 --- a/pkgs/by-name/qu/quill-log/package.nix +++ b/pkgs/by-name/qu/quill-log/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "quill-log"; - version = "9.0.0"; + version = "9.0.1"; src = fetchFromGitHub { owner = "odygrd"; repo = "quill"; rev = "v${version}"; - hash = "sha256-WkJOB06yH3B3L2aqglh1jc38e1fDbxaqFEEh1AvBUcw="; + hash = "sha256-RPffzaFrkV7w40CAQLAXV47EyWv4M7pShaY7Phsmw1o="; }; nativeBuildInputs = [ cmake ]; From 8aca93efeab269f859be19c941ed8437a3969622 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Apr 2025 08:42:43 +0000 Subject: [PATCH 071/101] cargo-deb: 2.11.4 -> 2.12.1 --- pkgs/by-name/ca/cargo-deb/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-deb/package.nix b/pkgs/by-name/ca/cargo-deb/package.nix index f54a2c67e987..14dbd2f002e5 100644 --- a/pkgs/by-name/ca/cargo-deb/package.nix +++ b/pkgs/by-name/ca/cargo-deb/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "2.11.4"; + version = "2.12.1"; src = fetchFromGitHub { owner = "kornelski"; repo = "cargo-deb"; rev = "v${version}"; - hash = "sha256-E0PU0j0n1ITP65D+p1upn3cBFBKkoCbyHe6S5XxDAyU="; + hash = "sha256-Ov3rVfURzzZ6+YFq4Cqtoq5RQVHHjqvgkOcpsvAy1jc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-uPLXUx+nbUqXJM83RHxuXWiVWEWp5c+v5A0dOESL9oA="; + cargoHash = "sha256-11l/9l1WD7vLHNOKFVOxcR4OI2ft1IrT5bRX77XS+BI="; nativeBuildInputs = [ makeWrapper From b257be3279ab0951e84874cfb3ce6b78d5b2f6e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Apr 2025 08:43:52 +0000 Subject: [PATCH 072/101] trufflehog: 3.88.21 -> 3.88.23 --- pkgs/tools/security/trufflehog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 7e56c8a73eda..90e5f637e2d4 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.88.21"; + version = "3.88.23"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; tag = "v${version}"; - hash = "sha256-hUBUpsfVKifeQ9DpeNKwBGnoLH1OK2T4IOb7yFWxz+Q="; + hash = "sha256-dGk3cVFEaeaZfZxJYeGMvexssbUPssAqdJbBTOV8b6I="; }; vendorHash = "sha256-vJl2gIS14NA9nV9j+81xKv3NnsDce4V7XoeipOZV+wI="; From 38026753c0777667893e0be2b4664030712da597 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Apr 2025 09:08:56 +0000 Subject: [PATCH 073/101] phpExtensions.mongodb: 1.21.0 -> 2.0.0 --- pkgs/development/php-packages/mongodb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index 0f44ca36c387..4e92fec0749a 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -16,13 +16,13 @@ buildPecl rec { pname = "mongodb"; - version = "1.21.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-php-driver"; rev = version; - hash = "sha256-BMa0JOhk3jMiuhKX9AcGC2cpL1K0mocOs5wH8F43F0U="; + hash = "sha256-o4fy46oh3iWLAcszcFo1m5GdalQs6OswT+OQTYo2cZc="; fetchSubmodules = true; }; From fb9e75cadb0ec95ecc7bf8b106d6a0042659aafe Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Sun, 13 Apr 2025 12:21:44 +0200 Subject: [PATCH 074/101] nheko: unset `QT_STYLE_OVERRIDE` unset `QT_STYLE_OVERRIDE` to avoid showing a blank window at startup see: https://github.com/NixOS/nixpkgs/issues/333009 --- pkgs/by-name/nh/nheko/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/nh/nheko/package.nix b/pkgs/by-name/nh/nheko/package.nix index 005c5937388b..bd1fe4e56900 100644 --- a/pkgs/by-name/nh/nheko/package.nix +++ b/pkgs/by-name/nh/nheko/package.nix @@ -80,7 +80,12 @@ stdenv.mkDerivation rec { preFixup = '' # add gstreamer plugins path to the wrapper - qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + # unset QT_STYLE_OVERRIDE to avoid showing a blank window when started + # https://github.com/NixOS/nixpkgs/issues/333009 + qtWrapperArgs+=( + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + --unset QT_STYLE_OVERRIDE + ) ''; meta = with lib; { From dbb0c30e67d9891f40b06a6e5f4ca2aee057f52b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 12 Apr 2025 19:23:00 +0200 Subject: [PATCH 075/101] python312Packages.cramjam: 2.9.1-unstable-2025-01-04 -> 2.10.0 Diff: https://github.com/milesgranger/cramjam/compare/61564e7761e38e5ec55e7939ccd6a276c2c55d11...2.10.0 Changelog: https://github.com/milesgranger/cramjam/releases/tag/2.10.0 --- .../python-modules/cramjam/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/cramjam/default.nix b/pkgs/development/python-modules/cramjam/default.nix index 750ff3fa7076..76a8825b703e 100644 --- a/pkgs/development/python-modules/cramjam/default.nix +++ b/pkgs/development/python-modules/cramjam/default.nix @@ -13,23 +13,19 @@ buildPythonPackage rec { pname = "cramjam"; - # 2.9.1 ships with experimental decoders that were having issues. - # They were removed afterwards but the change has not been released yet: - # https://github.com/milesgranger/cramjam/pull/197 - # TODO: update to the next stable release when available - version = "2.9.1-unstable-2025-01-04"; + version = "2.10.0"; pyproject = true; src = fetchFromGitHub { owner = "milesgranger"; repo = "cramjam"; - rev = "61564e7761e38e5ec55e7939ccd6a276c2c55d11"; - hash = "sha256-KTYTelQdN5EIJFbyQgrYcayqkAQQSNF+SHqUFFHf1Z8="; + tag = version; + hash = "sha256-zM3EIo7KQYWK7W3LSGaY72iYQQcRB84opLqj/lrSwwY="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname src version; - hash = "sha256-Jw9zbgcrX3pofW7E8b4xzZYKj3h6ufCVLjv2xD/qONo="; + hash = "sha256-eMVUDF6DWNzdNfzWuwDF0UBbJ5wQU4/DHaNkP/k2SJ8="; }; nativeBuildInputs = with rustPlatform; [ @@ -50,6 +46,12 @@ buildPythonPackage rec { CI = true; }; + disabledTests = [ + # I (@GaetanLepage) cannot reproduce the failure, but it fails consistently on Ofborg with: + # SyntaxError: could not convert string to float: 'V' - Consider hexadecimal for huge integer literals to avoid decimal conversion limits. + "test_variants_decompress_into" + ]; + disabledTestPaths = [ "benchmarks/test_bench.py" ]; From 65000532a2b1fc7e765bc4d0f56ca4ce28d8640f Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 13 Apr 2025 12:06:39 +0300 Subject: [PATCH 076/101] kdePackages: Frameworks 6.12 -> 6.13 --- pkgs/kde/generated/sources/frameworks.json | 432 ++++++++++----------- 1 file changed, 216 insertions(+), 216 deletions(-) diff --git a/pkgs/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json index 6d69bb11ca55..7cc16f3efb7a 100644 --- a/pkgs/kde/generated/sources/frameworks.json +++ b/pkgs/kde/generated/sources/frameworks.json @@ -1,362 +1,362 @@ { "attica": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/attica-6.12.0.tar.xz", - "hash": "sha256-UnV/+x6gHjvrdCUy9n0cy96aVi46/9YhRDvxPZN864I=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/attica-6.13.0.tar.xz", + "hash": "sha256-rMy3/2Lh5CH6pf/TgbQXd9DHv7omj64e2AK1GmvZioc=" }, "baloo": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/baloo-6.12.0.tar.xz", - "hash": "sha256-iYRPq5x5LfWioZ6DJC5Pxx/8X9UeGOKz2QY3cdUJa14=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/baloo-6.13.0.tar.xz", + "hash": "sha256-W0V02aSggL3JdekxvUEac4agwX/w1cV1HdJskgEBM/g=" }, "bluez-qt": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/bluez-qt-6.12.0.tar.xz", - "hash": "sha256-2KhM0zoTRTAUhzkcbcYl4ne1olRNc2Dl9u2gKjTMdVg=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/bluez-qt-6.13.0.tar.xz", + "hash": "sha256-GpmVSgqtcNMOe2DoC2czJTR0PsRVbr2yem9AtvEUkUI=" }, "breeze-icons": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/breeze-icons-6.12.0.tar.xz", - "hash": "sha256-Gvl5pnwFOfJ6j8v/lzyRJFWEv7Jg3WTCBrxpFXXLtmg=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/breeze-icons-6.13.0.tar.xz", + "hash": "sha256-dtoFRILAuX4K5ouUqsqRmMUAKI3teLNL2ws8uIxHO10=" }, "extra-cmake-modules": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/extra-cmake-modules-6.12.0.tar.xz", - "hash": "sha256-5U6HNl4ZPIBpZulpgyC96BmBIZV0ch/xlwqYFjyO1aA=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/extra-cmake-modules-6.13.0.tar.xz", + "hash": "sha256-cAYBfADIF/9MBWmVFG0nF5HRSHo5jTnqbKwc1ZqL9AI=" }, "frameworkintegration": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/frameworkintegration-6.12.0.tar.xz", - "hash": "sha256-mw1qoaUUkzMd4S5I4JHbHVTu9BEgx88+qLpn3/jtPEE=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/frameworkintegration-6.13.0.tar.xz", + "hash": "sha256-GCuRHJoI3piQwkJ+ihz8ICtK4FrqN8bZOaRJv6mH8x8=" }, "kapidox": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kapidox-6.12.0.tar.xz", - "hash": "sha256-N+BjcFYUHNw6c353PSyq4yN9ExQGvrAJYMEI6OYWBpg=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kapidox-6.13.0.tar.xz", + "hash": "sha256-820HphMbOUf0yMX4XapiDpI2sF/R5kpe7Hrxo5LLNjE=" }, "karchive": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/karchive-6.12.0.tar.xz", - "hash": "sha256-kKU5fV3zqQSGtNfvrqspgptjqHeyXiPln18S9DH4KQQ=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/karchive-6.13.0.tar.xz", + "hash": "sha256-PJtdzzq9/idh4hU9cNnWZ/H/D9L2yArdunVJ2pVPzJA=" }, "kauth": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kauth-6.12.0.tar.xz", - "hash": "sha256-BM9PHC0ezet4z9mG4h1Iq1May+aUIPNDIH3Wbaj/nZM=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kauth-6.13.0.tar.xz", + "hash": "sha256-ozvweCjYjPSZyL/nF/Avfiidz09YuPOq6eL5VhWo2NY=" }, "kbookmarks": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kbookmarks-6.12.0.tar.xz", - "hash": "sha256-G27cIKenl/4qGQ1aeKO20PRtHnsbLIFkbeMXa/dPjjo=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kbookmarks-6.13.0.tar.xz", + "hash": "sha256-ax1T1I46jS2vgzXxBcM4n5lwi+Rv98wC3uXVkOZtstI=" }, "kcalendarcore": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kcalendarcore-6.12.0.tar.xz", - "hash": "sha256-+HD6Tjn5HgT55o8qPrD0lHmEYAW7DNQYA8khD16V4lE=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kcalendarcore-6.13.0.tar.xz", + "hash": "sha256-4VBKhR85+/m+rAXWIspG671unysRBuccXUu/fKf6H0E=" }, "kcmutils": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kcmutils-6.12.0.tar.xz", - "hash": "sha256-eqzS8G8POTYx/AWBiLkq1Vkphx6Tqi6j3iqdCzWjasc=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kcmutils-6.13.0.tar.xz", + "hash": "sha256-EfAyO4250hUXlirw/7vvW6P5PA8RmIHe0IvpQA3BXI8=" }, "kcodecs": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kcodecs-6.12.0.tar.xz", - "hash": "sha256-blhSlUqeg3UONG+GA+gUYBDNyNfVRKXl1etG2TyUqRE=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kcodecs-6.13.0.tar.xz", + "hash": "sha256-3d3gXZcNAmrmorMeNVlTIQf03mDybX2HpFczF24SIII=" }, "kcolorscheme": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kcolorscheme-6.12.0.tar.xz", - "hash": "sha256-9CJpmce5ydqN6e2eMXT8pJ94ZNoNodC8lmjERI9mdRI=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kcolorscheme-6.13.0.tar.xz", + "hash": "sha256-irilZ724uD9kgkrT1EkHfsuS9zAkMU9V7qt3d9kSnt8=" }, "kcompletion": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kcompletion-6.12.0.tar.xz", - "hash": "sha256-jNMReVtdFcB7IbNsESTOTxqgoYo6A//ylgjkyt0JGpw=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kcompletion-6.13.0.tar.xz", + "hash": "sha256-VVzqytv9kaBZ3t49nwapOThY/eoStVhBNa1BOaKnkQo=" }, "kconfig": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kconfig-6.12.0.tar.xz", - "hash": "sha256-A9HQkFTWRsZ/yqnx+lMVeBGtB+9Ao4ufTgtSrjFzsb8=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kconfig-6.13.0.tar.xz", + "hash": "sha256-LsZsmWKI30cvzDq6UFQOJm+2IY1g0456SkRdSxk/lEU=" }, "kconfigwidgets": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kconfigwidgets-6.12.0.tar.xz", - "hash": "sha256-ZtpiyQtrBuW+xo5pH3DJwwL+TcX9TeUANZV9p/Ro0mY=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kconfigwidgets-6.13.0.tar.xz", + "hash": "sha256-xd9V1zsRb+VmhjzDuQvU7f1cSYnxIez9jgwffI5ANlo=" }, "kcontacts": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kcontacts-6.12.0.tar.xz", - "hash": "sha256-TI4LdCAcSDiM7c/7djen9Gt1r+ao8IggappEGNQ/KoA=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kcontacts-6.13.0.tar.xz", + "hash": "sha256-w/OJ+eQfKq6+XGssb7wzkn9kQjyyTMJA9h6T28BXUG8=" }, "kcoreaddons": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kcoreaddons-6.12.0.tar.xz", - "hash": "sha256-ezfo1OGFvN2L/RZsc59628sHMM3xQNZKMI97lrGEVzY=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kcoreaddons-6.13.0.tar.xz", + "hash": "sha256-oRC8MwPFQfusPi06qTwuslQTBV3iRjSmkDQhD23929s=" }, "kcrash": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kcrash-6.12.0.tar.xz", - "hash": "sha256-wLlhENJfqjVYesSvMM0eOoASEz/KwSJ26LJZd82bhKQ=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kcrash-6.13.0.tar.xz", + "hash": "sha256-Ji4prbpEXT0AslBD5TwCPzKix93hFxHCpIPDU21XuV8=" }, "kdav": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kdav-6.12.0.tar.xz", - "hash": "sha256-sHPWBCvxRIAcFrPBnhuKKoGDuJOTl6w86qQ9IGhDML4=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kdav-6.13.0.tar.xz", + "hash": "sha256-12fo9RWNf0wfWI8XKGF3FFiA2Az7LiFfVUpsgg+GsNk=" }, "kdbusaddons": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kdbusaddons-6.12.0.tar.xz", - "hash": "sha256-wjbHCSK5ZAp9/jrIELDXQ1Vd9K65RTZ15WpEnuwexSE=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kdbusaddons-6.13.0.tar.xz", + "hash": "sha256-my8WBFo4sNsU0ZRqPfVSrtRe2smB5b/2n8l1Kryxf54=" }, "kdeclarative": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kdeclarative-6.12.0.tar.xz", - "hash": "sha256-thIfcgM7Nh9AjecSX2H0DPFOnGxU6rlcRtquAoEuc7A=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kdeclarative-6.13.0.tar.xz", + "hash": "sha256-6CjjYz2PBv69a7HK9dyYMhjofJ+1qxJZQptnb5awoyg=" }, "kded": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kded-6.12.0.tar.xz", - "hash": "sha256-YBrJZL2EFFbRyu/pWwSj3wVcqFg9dTNTpVtHpt+2g+g=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kded-6.13.0.tar.xz", + "hash": "sha256-cHWkLQcMQksIODzrAedms0lXvjfP201xNs29+ECTH7g=" }, "kdesu": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kdesu-6.12.0.tar.xz", - "hash": "sha256-wZ2Nz0x0rXTilAOj79FmIIZF7c7xQpdf+t87Icwi508=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kdesu-6.13.0.tar.xz", + "hash": "sha256-a+keshkSuyUh9OTxkmdjnDvtM6td0J958nni+Uw4CmI=" }, "kdnssd": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kdnssd-6.12.0.tar.xz", - "hash": "sha256-q7RTjqVsff6e2gYzii3TuA9HMmODpsWiPyoJrV+svpg=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kdnssd-6.13.0.tar.xz", + "hash": "sha256-49Jd+qOIbf9IUeW4j2Uva8bo6HGHCL2AukmHUUGQfoI=" }, "kdoctools": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kdoctools-6.12.0.tar.xz", - "hash": "sha256-DHLfRaYkeMKvELglXswYunnkEI/0spChNoHjU89cfhc=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kdoctools-6.13.0.tar.xz", + "hash": "sha256-tcXAJdJpyDlHfz8mTAl68HTnPysHrRqGgzZ/OV0qyq0=" }, "kfilemetadata": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kfilemetadata-6.12.0.tar.xz", - "hash": "sha256-X7OaNwUVQxfu/3i366d2tRpEY0oSFrYOvn9i7METGPc=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kfilemetadata-6.13.0.tar.xz", + "hash": "sha256-CQ/NBVd815QOcHL8+IVfGn8Hb/Ca4zl7v6QGgd6kvp4=" }, "kglobalaccel": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kglobalaccel-6.12.0.tar.xz", - "hash": "sha256-HF5+TZtoYus2ofbCP9n/9LS88LT610C65cpY4VyEB/Q=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kglobalaccel-6.13.0.tar.xz", + "hash": "sha256-mVTxaozyV/RWnP27ZKhCz1N/4vr2tPqP4Y9idE7+lrA=" }, "kguiaddons": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kguiaddons-6.12.0.tar.xz", - "hash": "sha256-45SCbK3hxdlJEWbzo/TQw9YlvycQY1JnigbS7FNkxTI=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kguiaddons-6.13.0.tar.xz", + "hash": "sha256-koCg8E8puOT/q+PJQmIeLGCSvcADejq54LmeXqVohL8=" }, "kholidays": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kholidays-6.12.0.tar.xz", - "hash": "sha256-aYx3RO0ExdOVlgtPTIwHz196KBy5zsaL8w/beEFVA8M=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kholidays-6.13.0.tar.xz", + "hash": "sha256-N9Kur7LHaV923cCY0HZG639loDrufItf7Qq3xO8mR3U=" }, "ki18n": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/ki18n-6.12.0.tar.xz", - "hash": "sha256-zRrbzeG637esiUXDwKmvwCsu1kLHaddOG8twoC0HDcU=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/ki18n-6.13.0.tar.xz", + "hash": "sha256-AIwKMiNdwqfTqi+pqYpUDxtLr2q179FIOaEf2m50ahQ=" }, "kiconthemes": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kiconthemes-6.12.0.tar.xz", - "hash": "sha256-VLG18oORYtmAhzMocWswzwj5D9B5rYVMwJh4rZs3bs8=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kiconthemes-6.13.0.tar.xz", + "hash": "sha256-oyeMXSnC/bDvXdcqDV+bWnXAcmYwJuHk/bsn9Rv6WqE=" }, "kidletime": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kidletime-6.12.0.tar.xz", - "hash": "sha256-2KiIqMgDMU66l63yDkj51ZYExIC7A0KLfugycBAPpsM=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kidletime-6.13.0.tar.xz", + "hash": "sha256-7hfT983VBzkODpupaJa33PqgCOOFqdtCMge8PuI25tw=" }, "kimageformats": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kimageformats-6.12.0.tar.xz", - "hash": "sha256-ye/zCJlTC2GT7nhVtFLwc7C2tvkyVRYZXAhDlc3O2jY=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kimageformats-6.13.0.tar.xz", + "hash": "sha256-jKzpLcSc4krYZbMdG/suqy189VBUJmD50qFtvptH804=" }, "kio": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kio-6.12.0.tar.xz", - "hash": "sha256-FYHk+IV1DwijE0+tR7gelTVW4/yUAok5tH/64KtDLu4=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kio-6.13.0.tar.xz", + "hash": "sha256-QxVS0LdA81fE233i4o3PDsKOK/sEGgQtpXCK4m7CogM=" }, "kirigami": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kirigami-6.12.0.tar.xz", - "hash": "sha256-0Xfq4YqtNub0HTBxBORaj8xo2xR9uzM/bdsXiihGTnw=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kirigami-6.13.0.tar.xz", + "hash": "sha256-3Vqhtbj7xOtzEieFGvfKnKodyqwNyZQh29PQ1Y2Ygyk=" }, "kitemmodels": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kitemmodels-6.12.0.tar.xz", - "hash": "sha256-YmiDEQgrasoiYReBC8OZGwy5UVjexNTIANcKmb3P38g=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kitemmodels-6.13.0.tar.xz", + "hash": "sha256-QWxHkumRjE+Qnh2tj751UftWFwPALU4AAbNy3x+rWOY=" }, "kitemviews": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kitemviews-6.12.0.tar.xz", - "hash": "sha256-+NX/Lk5SNLzo7VaInYs9fpRVTsi0Djl9LprC/8EX49M=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kitemviews-6.13.0.tar.xz", + "hash": "sha256-4N6Mn6K6onvear04R7bV9MtUrs6rNDbGT4mlD+HZaV0=" }, "kjobwidgets": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kjobwidgets-6.12.0.tar.xz", - "hash": "sha256-7D4xSYwUCylvXkQuJSCCNDfybLYtcYbxFhN9GbvLnxI=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kjobwidgets-6.13.0.tar.xz", + "hash": "sha256-aPg4gSxDBCEsDSVhHEJRwnqHYIhbPbIt+pCTVcVzuJU=" }, "knewstuff": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/knewstuff-6.12.0.tar.xz", - "hash": "sha256-8LzKZsJn26M1499esImuQMVmgKfThRdrxE2VHe+j0Ck=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/knewstuff-6.13.0.tar.xz", + "hash": "sha256-M4hzzsoFk/A6dgcy5PjQ/RuwWfIbfe3N4T9eWUIm15g=" }, "knotifications": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/knotifications-6.12.0.tar.xz", - "hash": "sha256-0oJUc7zE93QjtSZqW5LoGKmpix1nKxwp2PI33RHpkCY=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/knotifications-6.13.0.tar.xz", + "hash": "sha256-0rEvHUroD3ALyHQRLs7pmx5EQ4xJuyqKd860xwVp+d0=" }, "knotifyconfig": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/knotifyconfig-6.12.0.tar.xz", - "hash": "sha256-U0SPmB0WVuQjNSoBcj3iq5k+W7o5pz9t5CLrTestqqs=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/knotifyconfig-6.13.0.tar.xz", + "hash": "sha256-q5s56/wd6C+Kq8OkQa/tcwICoz1ygoMI6tyBIy74ObQ=" }, "kpackage": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kpackage-6.12.0.tar.xz", - "hash": "sha256-qNZQX6alO/3MMfqPKtCpIm7J+vq8DAEgSQ++trAX+0o=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kpackage-6.13.0.tar.xz", + "hash": "sha256-piJpSqcj15t7SYjLK8UfhdIPyq/uAg90HuUgU9yFZIo=" }, "kparts": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kparts-6.12.0.tar.xz", - "hash": "sha256-uJeqMkED75dM5ROVVHP+Zf6uq6Td+Z+0zIZ3IRT6kww=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kparts-6.13.0.tar.xz", + "hash": "sha256-yNM2+rTTewlryfD/8tCm7yU5QFm8h/ypOwDqaynjPfQ=" }, "kpeople": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kpeople-6.12.0.tar.xz", - "hash": "sha256-pD3d54MlDX+1nT3814DPJ6t+QCj2snwDVR/Rei0xV+Y=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kpeople-6.13.0.tar.xz", + "hash": "sha256-OuwcoRHvIceScXCgDSDpcbWxlbGah98Yo65cuWh8+AQ=" }, "kplotting": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kplotting-6.12.0.tar.xz", - "hash": "sha256-RidBrgpxcNRT1KqT2BP/nQ7XDL42OIhVY3rpWxsRy/4=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kplotting-6.13.0.tar.xz", + "hash": "sha256-kYtW+dCsZ318Tr4/EknatcfUav2KKPlAdRZV+8STWRY=" }, "kpty": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kpty-6.12.0.tar.xz", - "hash": "sha256-hOcTzPYwyRo1HMrj2Vw7hXtn5Eb8SRpioBPcEBlPgDo=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kpty-6.13.0.tar.xz", + "hash": "sha256-r6j6jFeb0spLDMzGlCf5A1+n12zv4lhjnsF9lmqkNRM=" }, "kquickcharts": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kquickcharts-6.12.0.tar.xz", - "hash": "sha256-4zE7TcXiYBQloQPW9wzmHeoDQP6qBdH9mb9EU70d43o=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kquickcharts-6.13.0.tar.xz", + "hash": "sha256-vOB+laRg9EyxpRkalv2yLa/uaB8J2+0o/nUI4zIZ6gs=" }, "krunner": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/krunner-6.12.0.tar.xz", - "hash": "sha256-zgzjKC/J0fgRp7TEz7AV57n82NbKytlF6KOHV3E71Rs=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/krunner-6.13.0.tar.xz", + "hash": "sha256-XeF3Wm5drztygQ+biq/e6WXRS/Zwhkrq3kR45Q8E9Ts=" }, "kservice": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kservice-6.12.0.tar.xz", - "hash": "sha256-lTO5OpUE3fLx6OaWvPraDDeRAZ7o6M++4E2dHRS2uWQ=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kservice-6.13.0.tar.xz", + "hash": "sha256-ZdlUL3KdML49zBKqLr61AjjOTTCoUHdfmwBrm58cHNU=" }, "kstatusnotifieritem": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kstatusnotifieritem-6.12.0.tar.xz", - "hash": "sha256-Ww57IEktvZ1XQruv1vhXfcaCSAphXhll88U3QeaE/D0=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kstatusnotifieritem-6.13.0.tar.xz", + "hash": "sha256-7Th/3uPctbw/qVbva7mb0tTA7VbuXi8diauusMC03po=" }, "ksvg": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/ksvg-6.12.0.tar.xz", - "hash": "sha256-dAfNrJ8f43cK2oig4UuKx9+sbfE3FFAeHXGz0PBFanc=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/ksvg-6.13.0.tar.xz", + "hash": "sha256-m/DSp2JlV7Q8UIIbq30ZYKc/jrmB6okqZMtKESd+0ks=" }, "ktexteditor": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/ktexteditor-6.12.0.tar.xz", - "hash": "sha256-1dIepl+chKm9o/utPY33DHaSTZ1WGCIGnuuc6GKSSj8=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/ktexteditor-6.13.0.tar.xz", + "hash": "sha256-fBLvBh9FvcO17MXA7skInNZSHEmSF94HonPcZf3Xx88=" }, "ktexttemplate": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/ktexttemplate-6.12.0.tar.xz", - "hash": "sha256-n//X9skwmy/KOXz+29tV3tM+So5UOODc6/M7b5UAaZw=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/ktexttemplate-6.13.0.tar.xz", + "hash": "sha256-QFDOdt44rLgQTYwLbn7LOL8o/01lSZ7JEfsxbzg/ktk=" }, "ktextwidgets": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/ktextwidgets-6.12.0.tar.xz", - "hash": "sha256-aY4r5/xv0ntKpMGSoasLCrwIEhY5d1xP9PS0yB2PBB0=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/ktextwidgets-6.13.0.tar.xz", + "hash": "sha256-H/Kb8Cskfwn/qq/kV48Jd7UcQrZ+74T921Z33X0e3y4=" }, "kunitconversion": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kunitconversion-6.12.0.tar.xz", - "hash": "sha256-4pikWf+YHcgFKSBmBPpZkcJrzxnSiRdxaMOdubvA4II=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kunitconversion-6.13.0.tar.xz", + "hash": "sha256-II8DfoCJ+ZnguwqvhVcbOi00HNjkDBEbNerZ0mEAF+o=" }, "kuserfeedback": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kuserfeedback-6.12.0.tar.xz", - "hash": "sha256-b0VTezJ02Zw9Ubtc407++bVqZqhgkApjigbmZIsTMCw=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kuserfeedback-6.13.0.tar.xz", + "hash": "sha256-SMGGSC/npvEBen5Qs6Fv18EMEPf5Y8APMsYbsHNAS5o=" }, "kwallet": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kwallet-6.12.0.tar.xz", - "hash": "sha256-0j5/29pmZJBGK7v9UIeSTtRRtw3P9vpMmtNU257VrQA=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kwallet-6.13.0.tar.xz", + "hash": "sha256-Gm/yzPZgpDO9prAKyHN5bctGvSRDeH/PX75MQzyoyzY=" }, "kwidgetsaddons": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kwidgetsaddons-6.12.0.tar.xz", - "hash": "sha256-As5grIui5xcYBxX3+3CwJNMMQ2+C+rbOGlRGlqnwwc0=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kwidgetsaddons-6.13.0.tar.xz", + "hash": "sha256-oVOIKZlzGfivAETteuhPebThjPKzLKzU/cR0i48cdAY=" }, "kwindowsystem": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kwindowsystem-6.12.0.tar.xz", - "hash": "sha256-bn8Oob1bGw+B94X/D93rlDIiOC8cEbUgH2m2xidjtvY=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kwindowsystem-6.13.0.tar.xz", + "hash": "sha256-T6g0JPOal9f+eEUz0q1NSWn/h40mQ43ancAOMHRZWaw=" }, "kxmlgui": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/kxmlgui-6.12.0.tar.xz", - "hash": "sha256-PDCkTj1Rdt42r1a2wp2GQT/VjGOGZ5xiIqpNC0bQ2Iw=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/kxmlgui-6.13.0.tar.xz", + "hash": "sha256-4QZILTuxX3r97rVULg8PPKJrm1xjdKA8oYFT1dJ1DeY=" }, "modemmanager-qt": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/modemmanager-qt-6.12.0.tar.xz", - "hash": "sha256-HuUSPviznfy9zwTTEvAjS4Z2vNwO+sI8RiPAqJYvTto=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/modemmanager-qt-6.13.0.tar.xz", + "hash": "sha256-Je/TMsFq+PWNwzXowlnsPBOz5en0wq6tuH7KVi0029A=" }, "networkmanager-qt": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/networkmanager-qt-6.12.0.tar.xz", - "hash": "sha256-s7Asg2PqptULmHgOiSLDWgck0lT1sVYYe9oyD/gHqc0=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/networkmanager-qt-6.13.0.tar.xz", + "hash": "sha256-mp41laG5gWsnN7BBa52St24rDKCYnQ72WpXl+JWsNsE=" }, "prison": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/prison-6.12.0.tar.xz", - "hash": "sha256-AABM15tQ2zxDl/apKKvrnB3MNI3NQ3sVjFfa2uhshoE=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/prison-6.13.0.tar.xz", + "hash": "sha256-I8RuKJwn8drLDIMRer3GIbXAv+q0XNGHRksAaPcAA+E=" }, "purpose": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/purpose-6.12.0.tar.xz", - "hash": "sha256-r46HaFgvNXwI86F3Z0f0xKLFqMx9pVoK9WfOX1OtBg0=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/purpose-6.13.0.tar.xz", + "hash": "sha256-K6t0kHUFvulfqs3JyT6KlLKrM2Ual9KufWP9SD9Fgyc=" }, "qqc2-desktop-style": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/qqc2-desktop-style-6.12.0.tar.xz", - "hash": "sha256-j7jay+aPaPly3bHM7vFbnXDX5R7yBKbyX4MpgQyoliQ=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/qqc2-desktop-style-6.13.0.tar.xz", + "hash": "sha256-qKWozjQ+p3yx0LMAwS6GgpyRPgNsb/itXSG4+WIYQmo=" }, "solid": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/solid-6.12.0.tar.xz", - "hash": "sha256-S9lrOUcjvlM6MEBIBL5Avkld+uBaRDDAESI9YD19hmY=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/solid-6.13.0.tar.xz", + "hash": "sha256-VBnxGKmkXVx2qOK3G9K+Ox37UxP8JkSEu7ocLkRkBR8=" }, "sonnet": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/sonnet-6.12.0.tar.xz", - "hash": "sha256-vuzKUsuVoEp6BDeAKWWVBesXoL1N/wkV1+XhyKO3XNI=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/sonnet-6.13.0.tar.xz", + "hash": "sha256-1HRlqdYjJXz7AZLDpNwkczSQqolSMQQi5ALYKK1GHu4=" }, "syndication": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/syndication-6.12.0.tar.xz", - "hash": "sha256-vH0CgitnBfkxLsoR8vHE3aTuE3+JgYV1TpoXHkKORyA=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/syndication-6.13.0.tar.xz", + "hash": "sha256-H+B6WBcFZZdT+ZWn7gmXe/UosCCmWXg0m5cihi2gj7c=" }, "syntax-highlighting": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/syntax-highlighting-6.12.0.tar.xz", - "hash": "sha256-VkSvkAvqQNTaWo+eH7VzACMGrp4oSkOuU0LRphgQ5Is=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/syntax-highlighting-6.13.0.tar.xz", + "hash": "sha256-1vGbuIbW4cclHYE0l/FOzJ2sQTJTdk62Go86g2gGRQ0=" }, "threadweaver": { - "version": "6.12.0", - "url": "mirror://kde/stable/frameworks/6.12/threadweaver-6.12.0.tar.xz", - "hash": "sha256-7Hf7r7vZpr7wSOV+C9ZJmbHBezG0PVmjxamBqxjy4b4=" + "version": "6.13.0", + "url": "mirror://kde/stable/frameworks/6.13/threadweaver-6.13.0.tar.xz", + "hash": "sha256-ZKFi9J/SUmPdmSs+cIVLens7zRURS7ZwlbtRPECX45o=" } } \ No newline at end of file From 3a0d4ae3a598054ca17220d2fd679d1f238d1a86 Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Fri, 28 Mar 2025 19:01:55 +0000 Subject: [PATCH 077/101] buildPgrxExtension: restructure with lib.extendMkDerivation Support fixed-point arguments with lib.extendMkDerivation --- .../rust/cargo-pgrx/buildPgrxExtension.nix | 237 +++++++++--------- 1 file changed, 119 insertions(+), 118 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix b/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix index 9b8f5da950c8..3a2e952de352 100644 --- a/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix +++ b/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix @@ -47,146 +47,147 @@ # If the generated rust bindings aren't needed to use the extension, its a # unnecessary and heavy dependency. If you set this to true, you also # have to add `rustfmt` to `nativeBuildInputs`. +lib.extendMkDerivation { + constructDrv = rustPlatform.buildRustPackage; -{ - buildAndTestSubdir ? null, - buildType ? "release", - buildFeatures ? [ ], - cargoBuildFlags ? [ ], - cargoPgrxFlags ? [ ], - postgresql, - # cargo-pgrx calls rustfmt on generated bindings, this is not strictly necessary, so we avoid the - # dependency here. Set to false and provide rustfmt in nativeBuildInputs, if you need it, e.g. - # if you include the generated code in the output via postInstall. - useFakeRustfmt ? true, - usePgTestCheckFeature ? true, - ... -}@args: -let - rustfmtInNativeBuildInputs = lib.lists.any (dep: lib.getName dep == "rustfmt") ( - args.nativeBuildInputs or [ ] - ); -in - -assert lib.asserts.assertMsg ( - (args.installPhase or "") == "" -) "buildPgrxExtensions overwrites the installPhase, so providing one does nothing"; -assert lib.asserts.assertMsg ( - (args.buildPhase or "") == "" -) "buildPgrxExtensions overwrites the buildPhase, so providing one does nothing"; -assert lib.asserts.assertMsg (useFakeRustfmt -> !rustfmtInNativeBuildInputs) - "The parameter useFakeRustfmt is set to true, but rustfmt is included in nativeBuildInputs. Either set useFakeRustfmt to false or remove rustfmt from nativeBuildInputs."; -assert lib.asserts.assertMsg (!useFakeRustfmt -> rustfmtInNativeBuildInputs) - "The parameter useFakeRustfmt is set to false, but rustfmt is not included in nativeBuildInputs. Either set useFakeRustfmt to true or add rustfmt from nativeBuildInputs."; - -let - fakeRustfmt = writeShellScriptBin "rustfmt" '' - exit 0 - ''; - maybeDebugFlag = lib.optionalString (buildType != "release") "--debug"; - maybeEnterBuildAndTestSubdir = lib.optionalString (buildAndTestSubdir != null) '' - export CARGO_TARGET_DIR="$(pwd)/target" - pushd "${buildAndTestSubdir}" - ''; - maybeLeaveBuildAndTestSubdir = lib.optionalString (buildAndTestSubdir != null) "popd"; - - pgrxPostgresMajor = lib.versions.major postgresql.version; - preBuildAndTest = '' - export PGRX_HOME="$(mktemp -d)" - export PGDATA="$PGRX_HOME/data-${pgrxPostgresMajor}/" - cargo-pgrx pgrx init "--pg${pgrxPostgresMajor}" ${lib.getDev postgresql}/bin/pg_config - - # unix sockets work in sandbox, too. - export PGHOST="$(mktemp -d)" - cat > "$PGDATA/postgresql.conf" < !rustfmtInNativeBuildInputs) + "The parameter useFakeRustfmt is set to true, but rustfmt is included in nativeBuildInputs. Either set useFakeRustfmt to false or remove rustfmt from nativeBuildInputs."; + assert lib.asserts.assertMsg (!useFakeRustfmt -> rustfmtInNativeBuildInputs) + "The parameter useFakeRustfmt is set to false, but rustfmt is not included in nativeBuildInputs. Either set useFakeRustfmt to true or add rustfmt from nativeBuildInputs."; - nativeBuildInputs = - (args.nativeBuildInputs or [ ]) - ++ [ - cargo-pgrx - postgresql - pkg-config - rustPlatform.bindgenHook - ] - ++ lib.optionals useFakeRustfmt [ fakeRustfmt ]; + let + fakeRustfmt = writeShellScriptBin "rustfmt" '' + exit 0 + ''; + maybeDebugFlag = lib.optionalString (buildType != "release") "--debug"; + maybeEnterBuildAndTestSubdir = lib.optionalString (buildAndTestSubdir != null) '' + export CARGO_TARGET_DIR="$(pwd)/target" + pushd "${buildAndTestSubdir}" + ''; + maybeLeaveBuildAndTestSubdir = lib.optionalString (buildAndTestSubdir != null) "popd"; - buildPhase = '' - runHook preBuild + pgrxPostgresMajor = lib.versions.major postgresql.version; + preBuildAndTest = '' + export PGRX_HOME="$(mktemp -d)" + export PGDATA="$PGRX_HOME/data-${pgrxPostgresMajor}/" + cargo-pgrx pgrx init "--pg${pgrxPostgresMajor}" ${lib.getDev postgresql}/bin/pg_config - echo "Executing cargo-pgrx buildPhase" - ${preBuildAndTest} - ${maybeEnterBuildAndTestSubdir} + # unix sockets work in sandbox, too. + export PGHOST="$(mktemp -d)" + cat > "$PGDATA/postgresql.conf" < Date: Fri, 28 Mar 2025 19:10:40 +0000 Subject: [PATCH 078/101] buildPgrxExtension: add missing doc of usePgTestCheckFeature and fix typo --- .../development/tools/rust/cargo-pgrx/buildPgrxExtension.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix b/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix index 3a2e952de352..b62db684d072 100644 --- a/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix +++ b/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix @@ -47,6 +47,7 @@ # If the generated rust bindings aren't needed to use the extension, its a # unnecessary and heavy dependency. If you set this to true, you also # have to add `rustfmt` to `nativeBuildInputs`. +# - `usePgTestCheckFeature` Whether to enable the `pg_test` feature during the check phase. lib.extendMkDerivation { constructDrv = rustPlatform.buildRustPackage; @@ -80,10 +81,10 @@ lib.extendMkDerivation { assert lib.asserts.assertMsg ( (args.installPhase or "") == "" - ) "buildPgrxExtensions overwrites the installPhase, so providing one does nothing"; + ) "buildPgrxExtension overwrites the installPhase, so providing one does nothing"; assert lib.asserts.assertMsg ( (args.buildPhase or "") == "" - ) "buildPgrxExtensions overwrites the buildPhase, so providing one does nothing"; + ) "buildPgrxExtension overwrites the buildPhase, so providing one does nothing"; assert lib.asserts.assertMsg (useFakeRustfmt -> !rustfmtInNativeBuildInputs) "The parameter useFakeRustfmt is set to true, but rustfmt is included in nativeBuildInputs. Either set useFakeRustfmt to false or remove rustfmt from nativeBuildInputs."; assert lib.asserts.assertMsg (!useFakeRustfmt -> rustfmtInNativeBuildInputs) From b50641edc86094b0252da67cef6fed537cac5636 Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Fri, 28 Mar 2025 19:14:24 +0000 Subject: [PATCH 079/101] postgresqlPackages: use finalAttrs pattern on cargo-pgrx extensions --- .../sql/postgresql/ext/pgvecto-rs/package.nix | 10 +- .../postgresql/ext/pgvectorscale/package.nix | 155 +++++++++--------- pkgs/servers/sql/postgresql/ext/pgx_ulid.nix | 8 +- .../postgresql/ext/timescaledb_toolkit.nix | 6 +- 4 files changed, 88 insertions(+), 91 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix index ae5f6669f08c..1f0b4046fcd5 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix @@ -30,7 +30,7 @@ in cargo-pgrx = cargo-pgrx_0_12_0_alpha_1; rustPlatform = rustPlatform'; }) - rec { + (finalAttrs: { inherit postgresql; pname = "pgvecto-rs"; @@ -49,7 +49,7 @@ in src = fetchFromGitHub { owner = "tensorchord"; repo = "pgvecto.rs"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-X7BY2Exv0xQNhsS/GA7GNvj9OeVDqVCd/k3lUkXtfgE="; }; @@ -58,7 +58,7 @@ in # Set appropriate version on vectors.control, otherwise it won't show up on PostgreSQL postPatch = '' - substituteInPlace ./vectors.control --subst-var-by CARGO_VERSION ${version} + substituteInPlace ./vectors.control --subst-var-by CARGO_VERSION ${finalAttrs.version} ''; # Include upgrade scripts in the final package @@ -90,7 +90,7 @@ in || # PostgreSQL 17 support issue upstream: https://github.com/tensorchord/pgvecto.rs/issues/607 # Check after next package update. - lib.versionAtLeast postgresql.version "17" && version == "0.3.0"; + lib.versionAtLeast postgresql.version "17" && finalAttrs.version == "0.3.0"; description = "Scalable, Low-latency and Hybrid-enabled Vector Search in Postgres"; homepage = "https://github.com/tensorchord/pgvecto.rs"; license = lib.licenses.asl20; @@ -99,4 +99,4 @@ in esclear ]; }; - } + }) diff --git a/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix b/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix index 17b0692f9c4b..f25c7efc67b5 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix @@ -6,84 +6,81 @@ postgresqlTestExtension, }: -let - finalPackage = buildPgrxExtension rec { - pname = "pgvectorscale"; - version = "0.7.0"; +buildPgrxExtension (finalAttrs: { + pname = "pgvectorscale"; + version = "0.7.0"; - src = fetchFromGitHub { - owner = "timescale"; - repo = "pgvectorscale"; - tag = version; - hash = "sha256-dy481k2SvyYXwwcsyLZSl3XlhSk9C5+4LfEfciB1DK4="; - }; - - doCheck = false; - - useFetchCargoVendor = true; - cargoHash = "sha256-CeRyDn9VhxfjWFJ1/Z/XvOUQOSnDoHHZAqgfYTeKU0o="; - cargoPatches = [ - ./add-Cargo.lock.patch - ]; - - cargoPgrxFlags = [ - "-p" - "vectorscale" - ]; - - inherit postgresql; - - passthru.tests.extension = postgresqlTestExtension { - inherit finalPackage; - withPackages = [ "pgvector" ]; - sql = - let - genCheck = - id: compare: expected: - let - vecStr = "[${lib.concatMapStringsSep "," toString compare}]"; - in - '' - ASSERT ( - SELECT id - FROM document_embedding - WHERE ${toString expected} = (embedding <-> '${vecStr}') - ) = ${toString id}, - 'Expected vector of row with ID=${toString id} to have a euclidean distance from ${vecStr} of ${toString expected}'; - ''; - in - '' - CREATE EXTENSION vectorscale CASCADE; - CREATE TABLE IF NOT EXISTS document_embedding ( - id BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, - embedding VECTOR(3) - ); - - INSERT INTO document_embedding (id, embedding) VALUES - (1, '[1,2,4]'), - (2, '[1,2,5]'); - - CREATE INDEX document_embedding_idx ON document_embedding - USING diskann (embedding vector_cosine_ops); - - DO $$ - BEGIN - ${genCheck 1 [ 1 2 3 ] 1} - ${genCheck 2 [ 1 2 3 ] 2} - END; - $$ - LANGUAGE PLPGSQL; - ''; - }; - - meta = { - homepage = "https://github.com/timescale/pgvectorscale"; - maintainers = lib.teams.flyingcircus.members; - description = "Complement to pgvector for high performance, cost efficient vector search on large workloads"; - license = lib.licenses.postgresql; - platforms = postgresql.meta.platforms; - changelog = "https://github.com/timescale/pgvectorscale/releases/tag/${version}"; - }; + src = fetchFromGitHub { + owner = "timescale"; + repo = "pgvectorscale"; + tag = finalAttrs.version; + hash = "sha256-dy481k2SvyYXwwcsyLZSl3XlhSk9C5+4LfEfciB1DK4="; }; -in -finalPackage + + doCheck = false; + + useFetchCargoVendor = true; + cargoHash = "sha256-CeRyDn9VhxfjWFJ1/Z/XvOUQOSnDoHHZAqgfYTeKU0o="; + cargoPatches = [ + ./add-Cargo.lock.patch + ]; + + cargoPgrxFlags = [ + "-p" + "vectorscale" + ]; + + inherit postgresql; + + passthru.tests.extension = postgresqlTestExtension { + inherit (finalAttrs) finalPackage; + withPackages = [ "pgvector" ]; + sql = + let + genCheck = + id: compare: expected: + let + vecStr = "[${lib.concatMapStringsSep "," toString compare}]"; + in + '' + ASSERT ( + SELECT id + FROM document_embedding + WHERE ${toString expected} = (embedding <-> '${vecStr}') + ) = ${toString id}, + 'Expected vector of row with ID=${toString id} to have a euclidean distance from ${vecStr} of ${toString expected}'; + ''; + in + '' + CREATE EXTENSION vectorscale CASCADE; + CREATE TABLE IF NOT EXISTS document_embedding ( + id BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, + embedding VECTOR(3) + ); + + INSERT INTO document_embedding (id, embedding) VALUES + (1, '[1,2,4]'), + (2, '[1,2,5]'); + + CREATE INDEX document_embedding_idx ON document_embedding + USING diskann (embedding vector_cosine_ops); + + DO $$ + BEGIN + ${genCheck 1 [ 1 2 3 ] 1} + ${genCheck 2 [ 1 2 3 ] 2} + END; + $$ + LANGUAGE PLPGSQL; + ''; + }; + + meta = { + homepage = "https://github.com/timescale/pgvectorscale"; + maintainers = lib.teams.flyingcircus.members; + description = "Complement to pgvector for high performance, cost efficient vector search on large workloads"; + license = lib.licenses.postgresql; + platforms = postgresql.meta.platforms; + changelog = "https://github.com/timescale/pgvectorscale/releases/tag/${finalAttrs.version}"; + }; +}) diff --git a/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix b/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix index 3db15229739a..68fa56b77ef1 100644 --- a/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix +++ b/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix @@ -6,7 +6,7 @@ postgresql, util-linux, }: -buildPgrxExtension rec { +buildPgrxExtension (finalAttrs: { inherit postgresql; pname = "pgx_ulid"; @@ -15,7 +15,7 @@ buildPgrxExtension rec { src = fetchFromGitHub { owner = "pksunkara"; repo = "pgx_ulid"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-VdLWwkUA0sVs5Z/Lyf5oTRhcHVzPmhgnYQhIM8MWJ0c="; }; @@ -42,8 +42,8 @@ buildPgrxExtension rec { broken = lib.versionOlder postgresql.version "14"; description = "ULID Postgres extension written in Rust"; homepage = "https://github.com/pksunkara/pgx_ulid"; - changelog = "https://github.com/pksunkara/pgx_ulid/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/pksunkara/pgx_ulid/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ myypo ]; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix index 3c294a0338a7..12b4c101356b 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix @@ -8,7 +8,7 @@ postgresql, }: -(buildPgrxExtension.override { cargo-pgrx = cargo-pgrx_0_12_6; }) rec { +(buildPgrxExtension.override { cargo-pgrx = cargo-pgrx_0_12_6; }) (finalAttrs: { inherit postgresql; pname = "timescaledb_toolkit"; @@ -17,7 +17,7 @@ src = fetchFromGitHub { owner = "timescale"; repo = "timescaledb-toolkit"; - tag = version; + tag = finalAttrs.version; hash = "sha256-7yUbtWbYL4AnuUX8OXG4OVqYCY2Lf0pISSTlcFdPqog="; }; @@ -40,4 +40,4 @@ platforms = postgresql.meta.platforms; license = lib.licenses.tsl; }; -} +}) From 8aa483cc85cdcb0d3b4398741b4fc3cbd5e35a9d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Apr 2025 11:55:42 +0000 Subject: [PATCH 080/101] python312Packages.pyexploitdb: 0.2.75 -> 0.2.76 --- pkgs/development/python-modules/pyexploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 32c92136fb16..f6151005ae3b 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.75"; + version = "0.2.76"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-rQP9OuWK+kEyc5DipPo0tPagvHm1Rl1YVUiALL7OKvQ="; + hash = "sha256-HcedkHQVatxyoVHRxivTd5vPxs4zMkLC2X27cmmAcMo="; }; build-system = [ setuptools ]; From 33afcf8ca0722e2728a86705658ac17ab881fd30 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 13 Apr 2025 14:15:01 +0200 Subject: [PATCH 081/101] doc/neovim: fix some gaps --- doc/languages-frameworks/neovim.section.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/languages-frameworks/neovim.section.md b/doc/languages-frameworks/neovim.section.md index 3a701a9edad0..1c58170e3fe6 100644 --- a/doc/languages-frameworks/neovim.section.md +++ b/doc/languages-frameworks/neovim.section.md @@ -63,7 +63,7 @@ For instance, `sqlite-lua` needs `g:sqlite_clib_path` to be set to work. Nixpkgs - `plugins`: A list of plugins to add to the wrapper. ``` -wrapNeovimUnstable { +wrapNeovimUnstable neovim-unwrapped { autoconfigure = true; autowrapRuntimeDeps = true; luaRcContent = '' @@ -105,10 +105,10 @@ patch those plugins but expose the necessary configuration under `PLUGIN.passthru.initLua` for neovim plugins. For instance, the `unicode-vim` plugin needs the path towards a unicode database so we expose the following snippet `vim.g.Unicode_data_directory="${self.unicode-vim}/autoload/unicode"` under `vimPlugins.unicode-vim.passthru.initLua`. -#### {#neovim-luarocks-based-plugins} +#### LuaRocks based plugins {#neovim-luarocks-based-plugins} In order to automatically handle plugin dependencies, several neovim plugins -upload their package to [](www.luarocks.org). This means less work for nixpkgs maintainers in the long term as dependencies get updated automatically. +upload their package to [LuaRocks](https://www.luarocks.org). This means less work for nixpkgs maintainers in the long term as dependencies get updated automatically. This means several neovim plugins are first packaged as nixpkgs [lua packages](#packaging-a-library-on-luarocks), and converted via `buildNeovimPlugin` in a vim plugin. This conversion is necessary because neovim expects lua folders to be From f4cf1256096908ab96d28010deaa3eb9b733a8af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Apr 2025 12:38:31 +0000 Subject: [PATCH 082/101] yaziPlugins.toggle-pane: 25.2.26-unstable-2025-03-02 -> 25.2.26-unstable-2025-03-19 --- pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix b/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix index a77ea05970eb..5a1cefc8fda9 100644 --- a/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix @@ -5,7 +5,7 @@ }: mkYaziPlugin { pname = "toggle-pane.yazi"; - version = "25.2.26-unstable-2025-03-02"; + version = "25.2.26-unstable-2025-03-19"; src = fetchFromGitHub { owner = "yazi-rs"; From 0eb521fb3359a0ea40f4948a5fa8718142d72a7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Apr 2025 12:41:11 +0000 Subject: [PATCH 083/101] yaziPlugins.duckdb: 25.4.8-unstable-2025-04-08 -> 25.4.8-unstable-2025-04-09 --- pkgs/by-name/ya/yazi/plugins/duckdb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ya/yazi/plugins/duckdb/default.nix b/pkgs/by-name/ya/yazi/plugins/duckdb/default.nix index 92a797a83ba4..9e022261fbad 100644 --- a/pkgs/by-name/ya/yazi/plugins/duckdb/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/duckdb/default.nix @@ -5,7 +5,7 @@ }: mkYaziPlugin { pname = "duckdb.yazi"; - version = "25.4.8-unstable-2025-04-08"; + version = "25.4.8-unstable-2025-04-09"; src = fetchFromGitHub { owner = "wylie102"; From 291b95c7e851cfb66d5633b19c741afaa9980f2c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Apr 2025 13:01:13 +0000 Subject: [PATCH 084/101] yaziPlugins.time-travel: 0-unstable-2025-03-02 -> 0-unstable-2025-02-14 --- pkgs/by-name/ya/yazi/plugins/time-travel/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ya/yazi/plugins/time-travel/default.nix b/pkgs/by-name/ya/yazi/plugins/time-travel/default.nix index a1894e8b2653..da12b23cccaf 100644 --- a/pkgs/by-name/ya/yazi/plugins/time-travel/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/time-travel/default.nix @@ -5,7 +5,7 @@ }: mkYaziPlugin { pname = "time-travel.yazi"; - version = "0-unstable-2025-03-02"; + version = "0-unstable-2025-02-14"; src = fetchFromGitHub { owner = "iynaix"; From 26cd709f351ff2a7e5791cd81d0be31ea7be18d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Apr 2025 13:02:20 +0000 Subject: [PATCH 085/101] yaziPlugins.projects: 0-unstable-2025-03-02 -> 0-unstable-2025-03-03 --- pkgs/by-name/ya/yazi/plugins/projects/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ya/yazi/plugins/projects/default.nix b/pkgs/by-name/ya/yazi/plugins/projects/default.nix index cf8c7d54b35a..f0a9cf929391 100644 --- a/pkgs/by-name/ya/yazi/plugins/projects/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/projects/default.nix @@ -5,7 +5,7 @@ }: mkYaziPlugin { pname = "projects.yazi"; - version = "0-unstable-2025-03-02"; + version = "0-unstable-2025-03-03"; src = fetchFromGitHub { owner = "MasouShizuka"; From 1bbfe38c495076e0a981298c9f34c8b71ef7b8f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Apr 2025 13:07:09 +0000 Subject: [PATCH 086/101] yaziPlugins.vcs-files: 25.3.7-unstable-2025-03-07 -> 25.4.8-unstable-2025-04-08 --- pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix b/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix index f83d4d766a21..e4dec9f79c42 100644 --- a/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "vcs-files.yazi"; - version = "25.3.7-unstable-2025-03-07"; + version = "25.4.8-unstable-2025-04-08"; src = fetchFromGitHub { owner = "yazi-rs"; repo = "plugins"; - rev = "273019910c1111a388dd20e057606016f4bd0d17"; - hash = "sha256-80mR86UWgD11XuzpVNn56fmGRkvj0af2cFaZkU8M31I="; + rev = "a1738e8088366ba73b33da5f45010796fb33221e"; + hash = "sha256-eiLkIWviGzG9R0XP1Cik3Bg0s6lgk3nibN6bZvo8e9o="; }; meta = { From ed0bba96c4d4278ceb94cb6e22a2faea620e7126 Mon Sep 17 00:00:00 2001 From: Artur Manuel Date: Sun, 13 Apr 2025 03:39:25 +0100 Subject: [PATCH 087/101] rose-pine-kvantum: init at unstable-2025-03-26 I have added a new package: `rose-pine-kvantum-unstable-2025-03-26`. This package provides a Rose-Pine theme for Kvantum. --- pkgs/by-name/ro/rose-pine-kvantum/package.nix | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/ro/rose-pine-kvantum/package.nix diff --git a/pkgs/by-name/ro/rose-pine-kvantum/package.nix b/pkgs/by-name/ro/rose-pine-kvantum/package.nix new file mode 100644 index 000000000000..ea0b6a3ed42c --- /dev/null +++ b/pkgs/by-name/ro/rose-pine-kvantum/package.nix @@ -0,0 +1,36 @@ +{ + stdenvNoCC, + fetchFromGitHub, + lib, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "rose-pine-kvantum"; + version = "0-unstable-2025-03-26"; + + src = fetchFromGitHub { + owner = "rose-pine"; + repo = "kvantum"; + rev = "5a51f5892ba752088dee062a6188b9f0bb59324b"; + hash = "sha256-lUO3Bg9+KbPkllKu2sv9ueV1dcZu4qRn32N/+4+2B4A="; + }; + + dontBuild = true; + installPhase = '' + runHook preInstall + + mkdir -p $out/share/Kvantum/themes + for i in $(find . -iname "*.tar.gz"); do + tar -xf $i -C $out/share/Kvantum/themes + done + + runHook postInstall + ''; + + meta = { + description = "Kvantum-themes based on Rose Pine"; + homepage = "https://github.com/rose-pine/kvantum"; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ amadaluzia ]; + license = lib.licenses.unfree; # rose-pine/kvantum#1 + }; +}) From 23a78441525657b5a85afc2cc3bc76bf77534226 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 13 Apr 2025 21:15:50 +0800 Subject: [PATCH 088/101] README: change the url of nixos-hires.png --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 92184fbf1145..5b00a40c4c0c 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@

- + - NixOS logo + NixOS logo

From 0c507df09065042189f9e5f4cfcf612006e9a2e2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 20 Sep 2024 07:48:01 +0200 Subject: [PATCH 089/101] mistral-rs: fix cuda support Co-authored-by: Someone Serge --- pkgs/by-name/mi/mistral-rs/package.nix | 31 +++++++++++++++++++------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/mi/mistral-rs/package.nix b/pkgs/by-name/mi/mistral-rs/package.nix index cb65ef0c7110..9903ed90480a 100644 --- a/pkgs/by-name/mi/mistral-rs/package.nix +++ b/pkgs/by-name/mi/mistral-rs/package.nix @@ -7,6 +7,8 @@ # nativeBuildInputs pkg-config, python3, + autoPatchelfHook, + autoAddDriverRunpath, # buildInputs oniguruma, @@ -86,10 +88,19 @@ rustPlatform.buildRustPackage (finalAttrs: { useFetchCargoVendor = true; cargoHash = "sha256-YGGtS8gJJQKIgXxMWjO05ikSVdfVNs+cORbJ+Wf88y4="; - nativeBuildInputs = [ - pkg-config - python3 - ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; + nativeBuildInputs = + [ + pkg-config + python3 + ] + ++ lib.optionals cudaSupport [ + # WARNING: autoAddDriverRunpath must run AFTER autoPatchelfHook + # Otherwise, autoPatchelfHook removes driverLink from RUNPATH + autoPatchelfHook + autoAddDriverRunpath + + cudaPackages.cuda_nvcc + ]; buildInputs = [ @@ -97,6 +108,7 @@ rustPlatform.buildRustPackage (finalAttrs: { openssl ] ++ lib.optionals cudaSupport [ + cudaPackages.cuda_cccl cudaPackages.cuda_cudart cudaPackages.cuda_nvrtc cudaPackages.libcublas @@ -132,13 +144,16 @@ rustPlatform.buildRustPackage (finalAttrs: { // (lib.optionalAttrs cudaSupport { CUDA_COMPUTE_CAP = cudaCapability'; - # Apparently, cudart is enough: No need to provide the entire cudaPackages.cudatoolkit derivation. + # We already list CUDA dependencies in buildInputs + # We only set CUDA_TOOLKIT_ROOT_DIR to satisfy some redundant checks from upstream CUDA_TOOLKIT_ROOT_DIR = lib.getDev cudaPackages.cuda_cudart; }); - NVCC_PREPEND_FLAGS = lib.optionals cudaSupport [ - "-I${lib.getDev cudaPackages.cuda_cudart}/include" - "-I${lib.getDev cudaPackages.cuda_cccl}/include" + appendRunpaths = [ + (lib.makeLibraryPath [ + cudaPackages.libcublas + cudaPackages.libcurand + ]) ]; # swagger-ui will once more be copied in the target directory during the check phase From 25c1a6ee15a2f1ae2f4d47842a633272855ca911 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 13 Apr 2025 15:41:45 +0200 Subject: [PATCH 090/101] release-cuda: build mistral-rs on nix-community Hydra --- pkgs/top-level/release-cuda.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix index 4ebabe05e1f3..2d2deb1b34a2 100644 --- a/pkgs/top-level/release-cuda.nix +++ b/pkgs/top-level/release-cuda.nix @@ -105,6 +105,7 @@ let lightgbm = linux; llama-cpp = linux; meshlab = linux; + mistral-rs = linux; monado = linux; # Failed in https://github.com/NixOS/nixpkgs/pull/233581 noisetorch = linux; obs-studio-plugins.obs-backgroundremoval = linux; From 7a62b269028ee23323cfabc56c696e65b9413034 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Apr 2025 12:43:29 +0000 Subject: [PATCH 091/101] yaziPlugins.starship: 25.2.7-unstable-2025-02-23 -> 25.4.8-unstable-2025-04-09 --- pkgs/by-name/ya/yazi/plugins/starship/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yazi/plugins/starship/default.nix b/pkgs/by-name/ya/yazi/plugins/starship/default.nix index d08ed87232b0..f3cc5e0863c6 100644 --- a/pkgs/by-name/ya/yazi/plugins/starship/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/starship/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "starship.yazi"; - version = "25.2.7-unstable-2025-02-23"; + version = "25.4.8-unstable-2025-04-09"; src = fetchFromGitHub { owner = "Rolv-Apneseth"; repo = "starship.yazi"; - rev = "6c639b474aabb17f5fecce18a4c97bf90b016512"; - hash = "sha256-bhLUziCDnF4QDCyysRn7Az35RAy8ibZIVUzoPgyEO1A="; + rev = "c0707544f1d526f704dab2da15f379ec90d613c2"; + hash = "sha256-H8j+9jcdcpPFXVO/XQZL3zq1l5f/WiOm4YUxAMduSRs="; }; meta = { From ff350e9d0b326cfbbf95d284f9099a5ac30680bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Apr 2025 13:20:19 +0000 Subject: [PATCH 092/101] lttng-tools: 2.13.14 -> 2.13.15 --- pkgs/by-name/lt/lttng-tools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lt/lttng-tools/package.nix b/pkgs/by-name/lt/lttng-tools/package.nix index 03e6a16134e2..445f47be4e96 100644 --- a/pkgs/by-name/lt/lttng-tools/package.nix +++ b/pkgs/by-name/lt/lttng-tools/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "lttng-tools"; - version = "2.13.14"; + version = "2.13.15"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2"; - sha256 = "sha256-U733xK0H2/5mDuTZr/xj/kSuWemnPG96luD8oUDlrcs="; + sha256 = "sha256-lupCNR7hEsGdrZ/ceq6TtYPZ8XIrIXVmSjgdLTN3A8Q="; }; nativeBuildInputs = [ pkg-config ]; From 62adbc19f0cbe8b4e067bdd4a195ca25f5d6edb3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 13 Apr 2025 16:20:31 +0200 Subject: [PATCH 093/101] python313Packages.cramjam: fix eval --- pkgs/development/python-modules/cramjam/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/python-modules/cramjam/default.nix b/pkgs/development/python-modules/cramjam/default.nix index c9f410ea3cea..76a8825b703e 100644 --- a/pkgs/development/python-modules/cramjam/default.nix +++ b/pkgs/development/python-modules/cramjam/default.nix @@ -56,12 +56,6 @@ buildPythonPackage rec { "benchmarks/test_bench.py" ]; - disabledTests = [ - # https://github.com/milesgranger/cramjam/issues/201 - # https://github.com/HypothesisWorks/hypothesis/issues/4267 - "test_variants_decompress_into" - ]; - pythonImportsCheck = [ "cramjam" ]; meta = { From b26e0e710d973a917f62f1d803d9f16babf78aa5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Apr 2025 15:21:08 +0000 Subject: [PATCH 094/101] eask-cli: 0.11.0 -> 0.11.1 --- pkgs/by-name/ea/eask-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ea/eask-cli/package.nix b/pkgs/by-name/ea/eask-cli/package.nix index 1e826d8cf3f0..12fad1c7ae23 100644 --- a/pkgs/by-name/ea/eask-cli/package.nix +++ b/pkgs/by-name/ea/eask-cli/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "eask-cli"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "emacs-eask"; repo = "cli"; rev = version; - hash = "sha256-xMay2HGw5vGvGIrbjCk0LNn5bvSiHbnpjfdGdO7BpQ4="; + hash = "sha256-4KV/wuZCtgVFfZwNEtlj8fjNS+Pk9d8yquYGCBEj+pE="; }; - npmDepsHash = "sha256-8/2DCFlQ0bQt9uajWm17qqp2zc8scHdscL6n/laSZZ8="; + npmDepsHash = "sha256-4AMFqX4wco+aCcWvnixR1KgYBPmQb2XSCicZpQwusRs="; dontBuild = true; From 93b98639dd185d141c6710f4b118805e82033541 Mon Sep 17 00:00:00 2001 From: sudoBash418 Date: Sat, 29 Mar 2025 22:50:50 -0600 Subject: [PATCH 095/101] make-initrd-ng: Restore stripped file permissions Previously, all initrd ELFs would be made *world-writable*. This commit sets the write bit for the file owner exclusively, and removes it when done. It also sets the umask so that files don't implicitly become writable for other users by mistake. Fixes: https://github.com/NixOS/nixpkgs/security/advisories/GHSA-m7pq-h9p4-8rr4 Reported-By: sudoBash418 --- .../kernel/make-initrd-ng/Cargo.lock | 9 ++++++++- .../kernel/make-initrd-ng/Cargo.toml | 1 + .../kernel/make-initrd-ng/src/main.rs | 17 ++++++++++++++--- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock b/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock index ce5f5ef00971..67f72276575e 100644 --- a/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock +++ b/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "eyre" @@ -35,6 +35,12 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +[[package]] +name = "libc" +version = "0.2.171" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" + [[package]] name = "log" version = "0.4.21" @@ -47,6 +53,7 @@ version = "0.1.0" dependencies = [ "eyre", "goblin", + "libc", "serde", "serde_json", ] diff --git a/pkgs/build-support/kernel/make-initrd-ng/Cargo.toml b/pkgs/build-support/kernel/make-initrd-ng/Cargo.toml index 69081b94d892..bdcdffd80195 100644 --- a/pkgs/build-support/kernel/make-initrd-ng/Cargo.toml +++ b/pkgs/build-support/kernel/make-initrd-ng/Cargo.toml @@ -9,5 +9,6 @@ edition = "2018" [dependencies] eyre = "0.6.8" goblin = "0.5.0" +libc = "0.2.171" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/pkgs/build-support/kernel/make-initrd-ng/src/main.rs b/pkgs/build-support/kernel/make-initrd-ng/src/main.rs index 934c2faebed8..64c114f2d9fa 100644 --- a/pkgs/build-support/kernel/make-initrd-ng/src/main.rs +++ b/pkgs/build-support/kernel/make-initrd-ng/src/main.rs @@ -5,9 +5,12 @@ use std::fs; use std::hash::Hash; use std::iter::FromIterator; use std::os::unix; +use std::os::unix::fs::PermissionsExt; use std::path::{Component, Path, PathBuf}; use std::process::Command; +use libc::umask; + use eyre::Context; use goblin::{elf::Elf, Object}; use serde::Deserialize; @@ -191,9 +194,9 @@ fn copy_file< let mut permissions = fs::metadata(&target) .wrap_err_with(|| format!("failed to get metadata for {:?}", target))? .permissions(); - permissions.set_readonly(false); - fs::set_permissions(&target, permissions) - .wrap_err_with(|| format!("failed to set readonly flag to false for {:?}", target))?; + permissions.set_mode(permissions.mode() | 0o200); + fs::set_permissions(&target, permissions.clone()) + .wrap_err_with(|| format!("failed to set read-write permissions for {:?}", target))?; // Strip further than normal if let Ok(strip) = env::var("STRIP") { @@ -207,6 +210,11 @@ fn copy_file< println!("{:?} was not successfully stripped.", OsStr::new(&target)); } } + + // Remove writable permissions + permissions.set_mode(permissions.mode() ^ 0o222); + fs::set_permissions(&target, permissions) + .wrap_err_with(|| format!("failed to remove writable permissions for {:?}", target))?; }; Ok(()) @@ -335,6 +343,9 @@ fn main() -> eyre::Result<()> { let output = &args[2]; let out_path = Path::new(output); + // The files we create should not be writable. + unsafe { umask(0o022) }; + let mut queue = NonRepeatingQueue::::new(); for sp in input { From c9ea864d6fd086f174321cc96a414bdb92490588 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Wed, 2 Apr 2025 15:56:28 -0400 Subject: [PATCH 096/101] nixos/shutdown: Create /run/initramfs with mode 0700 --- nixos/modules/system/boot/systemd/shutdown.nix | 1 + nixos/tests/systemd-shutdown.nix | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/nixos/modules/system/boot/systemd/shutdown.nix b/nixos/modules/system/boot/systemd/shutdown.nix index 1e8b8c6f863c..242b47cc40b1 100644 --- a/nixos/modules/system/boot/systemd/shutdown.nix +++ b/nixos/modules/system/boot/systemd/shutdown.nix @@ -52,6 +52,7 @@ in what = "tmpfs"; where = "/run/initramfs"; type = "tmpfs"; + options = "mode=0700"; } ]; diff --git a/nixos/tests/systemd-shutdown.nix b/nixos/tests/systemd-shutdown.nix index 602ead50639e..fa0105cb90cf 100644 --- a/nixos/tests/systemd-shutdown.nix +++ b/nixos/tests/systemd-shutdown.nix @@ -23,6 +23,8 @@ import ./make-test-python.nix ( }; testScript = '' + # Check that 'generate-shutdown-ramfs.service' is started + # automatically and that 'systemd-shutdown' runs our script. machine.wait_for_unit("multi-user.target") # .shutdown() would wait for the machine to power off machine.succeed("systemctl poweroff") @@ -31,6 +33,12 @@ import ./make-test-python.nix ( machine.wait_for_console_text("${msg}") # Don't try to sync filesystems machine.wait_for_shutdown() + + # In a separate boot, start 'generate-shutdown-ramfs.service' + # manually in order to check the permissions on '/run/initramfs'. + machine.systemctl("start generate-shutdown-ramfs.service") + stat = machine.succeed("stat --printf=%a:%u:%g /run/initramfs") + assert stat == "700:0:0", f"Improper permissions on /run/initramfs: {stat}" ''; } ) From e049c438a985eca2c9e2c6bf35fd6e3ea8b655ac Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Sun, 13 Apr 2025 17:37:01 +0000 Subject: [PATCH 097/101] anubis: 1.15.2 -> 1.16.0 (#397605) --- pkgs/by-name/an/anubis/package.nix | 52 +++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix index 9282a3bb13e0..8741d9877d48 100644 --- a/pkgs/by-name/an/anubis/package.nix +++ b/pkgs/by-name/an/anubis/package.nix @@ -1,22 +1,56 @@ { lib, buildGoModule, + buildNpmPackage, fetchFromGitHub, nix-update-script, stdenv, + + esbuild, + brotli, + zstd, }: -buildGoModule (finalAttrs: { +let pname = "anubis"; - version = "1.15.2"; + version = "1.16.0"; src = fetchFromGitHub { owner = "TecharoHQ"; repo = "anubis"; - tag = "v${finalAttrs.version}"; - hash = "sha256-5OqpmuRTrM+hseIhR2sTb+K01Co6X+Rhb6mN+U54NAI="; + tag = "v${version}"; + hash = "sha256-/7GMf0QGR0rtz05vHN/yYYuzxN25NhqidITdAf6jSXY="; }; - vendorHash = "sha256-Rcra5cu7zxGm2LhL2x9Kd3j/uQaEb8OOh/j5Rhh8S1k="; + anubisXess = buildNpmPackage { + inherit version src; + pname = "${pname}-xess"; + + npmDepsHash = "sha256-QrW0grgNRZRum2mCec86Za1UV4R5QSRlhjVYFsZDwY8="; + + buildPhase = '' + runHook preBuild + npx postcss ./xess/xess.css -o xess.min.css + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp xess.min.css $out + runHook postInstall + ''; + }; +in +buildGoModule (finalAttrs: { + inherit pname version src; + + vendorHash = "sha256-D0+SDJIagAPqd71fIHCh29vPMVL0ZZAFg0rmgW2EaGw="; + + nativeBuildInputs = [ + esbuild + brotli + zstd + ]; subPackages = [ "cmd/anubis" @@ -32,6 +66,14 @@ buildGoModule (finalAttrs: { "-extldflags=-static" ]; + postPatch = '' + patchShebangs ./web/build.sh + ''; + + preBuild = '' + go generate ./... && ./web/build.sh && cp -r ${anubisXess}/xess.min.css ./xess + ''; + preCheck = '' export DONT_USE_NETWORK=1 ''; From eb786288e19d724551938267608a253b3c408826 Mon Sep 17 00:00:00 2001 From: Masum Reza <50095635+JohnRTitor@users.noreply.github.com> Date: Sun, 13 Apr 2025 23:13:04 +0530 Subject: [PATCH 098/101] treewide: adopt android packages as NixOS/android Co-authored-by: Morgan Jones Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com> --- .../editors/android-studio-for-platform/common.nix | 2 +- pkgs/applications/editors/android-studio/common.nix | 11 +++++------ pkgs/by-name/an/android-studio-tools/package.nix | 2 +- pkgs/by-name/an/android-udev-rules/package.nix | 2 +- pkgs/development/androidndk-pkgs/androidndk-pkgs.nix | 7 ++++++- pkgs/development/androidndk-pkgs/default.nix | 2 +- pkgs/development/mobile/androidenv/default.nix | 5 +---- pkgs/tools/misc/android-tools/default.nix | 2 +- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/editors/android-studio-for-platform/common.nix b/pkgs/applications/editors/android-studio-for-platform/common.nix index 791f4c948e7f..ae0ea00f7fb4 100644 --- a/pkgs/applications/editors/android-studio-for-platform/common.nix +++ b/pkgs/applications/editors/android-studio-for-platform/common.nix @@ -188,7 +188,7 @@ runCommand drvName # binaries are also distributed as proprietary software (unlike the # source-code itself). platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ robbins ]; + maintainers = teams.android.members ++ (with maintainers; [ robbins ]); mainProgram = pname; }; } diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 5ac252ff941b..b613f3a06964 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -323,13 +323,12 @@ let # source-code itself). platforms = [ "x86_64-linux" ]; maintainers = - with lib.maintainers; rec { - stable = [ - alapshin - johnrtitor - numinit - ]; + stable = + lib.teams.android.members + ++ (with lib.maintainers; [ + alapshin + ]); beta = stable; canary = stable; dev = stable; diff --git a/pkgs/by-name/an/android-studio-tools/package.nix b/pkgs/by-name/an/android-studio-tools/package.nix index 0cd30e449e93..9dc7a96aae58 100644 --- a/pkgs/by-name/an/android-studio-tools/package.nix +++ b/pkgs/by-name/an/android-studio-tools/package.nix @@ -51,7 +51,7 @@ stdenvNoCC.mkDerivation { downloadPage = "https://developer.android.com/studio"; changelog = "https://developer.android.com/studio/releases"; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ pandapip1 ]; + maintainers = lib.teams.android.members ++ (with lib.maintainers; [ pandapip1 ]); platforms = lib.platforms.all; sourceProvenance = with lib.sourceTypes; [ fromSource ]; # The 'binaries' are actually shell scripts }; diff --git a/pkgs/by-name/an/android-udev-rules/package.nix b/pkgs/by-name/an/android-udev-rules/package.nix index a1dcffe21cd8..1fd76fd1a44b 100644 --- a/pkgs/by-name/an/android-udev-rules/package.nix +++ b/pkgs/by-name/an/android-udev-rules/package.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { description = "Android udev rules list aimed to be the most comprehensive on the net"; platforms = platforms.linux; license = licenses.gpl3Plus; - maintainers = with maintainers; [ abbradar ]; + maintainers = lib.teams.android.members ++ (with maintainers; [ abbradar ]); }; } diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index ee9c6857afc3..02501154b8fb 100644 --- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -74,7 +74,7 @@ let ); in -rec { +lib.recurseIntoAttrs rec { # Misc tools binaries = stdenv.mkDerivation { pname = "${targetPrefix}ndk-toolchain"; @@ -138,6 +138,11 @@ rec { patchShebangs $out/bin ''; + meta = { + description = "The Android NDK toolchain, tuned for other platforms"; + license = with lib.licenses; [ unfree ]; + maintainers = lib.teams.android.members; + }; }; binutils = wrapBintoolsWith { diff --git a/pkgs/development/androidndk-pkgs/default.nix b/pkgs/development/androidndk-pkgs/default.nix index f7ffb0745070..3fd4b5f66527 100644 --- a/pkgs/development/androidndk-pkgs/default.nix +++ b/pkgs/development/androidndk-pkgs/default.nix @@ -53,7 +53,7 @@ let }; in -{ +lib.recurseIntoAttrs { "21" = makeNdkPkgs "21.0.6113669" pkgs.llvmPackages_14; # "9" "23" = makeNdkPkgs "23.1.7779620" pkgs.llvmPackages_14; # "12" # Versions below 24 use a version not available in nixpkgs/old version which could be removed in the near future so use 14 for them as this is only used to get the hardening flags. diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 38084115c1c4..1b4f30a7f355 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -36,9 +36,6 @@ lib.recurseIntoAttrs rec { description = "Android SDK tools, packaged in Nixpkgs"; license = lib.licenses.unfree; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ - numinit - hadilq - ]; + maintainers = lib.teams.android.members; }; } diff --git a/pkgs/tools/misc/android-tools/default.nix b/pkgs/tools/misc/android-tools/default.nix index 95af0ed528ce..18c2ed88387d 100644 --- a/pkgs/tools/misc/android-tools/default.nix +++ b/pkgs/tools/misc/android-tools/default.nix @@ -79,6 +79,6 @@ stdenv.mkDerivation rec { unicode-dfs-2015 ]; platforms = platforms.unix; - maintainers = with maintainers; [ primeos ]; + maintainers = teams.android.members ++ (with maintainers; [ primeos ]); }; } From a59e06abc4b9a6ab348fb2293592f1b8bc15d077 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Mon, 7 Apr 2025 00:57:25 -0700 Subject: [PATCH 099/101] androidenv: fix weird package naming and add versions Some of the system images and NDK packages looked like: `androidenv.androidPkgs.all.system_images.v35.google_apis_playstore.x_86___64`. `androidenv.androidPkgs.all.packages.ndk.v21_0_6011959_rc_2` Now they look like: `androidenv.androidPkgs.all.system-images.v35.google_apis_playstore.x86_64`. `androidenv.androidPkgs.all.packages.ndk.v21_0_6011959-rc2` They should also have the versions correctly attached now for s.n.o. --- .../androidenv/compose-android-packages.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index e7552862c2b7..c63e20d43733 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -175,7 +175,13 @@ let passthru = { info = packageInfo; }; - }) + }).overrideAttrs + (prev: { + # fetchurl won't generate the correct filename if we specify pname and version, + # and we still want the version attribute to show up in search, so specify these in an override + pname = packageInfo.name; + version = packageInfo.revision; + }) ) validArchives ) ) @@ -207,8 +213,11 @@ let # Converts things like 'extras;google;auto' to 'extras-google-auto' toVersionKey = name: - lib.optionalString (lib.match "^[0-9].*" name != null) "v" - + lib.concatStringsSep "_" (lib.splitVersion (lib.replaceStrings [ ";" ] [ "-" ] name)); + let + normalizedName = lib.replaceStrings [ ";" "." ] [ "-" "_" ] name; + versionParts = lib.match "^([0-9][0-9\\.]*)(.*)$" normalizedName; + in + if versionParts == null then normalizedName else "v" + lib.concatStrings versionParts; recurse = lib.mapAttrs' ( name: value: From 6281e512137ea25e5296139e3d30f3043d16ca33 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sat, 12 Apr 2025 22:50:44 -0700 Subject: [PATCH 100/101] androidenv: fix missing versions for Google addons This is a regression caused by fixing the linking of Google TV addons. Change the check so we just check for the package being present instead of checking the specific version. --- .../androidenv/compose-android-packages.nix | 55 ++++++++++--------- .../mobile/androidenv/examples/shell.nix | 1 + 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index c63e20d43733..aaf0dd43dc80 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -257,14 +257,19 @@ let ++ extraLicenses ); - # put a much nicer error message that includes the available options. - check-version = + # Returns true if the given version exists. + hasVersion = packages: package: version: - if lib.hasAttrByPath [ package version ] packages then - packages.${package}.${version} + lib.hasAttrByPath [ package (toString version) ] packages; + + # Displays a nice error message that includes the available options if a version doesn't exist. + checkVersion = + packages: package: version: + if hasVersion packages package version then + packages.${package}.${toString version} else throw '' - The version ${version} is missing in package ${package}. + The version ${toString version} is missing in package ${package}. The only available versions are ${ builtins.concatStringsSep ", " (builtins.attrNames packages.${package}) }. @@ -415,7 +420,7 @@ lib.recurseIntoAttrs rec { arch meta ; - package = check-version allArchives.packages "platform-tools" platformToolsVersion; + package = checkVersion allArchives.packages "platform-tools" platformToolsVersion; }; tools = callPackage ./tools.nix { @@ -425,7 +430,7 @@ lib.recurseIntoAttrs rec { arch meta ; - package = check-version allArchives.packages "tools" toolsVersion; + package = checkVersion allArchives.packages "tools" toolsVersion; postInstall = '' ${linkPlugin { @@ -449,7 +454,7 @@ lib.recurseIntoAttrs rec { arch meta ; - package = check-version allArchives.packages "build-tools" version; + package = checkVersion allArchives.packages "build-tools" version; postInstall = '' ${linkPlugin { @@ -468,7 +473,7 @@ lib.recurseIntoAttrs rec { arch meta ; - package = check-version allArchives.packages "emulator" emulatorVersion; + package = checkVersion allArchives.packages "emulator" emulatorVersion; postInstall = '' ${linkSystemImages { @@ -483,14 +488,14 @@ lib.recurseIntoAttrs rec { platforms = map ( version: deployAndroidPackage { - package = check-version allArchives.packages "platforms" (toString version); + package = checkVersion allArchives.packages "platforms" version; } ) platformVersions; sources = map ( version: deployAndroidPackage { - package = check-version allArchives.packages "sources" (toString version); + package = checkVersion allArchives.packages "sources" version; } ) platformVersions; @@ -545,7 +550,7 @@ lib.recurseIntoAttrs rec { arch meta ; - package = check-version allArchives.packages "cmake" version; + package = checkVersion allArchives.packages "cmake" version; } ) cmakeVersions; @@ -581,27 +586,23 @@ lib.recurseIntoAttrs rec { # The "default" NDK bundle. ndk-bundle = if ndk-bundles == [ ] then null else lib.head ndk-bundles; - # Makes a Google API bundle. - google-apis = - map - ( - version: - deployAndroidPackage { - package = (check-version allArchives "addons" (toString version)).google_apis; - } - ) - ( - builtins.filter (platformVersion: lib.versionOlder (toString platformVersion) "26") platformVersions - ); # API level 26 and higher include Google APIs by default + # Makes a Google API bundle from supported versions. + google-apis = map ( + version: + deployAndroidPackage { + package = (checkVersion allArchives "addons" version).google_apis; + } + ) (lib.filter (hasVersion allArchives "addons") platformVersions); + # Makes a Google TV addons bundle from supported versions. google-tv-addons = map ( version: deployAndroidPackage { - package = (check-version allArchives "addons" (toString version)).google_tv_addon; + package = (checkVersion allArchives "addons" version).google_tv_addon; } - ) platformVersions; + ) (lib.filter (hasVersion allArchives "addons") platformVersions); - cmdline-tools-package = check-version allArchives.packages "cmdline-tools" cmdLineToolsVersion; + cmdline-tools-package = checkVersion allArchives.packages "cmdline-tools" cmdLineToolsVersion; # This derivation deploys the tools package and symlinks all the desired # plugins that we want to use. If the license isn't accepted, prints all the licenses diff --git a/pkgs/development/mobile/androidenv/examples/shell.nix b/pkgs/development/mobile/androidenv/examples/shell.nix index 7a45dcfbbcbc..9058e1664fe6 100644 --- a/pkgs/development/mobile/androidenv/examples/shell.nix +++ b/pkgs/development/mobile/androidenv/examples/shell.nix @@ -51,6 +51,7 @@ let includeEmulator = "if-supported"; includeNDK = "if-supported"; useGoogleAPIs = true; + useGoogleTVAddOns = true; # Make sure everything from the last decade works since we are not using system images. numLatestPlatformVersions = 10; From c514b5c012b79b85ab249463cfd34ffc53accb6c Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sat, 12 Apr 2025 22:55:03 -0700 Subject: [PATCH 101/101] androidenv: move release notes from NixOS to nixpkgs These were committed in the wrong place, since they are more nixpkgs docs. --- doc/release-notes/rl-2505.section.md | 5 +++++ nixos/doc/manual/release-notes/rl-2505.section.md | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index e2460b1128f9..1fd281475dbe 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -335,6 +335,11 @@ - `titaniumenv`, `titanium`, and `titanium-alloy` have been removed due to lack of maintenance in Nixpkgs []{#sec-nixpkgs-release-25.05-incompatibilities-titanium-removed}. +- androidenv has been improved: + - All versions specified in composeAndroidPackages now track the latest. Android packages are automatically updated on unstable, and run the androidenv test suite on every update. + - Many androidenv packages are now searchable on [search.nixos.org](https://search.nixos.org). + - We now use the latest Google repositories, which should improve aarch64-darwin compatibility. The SDK now additionally evaluates on aarch64-linux, though not all packages are functional. + - `gerbera` now has wavpack support. - GOverlay has been updated to 1.2, please check the [upstream changelog](https://github.com/benjamimgois/goverlay/releases) for more details. diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index efffedce7d4f..a080e04ac603 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -34,11 +34,6 @@ - A new `pkgs.mattermost.buildPlugin` function has been added, which allows plugins to be built from source, including webapp frontends with a supported package-lock.json. See the Mattermost NixOS test and [manual](https://nixos.org/manual/nixpkgs/unstable/#sec-mattermost-plugins-build) for an example. - Note that the Mattermost module will create an account _without_ a well-known UID if the username differs from the default (`mattermost`). If you used Mattermost with a nonstandard username, you may want to review the module changes before upgrading. -- androidenv has been updated: - - All versions specified in composeAndroidPackages now track latest. Android packages are automatically updated on unstable, and run the androidenv test suite on every update. - - Some androidenv packages are now searchable on [search.nixos.org](https://search.nixos.org). - - We now use the latest Google repositories, which should improve aarch64-darwin compatibility. The SDK now additionally evaluates on aarch64-linux, though not all packages are functional. - ## New Modules {#sec-release-25.05-new-modules}