From bb4ba2ab1c9135561db8b5db202ce0d288f100bf Mon Sep 17 00:00:00 2001 From: cswimr Date: Mon, 28 Apr 2025 01:51:37 -0500 Subject: [PATCH 01/63] starship: add xonsh shell configuration --- nixos/doc/manual/release-notes/rl-2505.section.md | 2 ++ nixos/modules/programs/starship.nix | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index bfc3ad7dde6a..23854e6fc2a1 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -542,6 +542,8 @@ - `bind.cacheNetworks` now only controls access for recursive queries, where it previously controlled access for all queries. +- The [Starship](https://starship.rs) module now automatically loads the starship prompt when using [`xonsh`](https://xon.sh). + - [`services.mongodb.enableAuth`](#opt-services.mongodb.enableAuth) now uses the newer [mongosh](https://github.com/mongodb-js/mongosh) shell instead of the legacy shell to configure the initial superuser. You can configure the mongosh package to use through the [`services.mongodb.mongoshPackage`](#opt-services.mongodb.mongoshPackage) option. - There is a new set of NixOS test tools for testing virtual Wi-Fi networks in many different topologies. See the {option}`services.vwifi` module, {option}`services.kismet` NixOS test, and [manual](https://nixos.org/manual/nixpkgs/unstable/#sec-nixos-test-wifi) for documentation and examples. diff --git a/nixos/modules/programs/starship.nix b/nixos/modules/programs/starship.nix index 044054c5452f..e606f776ab81 100644 --- a/nixos/modules/programs/starship.nix +++ b/nixos/modules/programs/starship.nix @@ -158,6 +158,18 @@ in eval "$(${cfg.package}/bin/starship init zsh)" fi ''; + + # use `config` instead of `${initOption}` because `programs.xonsh` doesn't have `shellInit` or `promptInit` + programs.xonsh.config = '' + if $TERM != "dumb": + # don't set STARSHIP_CONFIG automatically if there's a user-specified + # config file. starship appears to use a hardcoded config location + # rather than one inside an XDG folder: + # https://github.com/starship/starship/blob/686bda1706e5b409129e6694639477a0f8a3f01b/src/configure.rs#L651 + if not `$HOME/.config/starship.toml`: + $STARSHIP_CONFIG = ('${settingsFile}') + execx($(${cfg.package}/bin/starship init xonsh)) + ''; }; meta.maintainers = pkgs.starship.meta.maintainers; From 03ea79a2b9ee3f7474d0762df96d96ab1580a9cb Mon Sep 17 00:00:00 2001 From: DashieTM Date: Fri, 9 May 2025 19:34:48 +0200 Subject: [PATCH 02/63] maintainers: add dashietm --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4db5037b957c..e0ba16fef139 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5611,6 +5611,12 @@ githubId = 4971975; name = "Janne Heß"; }; + dashietm = { + email = "fabio.lenherr@gmail.com"; + github = "DashieTM"; + githubId = 72016555; + name = "Fabio Lenherr"; + }; dasisdormax = { email = "dasisdormax@mailbox.org"; github = "dasisdormax"; From 2035aa58e88b15868ec5682ea0841ca24bcf9d32 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 May 2025 07:50:35 +0000 Subject: [PATCH 03/63] oneDNN: 3.7.3 -> 3.8 --- pkgs/by-name/on/oneDNN/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/on/oneDNN/package.nix b/pkgs/by-name/on/oneDNN/package.nix index e3855a3a57b5..56cfcf83ba64 100644 --- a/pkgs/by-name/on/oneDNN/package.nix +++ b/pkgs/by-name/on/oneDNN/package.nix @@ -11,13 +11,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation (finalAttrs: { pname = "oneDNN"; - version = "3.7.3"; + version = "3.8"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${finalAttrs.version}"; - hash = "sha256-wOS/VBcP8VyuBAdXVNkTDtYizTQe00ZocW5p0PMqbr4="; + hash = "sha256-GGfrP3QOPOlqWroG4MQ0az5q5Y4Ii9fNblk5WnMBsuI="; }; outputs = [ From db170a9c623dc81a7fe38c10ad2f23c18f0e74bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 May 2025 16:17:37 +0000 Subject: [PATCH 04/63] clazy: 1.13 -> 1.14 --- pkgs/development/tools/analysis/clazy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/clazy/default.nix b/pkgs/development/tools/analysis/clazy/default.nix index 6b355d4493b0..cf1997015ec4 100644 --- a/pkgs/development/tools/analysis/clazy/default.nix +++ b/pkgs/development/tools/analysis/clazy/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "clazy"; - version = "1.13"; + version = "1.14"; src = fetchFromGitHub { owner = "KDE"; repo = "clazy"; tag = finalAttrs.version; - hash = "sha256-cNckRQ3+9HjJ1xYIDkosEP7K66+G0J3K9wt4OWLokLs="; + hash = "sha256-t1j/MrKD8ocmhbFtWz6BJUbPSCSWjlRmuYnsPhHWgAM="; }; buildInputs = [ From 530c13944813d0b1b7caed631257bf1b71b00ebd Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 13 May 2025 01:04:24 -0700 Subject: [PATCH 05/63] perlPackages.ApacheDB: unbreak on Darwin --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d0b49254e8ec..58e20f09cef6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -979,7 +979,7 @@ with self; artistic1 gpl1Plus ]; - broken = true; # DB.c:(.text+0x153): undefined reference to `Perl_init_debugger' + broken = stdenv.hostPlatform.isLinux; # DB.c: undefined reference to `Perl_init_debugger' }; }; From d35f21ec470e7e75a71dc7a317c279dac806ed2e Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 13 May 2025 01:07:09 -0700 Subject: [PATCH 06/63] perlPackages.DBDsybase: unbreak on Darwin --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 58e20f09cef6..99866e4b6083 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9897,7 +9897,6 @@ with self; artistic1 gpl1Only ]; - broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.DBDsybase.x86_64-darwin }; }; From 0598f4b0bfa682fcdcaac1991f1e18042972408b Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 13 May 2025 01:09:27 -0700 Subject: [PATCH 07/63] perlPackages.FileLibMagic: unbreak on Darwin --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 99866e4b6083..82a88f865f20 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13562,7 +13562,6 @@ with self; artistic1 gpl1Plus ]; - broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.FileLibMagic.x86_64-darwin }; }; From b860376d83f0f5af5f3ccc7a81de0a03edcdae24 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 13 May 2025 01:10:51 -0700 Subject: [PATCH 08/63] perlPackages.DataUtil: unbreak on Darwin --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 82a88f865f20..c845661ac97f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8655,7 +8655,6 @@ with self; artistic1 gpl1Plus ]; - broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.DataUtil.x86_64-darwin }; }; From f09a42bc01ce3f3a22bb7d61db970ec923b1f87b Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 13 May 2025 01:13:08 -0700 Subject: [PATCH 09/63] perlPackages.DataMessagePack: unbreak on Darwin and fix description --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c845661ac97f..a90f3afc7d27 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8273,14 +8273,13 @@ with self; TestRequires ]; meta = { - description = "Grep-like program for searching source code"; + description = "MessagePack serialization format"; homepage = "https://github.com/msgpack/msgpack-perl"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; - broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.DataMessagePack.x86_64-darwin }; }; From 34ce4c790091ded1ab2b1c4597c4d796cd370360 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 13 May 2025 01:14:36 -0700 Subject: [PATCH 10/63] perlPackages.HTMLEscape: unbreak on Darwin --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a90f3afc7d27..e5102fc7b327 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15805,7 +15805,6 @@ with self; artistic1 gpl1Plus ]; - broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.HTMLEscape.x86_64-darwin }; }; From 46bd58768a12d2047ab4a93e3778fc09e2611d0b Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 13 May 2025 01:15:57 -0700 Subject: [PATCH 11/63] perlPackages.MaxMindDBReaderXS: unbreak on Darwin --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e5102fc7b327..40b74f2d7bb6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21020,7 +21020,6 @@ with self; description = "Fast XS implementation of MaxMind DB reader"; homepage = "https://metacpan.org/release/MaxMind-DB-Reader-XS"; license = with lib.licenses; [ artistic2 ]; - broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.MaxMindDBReaderXS.x86_64-darwin }; }; From dd87890fa3aff2ec73214f84b3b8b2195e1c7042 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 13 May 2025 01:17:23 -0700 Subject: [PATCH 12/63] perlPackages.TextIconv: unbreak on Darwin --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 40b74f2d7bb6..bed049608364 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -35827,7 +35827,6 @@ with self; artistic1 gpl1Plus ]; # taken from el6 - broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.TextIconv.x86_64-darwin }; }; From cde5ca5093ae059737bb30be27b2635b94d904a8 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 13 May 2025 01:26:26 -0700 Subject: [PATCH 13/63] perlPackages.AlienLibGumbo: mark as broken on Linux instead of Darwin --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bed049608364..00222a3ff571 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -468,7 +468,7 @@ with self; artistic1 gpl1Plus ]; - broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.AlienLibGumbo.x86_64-darwin + broken = stdenv.hostPlatform.isLinux; # Fails with: cannot find ./.libs/libgumbo.so }; }; From 451b6bc25220e2e67b58f6f0d5adda25cf5d34d8 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 13 May 2025 01:28:27 -0700 Subject: [PATCH 14/63] perlPackages.SysVirt: unbreak on Darwin --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 00222a3ff571..d57e4910ff99 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -32352,7 +32352,6 @@ with self; gpl2Plus artistic1 ]; - broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.SysVirt.x86_64-darwin }; }; From 466e7e1da652ec53578eb9ebd6a2b109e9380581 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 13 May 2025 01:30:26 -0700 Subject: [PATCH 15/63] perlPackages.MaxMindDBWriter: unbreak on Darwin --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d57e4910ff99..5955f26e8e5d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21057,7 +21057,6 @@ with self; artistic1 gpl1Plus ]; - broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.MaxMindDBWriter.x86_64-darwin }; }; From 0ea65a68a70906ea8ca0889942c7f19d45ccb43e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 May 2025 12:33:31 +0000 Subject: [PATCH 16/63] python3Packages.django-celery-beat: 2.8.0 -> 2.8.1 --- .../development/python-modules/django-celery-beat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-celery-beat/default.nix b/pkgs/development/python-modules/django-celery-beat/default.nix index e4bed5b213f3..2b80ed336234 100644 --- a/pkgs/development/python-modules/django-celery-beat/default.nix +++ b/pkgs/development/python-modules/django-celery-beat/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "django-celery-beat"; - version = "2.8.0"; + version = "2.8.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "celery"; repo = "django-celery-beat"; tag = "v${version}"; - hash = "sha256-PWTWFcmjeY0T6dmLzMDN3gqgJaYx1kWy1VJKlWxY+io="; + hash = "sha256-pakOpch5r2ug0UDSqEU34qr4Tz1/mkuFiHW+IOUuGcc="; }; pythonRelaxDeps = [ "django" ]; From 293bb8f3489419dde88799538cefac61fe2d150b Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sun, 18 May 2025 13:54:08 +0800 Subject: [PATCH 17/63] code-cursor: add prince213 to maintainers --- pkgs/by-name/co/code-cursor/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix index 2e37479f805f..0b55208394bb 100644 --- a/pkgs/by-name/co/code-cursor/package.nix +++ b/pkgs/by-name/co/code-cursor/package.nix @@ -191,6 +191,7 @@ stdenvNoCC.mkDerivation { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with lib.maintainers; [ aspauldingcode + prince213 ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "cursor"; From 5aa3674a6194922562409cedebf4a7c6c173c89a Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sun, 18 May 2025 13:47:15 +0800 Subject: [PATCH 18/63] code-cursor: use jq for update.sh --- pkgs/by-name/co/code-cursor/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/co/code-cursor/update.sh b/pkgs/by-name/co/code-cursor/update.sh index e0ee1c274321..20e7abf12025 100755 --- a/pkgs/by-name/co/code-cursor/update.sh +++ b/pkgs/by-name/co/code-cursor/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl yq coreutils common-updater-scripts +#!nix-shell -i bash -p curl jq coreutils common-updater-scripts set -eu -o pipefail currentVersion=$(nix-instantiate --eval -E "with import ./. {}; code-cursor.version or (lib.getVersion code-cursor)" | tr -d '"') From c0099261f9316d75150231b62289befda8911de5 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sun, 18 May 2025 13:51:21 +0800 Subject: [PATCH 19/63] code-cursor: 0.49.6 -> 0.50.5 --- pkgs/by-name/co/code-cursor/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix index 0b55208394bb..118866891f9b 100644 --- a/pkgs/by-name/co/code-cursor/package.nix +++ b/pkgs/by-name/co/code-cursor/package.nix @@ -49,26 +49,26 @@ }: let pname = "cursor"; - version = "0.49.6"; + version = "0.50.5"; inherit (stdenvNoCC) hostPlatform; sources = { x86_64-linux = fetchurl { - url = "https://downloads.cursor.com/production/0781e811de386a0c5bcb07ceb259df8ff8246a52/linux/x64/Cursor-0.49.6-x86_64.AppImage"; - hash = "sha256-WH4/Zw0VJmRGyRzMlkThkhZ4fGysMKBUSIPCTsyGS4w="; + url = "https://downloads.cursor.com/production/96e5b01ca25f8fbd4c4c10bc69b15f6228c80771/linux/x64/Cursor-0.50.5-x86_64.AppImage"; + hash = "sha256-DUWIgQYD3Wj6hF7NBb00OGRynKmXcFldWFUA6W8CZeM="; }; aarch64-linux = fetchurl { - url = "https://downloads.cursor.com/production/0781e811de386a0c5bcb07ceb259df8ff8246a52/linux/arm64/Cursor-0.49.6-aarch64.AppImage"; - hash = "sha256-cpNoff6mDRkT2RicaDlxzqVP9BNe6UEGgJVHr1xMiv0="; + url = "https://downloads.cursor.com/production/96e5b01ca25f8fbd4c4c10bc69b15f6228c80771/linux/arm64/Cursor-0.50.5-aarch64.AppImage"; + hash = "sha256-51zTYg4A+4ZUbGZ6/Qp3d5aL8IafewGOUYbXWGG8ILY="; }; x86_64-darwin = fetchurl { - url = "https://downloads.cursor.com/production/0781e811de386a0c5bcb07ceb259df8ff8246a52/darwin/x64/Cursor-darwin-x64.dmg"; - hash = "sha256-fAaLY9YTIuNThFl5OsIMHavy2xwDgYooL4xTSp4Cwzw="; + url = "https://downloads.cursor.com/production/96e5b01ca25f8fbd4c4c10bc69b15f6228c80771/darwin/x64/Cursor-darwin-x64.dmg"; + hash = "sha256-C2+z3WXi3Ma3PzlU8BrcuJFGMx8YosNdxuSqR5tJdBE="; }; aarch64-darwin = fetchurl { - url = "https://downloads.cursor.com/production/0781e811de386a0c5bcb07ceb259df8ff8246a52/darwin/arm64/Cursor-darwin-arm64.dmg"; - hash = "sha256-DNN2+gfs9u0tZmh75J258d2TL6ErIYludMgPJZcgfb8="; + url = "https://downloads.cursor.com/production/96e5b01ca25f8fbd4c4c10bc69b15f6228c80771/darwin/arm64/Cursor-darwin-arm64.dmg"; + hash = "sha256-Gz+aYDaDMDx46R7HA8u5vZwkXx9q//uu4hNyyRmrq9s="; }; }; From ed13fb9859183ae08e506dfaa564f7ab8a909a06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 23:57:41 +0000 Subject: [PATCH 20/63] kanboard: 1.2.44 -> 1.2.45 --- pkgs/by-name/ka/kanboard/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ka/kanboard/package.nix b/pkgs/by-name/ka/kanboard/package.nix index b6514c79a2bf..9d3b860433e1 100644 --- a/pkgs/by-name/ka/kanboard/package.nix +++ b/pkgs/by-name/ka/kanboard/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "kanboard"; - version = "1.2.44"; + version = "1.2.45"; src = fetchFromGitHub { owner = "kanboard"; repo = "kanboard"; tag = "v${finalAttrs.version}"; - hash = "sha256-0vMHNB0wEyjp8oNWh1PZ2oT/Lpk/eiXrDNA5Dzv8xqI="; + hash = "sha256-MGQ+FJcdRx4VZppLnoB9lCC1eIoetbToyvBsWRBRSu4="; }; dontBuild = true; From 2e13b6d7763626bf532da62d0339fb1c5ff40891 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 May 2025 05:36:19 +0000 Subject: [PATCH 21/63] nb: 7.18.1 -> 7.19.1 --- pkgs/by-name/nb/nb/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nb/nb/package.nix b/pkgs/by-name/nb/nb/package.nix index 0645cdeb9298..1784ea6e499f 100644 --- a/pkgs/by-name/nb/nb/package.nix +++ b/pkgs/by-name/nb/nb/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "nb"; - version = "7.18.1"; + version = "7.19.1"; src = fetchFromGitHub { owner = "xwmx"; repo = "nb"; rev = version; - hash = "sha256-SKn4/Nqmvv8kRQkooGrvTuVrj70rastVg4j7U3cXdYg="; + hash = "sha256-vryc1sfjIE2ZaZ4Z/KG1Zij81tIwImUMjk2ZZvzpDF4="; }; nativeBuildInputs = [ installShellFiles ]; From 6d62661638fdff6def5625ba016f13ec3c1d0bdb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 May 2025 11:36:12 +0000 Subject: [PATCH 22/63] graphite-cli: 1.6.1 -> 1.6.2 --- pkgs/by-name/gr/graphite-cli/package-lock.json | 10 +++++----- pkgs/by-name/gr/graphite-cli/package.nix | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/gr/graphite-cli/package-lock.json b/pkgs/by-name/gr/graphite-cli/package-lock.json index 4ea132ec68e6..99209616e9bc 100644 --- a/pkgs/by-name/gr/graphite-cli/package-lock.json +++ b/pkgs/by-name/gr/graphite-cli/package-lock.json @@ -1,12 +1,12 @@ { "name": "@withgraphite/graphite-cli", - "version": "1.6.1", + "version": "1.6.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@withgraphite/graphite-cli", - "version": "1.6.1", + "version": "1.6.2", "hasInstallScript": true, "license": "None", "dependencies": { @@ -21,9 +21,9 @@ } }, "node_modules/semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", "license": "ISC", "bin": { "semver": "bin/semver.js" diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix index 8c9e09ba7938..f68a6994ebb0 100644 --- a/pkgs/by-name/gr/graphite-cli/package.nix +++ b/pkgs/by-name/gr/graphite-cli/package.nix @@ -8,14 +8,14 @@ buildNpmPackage rec { pname = "graphite-cli"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz"; - hash = "sha256-r7tChs0vsg60LXFf9WZjthqMxXGgohNL4ojdjXNZcCo="; + hash = "sha256-k8zZyzLXQkII87QXjoXYlcQPj09PcMCuNy2NFPT2tHY="; }; - npmDepsHash = "sha256-DoK3GaGIwei9kumvAwfgaIY9iw+Z6ysFzUm5dMVV2W4="; + npmDepsHash = "sha256-HSiitFpXcIWkE/t0LtuDH9Z4fDgyFWc0/gdIsuvVq9I="; postPatch = '' ln -s ${./package-lock.json} package-lock.json From 77c45ea139cdc330f1dd651beee948060d33fcea Mon Sep 17 00:00:00 2001 From: "re:fi.64" Date: Thu, 22 May 2025 18:56:17 -0500 Subject: [PATCH 23/63] oha: Use system jemalloc jemalloc-sys hardcodes the build system's pagesize (#202863), making it incompatible with systems that don't have the standard 4k page size (such as Asahi Linux). --- pkgs/by-name/oh/oha/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/oh/oha/package.nix b/pkgs/by-name/oh/oha/package.nix index 20cadb0eff29..e0443aa161ab 100644 --- a/pkgs/by-name/oh/oha/package.nix +++ b/pkgs/by-name/oh/oha/package.nix @@ -5,6 +5,7 @@ stdenv, pkg-config, openssl, + rust-jemalloc-sys, }: rustPlatform.buildRustPackage rec { @@ -27,6 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl + rust-jemalloc-sys ]; # tests don't work inside the sandbox From bc6bdef11b3699d0d4eaf3a6d5c11990221cfbc1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 May 2025 02:15:40 +0000 Subject: [PATCH 24/63] python3Packages.djangocms-alias: 2.0.2 -> 2.0.3 --- pkgs/development/python-modules/djangocms-alias/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/djangocms-alias/default.nix b/pkgs/development/python-modules/djangocms-alias/default.nix index 6d76e0805895..4fef532d870d 100644 --- a/pkgs/development/python-modules/djangocms-alias/default.nix +++ b/pkgs/development/python-modules/djangocms-alias/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "djangocms-alias"; - version = "2.0.2"; + version = "2.0.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "django-cms"; repo = "djangocms-alias"; tag = version; - hash = "sha256-yAH3eBeQhTBAHp0Zof1RIa7yYffC9V2zkS7E7mKecbA="; + hash = "sha256-q5iNTnoPto7jgxF/46I0oA8NYFBbDafsRUFmKMFoQM4="; }; build-system = [ setuptools ]; @@ -59,7 +59,7 @@ buildPythonPackage rec { meta = { description = "Lean enterprise content management powered by Django"; homepage = "https://django-cms.org"; - changelog = "https://github.com/django-cms/django-cms/releases/tag/${version}"; + changelog = "https://github.com/django-cms/django-cms/releases/tag/${src.tag}"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.onny ]; }; From 959c8e931134c3f986474045c24b05f09b1d770e Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Fri, 23 May 2025 07:10:15 +0200 Subject: [PATCH 25/63] nixos/anubis: Apply some more hardening settings Signed-off-by: Felix Singer --- nixos/modules/services/networking/anubis.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/anubis.nix b/nixos/modules/services/networking/anubis.nix index 2d63fa4ecc59..d44619446b7c 100644 --- a/nixos/modules/services/networking/anubis.nix +++ b/nixos/modules/services/networking/anubis.nix @@ -299,7 +299,8 @@ in ]; SystemCallArchitectures = "native"; MemoryDenyWriteExecute = true; - + AmbientCapabilities = ""; + PrivateMounts = true; PrivateUsers = true; PrivateTmp = true; PrivateDevices = true; @@ -313,6 +314,7 @@ in ProtectSystem = "strict"; ProtectControlGroups = "strict"; LockPersonality = true; + RemoveIPC = true; RestrictRealtime = true; RestrictSUIDSGID = true; RestrictNamespaces = true; From 3d7c2efe8f2589fc841a17c3f27cd15bb9c4f256 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 May 2025 15:39:16 +0000 Subject: [PATCH 26/63] maa-assistant-arknights: 5.16.4 -> 5.16.9 --- pkgs/by-name/ma/maa-assistant-arknights/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/maa-assistant-arknights/pin.json b/pkgs/by-name/ma/maa-assistant-arknights/pin.json index 1e2ba69c807e..ec43cd01494a 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/pin.json +++ b/pkgs/by-name/ma/maa-assistant-arknights/pin.json @@ -1,10 +1,10 @@ { "stable": { - "version": "5.16.4", - "hash": "sha256-1ERKook2z8fKHOkAi43fU0amBgQaxYewFYCQGjFcF3o=" + "version": "5.16.9", + "hash": "sha256-D6ea+fDffOxAPf9+dCOjbr9+meXdOEUN+1BAicO2xhc=" }, "beta": { - "version": "5.16.4", - "hash": "sha256-1ERKook2z8fKHOkAi43fU0amBgQaxYewFYCQGjFcF3o=" + "version": "5.16.9", + "hash": "sha256-D6ea+fDffOxAPf9+dCOjbr9+meXdOEUN+1BAicO2xhc=" } } From 3129e2b389b59e9768084db1839b3655bad7e02f Mon Sep 17 00:00:00 2001 From: Jasper Chan Date: Mon, 12 May 2025 06:49:48 +0000 Subject: [PATCH 27/63] ps2patchelf: init at 1.0.0 Co-authored-by: emaryn <197520219+emaryn@users.noreply.github.com> Co-authored-by: Aleksana --- pkgs/by-name/ps/ps2patchelf/deps.json | 1 + pkgs/by-name/ps/ps2patchelf/package.nix | 40 +++++++++++++++++++ .../ps2patchelf/patches/fix_arg_check.patch | 14 +++++++ .../ps2patchelf/patches/target_net8.0.patch | 26 ++++++++++++ 4 files changed, 81 insertions(+) create mode 100644 pkgs/by-name/ps/ps2patchelf/deps.json create mode 100644 pkgs/by-name/ps/ps2patchelf/package.nix create mode 100644 pkgs/by-name/ps/ps2patchelf/patches/fix_arg_check.patch create mode 100644 pkgs/by-name/ps/ps2patchelf/patches/target_net8.0.patch diff --git a/pkgs/by-name/ps/ps2patchelf/deps.json b/pkgs/by-name/ps/ps2patchelf/deps.json new file mode 100644 index 000000000000..fe51488c7066 --- /dev/null +++ b/pkgs/by-name/ps/ps2patchelf/deps.json @@ -0,0 +1 @@ +[] diff --git a/pkgs/by-name/ps/ps2patchelf/package.nix b/pkgs/by-name/ps/ps2patchelf/package.nix new file mode 100644 index 000000000000..409592dc5353 --- /dev/null +++ b/pkgs/by-name/ps/ps2patchelf/package.nix @@ -0,0 +1,40 @@ +{ + fetchFromGitHub, + buildDotnetModule, + dotnetCorePackages, + lib, +}: + +buildDotnetModule rec { + version = "1.0.0"; + pname = "PS2PatchElf"; + + src = fetchFromGitHub { + owner = "CaptainSwag101"; + repo = "PS2PatchElf"; + tag = "v${version}"; + hash = "sha256-iQL3tT71UOEFIYBdf9BNLUM4++Fm9qEhr77NkMCZdrU="; + }; + + patches = [ + ./patches/target_net8.0.patch + ./patches/fix_arg_check.patch + ]; + + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; + + dotnetFlags = [ "-p:TargetFramework=net8.0" ]; + + nugetDeps = ./deps.json; + + projectFile = "PS2PatchElf/PS2PatchElf.csproj"; + + meta = { + homepage = "https://github.com/CaptainSwag101/PS2PatchElf/"; + description = "Very basic tool for converting PCSX2 .pnach cheats to game executable patches"; + maintainers = [ lib.maintainers.gigahawk ]; + mainProgram = "PS2PatchElf"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/by-name/ps/ps2patchelf/patches/fix_arg_check.patch b/pkgs/by-name/ps/ps2patchelf/patches/fix_arg_check.patch new file mode 100644 index 000000000000..5e846eabe43c --- /dev/null +++ b/pkgs/by-name/ps/ps2patchelf/patches/fix_arg_check.patch @@ -0,0 +1,14 @@ +diff --git a/PS2PatchElf/Program.cs b/PS2PatchElf/Program.cs +index 8c0f1b4..78f4042 100644 +--- a/PS2PatchElf/Program.cs ++++ b/PS2PatchElf/Program.cs +@@ -9,7 +9,7 @@ namespace PS2PatchElf + { + static void Main(string[] args) + { +- if (args.Length is not 2 or 3) ++ if (args.Length != 2 && args.Length != 3) + { + Console.WriteLine("Improper number of arguments specified.\nPlease pass an input ELF/SLUS, a PNACH file, and optionally the patched ELF/SLUS's output path, in that order!"); + return; + diff --git a/pkgs/by-name/ps/ps2patchelf/patches/target_net8.0.patch b/pkgs/by-name/ps/ps2patchelf/patches/target_net8.0.patch new file mode 100644 index 000000000000..420dfe7502c0 --- /dev/null +++ b/pkgs/by-name/ps/ps2patchelf/patches/target_net8.0.patch @@ -0,0 +1,26 @@ +diff --git a/PS2PatchElf/PS2PatchElf.csproj b/PS2PatchElf/PS2PatchElf.csproj +index 3bfd30f..bb0c835 100644 +--- a/PS2PatchElf/PS2PatchElf.csproj ++++ b/PS2PatchElf/PS2PatchElf.csproj +@@ -2,7 +2,7 @@ + + + Exe +- net6.0 ++ net8.0 + enable + + +diff --git a/PS2PatchLib/PS2PatchLib.csproj b/PS2PatchLib/PS2PatchLib.csproj +index 4de8048..8d2b232 100644 +--- a/PS2PatchLib/PS2PatchLib.csproj ++++ b/PS2PatchLib/PS2PatchLib.csproj +@@ -1,7 +1,7 @@ + + + +- net6.0 ++ net8.0 + enable + + From e02ad17dbc8c09356df113d94b130fd573d30b57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 May 2025 07:18:15 +0000 Subject: [PATCH 28/63] reth: 1.3.12 -> 1.4.3 --- pkgs/by-name/re/reth/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/reth/package.nix b/pkgs/by-name/re/reth/package.nix index d2c039e2b338..159e4ff84917 100644 --- a/pkgs/by-name/re/reth/package.nix +++ b/pkgs/by-name/re/reth/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "reth"; - version = "1.3.12"; + version = "1.4.3"; src = fetchFromGitHub { owner = "paradigmxyz"; repo = pname; rev = "v${version}"; - hash = "sha256-59XUrMaXMiqSELQX8i7eK4Eo8YfGjPVZHT6q+rxoSPs="; + hash = "sha256-pl0eQU7BjkSg8ECxeB13oNMO9CNIwLyOOHiWWC4CWhY="; }; - cargoHash = "sha256-FHQ+iPcjxwcY7uoZMXlm/lRoVA5E5wRg7qFgJe+VSEc="; + cargoHash = "sha256-85mtKJWhDguOeNJhsqJyb99xVVF1H7D/2lWRmXF3LSg="; nativeBuildInputs = [ rustPlatform.bindgenHook From e02add77063b34d13cafd23ecbd58f0f86d81631 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 May 2025 08:48:18 +0000 Subject: [PATCH 29/63] hasura-cli: 2.3.1 -> 2.48.1 --- pkgs/servers/hasura/cli.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/hasura/cli.nix b/pkgs/servers/hasura/cli.nix index 0584e872f310..1b9591db4775 100644 --- a/pkgs/servers/hasura/cli.nix +++ b/pkgs/servers/hasura/cli.nix @@ -6,19 +6,19 @@ buildGoModule rec { pname = "hasura"; - version = "2.3.1"; + version = "2.48.1"; src = fetchFromGitHub { owner = "hasura"; repo = "graphql-engine"; rev = "v${version}"; - sha256 = "1r19qw2wxzmngb6sjpin3dk6i5r491brcb0ir4g8kw9d0ic90hpy"; + sha256 = "sha256-Bj9gaQc7zCy4M8apXdVJhEDClB2n75rzBiVq+PmNP4k="; }; modRoot = "./cli"; subPackages = [ "cmd/hasura" ]; - vendorHash = "sha256-S6xyevC/7dpn2Ana5mkROwIOvtQVPThoNEVKkXQmUGY="; + vendorHash = "sha256-riPCH7H1arKP2se2H52R69fL+DyKXK1i/ne5apoS/5w="; doCheck = false; From 8b06db0131f34860685fefe8791f0ff28e360d7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20H=C3=BCrlimann?= Date: Sat, 24 May 2025 13:16:04 +0200 Subject: [PATCH 30/63] wordpressPackages.plugins.civicrm: bump civicrm to 6.2.0 and fix install --- .../web-apps/wordpress/packages/thirdparty.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix b/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix index 535e57b526ca..62b2cf19103a 100644 --- a/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix +++ b/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix @@ -6,13 +6,18 @@ { plugins.civicrm = stdenv.mkDerivation rec { pname = "civicrm"; - version = "5.56.0"; + version = "6.2.0"; src = fetchzip { inherit version; name = pname; - url = "https://storage.googleapis.com/${pname}/${pname}-stable/${version}/${pname}-${version}-wordpress.zip"; - hash = "sha256-XsNFxVL0LF+OHlsqjjTV41x9ERLwMDq9BnKKP3Px2aI="; + url = "https://download.civicrm.org/${pname}-${version}-wordpress.zip"; + hash = "sha256-Bx1rixRbqJsiMrIIkzTGeqLIc5raiNoUVTsoxZ6q9uU="; }; + installPhase = '' + runHook preInstall + cp -r ./ -T $out + runHook postInstall + ''; meta.license = lib.licenses.agpl3Only; }; themes = { From 0fedafa2a960b5c296eb4bdd08cd976aaf139207 Mon Sep 17 00:00:00 2001 From: Ulysses Zhan Date: Sat, 24 May 2025 14:53:31 -0700 Subject: [PATCH 31/63] svg-text-to-path: init at 2.0.4 --- pkgs/by-name/sv/svg-text-to-path/package.nix | 33 ++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/sv/svg-text-to-path/package.nix diff --git a/pkgs/by-name/sv/svg-text-to-path/package.nix b/pkgs/by-name/sv/svg-text-to-path/package.nix new file mode 100644 index 000000000000..3955b0cccdf8 --- /dev/null +++ b/pkgs/by-name/sv/svg-text-to-path/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "svg-text-to-path"; + version = "2.0.4"; + + src = fetchFromGitHub { + owner = "paulzi"; + repo = "svg-text-to-path"; + tag = "v${finalAttrs.version}"; + hash = "sha256-1LW4jYRawP+BM1UtFJiTdcWVnFsEtRdVMlpZgbpZZ8Q="; + }; + + npmDepsHash = "sha256-HBV002dwyWwb9dBBpQY4FFZ/U0lfrXNEmNz4Aa0gRKw="; + npmPackFlags = [ "--ignore-scripts" ]; + dontNpmBuild = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Convert svg nodes to vector font-free elements"; + homepage = "https://github.com/paulzi/svg-text-to-path"; + maintainers = with lib.maintainers; [ ulysseszhan ]; + license = lib.licenses.mit; + mainProgram = "svg-text-to-path"; + platforms = lib.platforms.unix; + }; +}) From a52687d331e977d8c1f24c634b63cc09a6052aa5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 May 2025 23:02:36 +0000 Subject: [PATCH 32/63] syft: 1.24.0 -> 1.26.1 --- pkgs/by-name/sy/syft/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix index ed7a4db2d4de..33715336dd4c 100644 --- a/pkgs/by-name/sy/syft/package.nix +++ b/pkgs/by-name/sy/syft/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "syft"; - version = "1.24.0"; + version = "1.26.1"; src = fetchFromGitHub { owner = "anchore"; repo = "syft"; tag = "v${version}"; - hash = "sha256-7Fav9tTcPFpAQnKMXOeD9Ho5rADDwGvLD3f9VzV82NU="; + hash = "sha256-xWQxxrKHBr6GizXbCiMhc7IFlVY7xo1kvyB3RsFFDsQ="; # 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; @@ -28,7 +28,7 @@ buildGoModule rec { # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-+7tqC6I8zFbGVHFulIbeLBdy3br2ifrEEXM5hZZe3/8="; + vendorHash = "sha256-mK46xzwQ+Qjey0IrAuYdrt2Mz8rA4RdhrT2ayAK3TTw="; nativeBuildInputs = [ installShellFiles ]; From 9655143028169f56b10f658ee58bdc20db6cda6e Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Sun, 25 May 2025 01:34:06 +0200 Subject: [PATCH 33/63] nixos/clevis: fix clevis in scripted initrd Fixes #389750 --- nixos/modules/system/boot/clevis.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/clevis.nix b/nixos/modules/system/boot/clevis.nix index cd174d363547..881a6452d9c9 100644 --- a/nixos/modules/system/boot/clevis.nix +++ b/nixos/modules/system/boot/clevis.nix @@ -81,7 +81,7 @@ in extraUtilsCommands = lib.mkIf (!systemd.enable) '' copy_bin_and_libs ${pkgs.jose}/bin/jose copy_bin_and_libs ${pkgs.curl}/bin/curl - copy_bin_and_libs ${pkgs.bash}/bin/bash + copy_bin_and_libs ${pkgs.bashNonInteractive}/bin/bash copy_bin_and_libs ${pkgs.tpm2-tools}/bin/.tpm2-wrapped mv $out/bin/{.tpm2-wrapped,tpm2} @@ -95,7 +95,7 @@ in done for BIN in $out/bin/clevis{,-decrypt{,-null,-tang,-tpm2}}; do - sed -i $BIN -e 's,${pkgs.bash},,' -e 's,${pkgs.coreutils},,' + sed -i $BIN -e 's,${pkgs.bashNonInteractive},,' -e 's,${pkgs.coreutils},,' done sed -i $out/bin/clevis-decrypt-tpm2 -e 's,tpm2_,tpm2 ,' From 02b517263f683cbc0f606017559deccc5fdcba73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Maret?= Date: Sun, 25 May 2025 11:22:32 +0200 Subject: [PATCH 34/63] imager: fix numpy header detection With recent Numpy versions (> 2.0.0), the header files are located in _core/include instead of core/include, and the configure script does not detect them. Use the `numpy.get_include()` function for the detection in that script. --- pkgs/by-name/im/imager/numpy-header.patch | 26 +++++++++++++++++++++++ pkgs/by-name/im/imager/package.nix | 3 +++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/by-name/im/imager/numpy-header.patch diff --git a/pkgs/by-name/im/imager/numpy-header.patch b/pkgs/by-name/im/imager/numpy-header.patch new file mode 100644 index 000000000000..6424c5a54f59 --- /dev/null +++ b/pkgs/by-name/im/imager/numpy-header.patch @@ -0,0 +1,26 @@ +diff --git a/admin/gildas-env.sh b/admin/gildas-env.sh +index acb06f9..b25ecd5 100644 +--- a/admin/gildas-env.sh ++++ b/admin/gildas-env.sh +@@ -441,7 +441,7 @@ EOF + # Now search for Numpy + if python -c "import numpy" > /dev/null 2>&1; then + NUMPY_PRESENT=yes +- NUMPY_INC_DIR=`python -c "import numpy; print(numpy.__path__[0] + '/core/include')"` ++ NUMPY_INC_DIR=`python -c "import numpy; print(numpy.get_include())"` + if [ -e "$NUMPY_INC_DIR/numpy/arrayobject.h" ]; then + NUMPY_INC_PRESENT=yes + else +diff --git a/utilities/etc/setup.py.src b/utilities/etc/setup.py.src +index 9a4da86..110a0d1 100644 +--- a/utilities/etc/setup.py.src ++++ b/utilities/etc/setup.py.src +@@ -75,7 +75,7 @@ mod_extras = mod_extras.split() + + if (os.environ.get('NUMPY_PRESENT') == "yes"): + import numpy +- mod_inc_dirs.append(numpy.__path__[0] + '/core/include') ++ mod_inc_dirs.append(numpy.get_include()) + else: + raise Exception("Numpy python package should be present. Aborting.") + diff --git a/pkgs/by-name/im/imager/package.nix b/pkgs/by-name/im/imager/package.nix index b3f393b7571c..d21c94272127 100644 --- a/pkgs/by-name/im/imager/package.nix +++ b/pkgs/by-name/im/imager/package.nix @@ -59,6 +59,9 @@ stdenv.mkDerivation (finalAttrs: { ./clang.patch # Replace hardcoded cpp with GAG_CPP (see below). ./cpp-darwin.patch + # Fix the numpy header detection with numpy > 2.0.0 + # Patch submitted upstream, it will be included in the next release. + ./numpy-header.patch ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; From f969269821b57cd02f2a8ca3f3e4c30c92a371f4 Mon Sep 17 00:00:00 2001 From: bokicoder <1556588440@qq.com> Date: Sun, 25 May 2025 18:20:24 +0800 Subject: [PATCH 35/63] maintainers: add bokicoder --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d9731063b760..f6a5209bc676 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3486,6 +3486,11 @@ githubId = 50839; name = "Brian Jones"; }; + bokicoder = { + github = "bokicoder"; + githubId = 193465580; + name = "bokicoder"; + }; boldikoller = { email = "boldi.koller@wtss.eu"; github = "boldikoller"; From c9a4d7bea86441a63c5f77fdf952ab5b83bb3f63 Mon Sep 17 00:00:00 2001 From: Omar Jatoi Date: Sun, 25 May 2025 08:38:47 -0400 Subject: [PATCH 36/63] claude-code: 1.0.2 -> 1.0.3 --- pkgs/by-name/cl/claude-code/package-lock.json | 8 ++++---- pkgs/by-name/cl/claude-code/package.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index 320bb49a8443..035b36b59263 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -5,13 +5,13 @@ "packages": { "": { "dependencies": { - "@anthropic-ai/claude-code": "^1.0.2" + "@anthropic-ai/claude-code": "^1.0.3" } }, "node_modules/@anthropic-ai/claude-code": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.2.tgz", - "integrity": "sha512-6p7RMXEcVfymsJ7v0GyMfA3gcD2AbFVSb9b1Py4tbxM2ensjyaSx3wVQW2QiFk+9mhoRkYc0ETVnJ1x/G0LW7g==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.3.tgz", + "integrity": "sha512-a4aBhcXGG7k4YtyF2aYVKt08h48BG+F12RA/G3K1vb6unl9CAvWDP/A7xudtCOzxFKxLwxctrn74pHEdpmHSPw==", "hasInstallScript": true, "license": "SEE LICENSE IN README.md", "bin": { diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index 53519341a4c2..456488949cad 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "claude-code"; - version = "1.0.2"; + version = "1.0.3"; nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz"; - hash = "sha256-mQv2o9uaOZiZSdkNmLiqJs66fe9fiHfEmrXQZwmME34="; + hash = "sha256-LjDxVv6KSTuRZhCHztvf81E5DQbkqs8cbrnbbGkCeQU="; }; - npmDepsHash = "sha256-Diii1tBBzYlB4svlphtu1VAOoijoq9WudxtJFSXXbbE="; + npmDepsHash = "sha256-muMukVEj6uXkupSoyp41FihsLth0ENgfzBlD5CwlE2w="; postPatch = '' cp ${./package-lock.json} package-lock.json From 97557de1e29d0ee88e15b1536eaf59d6e212b0d6 Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Sat, 24 May 2025 15:15:30 +0200 Subject: [PATCH 37/63] nixos/prowlarr: use DynamicUser again, configure bind mount for custom dataDirs --- .../services/misc/servarr/prowlarr.nix | 58 ++++++++----------- 1 file changed, 23 insertions(+), 35 deletions(-) diff --git a/nixos/modules/services/misc/servarr/prowlarr.nix b/nixos/modules/services/misc/servarr/prowlarr.nix index b8d93bd6e8a4..9682df2b161f 100644 --- a/nixos/modules/services/misc/servarr/prowlarr.nix +++ b/nixos/modules/services/misc/servarr/prowlarr.nix @@ -7,6 +7,7 @@ let cfg = config.services.prowlarr; servarr = import ./settings-options.nix { inherit lib pkgs; }; + isCustomDataDir = cfg.dataDir != "/var/lib/prowlarr"; in { options = { @@ -16,7 +17,12 @@ in dataDir = lib.mkOption { type = lib.types.str; default = "/var/lib/prowlarr"; - description = "The directory where Prowlarr stores its data files."; + description = '' + The directory where Prowlarr stores its data files. + + Note: A bind mount will be used to mount the directory at the expected location + if a different value than `/var/lib/prowlarr` is used. + ''; }; package = lib.mkPackageOption pkgs "prowlarr" { }; @@ -30,22 +36,6 @@ in settings = servarr.mkServarrSettingsOptions "prowlarr" 9696; environmentFiles = servarr.mkServarrEnvironmentFiles "prowlarr"; - - user = lib.mkOption { - type = lib.types.str; - default = "prowlarr"; - description = '' - User account under which Prowlarr runs. - ''; - }; - - group = lib.mkOption { - type = lib.types.str; - default = "prowlarr"; - description = '' - Group under which Prowlarr runs. - ''; - }; }; }; @@ -55,38 +45,36 @@ in description = "Prowlarr"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - environment = servarr.mkServarrSettingsEnvVars "PROWLARR" cfg.settings; + environment = servarr.mkServarrSettingsEnvVars "PROWLARR" cfg.settings // { + HOME = "/var/empty"; + }; serviceConfig = { Type = "simple"; - User = cfg.user; - Group = cfg.group; + DynamicUser = true; + StateDirectory = "prowlarr"; EnvironmentFile = cfg.environmentFiles; - ExecStart = "${lib.getExe cfg.package} -nobrowser -data='${cfg.dataDir}'"; + ExecStart = "${lib.getExe cfg.package} -nobrowser -data=/var/lib/prowlarr"; Restart = "on-failure"; }; }; - tmpfiles.settings."10-prowlarr".${cfg.dataDir}.d = { - inherit (cfg) user group; + tmpfiles.settings."10-prowlarr".${cfg.dataDir}.d = lib.mkIf isCustomDataDir { + user = "root"; + group = "root"; mode = "0700"; }; + + mounts = lib.optional isCustomDataDir { + what = cfg.dataDir; + where = "/var/lib/private/prowlarr"; + options = "bind"; + wantedBy = [ "local-fs.target" ]; + }; }; networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.settings.server.port ]; }; - - users.users = lib.mkIf (cfg.user == "prowlarr") { - prowlarr = { - isSystemUser = true; - group = cfg.group; - home = cfg.dataDir; - }; - }; - - users.groups = lib.mkIf (cfg.group == "prowlarr") { - prowlarr = { }; - }; }; } From 9b5aea92337798f33ec75420147fea707c642fa5 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 25 May 2025 16:19:10 +0200 Subject: [PATCH 38/63] haskell.packages.ghc865Binary: remove dontChecks The only 8.6.x package set still in Nixpkgs is ghc865Binary, which has checks disabled across the board. --- .../configuration-ghc-8.6.x.nix | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 2d0407937acf..d4bd67400d81 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -68,28 +68,15 @@ self: super: { # Needs Cabal 3.0.x. jailbreak-cabal = super.jailbreak-cabal.overrideScope (cself: _: { Cabal = cself.Cabal_3_2_1_0; }); - # https://github.com/tibbe/unordered-containers/issues/214 - unordered-containers = dontCheck super.unordered-containers; - # Test suite does not compile. data-clist = doJailbreak super.data-clist; # won't cope with QuickCheck 2.12.x dates = doJailbreak super.dates; # base >=4.9 && <4.12 - Diff = dontCheck super.Diff; - equivalence = dontCheck super.equivalence; # test suite doesn't compile https://github.com/pa-ba/equivalence/issues/5 HaTeX = doJailbreak super.HaTeX; # containers >=0.4 && <0.6 is too tight; https://github.com/Daniel-Diaz/HaTeX/issues/126 hpc-coveralls = doJailbreak super.hpc-coveralls; # https://github.com/guillaume-nargeot/hpc-coveralls/issues/82 http-api-data = doJailbreak super.http-api-data; - persistent-sqlite = dontCheck super.persistent-sqlite; - unicode-transforms = dontCheck super.unicode-transforms; wl-pprint-extras = doJailbreak super.wl-pprint-extras; # containers >=0.4 && <0.6 is too tight; https://github.com/ekmett/wl-pprint-extras/issues/17 - RSA = dontCheck super.RSA; # https://github.com/GaloisInc/RSA/issues/14 - github = dontCheck super.github; # hspec upper bound exceeded; https://github.com/phadej/github/pull/341 - binary-orphans = dontCheck super.binary-orphans; # tasty upper bound exceeded; https://github.com/phadej/binary-orphans/commit/8ce857226595dd520236ff4c51fa1a45d8387b33 rebase = doJailbreak super.rebase; # time ==1.9.* is too low - # https://github.com/jgm/skylighting/issues/55 - skylighting-core = dontCheck super.skylighting-core; - # cabal2nix needs the latest version of Cabal, and the one # hackage-db uses must match, so take the latest cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; }); @@ -106,14 +93,5 @@ self: super: { # This became a core library in ghc 8.10., so we don’t have an "exception" attribute anymore. exceptions = self.exceptions_0_10_9; - # vector 0.12.2 indroduced doctest checks that don’t work on older compilers - vector = dontCheck super.vector; - - # https://github.com/haskellari/time-compat/issues/23 - time-compat = dontCheck super.time-compat; - mime-string = disableOptimization super.mime-string; - - # https://github.com/fpco/inline-c/issues/127 (recommend to upgrade to Nixpkgs GHC >=9.0) - inline-c-cpp = (if isDarwin then dontCheck else x: x) super.inline-c-cpp; } From 906591c38f5c5a4b1d602fd6ee3f0acfb065d283 Mon Sep 17 00:00:00 2001 From: DashieTM Date: Fri, 9 May 2025 19:32:10 +0200 Subject: [PATCH 39/63] fancontrol-gui: init at 0.8 --- pkgs/by-name/fa/fancontrol-gui/package.nix | 62 ++++++++++++++++++++ pkgs/by-name/fa/fancontrol-gui/version.patch | 13 ++++ 2 files changed, 75 insertions(+) create mode 100644 pkgs/by-name/fa/fancontrol-gui/package.nix create mode 100644 pkgs/by-name/fa/fancontrol-gui/version.patch diff --git a/pkgs/by-name/fa/fancontrol-gui/package.nix b/pkgs/by-name/fa/fancontrol-gui/package.nix new file mode 100644 index 000000000000..300a29826289 --- /dev/null +++ b/pkgs/by-name/fa/fancontrol-gui/package.nix @@ -0,0 +1,62 @@ +{ + cmake, + extra-cmake-modules, + fancontrol-gui, + fetchFromGitHub, + lib, + libgcc, + libsForQt5, + nix-update-script, + stdenv, + testers, +}: +stdenv.mkDerivation rec { + pname = "fancontrol-gui"; + version = "0.8"; + + src = fetchFromGitHub { + owner = "Maldela"; + repo = "fancontrol-gui"; + tag = "v${version}"; + hash = "sha256-hJaU8SL0b6GmTONGSIzUzzbex6KxHf2Np0bCX8YSSVM="; + }; + + buildInputs = with libsForQt5; [ + libgcc + kcmutils + kdeclarative + kio + plasma-framework + qt5.qtdeclarative + qt5.qtquickcontrols + qt5.qtquickcontrols2 + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + libsForQt5.wrapQtAppsHook + ]; + + patches = [ + ./version.patch + ]; + + passthru = { + tests.version = testers.testVersion { + package = fancontrol-gui; + command = "env QT_QPA_PLATFORM=minimal ${lib.getExe fancontrol-gui} --version"; + }; + updateScript = nix-update-script { }; + }; + + meta = { + description = "GUI for fancontrol with QT and KDE framework 5"; + homepage = "https://github.com/Maldela/fancontrol-gui"; + changelog = "https://github.com/Maldela/fancontrol-gui/releases/tag/v${version}"; + license = lib.licenses.gpl2Plus; + mainProgram = "fancontrol_gui"; + maintainers = with lib.maintainers; [ dashietm ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/fa/fancontrol-gui/version.patch b/pkgs/by-name/fa/fancontrol-gui/version.patch new file mode 100644 index 000000000000..9b0ea0943b8f --- /dev/null +++ b/pkgs/by-name/fa/fancontrol-gui/version.patch @@ -0,0 +1,13 @@ +diff --git a/fancontrol-gui/src/main.cpp b/fancontrol-gui/src/main.cpp +index 9f33fa0..ae0deb6 100644 +--- a/fancontrol-gui/src/main.cpp ++++ b/fancontrol-gui/src/main.cpp +@@ -81,7 +81,7 @@ int main(int argc, char *argv[]) + + auto about = KAboutData(QStringLiteral("org.kde.fancontrol.gui"), + i18n("Fancontrol-GUI"), +- QStringLiteral("0.7"), ++ QStringLiteral("0.8"), + i18n("Graphical user interface for fancontrol"), + KAboutLicense::KAboutLicense::GPL_V2, + QStringLiteral("Copyright (C) 2015 Malte Veerman"), From 71d5f0f591c7ec68d2ca476aee4f57039cf51fd6 Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Sat, 24 May 2025 15:27:10 +0200 Subject: [PATCH 40/63] nixos/tests/prowlarr: add subtest for dataDir migration --- nixos/tests/all-tests.nix | 2 +- nixos/tests/prowlarr.nix | 44 +++++++++++++++++++++++++++------------ 2 files changed, 32 insertions(+), 14 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 933eaab3b0a9..c03ed4767c77 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1125,7 +1125,7 @@ in prosody = handleTest ./xmpp/prosody.nix { }; prosody-mysql = handleTest ./xmpp/prosody-mysql.nix { }; proxy = handleTest ./proxy.nix { }; - prowlarr = handleTest ./prowlarr.nix { }; + prowlarr = runTest ./prowlarr.nix; pt2-clone = handleTest ./pt2-clone.nix { }; pykms = handleTest ./pykms.nix { }; public-inbox = handleTest ./public-inbox.nix { }; diff --git a/nixos/tests/prowlarr.nix b/nixos/tests/prowlarr.nix index 859ce58b3b1b..c03475df0423 100644 --- a/nixos/tests/prowlarr.nix +++ b/nixos/tests/prowlarr.nix @@ -1,22 +1,40 @@ -import ./make-test-python.nix ( - { lib, ... }: +{ lib, config, ... }: - { - name = "prowlarr"; - meta.maintainers = with lib.maintainers; [ ]; +{ + name = "prowlarr"; + meta.maintainers = with lib.maintainers; [ ]; - nodes.machine = - { pkgs, ... }: - { - services.prowlarr.enable = true; + nodes.machine = + { pkgs, ... }: + { + services.prowlarr.enable = true; + specialisation.customDataDir = { + inheritParentConfig = true; + configuration.services.prowlarr.dataDir = "/srv/prowlarr"; }; + }; - testScript = '' + testScript = '' + def verify_prowlarr_works(): machine.wait_for_unit("prowlarr.service") machine.wait_for_open_port(9696) response = machine.succeed("curl --fail http://localhost:9696/") assert 'Prowlarr' in response, "Login page didn't load successfully" machine.succeed("[ -d /var/lib/prowlarr ]") - ''; - } -) + + with subtest("Prowlarr starts and responds to requests"): + verify_prowlarr_works() + + with subtest("Prowlarr data directory migration works"): + machine.systemctl("stop prowlarr.service") + machine.succeed("mkdir -p /tmp/prowlarr-migration") + machine.succeed("mv /var/lib/prowlarr/* /tmp/prowlarr-migration") + machine.succeed("${config.nodes.machine.system.build.toplevel}/specialisation/customDataDir/bin/switch-to-configuration test") + machine.wait_for_unit("var-lib-private-prowlarr.mount") + machine.succeed("mv /tmp/prowlarr-migration/* /var/lib/prowlarr") + machine.systemctl("restart prowlarr.service") + # Check that we're using a bind mount when using a non-default dataDir + machine.succeed("findmnt /var/lib/private/prowlarr | grep /srv/prowlarr") + verify_prowlarr_works() + ''; +} From c75324835f543f50a9ca202223679b64c8794be9 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sun, 25 May 2025 22:27:47 +0200 Subject: [PATCH 41/63] librdf_redland: remove unused pcre dependency pcre 1 is deprecated and should not be used. `librdf_redland` previously offered optional pcre 1 support, but has since completely removed that dependency. Comparing build artifacts with and without pcre 1 using diffoscope, the output is identical (apart from references to the $out nix store paths). --- pkgs/development/libraries/librdf/redland.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index 3391a8cf6ee6..2640330fb188 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/pkgs/development/libraries/librdf/redland.nix @@ -7,7 +7,6 @@ libxslt, perl, curl, - pcre, libxml2, librdf_rasqal, gmp, @@ -40,7 +39,6 @@ stdenv.mkDerivation rec { openssl libxslt curl - pcre libxml2 gmp ] From e721ada106ffa6000276ce8fd65b78ba1e2c33fc Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 26 May 2025 01:22:34 +0200 Subject: [PATCH 42/63] python312Packages.pytensor: 2.31.1 -> 2.31.2 Diff: https://github.com/pymc-devs/pytensor/compare/refs/tags/rel-2.31.1...rel-2.31.2 Changelog: https://github.com/pymc-devs/pytensor/releases/tag/rel-2.31.2 --- pkgs/development/python-modules/pytensor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix index be8e1f24826a..0fefe2c61c32 100644 --- a/pkgs/development/python-modules/pytensor/default.nix +++ b/pkgs/development/python-modules/pytensor/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "pytensor"; - version = "2.31.1"; + version = "2.31.2"; pyproject = true; src = fetchFromGitHub { @@ -42,7 +42,7 @@ buildPythonPackage rec { postFetch = '' sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${src.tag})"/' $out/pytensor/_version.py ''; - hash = "sha256-R/qHLAqNbFqoi2MQeptlVE148cInVOpN5n/wGr1AB9M="; + hash = "sha256-dFqJm9/77Nelh//1FjLauPAAQSogDa2fd1JJjlVFWsY="; }; build-system = [ From f6c54fd18f80f512eb2773368faa813c2e570544 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 May 2025 00:32:18 +0000 Subject: [PATCH 43/63] guile-mqtt: 0.2.1 -> 1.0.0 --- pkgs/by-name/gu/guile-mqtt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gu/guile-mqtt/package.nix b/pkgs/by-name/gu/guile-mqtt/package.nix index f447f32590c4..fa6c41c46aa8 100644 --- a/pkgs/by-name/gu/guile-mqtt/package.nix +++ b/pkgs/by-name/gu/guile-mqtt/package.nix @@ -9,12 +9,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "guile-mqtt"; - version = "0.2.1"; + version = "1.0.0"; # building from git repo requires nyacc>=2.01.3 src = fetchurl { url = "https://github.com/mdjurfeldt/guile-mqtt/releases/download/v${finalAttrs.version}/guile-mqtt-${finalAttrs.version}.tar.gz"; - hash = "sha256-+qfrUw8yIY8iObEVLbg6bOfiQNR5Lkw2n9oHMr3JQ5k="; + hash = "sha256-6+U3FHewbdI8l7r4pVCrd0DNKPy4BHHy2m/hcQ7ByBQ="; }; strictDeps = true; From c4173728517b79fff068e900ac757152ceca5d1a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 May 2025 03:53:51 +0000 Subject: [PATCH 44/63] libretro.citra: 0-unstable-2025-05-07 -> 0-unstable-2025-05-17 --- pkgs/applications/emulators/libretro/cores/citra.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/citra.nix b/pkgs/applications/emulators/libretro/cores/citra.nix index febf6e8413c6..45356270486a 100644 --- a/pkgs/applications/emulators/libretro/cores/citra.nix +++ b/pkgs/applications/emulators/libretro/cores/citra.nix @@ -9,13 +9,13 @@ }: mkLibretroCore { core = "citra"; - version = "0-unstable-2025-05-07"; + version = "0-unstable-2025-05-17"; src = fetchFromGitHub { owner = "libretro"; repo = "citra"; - rev = "b1f9fe0c3d4d6c4e133a710bc172d9adcb40c706"; - hash = "sha256-EI8N+tjA6UsEq7sKIZ/zxeugW/oyCF+cPKX2HTjVqNI="; + rev = "8e634afee9e870620b40efedaef77478cd1f3c99"; + hash = "sha256-pf0fgamSg2OHxvft36+Y4wPF9hjyZOQXEtMWs0dkNRM="; fetchSubmodules = true; }; From 4e9ce9e550fd2058833c65f87236a6abea88f377 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 May 2025 05:42:02 +0000 Subject: [PATCH 45/63] dbeaver-bin: 25.0.4 -> 25.0.5 --- pkgs/by-name/db/dbeaver-bin/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index f56dc18dcdbf..ee7ec2c69559 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbeaver-bin"; - version = "25.0.4"; + version = "25.0.5"; src = let @@ -30,10 +30,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { aarch64-darwin = "macos-aarch64.dmg"; }; hash = selectSystem { - x86_64-linux = "sha256-ALtJIld7gT4pj+jGRkwMloq6B/ZBOMYZxws9N7xNNZg="; - aarch64-linux = "sha256-Ka+jEI6y1BRqV83yDvu1yDzJfpUIxKKD+zehVHcNQ/o="; - x86_64-darwin = "sha256-P8f0NlMjh/46RChQy8JIm71msqX023K2QaFEic2Br9M="; - aarch64-darwin = "sha256-a9H9M1j6iPcrVcfDxCZHeZj6e55QH3XochXaL2OStlI="; + x86_64-linux = "sha256-8JkvI6OZGP1Ot2TEP2n4hj3s9As7holT+thVf0BvOMQ="; + aarch64-linux = "sha256-cZQFEbogSxuIaS/z/tFQcvs08J0Omi21zLqb0eFQNw0="; + x86_64-darwin = "sha256-LueOQZIKB/r6gtlj0+xwoJXMRTFvbSY+RTwAB74KiYo="; + aarch64-darwin = "sha256-L6bOyvhlsT4sXL1QDhlJtb8DFfDVw21ixyRenOVdCxU="; }; in fetchurl { From 79277868d5741fc028adab59000ceb640d5aa639 Mon Sep 17 00:00:00 2001 From: Boris Bera Date: Mon, 26 May 2025 02:22:05 -0400 Subject: [PATCH 46/63] coredns: allow specifying position for externalPlugins (#360798) Co-authored-by: Arne Keller --- pkgs/by-name/co/coredns/package.nix | 63 +++++++++++++++++++---------- 1 file changed, 42 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/co/coredns/package.nix b/pkgs/by-name/co/coredns/package.nix index c0c8d6d97acc..109b6ac2ec76 100644 --- a/pkgs/by-name/co/coredns/package.nix +++ b/pkgs/by-name/co/coredns/package.nix @@ -10,26 +10,7 @@ }: let - attrsToPlugins = - attrs: - builtins.map ( - { - name, - repo, - version, - }: - "${name}:${repo}" - ) attrs; - attrsToSources = - attrs: - builtins.map ( - { - name, - repo, - version, - }: - "${repo}@${version}" - ) attrs; + attrsToSources = attrs: builtins.map ({ repo, version, ... }: "${repo}@${version}") attrs; in buildGoModule rec { pname = "coredns"; @@ -53,7 +34,47 @@ buildGoModule rec { # Override the go-modules fetcher derivation to fetch plugins modBuildPhase = '' - for plugin in ${builtins.toString (attrsToPlugins externalPlugins)}; do echo $plugin >> plugin.cfg; done + cp plugin.cfg plugin.cfg.orig + ${ + (lib.concatMapStringsSep "\n" ( + plugin: + let + position = plugin.position or "end-of-file"; + formatPlugin = { name, repo, ... }: "${name}:${repo}"; + in + if position == "end-of-file" then + "echo '${formatPlugin plugin}' >> plugin.cfg" + else if position == "start-of-file" then + "sed -i '1i ${formatPlugin plugin}' plugin.cfg" + else if lib.hasAttrByPath [ "before" ] position then + '' + if ! grep -q '^${position.before}:' plugin.cfg; then + echo 'Failed to insert ${plugin.name} before ${position.before} in plugin.cfg: ${position.before} is not in plugin.cfg' + exit 1 + fi + sed -i '/^${position.before}:/i ${formatPlugin plugin}' plugin.cfg + '' + else if lib.hasAttrByPath [ "after" ] position then + '' + if ! grep -q '^${position.after}:' plugin.cfg; then + echo 'Failed to insert ${plugin.name} after ${position.after} in plugin.cfg: ${position.after} is not in plugin.cfg' + exit 1 + fi + sed -i '/^${position.after}:/a ${formatPlugin plugin}' plugin.cfg + '' + else + throw '' + Unsupported position value in externalPlugin: + ${builtins.toJSON plugin}. + Valid values for position attr are: + - position = "end-of-file" (the default) + - position = "start-of-file" + - position.before = "{other plugin}" + - position.after = "{other plugin}" + '' + ) externalPlugins) + } + diff -u plugin.cfg.orig plugin.cfg || true for src in ${builtins.toString (attrsToSources externalPlugins)}; do go get $src; done GOOS= GOARCH= go generate go mod vendor From 4490c896fb54c50b16d7d68b141e97bd24292e41 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 May 2025 07:10:35 +0000 Subject: [PATCH 47/63] phpPackages.phpstan: 2.1.15 -> 2.1.17 --- pkgs/development/php-packages/phpstan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 12112552c2a3..380346dc3d70 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -7,16 +7,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpstan"; - version = "2.1.15"; + version = "2.1.17"; src = fetchFromGitHub { owner = "phpstan"; repo = "phpstan-src"; tag = finalAttrs.version; - hash = "sha256-1MHEN7/OL35xBLkwW7j2CxkjGb4EUkV1Zc8Nvn4xqNI="; + hash = "sha256-F4K+9tmnonUdk7VtXVo0tYf4RgoNjzGmIteWkzMOkYE="; }; - vendorHash = "sha256-7PAO+8hkeNQH9lM77NvRX2/56PlIgWCwJ700b4erM2Y="; + vendorHash = "sha256-q83Gb2oujougRQVmeTOtdnVtP4IRghPUpo1kzbSlhiQ="; composerStrictValidation = false; doInstallCheck = true; From 6f3db9f36094f5171db0d7247839eb3e4efc8ac0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 May 2025 07:11:59 +0000 Subject: [PATCH 48/63] phpExtensions.excimer: 1.2.3 -> 1.2.5 --- pkgs/development/php-packages/excimer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/excimer/default.nix b/pkgs/development/php-packages/excimer/default.nix index ff695b0d5eb5..06a8538faa6c 100644 --- a/pkgs/development/php-packages/excimer/default.nix +++ b/pkgs/development/php-packages/excimer/default.nix @@ -5,7 +5,7 @@ }: let - version = "1.2.3"; + version = "1.2.5"; in buildPecl { inherit version; @@ -15,7 +15,7 @@ buildPecl { owner = "wikimedia"; repo = "mediawiki-php-excimer"; tag = version; - hash = "sha256-p1tnrrSiTtoin/QSQFeeiX0Di1wFD8CMTdLazOfjWKU="; + hash = "sha256-xFnyqofazXtPfwp/4xNYwrPEW9vWzz5akXjCOiyP4nw="; }; meta = { From a2f0a0453dc9966f52e9304b036ac005ab79827d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 26 May 2025 09:10:12 +0200 Subject: [PATCH 49/63] bashunit: 0.19.0 -> 0.19.1 --- pkgs/by-name/ba/bashunit/package.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ba/bashunit/package.nix b/pkgs/by-name/ba/bashunit/package.nix index d458858dfdd0..b601f9000c1d 100644 --- a/pkgs/by-name/ba/bashunit/package.nix +++ b/pkgs/by-name/ba/bashunit/package.nix @@ -12,19 +12,20 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "bashunit"; - version = "0.19.0"; + version = "0.19.1"; + src = fetchFromGitHub { owner = "TypedDevs"; repo = "bashunit"; tag = finalAttrs.version; - hash = "sha256-EoCCqESzmCW12AuAqA3qh2VcE8gyUPIGJEoCcZhMA/Y="; + hash = "sha256-LoPtWf4Vo7hodWa0WJmqYDW7p7xJDrRZ5/qwUy/rB3U="; forceFetchGit = true; # needed to include the tests directory for the check phase }; nativeBuildInputs = [ makeBinaryWrapper ]; postConfigure = '' - patchShebangs src tests build.sh bashunit + patchShebangs tests build.sh bashunit substituteInPlace Makefile \ --replace-fail "SHELL=/bin/bash" "SHELL=${lib.getExe bash}" ''; @@ -41,9 +42,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - # some tests are currently broken on linux and it is not easy to disable them - # reenable them after https://github.com/TypedDevs/bashunit/pull/397 has been merged - doCheck = false; + doCheck = true; nativeCheckInputs = [ which ]; checkPhase = '' runHook preCheck From 2c673b6e6707d29037a386c4b579559d46b22347 Mon Sep 17 00:00:00 2001 From: programmerlexi <60185691+programmerlexi@users.noreply.github.com> Date: Mon, 26 May 2025 09:49:36 +0200 Subject: [PATCH 50/63] nixos/limine: fix boot entry not being created properly (#410935) --- .../boot/loader/limine/limine-install.py | 51 ++++++++++++------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/nixos/modules/system/boot/loader/limine/limine-install.py b/nixos/modules/system/boot/loader/limine/limine-install.py index c775d65d4057..d46f8c914859 100644 --- a/nixos/modules/system/boot/loader/limine/limine-install.py +++ b/nixos/modules/system/boot/loader/limine/limine-install.py @@ -412,27 +412,42 @@ def main(): efi_disk = find_disk_device(efi_partition) efibootmgr_output = subprocess.check_output([efibootmgr], stderr=subprocess.STDOUT, universal_newlines=True) - create_flag = '-c' + # Check the output of `efibootmgr` to find if limine is already installed and present in the boot record - if matches := re.findall(r'Boot[0-9a-fA-F]{4}\*? Limine', efibootmgr_output): - create_flag = '-C' # if present, keep the same boot order + limine_boot_entry = None + if matches := re.findall(r'Boot([0-9a-fA-F]{4})\*? Limine', efibootmgr_output): + limine_boot_entry = matches[0] - efibootmgr_output = subprocess.check_output([ - efibootmgr, - create_flag, - '-d', efi_disk, - '-p', efi_partition.removeprefix(efi_disk).removeprefix('p'), - '-l', f'\\efi\\limine\\{boot_file}', - '-L', 'Limine', - ], stderr=subprocess.STDOUT, universal_newlines=True) + # If there's already a Limine entry, replace it + if limine_boot_entry: + boot_order = re.findall(r'BootOrder: ((?:[0-9a-fA-F]{4},?)*)', efibootmgr_output)[0] + + efibootmgr_output = subprocess.check_output([ + efibootmgr, + '-b', limine_boot_entry, + '-B', + ], stderr=subprocess.STDOUT, universal_newlines=True) + + efibootmgr_output = subprocess.check_output([ + efibootmgr, + '-c', + '-b', limine_boot_entry, + '-d', efi_disk, + '-p', efi_partition.removeprefix(efi_disk).removeprefix('p'), + '-l', f'\\efi\\limine\\{boot_file}', + '-L', 'Limine', + '-o', boot_order, + ], stderr=subprocess.STDOUT, universal_newlines=True) + else: + efibootmgr_output = subprocess.check_output([ + efibootmgr, + '-c', + '-d', efi_disk, + '-p', efi_partition.removeprefix(efi_disk).removeprefix('p'), + '-l', f'\\efi\\limine\\{boot_file}', + '-L', 'Limine', + ], stderr=subprocess.STDOUT, universal_newlines=True) - for line in efibootmgr_output.split('\n'): - if matches := re.findall(r'Boot([0-9a-fA-F]{4}) has same label Limine', line): - subprocess.run( - [efibootmgr, '-b', matches[0], '-B'], - stdout=subprocess.DEVNULL, - stderr=subprocess.DEVNULL, - ) if config('biosSupport'): if cpu_family != 'x86': raise Exception(f'Unsupported CPU family for BIOS install: {cpu_family}') From 9176f62711f0dcb998c9e16eb4e8b16827a016e6 Mon Sep 17 00:00:00 2001 From: qbisi Date: Mon, 26 May 2025 06:07:03 +0800 Subject: [PATCH 51/63] pocl: 6.0-unstable-2025-01-02 -> 7.0 --- pkgs/by-name/po/pocl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/po/pocl/package.nix b/pkgs/by-name/po/pocl/package.nix index 4075762f19e5..671b6592bb2f 100644 --- a/pkgs/by-name/po/pocl/package.nix +++ b/pkgs/by-name/po/pocl/package.nix @@ -41,13 +41,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "pocl"; - version = "6.0-unstable-2025-01-02"; + version = "7.0"; src = fetchFromGitHub { owner = "pocl"; repo = "pocl"; - rev = "acf4ea163b7346d20b3023d41c1141f094acc755"; - hash = "sha256-d/BD8YkdMYtu6yFlGNXrsz7PVIrzBvvYLU1JRv7ZJmc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-pyolM0SR6xiwhad7K0mX9I/PKbIa8Ltin0CYoA1U/qo="; }; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' From 31395c766ea3ba4d31f6abb0e63b9d1a10b2ed18 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 26 May 2025 01:04:02 +0200 Subject: [PATCH 52/63] nix: mark i686-linux cross builds as broken They are broken on hydra's cross-trunk jobset since at least 2022-05-24 and more recently they've been getting stuck while running the functional-tests and block a build slot until the hard timeout. Co-authored-by: Robert Hensing --- pkgs/tools/package-management/nix/common-meson.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/package-management/nix/common-meson.nix b/pkgs/tools/package-management/nix/common-meson.nix index 8775feab540f..1e2bb73aef41 100644 --- a/pkgs/tools/package-management/nix/common-meson.nix +++ b/pkgs/tools/package-management/nix/common-meson.nix @@ -274,6 +274,10 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.lgpl21Plus; inherit maintainers teams; platforms = platforms.unix; + # Gets stuck in functional-tests in cross-trunk jobset and doesn't timeout + # https://hydra.nixos.org/build/298175022 + # probably https://github.com/NixOS/nix/issues/13042 + broken = stdenv.hostPlatform.system == "i686-linux" && stdenv.buildPlatform != stdenv.hostPlatform; outputsToInstall = [ "out" ] ++ optional enableDocumentation "man"; mainProgram = "nix"; }; From 11ed9936cc426b85466d11809a336d8d08110a23 Mon Sep 17 00:00:00 2001 From: sanana Date: Wed, 19 Mar 2025 22:34:42 +0300 Subject: [PATCH 53/63] nixos/make-disk-image: support partition layout `"legacy+boot"` This patch adds a new partition layout type `"legacy+boot` which will produce MBR images with a separate FAT32 boot partition. This is necessary for adding a NixOS test for Limine on BIOS systems, as Limine can't read ext4 partitions. --- nixos/lib/make-disk-image.nix | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 015d7e4dbe53..d418a4146294 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -39,6 +39,14 @@ This partition layout is unsuitable for UEFI. + #### `legacy+boot` + + The image is partitioned using MBR and: + - creates a FAT32 BOOT partition from 1MiB to specified `bootSize` parameter (256MiB by default), set it bootable ; + - creates a primary ext4 partition starting after the boot partition and extending to the full disk image + + This partition layout is unsuitable for UEFI. + #### `legacy+gpt` This partition table type uses GPT and: @@ -106,7 +114,7 @@ additionalSpace ? "512M", # size of the boot partition, is only used if partitionTableType is - # either "efi" or "hybrid" + # either "efi", "hybrid", or "legacy+boot" # This will be undersized slightly, as this is actually the offset of # the end of the partition. Generally it will be 1MiB smaller. bootSize ? "256M", @@ -197,6 +205,7 @@ assert ( lib.assertOneOf "partitionTableType" partitionTableType [ "legacy" + "legacy+boot" "legacy+gpt" "efi" "efixbootldr" @@ -260,6 +269,7 @@ let { # switch-case legacy = "1"; + "legacy+boot" = "2"; "legacy+gpt" = "2"; efi = "2"; efixbootldr = "3"; @@ -276,6 +286,14 @@ let mkpart primary ext4 1MiB 100% \ print ''; + "legacy+boot" = '' + parted --script $diskImage -- \ + mklabel msdos \ + mkpart primary fat32 1MiB $bootSizeMiB \ + set 1 boot on \ + mkpart primary ext4 $bootSizeMiB 100% \ + print + ''; "legacy+gpt" = '' parted --script $diskImage -- \ mklabel gpt \ @@ -540,6 +558,12 @@ let # Add the 1MiB aligned reserved space (includes MBR) reservedSpace=$(( mebibyte )) '' + else if partitionTableType == "legacy+boot" then + '' + # The explanation from the above "efi" case applies here too, + # but gptSpace is not needed without a GPT. + reservedSpace=$(( bootSize )) + '' else '' reservedSpace=0 @@ -694,6 +718,11 @@ let ${lib.optionalString touchEFIVars "mount -t efivarfs efivarfs /sys/firmware/efi/efivars"} ''} + ${lib.optionalString (partitionTableType == "legacy+boot") '' + mkdir -p /mnt/boot + mkfs.vfat -n BOOT /dev/vda1 + mount /dev/vda1 /mnt/boot + ''} # Install a configuration.nix mkdir -p /mnt/etc/nixos From 95355b4d94fd6019c03e0c800af412d0f25ef72c Mon Sep 17 00:00:00 2001 From: sanana Date: Wed, 19 Mar 2025 22:42:42 +0300 Subject: [PATCH 54/63] nixos/qemu-vm: add option for a separate boot partition on BIOS This patch adds the option `virtualisation.useBootPartition` which creates a separate boot partition on BIOS systems using the new `legacy+boot` partition layout type in `nixos/lib/make-disk-image.nix`. --- nixos/modules/virtualisation/qemu-vm.nix | 41 +++++++++++++++++++++--- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 4772cedb4beb..068aa7efa0b1 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -62,8 +62,20 @@ let }; selectPartitionTableLayout = - { useEFIBoot, useDefaultFilesystems }: - if useDefaultFilesystems then if useEFIBoot then "efi" else "legacy" else "none"; + { + useEFIBoot, + useDefaultFilesystems, + useBootPartition, + }: + if useDefaultFilesystems then + if useEFIBoot then + "efi" + else if useBootPartition then + "legacy+boot" + else + "legacy" + else + "none"; driveCmdline = idx: @@ -337,7 +349,9 @@ let format = "qcow2"; onlyNixStore = false; label = rootFilesystemLabel; - partitionTableType = selectPartitionTableLayout { inherit (cfg) useDefaultFilesystems useEFIBoot; }; + partitionTableType = selectPartitionTableLayout { + inherit (cfg) useBootPartition useDefaultFilesystems useEFIBoot; + }; installBootLoader = cfg.installBootLoader; touchEFIVars = cfg.useEFIBoot; diskSize = "auto"; @@ -431,8 +445,17 @@ in virtualisation.bootPartition = mkOption { type = types.nullOr types.path; - default = if cfg.useEFIBoot then "/dev/disk/by-label/${espFilesystemLabel}" else null; - defaultText = literalExpression ''if cfg.useEFIBoot then "/dev/disk/by-label/${espFilesystemLabel}" else null''; + default = + if cfg.useEFIBoot then + "/dev/disk/by-label/${espFilesystemLabel}" + else if cfg.useBootPartition then + "/dev/disk/by-label/BOOT" + else + null; + defaultText = literalExpression '' + if cfg.useEFIBoot then "/dev/disk/by-label/${espFilesystemLabel}" + else if cfg.useBootPartition then "/dev/disk/by-label/BOOT" + else null''; example = "/dev/disk/by-label/esp"; description = '' The path (inside the VM) to the device containing the EFI System Partition (ESP). @@ -929,6 +952,14 @@ in ''; }; + virtualisation.useBootPartition = mkEnableOption null // { + description = '' + If enabled for legacy MBR VMs, the VM image will have a separate boot + partition mounted at /boot. + useBootPartition is ignored if useEFIBoot == true. + ''; + }; + virtualisation.useEFIBoot = mkOption { type = types.bool; default = false; From c156a809e37d80ac0cc5042f945bc2da0b86d289 Mon Sep 17 00:00:00 2001 From: sanana Date: Wed, 19 Mar 2025 22:52:38 +0300 Subject: [PATCH 55/63] nixosTests.limine.bios: init This patch adds a NixOS test for Limine on BIOS systems. It also fixes some formatting in `nixos/lib/make-disk-image.nix`. Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com> --- nixos/lib/make-disk-image.nix | 33 +++++++++++++++--------- nixos/modules/virtualisation/qemu-vm.nix | 3 +++ nixos/tests/limine/bios.nix | 28 ++++++++++++++++++++ nixos/tests/limine/default.nix | 1 + 4 files changed, 53 insertions(+), 12 deletions(-) create mode 100644 nixos/tests/limine/bios.nix diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index d418a4146294..b63c64f0188b 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -731,19 +731,28 @@ let ''} ${lib.optionalString installBootLoader '' - # In this throwaway resource, we only have /dev/vda, but the actual VM may refer to another disk for bootloader, e.g. /dev/vdb - # Use this option to create a symlink from vda to any arbitrary device you want. - ${lib.optionalString (config.boot.loader.grub.enable) ( - lib.concatMapStringsSep " " ( - device: - lib.optionalString (device != "/dev/vda") '' - mkdir -p "$(dirname ${device})" - ln -s /dev/vda ${device} - '' - ) config.boot.loader.grub.devices - )} + # In this throwaway resource, we only have /dev/vda, but the actual VM may refer to another disk for bootloader, e.g. /dev/vdb + # Use this option to create a symlink from vda to any arbitrary device you want. + ${lib.optionalString (config.boot.loader.grub.enable) ( + lib.concatMapStringsSep " " ( + device: + lib.optionalString (device != "/dev/vda") '' + mkdir -p "$(dirname ${device})" + ln -s /dev/vda ${device} + '' + ) config.boot.loader.grub.devices + )} + ${ + let + limine = config.boot.loader.limine; + in + lib.optionalString (limine.enable && limine.biosSupport && limine.biosDevice != "/dev/vda") '' + mkdir -p "$(dirname ${limine.biosDevice})" + ln -s /dev/vda ${limine.biosDevice} + '' + } - # Set up core system link, bootloader (sd-boot, GRUB, uboot, etc.), etc. + # Set up core system link, bootloader (sd-boot, GRUB, uboot, etc.), etc. # NOTE: systemd-boot-builder.py calls nix-env --list-generations which # clobbers $HOME/.nix-defexpr/channels/nixos This would cause a folder diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 068aa7efa0b1..ce1773a2f86c 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -1159,6 +1159,9 @@ in `useBootLoader` useless. You might want to disable one of those options. ''; + # Install Limine on the bootloader device + boot.loader.limine.biosDevice = cfg.bootLoaderDevice; + # In UEFI boot, we use a EFI-only partition table layout, thus GRUB will fail when trying to install # legacy and UEFI. In order to avoid this, we have to put "nodev" to force UEFI-only installs. # Otherwise, we set the proper bootloader device for this. diff --git a/nixos/tests/limine/bios.nix b/nixos/tests/limine/bios.nix new file mode 100644 index 000000000000..bc22af764c66 --- /dev/null +++ b/nixos/tests/limine/bios.nix @@ -0,0 +1,28 @@ +{ lib, ... }: +{ + name = "bios"; + meta.maintainers = with lib.maintainers; [ + lzcunt + phip1611 + programmerlexi + ]; + meta.platforms = [ + "i686-linux" + "x86_64-linux" + ]; + nodes.machine = + { ... }: + { + virtualisation.useBootLoader = true; + virtualisation.useBootPartition = true; + boot.loader.limine.enable = true; + boot.loader.limine.efiSupport = false; + boot.loader.timeout = 0; + }; + + testScript = '' + machine.start() + with subtest('Machine boots correctly'): + machine.wait_for_unit('multi-user.target') + ''; +} diff --git a/nixos/tests/limine/default.nix b/nixos/tests/limine/default.nix index dad761b1f882..6923fb4de62b 100644 --- a/nixos/tests/limine/default.nix +++ b/nixos/tests/limine/default.nix @@ -3,6 +3,7 @@ ... }: { + bios = runTest ./bios.nix; checksum = runTest ./checksum.nix; secureBoot = runTest ./secure-boot.nix; specialisations = runTest ./specialisations.nix; From ad331efcaf680eb1c838cb339472399ea7b3cdab Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Mon, 26 May 2025 13:35:23 +0530 Subject: [PATCH 56/63] nixos/qemu-vm: useBootPartition -> useBIOSBoot useBootPartition was ambiguous, this makes the option more like useEFIBoot Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com> --- nixos/modules/virtualisation/qemu-vm.nix | 14 +++++++------- nixos/tests/limine/bios.nix | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index ce1773a2f86c..02f653922c34 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -65,12 +65,12 @@ let { useEFIBoot, useDefaultFilesystems, - useBootPartition, + useBIOSBoot, }: if useDefaultFilesystems then if useEFIBoot then "efi" - else if useBootPartition then + else if useBIOSBoot then "legacy+boot" else "legacy" @@ -350,7 +350,7 @@ let onlyNixStore = false; label = rootFilesystemLabel; partitionTableType = selectPartitionTableLayout { - inherit (cfg) useBootPartition useDefaultFilesystems useEFIBoot; + inherit (cfg) useBIOSBoot useDefaultFilesystems useEFIBoot; }; installBootLoader = cfg.installBootLoader; touchEFIVars = cfg.useEFIBoot; @@ -448,13 +448,13 @@ in default = if cfg.useEFIBoot then "/dev/disk/by-label/${espFilesystemLabel}" - else if cfg.useBootPartition then + else if cfg.useBIOSBoot then "/dev/disk/by-label/BOOT" else null; defaultText = literalExpression '' if cfg.useEFIBoot then "/dev/disk/by-label/${espFilesystemLabel}" - else if cfg.useBootPartition then "/dev/disk/by-label/BOOT" + else if cfg.useBIOSBoot then "/dev/disk/by-label/BOOT" else null''; example = "/dev/disk/by-label/esp"; description = '' @@ -952,11 +952,11 @@ in ''; }; - virtualisation.useBootPartition = mkEnableOption null // { + virtualisation.useBIOSBoot = mkEnableOption null // { description = '' If enabled for legacy MBR VMs, the VM image will have a separate boot partition mounted at /boot. - useBootPartition is ignored if useEFIBoot == true. + useBIOSBoot is ignored if useEFIBoot == true. ''; }; diff --git a/nixos/tests/limine/bios.nix b/nixos/tests/limine/bios.nix index bc22af764c66..5d367934b660 100644 --- a/nixos/tests/limine/bios.nix +++ b/nixos/tests/limine/bios.nix @@ -14,7 +14,7 @@ { ... }: { virtualisation.useBootLoader = true; - virtualisation.useBootPartition = true; + virtualisation.useBIOSBoot = true; boot.loader.limine.enable = true; boot.loader.limine.efiSupport = false; boot.loader.timeout = 0; From 188de1eee99173f4d7cadcb0c7efceea923f4d52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 25 May 2025 18:56:55 -0700 Subject: [PATCH 57/63] radicale: 3.5.3 -> 3.5.4 Diff: https://github.com/Kozea/Radicale/compare/refs/tags/v3.5.3...refs/tags/v3.5.4 Changelog: https://github.com/Kozea/Radicale/blob/v3.5.4/CHANGELOG.md --- pkgs/by-name/ra/radicale/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/radicale/package.nix b/pkgs/by-name/ra/radicale/package.nix index 836ba75cf4dc..5d3b72dd129a 100644 --- a/pkgs/by-name/ra/radicale/package.nix +++ b/pkgs/by-name/ra/radicale/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "radicale"; - version = "3.5.3"; + version = "3.5.4"; pyproject = true; src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; tag = "v${version}"; - hash = "sha256-+oAVgLXDyexvMCAf7hIhFOT+RELn4zeTpgE8YVGlCyw="; + hash = "sha256-45YLZyjQabv92izrMS1euyPhn6AATY0p+p5/GXuQxnM="; }; build-system = with python3.pkgs; [ From f782cd6e3bf32dc9b0ff9c980a09308b2968ee0e Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Mon, 26 May 2025 11:57:23 +0200 Subject: [PATCH 58/63] nixos/mealie: fix test `simple` was never defined, I assume that this was supposed to be `sqlite`. --- nixos/tests/mealie.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/mealie.nix b/nixos/tests/mealie.nix index 21e96dea4114..e296d5180ecd 100644 --- a/nixos/tests/mealie.nix +++ b/nixos/tests/mealie.nix @@ -36,8 +36,8 @@ import ./make-test-python.nix ( node.succeed("curl --fail http://localhost:9001") test_mealie(sqlite) - simple.send_monitor_command("quit") - simple.wait_for_shutdown() + sqlite.send_monitor_command("quit") + sqlite.wait_for_shutdown() test_mealie(postgres) ''; } From 4a00b3cebb933534eab7146e50d9493e0386d9ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 May 2025 10:38:04 +0000 Subject: [PATCH 59/63] pocketbase: 0.28.1 -> 0.28.2 --- pkgs/by-name/po/pocketbase/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/po/pocketbase/package.nix b/pkgs/by-name/po/pocketbase/package.nix index e0f27d1620a0..62e002705757 100644 --- a/pkgs/by-name/po/pocketbase/package.nix +++ b/pkgs/by-name/po/pocketbase/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.28.1"; + version = "0.28.2"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-tx9dx4ZFmdllG/pMoI8mmPSvMg7fBk6+lXSxkW5jlDM="; + hash = "sha256-R8sXa3Cs7GFRAs8/+wAoWteFYBUVsgVA+eJDKACb0k8="; }; - vendorHash = "sha256-DN3rCuRBFVeRfiXrwxeHemqOZgXb7OswwzcEqHbi4lo="; + vendorHash = "sha256-bTXxhHibKiu+btHhnktTpNycMJSzGekRJ+w9b1IwAQs="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; From 826fb664c7953bbfbe3d0fb0a96d371765eab463 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dimitrije=20Radojevi=C4=87?= Date: Mon, 26 May 2025 07:54:45 +0100 Subject: [PATCH 60/63] terraform-providers.routeros: init at 1.85.0 --- .../cluster/terraform-providers/providers.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1a134ed23c0e..1e832248c2f1 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1110,6 +1110,15 @@ "spdx": "MPL-2.0", "vendorHash": "sha256-KezwDRmQQj0MnmsVlrX1OhNG6oMgw8fCxX5VFGdUynw=" }, + "routeros": { + "hash": "sha256-/tTd8EzA1/Js7S3eGg3L9AY9dyoIA3lFSU6VlT6p4us=", + "homepage": "https://registry.terraform.io/providers/terraform-routeros/routeros", + "owner": "terraform-routeros", + "repo": "terraform-provider-routeros", + "rev": "v1.85.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-DDmJ/mEOd94E7DqLKjT6Y4XkpVdXyKeAaE/Wj6M3vuw=" + }, "rundeck": { "hash": "sha256-cf+0qXpgxIsc/JbB7+u3MpmWFwUmpsinp1uARRhuBw0=", "homepage": "https://registry.terraform.io/providers/rundeck/rundeck", From c9c97fa99eb17760f3bc520a7779454cd55d4277 Mon Sep 17 00:00:00 2001 From: bokicoder <1556588440@qq.com> Date: Sun, 25 May 2025 18:46:24 +0800 Subject: [PATCH 61/63] niriswitcher: init at 0.5.2 --- pkgs/by-name/ni/niriswitcher/package.nix | 54 ++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 pkgs/by-name/ni/niriswitcher/package.nix diff --git a/pkgs/by-name/ni/niriswitcher/package.nix b/pkgs/by-name/ni/niriswitcher/package.nix new file mode 100644 index 000000000000..c40357fbae9b --- /dev/null +++ b/pkgs/by-name/ni/niriswitcher/package.nix @@ -0,0 +1,54 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + wrapGAppsHook4, + gobject-introspection, + gtk4-layer-shell, + libadwaita, +}: + +python3Packages.buildPythonPackage rec { + pname = "niriswitcher"; + version = "0.5.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "isaksamsten"; + repo = "niriswitcher"; + tag = version; + hash = "sha256-jXnob/CJ3wrqYhbFRu7TnnnCrsKaDazD3t9lZoJVhdQ="; + }; + + build-system = [ python3Packages.hatchling ]; + + nativeBuildInputs = [ + wrapGAppsHook4 + gobject-introspection + ]; + + buildInputs = [ + gtk4-layer-shell + libadwaita + ]; + + dependencies = [ python3Packages.pygobject3 ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + ''${gappsWrapperArgs[@]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk4-layer-shell ]} + ) + ''; + + meta = { + description = "Application switcher for niri"; + homepage = "https://github.com/isaksamsten/niriswitcher"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bokicoder ]; + mainProgram = "niriswitcher"; + platforms = lib.platforms.linux; + }; +} From b2a6c1be50e07efcdb54f1ba13a4e58a15a51d88 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 26 May 2025 13:13:33 +0200 Subject: [PATCH 62/63] nvitop: 1.5.0 -> 1.5.1 Diff: https://github.com/XuehaiPan/nvitop/compare/refs/tags/v1.5.0...refs/tags/v1.5.1 Changelog: https://github.com/XuehaiPan/nvitop/releases/tag/v1.5.1 --- pkgs/by-name/nv/nvitop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nv/nvitop/package.nix b/pkgs/by-name/nv/nvitop/package.nix index 9436ba6386b7..a8b075749be3 100644 --- a/pkgs/by-name/nv/nvitop/package.nix +++ b/pkgs/by-name/nv/nvitop/package.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { pname = "nvitop"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "XuehaiPan"; repo = "nvitop"; tag = "v${version}"; - hash = "sha256-1WL1S6jUbCLtuAe223AAmCcOcLZ0rStE04uCd0L9gVw="; + hash = "sha256-FQbY9j6eJtupBiYTSCEJHAAlpDltb6U5hgWet42AKho="; }; pythonRelaxDeps = [ "nvidia-ml-py" ]; From 47e0d78dc7391cfc967c50d188e4dea570a9822d Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 26 May 2025 14:47:48 +0300 Subject: [PATCH 63/63] python312Packages.itables: init at 2.4.0 This adds ITables, which can render Pandas and Polar DataFrames as interactive DataTables. Fixes #347509. --- .../python-modules/itables/default.nix | 79 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 81 insertions(+) create mode 100644 pkgs/development/python-modules/itables/default.nix diff --git a/pkgs/development/python-modules/itables/default.nix b/pkgs/development/python-modules/itables/default.nix new file mode 100644 index 000000000000..39e6c1292f15 --- /dev/null +++ b/pkgs/development/python-modules/itables/default.nix @@ -0,0 +1,79 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + python, + + # build-system + dash, + hatchling, + hatch-jupyter-builder, + pyyaml, + setuptools, + + # nativeBuildInputs + nodejs, + + # dependencies + ipython, + numpy, + pandas, +}: + +buildPythonPackage rec { + pname = "itables"; + version = "2.4.0"; + + # itables has 4 different node packages, each with their own + # package-lock.json, and partially depending on each other. + # Our fetchNpmDeps tooling in nixpkgs doesn't support this yet, so we fetch + # the source tarball from pypi, wich includes the javascript bundle already. + src = fetchPypi { + inherit pname version; + hash = "sha256-S5HASUVfqTny+Vu15MYSSrEffCaJuL7UhDOc3eudVWI="; + }; + + pyproject = true; + + build-system = [ + dash + hatchling + hatch-jupyter-builder + pyyaml + setuptools + ]; + + nativeBuildInputs = [ + nodejs + ]; + + dependencies = [ + ipython + numpy + pandas + ]; + + # no tests in pypi tarball + doCheck = false; + + # don't run the hooks, as they try to invoke npm on packages/, + env.HATCH_BUILD_NO_HOOKS = true; + + # The pyproject.toml shipped with the sources doesn't install anything, + # as the paths in the pypi tarball are not the same as in the repo checkout. + # We exclude itables_for_dash here, as it's missing the .dist-info dir + # plumbing to be discoverable, and should be its own package anyways. + postInstall = '' + cp -R itables $out/${python.sitePackages} + ''; + + pythonImportsCheck = [ "itables" ]; + + meta = { + description = "Pandas and Polar DataFrames as interactive DataTables"; + homepage = "https://github.com/mwouts/itables"; + changelog = "https://github.com/mwouts/itables/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ flokli ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dabc058c5f53..3e9e11f6e6a8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6983,6 +6983,8 @@ self: super: with self; { israel-rail-api = callPackage ../development/python-modules/israel-rail-api { }; + itables = callPackage ../development/python-modules/itables { }; + itanium-demangler = callPackage ../development/python-modules/itanium-demangler { }; item-synchronizer = callPackage ../development/python-modules/item-synchronizer { };