From 07b697da7f300875735cec4184aa488b15232f60 Mon Sep 17 00:00:00 2001 From: Axel Karjalainen Date: Tue, 5 Aug 2025 18:47:01 +0300 Subject: [PATCH 001/429] rust-addr2line: init at 0.25.0 --- pkgs/by-name/ru/rust-addr2line/package.nix | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/ru/rust-addr2line/package.nix diff --git a/pkgs/by-name/ru/rust-addr2line/package.nix b/pkgs/by-name/ru/rust-addr2line/package.nix new file mode 100644 index 000000000000..7017045781a8 --- /dev/null +++ b/pkgs/by-name/ru/rust-addr2line/package.nix @@ -0,0 +1,39 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "rust-addr2line"; + version = "0.25.0"; + + src = fetchFromGitHub { + owner = "gimli-rs"; + repo = "addr2line"; + tag = version; + hash = "sha256-1kjFrDHfvGdU5FfSaLE+EFN83XjF0iSpydwsucjV7NQ="; + }; + + cargoBuildFlags = "--bin addr2line --features bin"; + + cargoHash = "sha256-IJ+hZ36QL5Awq4vI+ajTTHwbRU4paG+bnB/TZU9bCCk="; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Cross-platform `addr2line` clone written in Rust, using `gimli`"; + homepage = "https://github.com/gimli-rs/addr2line"; + license = with lib.licenses; [ + mit + asl20 + ]; + maintainers = [ lib.maintainers.axka ]; + mainProgram = "addr2line"; + }; +} From ea143853351c6401a18087d9595269e7fd31d9df Mon Sep 17 00:00:00 2001 From: wellWINeo Date: Fri, 16 May 2025 13:51:50 +0300 Subject: [PATCH 002/429] nixos/shadowsocks: add `package` option Closes: https://github.com/NixOS/nixpkgs/issues/384226 - add `package` option to services.shadowsocks and related changes - add tests for `pkgs.shadowsocks-rust` - add postfix 'libev' to original tests --- .../services/networking/shadowsocks.nix | 37 ++++++++++++++++--- nixos/tests/shadowsocks/common.nix | 7 +++- nixos/tests/shadowsocks/default.nix | 22 +++++++++-- 3 files changed, 54 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/networking/shadowsocks.nix b/nixos/modules/services/networking/shadowsocks.nix index 79d749abb9d5..79a0b66d260c 100644 --- a/nixos/modules/services/networking/shadowsocks.nix +++ b/nixos/modules/services/networking/shadowsocks.nix @@ -29,8 +29,15 @@ let configFile = pkgs.writeText "shadowsocks.json" (builtins.toJSON opts); + executablesMap = { + "${getName pkgs.shadowsocks-libev}" = { + server = "ss-server"; + }; + "${getName pkgs.shadowsocks-rust}" = { + server = "ssserver"; + }; + }; in - { ###### interface @@ -47,14 +54,25 @@ in ''; }; + package = mkPackageOption pkgs "Shadowsocks" { + default = "shadowsocks-libev"; + }; + localAddress = mkOption { - type = types.coercedTo types.str singleton (types.listOf types.str); + type = + with types; + oneOf [ + str + (listOf str) + ]; + # Keeped for compatibility default = [ "[::0]" "0.0.0.0" ]; description = '' Local addresses to which the server binds. + Note: shadowsocks-rust accepts only string parameter. ''; }; @@ -163,14 +181,19 @@ in (noPasswd && !noPasswdFile) || (!noPasswd && noPasswdFile); message = "Option `password` or `passwordFile` must be set and cannot be set simultaneously"; } + { + # Ensure localAddress is a string if package is shadowsocks-rust + assertion = !(getName cfg.package == "shadowsocks-rust" && !lib.strings.isString cfg.localAddress); + message = "Option `localAddress` must be a string when using shadowsocks-rust."; + } ]; - systemd.services.shadowsocks-libev = { - description = "shadowsocks-libev Daemon"; + systemd.services.${getName cfg.package} = { + description = "${getName cfg.package} Daemon"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; path = [ - pkgs.shadowsocks-libev + cfg.package ] ++ optional (cfg.plugin != null) cfg.plugin ++ optional (cfg.passwordFile != null) pkgs.jq; @@ -179,7 +202,9 @@ in ${optionalString (cfg.passwordFile != null) '' cat ${configFile} | jq --arg password "$(cat "${cfg.passwordFile}")" '. + { password: $password }' > /tmp/shadowsocks.json ''} - exec ss-server -c ${if cfg.passwordFile != null then "/tmp/shadowsocks.json" else configFile} + exec ${(executablesMap.${getName cfg.package}).server} -c ${ + if cfg.passwordFile != null then "/tmp/shadowsocks.json" else configFile + } ''; }; }; diff --git a/nixos/tests/shadowsocks/common.nix b/nixos/tests/shadowsocks/common.nix index 298483f36b8f..1ce54101a8be 100644 --- a/nixos/tests/shadowsocks/common.nix +++ b/nixos/tests/shadowsocks/common.nix @@ -1,11 +1,13 @@ { name, + package, plugin ? null, pluginOpts ? "", }: import ../make-test-python.nix ( { pkgs, lib, ... }: + { inherit name; meta = { @@ -27,9 +29,10 @@ import ../make-test-python.nix ( networking.firewall.allowedUDPPorts = [ 8488 ]; services.shadowsocks = { enable = true; + package = package; encryptionMethod = "chacha20-ietf-poly1305"; password = "pa$$w0rd"; - localAddress = [ "0.0.0.0" ]; + localAddress = "0.0.0.0"; port = 8488; fastOpen = false; mode = "tcp_and_udp"; @@ -78,7 +81,7 @@ import ../make-test-python.nix ( testScript = '' start_all() - server.wait_for_unit("shadowsocks-libev.service") + server.wait_for_unit("${lib.getName package}.service") server.wait_for_unit("nginx.service") client.wait_for_unit("shadowsocks-client.service") diff --git a/nixos/tests/shadowsocks/default.nix b/nixos/tests/shadowsocks/default.nix index 3587ffb0edc5..62e67d59afd6 100644 --- a/nixos/tests/shadowsocks/default.nix +++ b/nixos/tests/shadowsocks/default.nix @@ -5,12 +5,26 @@ }: { - "basic" = import ./common.nix { - name = "basic"; + "basic-libev" = import ./common.nix { + name = "basic-libev"; + package = pkgs.shadowsocks-libev; }; - "v2ray-plugin" = import ./common.nix { - name = "v2ray-plugin"; + "basic-rust" = import ./common.nix { + name = "basic-rust"; + package = pkgs.shadowsocks-rust; + }; + + "v2ray-plugin-libev" = import ./common.nix { + name = "v2ray-plugin-libev"; + package = pkgs.shadowsocks-libev; + plugin = "${pkgs.shadowsocks-v2ray-plugin}/bin/v2ray-plugin"; + pluginOpts = "host=nixos.org"; + }; + + "v2ray-plugin-rust" = import ./common.nix { + name = "v2ray-plugin-rust"; + package = pkgs.shadowsocks-rust; plugin = "${pkgs.shadowsocks-v2ray-plugin}/bin/v2ray-plugin"; pluginOpts = "host=nixos.org"; }; From 0e48f6098cc2213ec697609d77fdd3aa53778680 Mon Sep 17 00:00:00 2001 From: Haylin Moore Date: Thu, 11 Sep 2025 15:50:56 -0700 Subject: [PATCH 003/429] goarista: add passthru.updateScript --- pkgs/by-name/go/goarista/package.nix | 2 ++ pkgs/by-name/go/goarista/update.sh | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100755 pkgs/by-name/go/goarista/update.sh diff --git a/pkgs/by-name/go/goarista/package.nix b/pkgs/by-name/go/goarista/package.nix index fbb9ba440143..cb5de911aad4 100644 --- a/pkgs/by-name/go/goarista/package.nix +++ b/pkgs/by-name/go/goarista/package.nix @@ -18,6 +18,8 @@ buildGoModule { vendorHash = "sha256-n+P3L3dT2kYuTyI2qX/nrLRgFIUsP3kkwNZmRQ8EFRs="; + passthru.updateScript = ./update.sh; + checkFlags = let skippedTests = [ diff --git a/pkgs/by-name/go/goarista/update.sh b/pkgs/by-name/go/goarista/update.sh new file mode 100755 index 000000000000..900cb5dc9643 --- /dev/null +++ b/pkgs/by-name/go/goarista/update.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-update gnused + +set -eou pipefail + +nix-update pkgs.goarista --version branch + +# The last github release in 2020 was named ockafka-v0.0.5. +# I don't want this in the version name, it's from when Arista +# was doing per-package releases in the repo, and not just trunk +sed -i 's/ockafka-v0\.0\.5-/0-/' pkgs/by-name/go/goarista/package.nix From d6530f8baf36ba27cab87d7cd65bace7efed994d Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 28 Dec 2025 10:55:52 +0100 Subject: [PATCH 004/429] redo-sh: 4.0.6 -> 4.0.7 --- pkgs/by-name/re/redo-sh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/redo-sh/package.nix b/pkgs/by-name/re/redo-sh/package.nix index 4d9471f6a175..0ee857ea57e5 100644 --- a/pkgs/by-name/re/redo-sh/package.nix +++ b/pkgs/by-name/re/redo-sh/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation { pname = "redo-sh"; - version = "4.0.6"; + version = "4.0.7"; src = fetchurl { - url = "https://web.archive.org/web/20250225235353/http://news.dieweltistgarnichtso.net/bin/archives/redo-sh.tar.gz"; - hash = "sha256-pDhCnMelCXK/Pp3jPXZog7HLBTgrsCvX4LAVapYvxl8="; + url = "https://web.archive.org/web/20251228095310/http://news.dieweltistgarnichtso.net/bin/archives/redo-sh.tar.gz"; + hash = "sha256-h9C/8ti8TBRM66OLYOk+TotwmDCIZBRvJ0tJKdYAwaQ="; }; nativeBuildInputs = [ makeWrapper ]; From 1a05178b43c63b23d4ba8bfdc170e41ab54a931b Mon Sep 17 00:00:00 2001 From: Ashley Hooper Date: Thu, 1 Jan 2026 11:34:00 +1300 Subject: [PATCH 005/429] nixos/redis: add support for more auth options - Add Redis auth options that are important for running a secure Redis infrastructure - `masteruser` and `masterauth` for authentication between replicas and master - `sentinel auth-user` and `sentinel auth-pass` to provide credentials that a Sentinel instance should use to authenticate to the Redis instance it is monitoring - Add assertions to catch configuration issues before build/deployment Signed-off-by: Ashley Hooper --- nixos/modules/services/databases/redis.nix | 94 +++++++++++++++++++--- 1 file changed, 81 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 157a6c6b84e3..c9aa42557a11 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -335,7 +335,23 @@ in If the master is password protected (using the requirePass configuration) it is possible to tell the slave to authenticate before starting the replication synchronization process, otherwise the master will refuse the slave request. - (STORED PLAIN TEXT, WORLD-READABLE IN NIX STORE)''; + (STORED PLAIN TEXT, WORLD-READABLE IN NIX STORE) + ''; + }; + + masterAuthFile = lib.mkOption { + type = with types; nullOr path; + default = null; + description = "File with password for the master user."; + example = "/run/keys/redis-master-password"; + }; + + masterUser = lib.mkOption { + type = with types; nullOr str; + default = null; + description = '' + If the master is password protected via ACLs this option can be used to specify + the Redis user that is used by replicas.''; }; requirePass = lib.mkOption { @@ -355,6 +371,25 @@ in example = "/run/keys/redis-password"; }; + sentinelAuthUser = lib.mkOption { + type = with types; nullOr str; + default = null; + description = "The username to use to monitor a master from Sentinel."; + }; + + sentinelAuthPassFile = lib.mkOption { + type = with types; nullOr path; + default = null; + description = "File with password for connecting to other Sentinel instances."; + example = "/run/keys/sentinel-password"; + }; + + sentinelMasterName = lib.mkOption { + type = with types; nullOr str; + default = null; + description = "The master name of the Redis master that Sentinel will monitor."; + }; + appendOnly = lib.mkOption { type = types.bool; default = false; @@ -452,14 +487,38 @@ in config = lib.mkIf (enabledServers != { }) { - assertions = lib.attrValues ( - lib.mapAttrs (name: conf: { - assertion = conf.requirePass != null -> conf.requirePassFile == null; - message = '' - You can only set one services.redis.servers.${name}.requirePass - or services.redis.servers.${name}.requirePassFile - ''; - }) enabledServers + assertions = lib.concatLists ( + lib.mapAttrsToList (name: conf: [ + { + assertion = conf.requirePass != null -> conf.requirePassFile == null; + message = '' + You can only set one of services.redis.servers.${name}.requirePass + or services.redis.servers.${name}.requirePassFile + ''; + } + { + assertion = conf.masterAuth != null -> conf.masterAuthFile == null; + message = '' + You can only set one of services.redis.servers.${name}.masterAuth + or services.redis.servers.${name}.masterAuthFile + ''; + } + { + assertion = conf.masterUser != null -> (conf.masterAuth != null || conf.masterAuthFile != null); + message = '' + If using services.redis.servers.${name}.masterUser, either + services.redis.servers.${name}.masterAuthFile or + services.redis.servers.${name}.masterAuth must be provided + ''; + } + { + assertion = conf.sentinelAuthPassFile != null -> conf.sentinelMasterName != null; + message = '' + For Sentinel authentication, services.redis.servers.${name}.sentinelMasterName + must be specified + ''; + } + ]) enabledServers ); boot.kernel.sysctl = lib.mkIf cfg.vmOverCommit { @@ -515,10 +574,19 @@ in fi echo 'include "${redisConfStore}"' > "${redisConfRun}" ${lib.optionalString (conf.requirePassFile != null) '' - { - echo -n "requirepass " - cat ${lib.escapeShellArg conf.requirePassFile} - } >> "${redisConfRun}" + echo "requirepass $(cat ${lib.escapeShellArg conf.requirePassFile})" >> "${redisConfRun}" + ''} + ${lib.optionalString (conf.masterUser != null) '' + echo "masteruser ${conf.masterUser}" >> "${redisConfRun}" + ''} + ${lib.optionalString (conf.masterAuthFile != null) '' + echo "masterauth $(cat ${lib.escapeShellArg conf.masterAuthFile})" >> "${redisConfRun}" + ''} + ${lib.optionalString (conf.sentinelAuthUser != null) '' + echo "sentinel auth-user ${conf.sentinelMasterName} ${conf.sentinelAuthUser}" >> "${redisConfRun}" + ''} + ${lib.optionalString (conf.sentinelAuthPassFile != null) '' + echo "sentinel auth-pass ${conf.sentinelMasterName} $(cat ${lib.escapeShellArg conf.sentinelAuthPassFile})" >> "${redisConfRun}" ''} '' ); From b7d39def1141bca9fdc81e1f80067a010150142e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Mon, 19 Jan 2026 11:50:28 +0100 Subject: [PATCH 006/429] nixos/meilisearch: add instructions for generating masterKeyFile --- nixos/modules/services/search/meilisearch.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/search/meilisearch.nix b/nixos/modules/services/search/meilisearch.nix index 17b6931fcc87..80aca66daf17 100644 --- a/nixos/modules/services/search/meilisearch.nix +++ b/nixos/modules/services/search/meilisearch.nix @@ -121,6 +121,9 @@ in Path to file which contains the master key. By doing so, all routes will be protected and will require a key to be accessed. If no master key is provided, all routes can be accessed without requiring any key. + + You can generate a master key by running `openssl rand -base64 36`. + Alternatively, you can start Meilisearch without a master key and use the pre-generated key from the service's logs that can be obtained by `journalctl -u meilisearch | grep -- --master-key`. ''; default = null; type = lib.types.nullOr lib.types.path; From a81e104c674d45506a620f9c6ef550b1b7dfbc6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Mon, 19 Jan 2026 00:23:05 +0100 Subject: [PATCH 007/429] nixos/librechat: add meilisearch support --- nixos/modules/services/web-apps/librechat.nix | 35 ++++++++++++++++++- nixos/tests/librechat.nix | 7 ++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/librechat.nix b/nixos/modules/services/web-apps/librechat.nix index 95f684a491f6..120d6d092268 100644 --- a/nixos/modules/services/web-apps/librechat.nix +++ b/nixos/modules/services/web-apps/librechat.nix @@ -6,6 +6,7 @@ }: let cfg = config.services.librechat; + meiliCfg = config.services.meilisearch; format = pkgs.formats.yaml { }; configFile = format.generate "librechat.yaml" cfg.settings; exportCredentials = n: _: ''export ${n}="$(${pkgs.systemd}/bin/systemd-creds cat ${n}_FILE)"''; @@ -155,6 +156,26 @@ in }; enableLocalDB = lib.mkEnableOption "a local mongodb instance"; + + meilisearch = lib.mkOption { + type = lib.types.submodule { + options = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + example = true; + description = '' + Whether to enable and configure Meilisearch locally for Librechat. + You will manually need to set `services.meilisearch.masterKeyFile`. + ''; + }; + }; + }; + default = { }; + description = '' + See [LibreChat search feature](https://www.librechat.ai/docs/features/search). + ''; + }; }; config = lib.mkIf cfg.enable { @@ -178,6 +199,12 @@ in You can use https://www.librechat.ai/toolkit/creds_generator to generate these. ''; } + { + assertion = cfg.meilisearch.enable -> meiliCfg.masterKeyFile != null; + message = '' + LibreChat's Meilisearch integration requires `services.meilisearch.masterKeyFile` to be set. + ''; + } ]; networking.firewall.allowedTCPPorts = lib.optional cfg.openFirewall cfg.port; @@ -192,7 +219,8 @@ in after = [ "tmpfiles.target" ] - ++ lib.optional cfg.enableLocalDB "mongodb.service"; + ++ lib.optional cfg.meilisearch.enable "meilisearch.service"; + wants = lib.optional cfg.meilisearch.enable "meilisearch.service"; description = "Open-source app for all your AI conversations, fully customizable and compatible with any AI provider"; environment = cfg.env; script = # sh @@ -249,6 +277,11 @@ in services.librechat.env.MONGO_URI = lib.mkIf cfg.enableLocalDB "mongodb://localhost:27017"; services.mongodb.enable = lib.mkIf cfg.enableLocalDB true; + + services.meilisearch.enable = lib.mkIf cfg.meilisearch.enable true; + services.librechat.env.SEARCH = lib.mkIf cfg.meilisearch.enable true; + services.librechat.env.MEILI_HOST = lib.mkIf cfg.meilisearch.enable "http://${meiliCfg.settings.http_addr}"; + services.librechat.credentials.MEILI_MASTER_KEY = lib.mkIf cfg.meilisearch.enable meiliCfg.masterKeyFile; }; meta.maintainers = with lib.maintainers; [ diff --git a/nixos/tests/librechat.nix b/nixos/tests/librechat.nix index e737c139844f..28f0ab7ac3af 100644 --- a/nixos/tests/librechat.nix +++ b/nixos/tests/librechat.nix @@ -17,6 +17,7 @@ credsIvFile = pkgs.writeText "librechat-creds-iv" "7c09a571f65ac793611685cc9ab1dbe7"; jwtSecret = pkgs.writeText "librechat-jwt-secret" "29c4dc7f7de15306accf5eddb4cb8a70eb233d9fba4301f8f47f14c8c047ac81"; jwtRefreshSecret = pkgs.writeText "librechat-jwt-refresh-secret" "f2c1685561f2f570b3e7955df267b5c602ee099f14dc5caa0dacc320580ea180"; + meilisearchMasterKeyFile = pkgs.writeText "meilisearch-master-key" "xHkP3Bzcf98fw7FiSCR82g5ULLGrXc4frK1qkEfN8St/3kJZ"; in { services.librechat = { @@ -32,13 +33,19 @@ JWT_REFRESH_SECRET = jwtRefreshSecret; }; enableLocalDB = true; + meilisearch.enable = true; }; + + services.meilisearch.masterKeyFile = meilisearchMasterKeyFile; }; testScript = '' machine.start() machine.succeed("grep -qF 'ALLOW_REGISTRATION=true' /etc/systemd/system/librechat.service") + machine.succeed("grep -qF 'SEARCH=true' /etc/systemd/system/librechat.service") + machine.succeed("grep -qF 'MEILI_HOST=http://localhost:7700' /etc/systemd/system/librechat.service") + machine.succeed("grep -qG 'MEILI_MASTER_KEY_FILE:/nix/store/.*meilisearch-master-key' /etc/systemd/system/librechat.service") machine.wait_for_unit("librechat.service") machine.wait_for_open_port(3080) From 1509c61621d0a8d88fd960976e9934de12194a55 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Wed, 21 Jan 2026 00:27:35 +0900 Subject: [PATCH 008/429] lima-full: init at 2.0.3 --- pkgs/by-name/co/colima/package.nix | 6 ++---- pkgs/by-name/li/lima-full/package.nix | 7 +++++++ pkgs/by-name/li/lima/package.nix | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 pkgs/by-name/li/lima-full/package.nix diff --git a/pkgs/by-name/co/colima/package.nix b/pkgs/by-name/co/colima/package.nix index 8a9f01c4955e..62349cb135f5 100644 --- a/pkgs/by-name/co/colima/package.nix +++ b/pkgs/by-name/co/colima/package.nix @@ -5,7 +5,7 @@ buildGoModule, fetchFromGitHub, installShellFiles, - lima, + lima-full, makeWrapper, procps, qemu, @@ -62,9 +62,7 @@ buildGoModule rec { --prefix PATH : ${ lib.makeBinPath [ # Suppress warning on `colima start`: https://github.com/abiosoft/colima/issues/1333 - (lima.override { - withAdditionalGuestAgents = true; - }) + lima-full qemu ] } diff --git a/pkgs/by-name/li/lima-full/package.nix b/pkgs/by-name/li/lima-full/package.nix new file mode 100644 index 000000000000..e72b02fd668c --- /dev/null +++ b/pkgs/by-name/li/lima-full/package.nix @@ -0,0 +1,7 @@ +{ + lima, +}: + +lima.override { + withAdditionalGuestAgents = true; +} diff --git a/pkgs/by-name/li/lima/package.nix b/pkgs/by-name/li/lima/package.nix index d0ac229e876c..70cb3a51d6e7 100644 --- a/pkgs/by-name/li/lima/package.nix +++ b/pkgs/by-name/li/lima/package.nix @@ -21,7 +21,7 @@ }: buildGoModule (finalAttrs: { - pname = "lima"; + pname = "lima" + lib.optionalString withAdditionalGuestAgents "-full"; inherit (callPackage ./source.nix { }) version src vendorHash; From 486e25b9a4e149af8409de2abb0bb5f3c489df29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alice=20=E2=9C=A8=F0=9F=8C=99=20Luna?= Date: Fri, 23 Jan 2026 22:53:01 +0100 Subject: [PATCH 009/429] app2unit: fix missing runtime dependency The runtime dependency of xdg-terminal-exec is missing from app2unit. This commit replaces `xdg-terminal-exec` with the nix store path of the xdg-terminal-exec executable. This makes it possible to run terminal applications with app2unit without having to install xdg-terminal-exec as well. --- pkgs/by-name/ap/app2unit/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ap/app2unit/package.nix b/pkgs/by-name/ap/app2unit/package.nix index 904eb912f24d..eb59854c460f 100644 --- a/pkgs/by-name/ap/app2unit/package.nix +++ b/pkgs/by-name/ap/app2unit/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, dash, + xdg-terminal-exec, scdoc, fetchFromGitHub, nix-update-script, @@ -48,7 +49,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontPatchShebangs = true; postFixup = '' substituteInPlace $out/bin/app2unit \ - --replace-fail '#!/bin/sh' '#!${lib.getExe dash}' + --replace-fail '#!/bin/sh' '#!${lib.getExe dash}' \ + --replace-fail 'A2U__TERMINAL_HANDLER=xdg-terminal-exec' \ + 'A2U__TERMINAL_HANDLER=${lib.getExe xdg-terminal-exec}' ''; meta = { From 9b8b026dce8c7abe351ed53527261833944731d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alice=20=E2=9C=A8=F0=9F=8C=99=20Luna?= Date: Sat, 24 Jan 2026 22:25:19 +0100 Subject: [PATCH 010/429] app2unit: add withTerminalSupport argument --- pkgs/by-name/ap/app2unit/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ap/app2unit/package.nix b/pkgs/by-name/ap/app2unit/package.nix index eb59854c460f..50b674b257c7 100644 --- a/pkgs/by-name/ap/app2unit/package.nix +++ b/pkgs/by-name/ap/app2unit/package.nix @@ -7,6 +7,7 @@ fetchFromGitHub, nix-update-script, installShellFiles, + withTerminalSupport ? true, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "app2unit"; @@ -49,7 +50,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontPatchShebangs = true; postFixup = '' substituteInPlace $out/bin/app2unit \ - --replace-fail '#!/bin/sh' '#!${lib.getExe dash}' \ + --replace-fail '#!/bin/sh' '#!${lib.getExe dash}' + '' + + lib.optionalString withTerminalSupport '' + substituteInPlace $out/bin/app2unit \ --replace-fail 'A2U__TERMINAL_HANDLER=xdg-terminal-exec' \ 'A2U__TERMINAL_HANDLER=${lib.getExe xdg-terminal-exec}' ''; From 0b5d05ccf90a3656c6dc08028b087218c619cb5d Mon Sep 17 00:00:00 2001 From: hakan-demirli Date: Sun, 25 Jan 2026 17:15:24 +0100 Subject: [PATCH 011/429] veridian: add updateScript --- pkgs/by-name/ve/veridian/package.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ve/veridian/package.nix b/pkgs/by-name/ve/veridian/package.nix index 4ec243a668ce..d487f1923d58 100644 --- a/pkgs/by-name/ve/veridian/package.nix +++ b/pkgs/by-name/ve/veridian/package.nix @@ -15,10 +15,11 @@ verible, verilator, + nix-update-script, }: rustPlatform.buildRustPackage { pname = "veridian"; - version = "0-unstable-2025-12-01"; + version = "0-unstable-2025-11-30"; src = fetchFromGitHub { owner = "vivekmalneedi"; @@ -71,6 +72,16 @@ rustPlatform.buildRustPackage { SLANG_INSTALL_PATH = sv-lang; }; + passthru = { + updateScript = nix-update-script { + extraArgs = [ + "--version=branch" + # Avoid using "nightly" tag: https://github.com/Mic92/nix-update/pull/430 + "--version-regex=(0-unstable-.*)" + ]; + }; + }; + meta = { description = "SystemVerilog Language Server"; homepage = "https://github.com/vivekmalneedi/veridian"; From 51ac0ed7fdb24f3c51d6b60e18191291a4d7a496 Mon Sep 17 00:00:00 2001 From: Amaan Qureshi Date: Mon, 26 Jan 2026 23:05:56 -0500 Subject: [PATCH 012/429] html-xml-utils: fix build with GCC 15 GCC 15 treats empty parentheses as (void), conflicting with the actual lookup_element signature generated by gperf. This was intentionally done, as version 7.7 removed the arguments because gperf 3.0 generates `unsigned int` while gperf 3.1 generates `size_t`. However, gperf 3.1 is nearly 10 years old, so it's reasonable to assume that practically every system that wants to use GCC 15 will have gperf 3.1 or later. Nixpkgs uses gperf 3.3, so we use `size_t` in the prototype. This commit also adds gperf to `nativeBuildInputs` since patching the .hash file triggers regeneration of the C source. Fixes #480448 --- pkgs/by-name/ht/html-xml-utils/gcc15.patch | 32 ++++++++++++++++++++++ pkgs/by-name/ht/html-xml-utils/package.nix | 5 ++++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/by-name/ht/html-xml-utils/gcc15.patch diff --git a/pkgs/by-name/ht/html-xml-utils/gcc15.patch b/pkgs/by-name/ht/html-xml-utils/gcc15.patch new file mode 100644 index 000000000000..389b90c15297 --- /dev/null +++ b/pkgs/by-name/ht/html-xml-utils/gcc15.patch @@ -0,0 +1,32 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Amaan Qureshi +Date: Mon, 27 Jan 2026 00:00:00 -0500 +Subject: [PATCH] Fix GCC 15 build by adding proper function prototype + +GCC 15 treats empty parentheses as (void), conflicting with the actual +lookup_element signature generated by gperf. This was intentionally done, +as version 7.7 removed the arguments because gperf 3.0 generates `unsigned int` +while gperf 3.1 generates `size_t`. However, gperf 3.1 is nearly 10 years old, +so it's reasonable to assume that practically every system that wants +to use GCC 15 will have gperf 3.1 or later. + +This patch uses `size_t` to match gperf 3.1. + +--- + dtd.hash | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/dtd.hash b/dtd.hash +--- a/dtd.hash ++++ b/dtd.hash +@@ -43,8 +43,8 @@ EXPORT typedef struct _ElementType { + } ElementType; + + /* lookup_element -- look up the string in the hash table */ +-EXPORT const ElementType * lookup_element(/* register const char *str, +- register unsigned int len */); ++EXPORT const ElementType * lookup_element(register const char *str, ++ register size_t len); + + /* Different kinds of parent elements: */ + #define PHRASE "abbr", "acronym", "b", "bdi", "bdo", "big", "cite", "code", "dfn", "em", "i", "kbd", "q", "s", "samp", "small", "span", "strong", "sub", "sup", "time", "tt", "u", "var" diff --git a/pkgs/by-name/ht/html-xml-utils/package.nix b/pkgs/by-name/ht/html-xml-utils/package.nix index f2486ec224a1..c0bc244bb03c 100644 --- a/pkgs/by-name/ht/html-xml-utils/package.nix +++ b/pkgs/by-name/ht/html-xml-utils/package.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, curl, + gperf, libiconv, }: @@ -15,6 +16,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-iIoxYxp6cDCLsvMz4HfQQW9Lt4MX+Gl/+0qVGH9ncwE="; }; + patches = [ ./gcc15.patch ]; + + nativeBuildInputs = [ gperf ]; + buildInputs = [ curl libiconv From 21a5656772f35292c98af4960e8c022a8c94ca2d Mon Sep 17 00:00:00 2001 From: Ashley Hooper Date: Mon, 26 Jan 2026 17:36:40 +1300 Subject: [PATCH 013/429] nixos/redis: rework Sentinel options - Add sentinelMasterHost, sentinelMasterPort, sentinelMasterQuorum options - Add special handling for mutable state in /var/lib/redis-xxx Redis/Valkey Sentinel persists dynamic cluster state by rewriting its configuration file at runtime. This behaviour cannot be disabled. Add conditional preStart logic to avoid overwriting Sentinel-owned configuration while preserving NixOS-managed defaults. This introduces a necessary, documented deviation from strict declarative semantics. --- nixos/modules/services/databases/redis.nix | 87 +++++++++++++++++++--- 1 file changed, 77 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index c9aa42557a11..d55658bb25b2 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -371,12 +371,6 @@ in example = "/run/keys/redis-password"; }; - sentinelAuthUser = lib.mkOption { - type = with types; nullOr str; - default = null; - description = "The username to use to monitor a master from Sentinel."; - }; - sentinelAuthPassFile = lib.mkOption { type = with types; nullOr path; default = null; @@ -384,12 +378,36 @@ in example = "/run/keys/sentinel-password"; }; + sentinelAuthUser = lib.mkOption { + type = with types; nullOr str; + default = null; + description = "The username to use to monitor a master from Sentinel."; + }; + + sentinelMasterHost = lib.mkOption { + type = with types; nullOr str; + default = null; + description = "The IP address (recommended) or hostname of the Redis master that Sentinel will monitor."; + }; + sentinelMasterName = lib.mkOption { type = with types; nullOr str; default = null; description = "The master name of the Redis master that Sentinel will monitor."; }; + sentinelMasterPort = lib.mkOption { + type = with types; nullOr int; + default = null; + description = "The TCP port of the Redis master that Sentinel will monitor."; + }; + + sentinelMasterQuorum = lib.mkOption { + type = with types; nullOr int; + default = null; + description = "The Sentinel quorum (minimum number of Sentinel nodes online for failover)"; + }; + appendOnly = lib.mkOption { type = types.bool; default = false; @@ -511,11 +529,28 @@ in services.redis.servers.${name}.masterAuth must be provided ''; } + { + assertion = + conf.sentinelMasterName != null + -> ( + conf.sentinelMasterHost != null + && conf.sentinelMasterPort != null + && conf.sentinelMasterQuorum != null + ); + message = '' + For Sentinel, + services.redis.servers.${name}.sentinelMasterName, + services.redis.servers.${name}.sentinelMasterHost, + services.redis.servers.${name}.sentinelMasterPort, + and services.redis.servers.${name}.sentinelMasterQuorum + must all be provided + ''; + } { assertion = conf.sentinelAuthPassFile != null -> conf.sentinelMasterName != null; message = '' - For Sentinel authentication, services.redis.servers.${name}.sentinelMasterName - must be specified + For Sentinel authentication, services.redis.servers.${name}.sentinelMasterName, + must be provided ''; } ]) enabledServers @@ -557,6 +592,17 @@ in ExecStart = "${cfg.package}/bin/${ cfg.package.serverBin or "redis-server" } /var/lib/${redisName name}/redis.conf ${lib.escapeShellArgs conf.extraParams}"; + + # NOTE: Redis/Valkey Sentinel persists dynamic cluster state by rewriting its + # configuration file at runtime (redis.conf). This includes monitors, + # authentication credentials, and failover metadata, and this behaviour + # cannot be disabled. + # As a result, a fully declarative configuration is not possible for + # Sentinel-managed options. The preStart logic below appends sentinel + # configuration only if it is not already present, in order to avoid + # overwriting state that is owned and maintained by Sentinel itself. + # This is an intentional deviation from strict declarative semantics and + # is required for correct Sentinel operation. ExecStartPre = "+" + pkgs.writeShellScript "${redisName name}-prep-conf" ( @@ -582,11 +628,32 @@ in ${lib.optionalString (conf.masterAuthFile != null) '' echo "masterauth $(cat ${lib.escapeShellArg conf.masterAuthFile})" >> "${redisConfRun}" ''} + ${lib.optionalString (conf.sentinelMasterHost != null) '' + sentinel_monitor_line="sentinel monitor ${conf.sentinelMasterName} ${conf.sentinelMasterHost} ${toString conf.sentinelMasterPort} ${toString conf.sentinelMasterQuorum}" + if grep -qE "^sentinel monitor ${conf.sentinelMasterName}\b" "${redisConfVar}"; then + sed -i \ + "s|^sentinel monitor ${conf.sentinelMasterName}\b.*|$sentinel_monitor_line|" "${redisConfVar}" + else + echo "$sentinel_monitor_line" >> "${redisConfVar}" + fi + ''} ${lib.optionalString (conf.sentinelAuthUser != null) '' - echo "sentinel auth-user ${conf.sentinelMasterName} ${conf.sentinelAuthUser}" >> "${redisConfRun}" + sentinel_auth_user_line="sentinel auth-user ${conf.sentinelMasterName} ${conf.sentinelAuthUser}" + if grep -qE "^sentinel auth-user ${conf.sentinelMasterName}\b" "${redisConfVar}"; then + sed -i \ + "s|^sentinel auth-user ${conf.sentinelMasterName}\b.*|$sentinel_auth_user_line|" "${redisConfVar}" + else + echo "$sentinel_auth_user_line" >> "${redisConfVar}" + fi ''} ${lib.optionalString (conf.sentinelAuthPassFile != null) '' - echo "sentinel auth-pass ${conf.sentinelMasterName} $(cat ${lib.escapeShellArg conf.sentinelAuthPassFile})" >> "${redisConfRun}" + sentinel_auth_pass_line="sentinel auth-pass ${conf.sentinelMasterName} $(cat ${lib.escapeShellArg conf.sentinelAuthPassFile})" + if grep -qE "^sentinel auth-pass ${conf.sentinelMasterName}\b" "${redisConfVar}"; then + sed -i \ + "s|^sentinel auth-pass ${conf.sentinelMasterName}\b.*|$sentinel_auth_pass_line|" "${redisConfVar}" + else + echo "$sentinel_auth_pass_line" >> "${redisConfVar}" + fi ''} '' ); From 06ffe2b1833a4f18cebd8cd9505389958a7a46f2 Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Tue, 27 Jan 2026 14:44:53 +0100 Subject: [PATCH 014/429] opensc: use regex to determine release tags Prevents false updates such as https://github.com/NixOS/nixpkgs/pull/484332. --- pkgs/by-name/op/opensc/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/op/opensc/package.nix b/pkgs/by-name/op/opensc/package.nix index 1fe90a5082a3..1e98f718bd06 100644 --- a/pkgs/by-name/op/opensc/package.nix +++ b/pkgs/by-name/op/opensc/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { "completiondir=$(out)/etc" ]; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=^([0-9\.]+)$" ]; }; meta = { description = "Set of libraries and utilities to access smart cards"; From cb0bdca8b606d0b49a235b511d54e911ef5bab76 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 27 Jan 2026 22:51:14 +0100 Subject: [PATCH 015/429] galene-stt: drop --- pkgs/by-name/ga/galene-stt/package.nix | 91 ------------------- .../rocm-modules/release-attrPaths.json | 1 - pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 92 deletions(-) delete mode 100644 pkgs/by-name/ga/galene-stt/package.nix diff --git a/pkgs/by-name/ga/galene-stt/package.nix b/pkgs/by-name/ga/galene-stt/package.nix deleted file mode 100644 index 36caefe6d6a1..000000000000 --- a/pkgs/by-name/ga/galene-stt/package.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, - gitUpdater, - writeShellApplication, - _experimental-update-script-combinators, - galene, - libopus, - nix, - pkg-config, - sd, - whisper-cpp, -}: - -buildGoModule (finalAttrs: { - pname = "galene-stt"; - version = "0.1"; - - src = fetchFromGitHub { - owner = "jech"; - repo = "galene-stt"; - tag = "galene-stt-${finalAttrs.version}"; - hash = "sha256-uW1b5T+p7KGvqt+PlR9d7bo62V+URHniS45sZP/VuLQ="; - }; - - vendorHash = "sha256-UFOxo8jq+gxN1dkM2A/BQqtT9ggIp7qovFRLv3Q6Io0="; - - # Not necessary, but feels cleaner to pull it in like that - postPatch = '' - substituteInPlace whisper.go \ - --replace-fail 'cgo LDFLAGS: -lwhisper' 'cgo pkg-config: whisper' - ''; - - strictDeps = true; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - libopus - whisper-cpp - ]; - - ldflags = [ - "-s" - "-w" - ]; - - passthru = { - updateScriptSrc = gitUpdater { - rev-prefix = "galene-stt-"; - }; - updateScriptVendor = writeShellApplication { - name = "update-galene-stt-vendorHash"; - runtimeInputs = [ - nix - sd - ]; - text = '' - export UPDATE_NIX_ATTR_PATH="''${UPDATE_NIX_ATTR_PATH:-galene-stt}" - - oldhash="$(nix-instantiate . --eval --strict -A "$UPDATE_NIX_ATTR_PATH.goModules.drvAttrs.outputHash" | cut -d'"' -f2)" - newhash="$(nix-build -A "$UPDATE_NIX_ATTR_PATH.goModules" --no-out-link 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)" - - if [ "$newhash" == "" ]; then - echo "No new vendorHash." - exit 0 - fi - - fname="$(nix-instantiate --eval -E "with import ./. {}; (builtins.unsafeGetAttrPos \"version\" $UPDATE_NIX_ATTR_PATH).file" | cut -d'"' -f2)" - - ${sd.meta.mainProgram} --string-mode "$oldhash" "$newhash" "$fname" - ''; - }; - updateScript = _experimental-update-script-combinators.sequence [ - finalAttrs.passthru.updateScriptSrc.command - (lib.getExe finalAttrs.passthru.updateScriptVendor) - ]; - }; - - meta = { - description = "Speech-to-text support for Galene"; - homepage = "https://github.com/jech/galene-stt"; - changelog = "https://github.com/jech/galene-stt/raw/${finalAttrs.src.rev}/CHANGES"; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - inherit (galene.meta) maintainers; - }; -}) diff --git a/pkgs/development/rocm-modules/release-attrPaths.json b/pkgs/development/rocm-modules/release-attrPaths.json index ba0e760fa06a..677d99ae58c7 100644 --- a/pkgs/development/rocm-modules/release-attrPaths.json +++ b/pkgs/development/rocm-modules/release-attrPaths.json @@ -65,7 +65,6 @@ "firefoxpwa", "freecad", "frigate", - "galene-stt", "gdcm", "getdp", "git-sim", diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5a0a032508a3..2889f570bb4c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -705,6 +705,7 @@ mapAliases { fx_cast_bridge = throw "'fx_cast_bridge' has been renamed to/replaced by 'fx-cast-bridge'"; # Converted to throw 2025-10-27 fzf-zsh = throw "'fzf-zsh' has been removed because it was superseed by its builtin equivalent and archived upstream."; # Added 2026-01-17 g4music = throw "'g4music' has been renamed to/replaced by 'gapless'"; # Converted to throw 2025-10-27 + galene-stt = throw "'galene-stt' has been removed as it is unmaintained and broken"; # Added 2026-01-27 gamecube-tools = throw "gamecube-tools was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 gandi-cli = throw "'gandi-cli' has been removed as it is unmaintained upstream"; # Added 2026-01-11 garage_0_8 = throw "'garage_0_8' has been removed as it is unmaintained upstream"; # Added 2025-06-23 From 29ea62bd7f9c4d2024d37b2fe89cdfbdc5b890b9 Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Fri, 30 Jan 2026 22:14:45 +0100 Subject: [PATCH 016/429] mtkclient: 2.0.1-unstable-2025-09-26 -> 2.1.2 --- pkgs/by-name/mt/mtkclient/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mt/mtkclient/package.nix b/pkgs/by-name/mt/mtkclient/package.nix index 8424253da942..1fcd05b68974 100644 --- a/pkgs/by-name/mt/mtkclient/package.nix +++ b/pkgs/by-name/mt/mtkclient/package.nix @@ -4,16 +4,16 @@ python3Packages, }: -python3Packages.buildPythonApplication { +python3Packages.buildPythonApplication rec { pname = "mtkclient"; - version = "2.0.1-unstable-2025-09-26"; + version = "2.1.2"; pyproject = true; src = fetchFromGitHub { owner = "bkerler"; repo = "mtkclient"; - rev = "399b3a1c25e73ddf4951f12efd20f7254ee04a39"; - hash = "sha256-XNPYeVhp5P+zQdumS9IzlUd5+WebL56qcgs10WS2/LY="; + rev = "v${version}"; + hash = "sha256-mbfuOYJvwHfDvjTtAgMBLi7REIRRcJ9bhkY5oVjxCAM="; }; build-system = [ python3Packages.hatchling ]; From db5da97f1b564e472782bf5ed3e7450dae1744f2 Mon Sep 17 00:00:00 2001 From: GiggleSquid Date: Sun, 1 Feb 2026 11:50:50 +0000 Subject: [PATCH 017/429] gridcoin-research: fix GCC 15 build --- .../blockchains/gridcoin-research/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/blockchains/gridcoin-research/default.nix b/pkgs/applications/blockchains/gridcoin-research/default.nix index ba5a14a53845..405fec25f840 100644 --- a/pkgs/applications/blockchains/gridcoin-research/default.nix +++ b/pkgs/applications/blockchains/gridcoin-research/default.nix @@ -16,6 +16,7 @@ libtool, miniupnpc, hexdump, + fetchpatch2, }: stdenv.mkDerivation rec { @@ -29,6 +30,13 @@ stdenv.mkDerivation rec { hash = "sha256-nupZB4nNbitpf5EBCNy0e+ovjayAszup/r7qxbxA5jI="; }; + patches = [ + (fetchpatch2 { + url = "https://github.com/gridcoin-community/Gridcoin-Research/commit/bab91e95ca8c83f06dcc505e6b3f8b44dc6d50d4.patch"; + sha256 = "sha256-GzurVlR7Tk3pmQfgO9WtHXjX6xHqNzdYqOdbJND7MpA="; + }) + ]; + nativeBuildInputs = [ pkg-config wrapQtAppsHook From d28d16efbc533dc28e68d48db50c5701bb2240c8 Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Mon, 2 Feb 2026 21:12:12 +0100 Subject: [PATCH 018/429] idescriptor: add passthru updateScript and goModules --- pkgs/by-name/id/idescriptor/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/id/idescriptor/package.nix b/pkgs/by-name/id/idescriptor/package.nix index 43472b1e0afd..38d27f617e2c 100644 --- a/pkgs/by-name/id/idescriptor/package.nix +++ b/pkgs/by-name/id/idescriptor/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, buildGoModule, + nix-update-script, copyDesktopItems, makeDesktopItem, cmake, @@ -115,6 +116,12 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + passthru = { + updateScript = nix-update-script { }; + + goModules = finalAttrs.ipatool-go-modules; + }; + meta = { homepage = "https://github.com/iDescriptor/iDescriptor"; changelog = "https://github.com/iDescriptor/iDescriptor/releases/tag/v${finalAttrs.version}"; From 1ed08c21eebe7dc9c1f5c2c58b759ab4a2670824 Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Mon, 2 Feb 2026 21:14:14 +0100 Subject: [PATCH 019/429] idescriptor: 0.1.2 -> 0.2.0 --- pkgs/by-name/id/idescriptor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/id/idescriptor/package.nix b/pkgs/by-name/id/idescriptor/package.nix index 38d27f617e2c..7013efbe248a 100644 --- a/pkgs/by-name/id/idescriptor/package.nix +++ b/pkgs/by-name/id/idescriptor/package.nix @@ -28,13 +28,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "idescriptor"; - version = "0.1.2"; + version = "0.2.0"; src = fetchFromGitHub { owner = "iDescriptor"; repo = "iDescriptor"; tag = "v${finalAttrs.version}"; - hash = "sha256-pj/8PCZUTPu28MQd3zL8ceDsQy4+55348ZOCpiQaiEo="; + hash = "sha256-p6iJP4duesUiYEH8pgGgX5GOdaOhaAegPPphBaXU4VM="; fetchSubmodules = true; }; From 071a51bf9fe8f61891a88db650534f60b8346880 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Wed, 31 Dec 2025 10:29:32 +0900 Subject: [PATCH 020/429] lima-additional-guestagents: remove unused inputs This package requires static linking. These unused inputs were copied from the original lima package by mistake. --- pkgs/by-name/li/lima/additional-guestagents.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/by-name/li/lima/additional-guestagents.nix b/pkgs/by-name/li/lima/additional-guestagents.nix index 8f95811f21ac..e114531e9239 100644 --- a/pkgs/by-name/li/lima/additional-guestagents.nix +++ b/pkgs/by-name/li/lima/additional-guestagents.nix @@ -1,9 +1,7 @@ { lib, - stdenv, buildGoModule, callPackage, - apple-sdk_15, findutils, }: @@ -14,15 +12,12 @@ buildGoModule (finalAttrs: { # nixpkgs-update: no auto update inherit (callPackage ./source.nix { }) version src vendorHash; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_15 - ]; + env.CGO_ENABLED = "0"; buildPhase = let makeFlags = [ "VERSION=v${finalAttrs.version}" - "CC=${stdenv.cc.targetPrefix}cc" ]; in '' From 56f2e827cbf31d437e4bff4b8e388fceb3e7023c Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 27 Nov 2025 17:58:02 +0900 Subject: [PATCH 021/429] lima: share meta --- pkgs/by-name/li/lima/additional-guestagents.nix | 11 +++++------ pkgs/by-name/li/lima/package.nix | 13 +++++-------- pkgs/by-name/li/lima/source.nix | 10 ++++++++++ 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/li/lima/additional-guestagents.nix b/pkgs/by-name/li/lima/additional-guestagents.nix index 8f95811f21ac..296c797a27e2 100644 --- a/pkgs/by-name/li/lima/additional-guestagents.nix +++ b/pkgs/by-name/li/lima/additional-guestagents.nix @@ -7,12 +7,15 @@ findutils, }: +let + source = callPackage ./source.nix { }; +in buildGoModule (finalAttrs: { pname = "lima-additional-guestagents"; # Because agents must use the same version as lima, lima's updateScript should also update the shared src. # nixpkgs-update: no auto update - inherit (callPackage ./source.nix { }) version src vendorHash; + inherit (source) version src vendorHash; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 @@ -56,8 +59,7 @@ buildGoModule (finalAttrs: { runHook postInstallCheck ''; - meta = { - homepage = "https://github.com/lima-vm/lima"; + meta = source.meta // { description = "Lima Guest Agents for emulating non-native architectures"; longDescription = '' This package should only be used when your guest's architecture differs from the host's. @@ -71,8 +73,5 @@ buildGoModule (finalAttrs: { Typically, you won't need to directly add this package to your *.nix files. ''; - changelog = "https://github.com/lima-vm/lima/releases/tag/v${finalAttrs.version}"; - license = lib.licenses.asl20; - maintainers = [ ]; }; }) diff --git a/pkgs/by-name/li/lima/package.nix b/pkgs/by-name/li/lima/package.nix index 96b2e043dd4a..373f033929e2 100644 --- a/pkgs/by-name/li/lima/package.nix +++ b/pkgs/by-name/li/lima/package.nix @@ -20,10 +20,13 @@ jq, }: +let + source = callPackage ./source.nix { }; +in buildGoModule (finalAttrs: { pname = "lima"; - inherit (callPackage ./source.nix { }) version src vendorHash; + inherit (source) version src vendorHash; nativeBuildInputs = [ makeWrapper @@ -158,13 +161,7 @@ buildGoModule (finalAttrs: { }; }; - meta = { - homepage = "https://github.com/lima-vm/lima"; + meta = source.meta // { description = "Linux virtual machines with automatic file sharing and port forwarding"; - changelog = "https://github.com/lima-vm/lima/releases/tag/v${finalAttrs.version}"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ - anhduy - ]; }; }) diff --git a/pkgs/by-name/li/lima/source.nix b/pkgs/by-name/li/lima/source.nix index 215f72966a26..3d6d631181f9 100644 --- a/pkgs/by-name/li/lima/source.nix +++ b/pkgs/by-name/li/lima/source.nix @@ -1,4 +1,5 @@ { + lib, fetchFromGitHub, }: @@ -16,4 +17,13 @@ in }; vendorHash = "sha256-SeLYVQI+ZIbR9qVaNyF89VUvXdfv1M5iM+Cbas6e2E0="; + + meta = { + homepage = "https://github.com/lima-vm/lima"; + changelog = "https://github.com/lima-vm/lima/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + anhduy + ]; + }; } From bfd696ad87079a1bd25328d3b3f5de5ff7c5a632 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Wed, 4 Feb 2026 01:43:56 +0900 Subject: [PATCH 022/429] lima: mark as insecure if older than version 2.x --- pkgs/by-name/li/lima/source.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/li/lima/source.nix b/pkgs/by-name/li/lima/source.nix index 3d6d631181f9..99259ed5e823 100644 --- a/pkgs/by-name/li/lima/source.nix +++ b/pkgs/by-name/li/lima/source.nix @@ -21,6 +21,7 @@ in meta = { homepage = "https://github.com/lima-vm/lima"; changelog = "https://github.com/lima-vm/lima/releases/tag/v${version}"; + knownVulnerabilities = lib.optional (lib.versionOlder version "2") "Lima version ${version} is EOL. See https://lima-vm.io/docs/releases/."; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ anhduy From 8b5af3242e4e194bfac7cf00d375213a2c8454d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Feb 2026 12:38:56 +0000 Subject: [PATCH 023/429] ocelot-desktop: 1.14.1 -> 1.14.2 --- pkgs/by-name/oc/ocelot-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/oc/ocelot-desktop/package.nix b/pkgs/by-name/oc/ocelot-desktop/package.nix index d1191f8acb6c..068e70c087dd 100644 --- a/pkgs/by-name/oc/ocelot-desktop/package.nix +++ b/pkgs/by-name/oc/ocelot-desktop/package.nix @@ -29,14 +29,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ocelot-desktop"; - version = "1.14.1"; + version = "1.14.2"; __darwinAllowLocalNetworking = true; # Cannot build from source because sbt/scala support is completely non-existent in nixpkgs src = fetchurl { url = "https://gitlab.com/api/v4/projects/9941848/packages/generic/ocelot-desktop/v${finalAttrs.version}/ocelot-desktop-v${finalAttrs.version}.jar"; - hash = "sha256-OO+fgb9PO72znb2sU0olxFf+YuWZvgZkWdszFPpMZg8="; + hash = "sha256-ZnXFCcm/b4hXLUrL7QZmRYwEFksKkIGI8zDqfXB+uhc="; }; dontUnpack = true; From 7f32119c880218d53f8893cf963993c0de1d2266 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Feb 2026 13:54:24 +0000 Subject: [PATCH 024/429] libdnet: 1.18.0 -> 1.18.2 --- pkgs/by-name/li/libdnet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libdnet/package.nix b/pkgs/by-name/li/libdnet/package.nix index dae167de5c86..f8a092bda96f 100644 --- a/pkgs/by-name/li/libdnet/package.nix +++ b/pkgs/by-name/li/libdnet/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libdnet"; - version = "1.18.0"; + version = "1.18.2"; enableParallelBuilding = true; @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ofalk"; repo = "libdnet"; tag = "libdnet-${finalAttrs.version}"; - hash = "sha256-oPlBQB9e8vGJ/rVydMqsZqdInhrpm2sNWkDl9JkkXCI="; + hash = "sha256-MPNIkgsBG/ZtsGYTRO258oCYR/RVFN3xav+UizMFeV0="; }; nativeBuildInputs = [ From c3505b9a5cd03c27b69cd1847d755dd8b93a113a Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 5 Feb 2026 21:42:03 +0100 Subject: [PATCH 025/429] rpi-imager: 2.0.2 -> 2.0.6 Diff: https://github.com/raspberrypi/rpi-imager/compare/v2.0.2...v2.0.6 Changelog: https://github.com/raspberrypi/rpi-imager/releases/tag/v2.0.6 --- pkgs/by-name/rp/rpi-imager/package.nix | 62 +++++++++++++++++--------- 1 file changed, 40 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/rp/rpi-imager/package.nix b/pkgs/by-name/rp/rpi-imager/package.nix index 1cbc20fdae59..465297fbc350 100644 --- a/pkgs/by-name/rp/rpi-imager/package.nix +++ b/pkgs/by-name/rp/rpi-imager/package.nix @@ -4,29 +4,31 @@ cmake, curl, fetchFromGitHub, + gnutls, libarchive, + libtasn1, + liburing, nix-update-script, pkg-config, qt6, - wrapGAppsHook4, testers, + wrapGAppsHook4, writeShellScriptBin, xz, - gnutls, zstd, - libtasn1, enableTelemetry ? false, + enableUring ? stdenv.hostPlatform.isLinux, }: stdenv.mkDerivation (finalAttrs: { pname = "rpi-imager"; - version = "2.0.2"; + version = "2.0.6"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "rpi-imager"; tag = "v${finalAttrs.version}"; - hash = "sha256-dfzWVmRthoLzI//jfeY6P1W/sfT0cNjhp5EiNQQy8zA="; + hash = "sha256-YbPGxc6EWE3B+7MWgtwTDRdjin9FM7KpWfw38FqKXYA="; }; patches = [ ./remove-vendoring.patch ]; @@ -43,34 +45,41 @@ stdenv.mkDerivation (finalAttrs: { cd src ''; - nativeBuildInputs = [ - cmake - pkg-config - qt6.wrapQtAppsHook - wrapGAppsHook4 - # Fool upstream's cmake lsblk check a bit - (writeShellScriptBin "lsblk" '' - echo "our lsblk has --json support but it doesn't work in our sandbox" - '') - # Upstream uses `git describe` to define a `IMAGER_VERSION` CMake variable, - # and we fool it to take a version from a fake `git` executable. - (writeShellScriptBin "git" '' - echo "v${finalAttrs.version}" - '') - ]; + nativeBuildInputs = + let + # Fool upstream's cmake lsblk check a bit + fake-lsblk = writeShellScriptBin "lsblk" '' + echo "our lsblk has --json support but it doesn't work in our sandbox" + ''; + + # Upstream uses `git describe` to define a `IMAGER_VERSION` CMake variable, + # and we fool it to take a version from a fake `git` executable. + fake-git = writeShellScriptBin "git" '' + echo "v${finalAttrs.version}" + ''; + in + [ + cmake + fake-git + fake-lsblk + pkg-config + qt6.wrapQtAppsHook + wrapGAppsHook4 + ]; buildInputs = [ curl + gnutls libarchive + libtasn1 qt6.qtbase qt6.qtdeclarative qt6.qtsvg qt6.qttools xz - gnutls zstd - libtasn1 ] + ++ lib.optional enableUring liburing ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ]; @@ -79,21 +88,30 @@ stdenv.mkDerivation (finalAttrs: { # Isn't relevant for Nix (lib.cmakeBool "ENABLE_CHECK_VERSION" false) (lib.cmakeBool "ENABLE_TELEMETRY" enableTelemetry) + # Disable fetching external data files + (lib.cmakeBool "GENERATE_CAPITAL_CITIES" false) + (lib.cmakeBool "GENERATE_COUNTRIES_FROM_REGDB" false) + (lib.cmakeBool "GENERATE_TIMEZONES_FROM_IANA" false) ]; qtWrapperArgs = [ "--unset QT_QPA_PLATFORMTHEME" "--unset QT_STYLE_OVERRIDE" ]; + dontWrapGApps = true; + preFixup = '' qtWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; + env.LANG = "C.UTF-8"; + passthru = { tests.version = testers.testVersion { package = finalAttrs.finalPackage; command = "QT_QPA_PLATFORM=offscreen rpi-imager --version"; + version = "v${finalAttrs.version}"; }; updateScript = nix-update-script { }; }; From 5ca11c59e38a71c69cc825619ac71c67f9d6cca8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chadda=C3=AF=20Fouch=C3=A9?= Date: Thu, 5 Feb 2026 22:28:34 +0100 Subject: [PATCH 026/429] libgourou: 0.8.7 -> 0.8.8 Changes to Adobe servers causes adept_activate to fail sometime in 0.8.7 https://forge.soutade.fr/soutade/libgourou/issues/16 --- pkgs/by-name/li/libgourou/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libgourou/package.nix b/pkgs/by-name/li/libgourou/package.nix index a06c5cf51459..8b88a758a885 100644 --- a/pkgs/by-name/li/libgourou/package.nix +++ b/pkgs/by-name/li/libgourou/package.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libgourou"; - version = "0.8.7"; + version = "0.8.8"; src = fetchFromGitea { domain = "forge.soutade.fr"; owner = "soutade"; repo = "libgourou"; tag = "v${finalAttrs.version}"; - hash = "sha256-Tkft/pe3lH07pmyVibTEutIIvconUWDH1ZVN3qV4sSY="; + hash = "sha256-WQOlanavMy1z3ze+c8d1a7ZkAU60/GjEFS5JJfyNHMg="; }; postPatch = '' From e45fc96846b8500066bdf186d54aeada8a4a3e4b Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Fri, 6 Feb 2026 17:34:42 +0100 Subject: [PATCH 027/429] vp: add update script Signed-off-by: Marcin Serwin --- pkgs/by-name/vp/vp/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/vp/vp/package.nix b/pkgs/by-name/vp/vp/package.nix index 59c1a6cb3bc6..31d0a25c87d0 100644 --- a/pkgs/by-name/vp/vp/package.nix +++ b/pkgs/by-name/vp/vp/package.nix @@ -5,6 +5,7 @@ autoreconfHook, fetchFromGitHub, stdenv, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -40,6 +41,10 @@ stdenv.mkDerivation (finalAttrs: { "-I${lib.getDev SDL_image}/include/SDL" ]; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + meta = { homepage = "https://github.com/erikg/vp"; description = "SDL based picture viewer/slideshow"; From bae6dd105e1ef777310928edd8e8b5465fc75347 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Fri, 6 Feb 2026 17:34:47 +0100 Subject: [PATCH 028/429] chiaki: 2.2.0 -> 2.2.0-unstable-2026-01-04 Signed-off-by: Marcin Serwin --- pkgs/by-name/ch/chiaki/package.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ch/chiaki/package.nix b/pkgs/by-name/ch/chiaki/package.nix index 39720c826f2e..c654d1707bcd 100644 --- a/pkgs/by-name/ch/chiaki/package.nix +++ b/pkgs/by-name/ch/chiaki/package.nix @@ -4,7 +4,7 @@ fetchgit, cmake, pkg-config, - ffmpeg_7, + ffmpeg, libopus, SDL2, libevdev, @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "chiaki"; - version = "2.2.0"; + version = "2.2.0-unstable-2026-01-04"; src = fetchgit { url = "https://git.sr.ht/~thestr4ng3r/chiaki"; - tag = "v${finalAttrs.version}"; + rev = "ab55cf4c95f7723faae08a546fbe14e0f6bddf45"; fetchSubmodules = true; - hash = "sha256-mLx2ygMlIuDJt9iT4nIj/dcLGjMvvmneKd49L7C3BQk="; + hash = "sha256-GYhbq3QCyykMu5K1ITJ+XqNU593Gn3eBTM9coKmh/Vk="; }; nativeBuildInputs = [ @@ -30,14 +30,8 @@ stdenv.mkDerivation (finalAttrs: { libsForQt5.wrapQtAppsHook ]; - postPatch = '' - substituteInPlace CMakeLists.txt --replace-fail \ - 'cmake_minimum_required(VERSION 3.2)' \ - 'cmake_minimum_required(VERSION 3.5)' - ''; - buildInputs = [ - ffmpeg_7 # needs avcodec_close which was removed in ffmpeg 8 + ffmpeg libopus libsForQt5.qtbase libsForQt5.qtmultimedia From 23813cd12486eb0ed517cdd518596d136750bfa8 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Fri, 6 Feb 2026 17:59:02 +0100 Subject: [PATCH 029/429] vpWithSixel: drop Signed-off-by: Marcin Serwin --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 581697253578..143c1cbbeb95 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1896,6 +1896,7 @@ mapAliases { volk_2 = throw "'volk_2' has been removed after not being used by any package for a long time"; # Added 2025-10-25 volnoti = throw "'volnoti' has been removed due to lack of maintenance upstream. Consider using 'rumno' instead."; # Added 2024-12-04 voxelands = throw "'voxelands' has been removed due to lack of upstream maintenance"; # Added 2025-08-30 + vpWithSixel = throw "'vpWithSixel' has been removed as vp switched to SDL2 which does not support sixel"; # Added 2026-02-06 vtk_9 = warnAlias "'vtk_9' has been renamed to 'vtk_9_5'" vtk_9_5; # Added 2025-07-18 vtk_9_egl = warnAlias "'vtk_9_5' now build with egl support by default, so `vtk_9_egl` is deprecated, consider using 'vtk_9_5' instead." vtk_9_5; # Added 2025-07-18 vtk_9_withQt5 = throw "'vtk_9_withQt5' has been removed, Consider using 'vtkWithQt6' instead."; # Added 2025-07-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c516d2d0e4a2..4894fb99ddb1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3638,13 +3638,6 @@ with pkgs; vpn-slice = python3Packages.callPackage ../tools/networking/vpn-slice { }; - vpWithSixel = vp.override { - # Enable next line for console graphics. Note that it requires `sixel` - # enabled terminals such as mlterm or xterm -ti 340 - SDL = SDL_sixel; - SDL_image = SDL_image.override { SDL = SDL_sixel; }; - }; - openconnectPackages = callPackage ../tools/networking/openconnect { }; inherit (openconnectPackages) openconnect openconnect_openssl; From 68d0458cf4bc70ebd577ed75d1f80a350ec47bb4 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Fri, 6 Feb 2026 17:34:47 +0100 Subject: [PATCH 030/429] vp: 1.8-unstable-2017-03-22 -> 1.8-unstable-2025-09-15 Signed-off-by: Marcin Serwin --- pkgs/by-name/vp/vp/package.nix | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/vp/vp/package.nix b/pkgs/by-name/vp/vp/package.nix index 31d0a25c87d0..32db057dc31b 100644 --- a/pkgs/by-name/vp/vp/package.nix +++ b/pkgs/by-name/vp/vp/package.nix @@ -1,7 +1,9 @@ { lib, - SDL, - SDL_image, + pkg-config, + SDL2, + SDL2_image, + libx11, autoreconfHook, fetchFromGitHub, stdenv, @@ -10,23 +12,24 @@ stdenv.mkDerivation (finalAttrs: { pname = "vp"; - version = "1.8-unstable-2017-03-22"; + version = "1.8-unstable-2025-09-15"; src = fetchFromGitHub { owner = "erikg"; repo = "vp"; - rev = "52bae15955dbd7270cc906af59bb0fe821a01f27"; - hash = "sha256-AWRJ//0z97EwvQ00qWDjVeZrPrKnRMOXn4RagdVrcFc="; + rev = "12ab0c49a7d837af8370b91d3f6e4fa11789e57a"; + hash = "sha256-Ea1p9NLk7tW3elU0zmlPAkobyv+yLYeKv5hscJTFJhs="; }; nativeBuildInputs = [ autoreconfHook - SDL + pkg-config ]; buildInputs = [ - SDL - SDL_image + SDL2 + SDL2_image + libx11 ]; outputs = [ @@ -36,10 +39,8 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - env.NIX_CFLAGS_COMPILE = toString [ - "-I${lib.getDev SDL}/include/SDL" - "-I${lib.getDev SDL_image}/include/SDL" - ]; + # gcc15 build failure + env.NIX_CFLAGS_COMPILE = toString [ "-std=gnu17" ]; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; @@ -51,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; mainProgram = "vp"; maintainers = [ ]; - inherit (SDL.meta) platforms; + inherit (SDL2.meta) platforms; hydraPlatforms = lib.platforms.linux; # build hangs on both Darwin platforms, needs investigation }; }) From 2d2cd15a83f4e55a05ce820f7835f39582f6da70 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 7 Feb 2026 00:55:39 +0100 Subject: [PATCH 031/429] gnujump: fix build with gcc15 Tracking: https://github.com/NixOS/nixpkgs/issues/475479 Signed-off-by: Marcin Serwin --- pkgs/by-name/gn/gnujump/fix-c23-prototypes.patch | 16 ++++++++++++++++ pkgs/by-name/gn/gnujump/package.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/by-name/gn/gnujump/fix-c23-prototypes.patch diff --git a/pkgs/by-name/gn/gnujump/fix-c23-prototypes.patch b/pkgs/by-name/gn/gnujump/fix-c23-prototypes.patch new file mode 100644 index 000000000000..ef5c36c0e0a3 --- /dev/null +++ b/pkgs/by-name/gn/gnujump/fix-c23-prototypes.patch @@ -0,0 +1,16 @@ +diff --git a/src/game.h b/src/game.h +index fc75acc..fd511a8 100644 +--- a/src/game.h ++++ b/src/game.h +@@ -207,9 +207,9 @@ void continueTimer (L_timer * time); + + int yesNoQuestion (data_t * gfx, game_t * game, char *text); + +-int updateInput (); ++int updateInput (game_t * game); + +-void freeGame (); ++void freeGame (game_t * game); + + void drawGame (data_t * gfx, game_t * game); + diff --git a/pkgs/by-name/gn/gnujump/package.nix b/pkgs/by-name/gn/gnujump/package.nix index db5765e101a4..34b4522f06cf 100644 --- a/pkgs/by-name/gn/gnujump/package.nix +++ b/pkgs/by-name/gn/gnujump/package.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation (finalAttrs: { SDL_mixer ]; + patches = [ ./fix-c23-prototypes.patch ]; + env.NIX_LDFLAGS = "-lm"; desktopItems = [ From c6e75196c77b1bc6280298a1f45531cc676c28fc Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 6 Feb 2026 23:43:16 +0100 Subject: [PATCH 032/429] requireFile: use lib.extendMkDerivation --- .../trivial-builders/default.nix | 144 +++++++++++------- 1 file changed, 85 insertions(+), 59 deletions(-) diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index b350d51455cd..00fc2b6e275d 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -907,67 +907,93 @@ rec { # Docs in doc/build-helpers/fetchers.chapter.md # See https://nixos.org/manual/nixpkgs/unstable/#requirefile - requireFile = - { - name ? null, - sha256 ? null, - sha1 ? null, - hash ? null, - url ? null, - message ? null, - hashMode ? "flat", - }: - assert (message != null) || (url != null); - assert (sha256 != null) || (sha1 != null) || (hash != null); - assert (name != null) || (url != null); - let - msg = - if message != null then - message - else - '' - Unfortunately, we cannot download file ${name_} automatically. - Please go to ${url} to download it yourself, and add it to the Nix store - using either - nix-store --add-fixed ${hashAlgo} ${name_} - or - nix-prefetch-url --type ${hashAlgo} file:///path/to/${name_} - ''; - hashAlgo = - if hash != null then - (builtins.head (lib.strings.splitString "-" hash)) - else if sha256 != null then - "sha256" - else - "sha1"; - hashAlgo_ = if hash != null then "" else hashAlgo; - hash_ = - if hash != null then - hash - else if sha256 != null then - sha256 - else - sha1; - name_ = if name == null then baseNameOf (toString url) else name; - in - stdenvNoCC.mkDerivation { - name = name_; - outputHashMode = hashMode; - outputHashAlgo = hashAlgo_; - outputHash = hash_; - preferLocalBuild = true; - builder = writeScript "restrict-message" '' - source ${stdenvNoCC}/setup - cat <<_EOF_ + requireFile = lib.extendMkDerivation { + constructDrv = stdenv.mkDerivation; - *** - ${msg} - *** + excludeDrvArgNames = [ + "hash" + "hashMode" + "message" + "sha1" + "sha256" + "url" + ]; - _EOF_ - exit 1 - ''; - }; + extendDrvArgs = + finalAttrs: + { + name ? null, + sha256 ? null, + sha1 ? null, + hash ? null, + url ? null, + message ? null, + hashMode ? "flat", + }@args: + assert (message != null) || (url != null); + assert (sha256 != null) || (sha1 != null) || (hash != null); + assert (name != null) || (url != null); + let + msg = + if message != null then + message + else + '' + Unfortunately, we cannot download file ${name_} automatically. + Please go to ${url} to download it yourself, and add it to the Nix store + using either + nix-store --add-fixed ${hashAlgo} ${name_} + or + nix-prefetch-url --type ${hashAlgo} file:///path/to/${name_} + ''; + hashAlgo = + if hash != null then + (builtins.head (lib.strings.splitString "-" hash)) + else if sha256 != null then + "sha256" + else + "sha1"; + hashAlgo_ = if hash != null then "" else hashAlgo; + hash_ = + if hash != null then + hash + else if sha256 != null then + sha256 + else + sha1; + name_ = if name == null then baseNameOf (toString url) else name; + in + { + outputHashMode = hashMode; + outputHashAlgo = hashAlgo_; + outputHash = hash_; + preferLocalBuild = true; + builder = writeScript "restrict-message" '' + source ${stdenvNoCC}/setup + cat <<_EOF_ + + *** + ${msg} + *** + + _EOF_ + exit 1 + ''; + } + // (lib.optionalAttrs (name == null) { + # The case of providing `url`, but not `name`. This has + # weird interactions with the positioning system + + # When we set `name` explicitly here, we override where the + # position is read from. So we must fix it here. + pos = lib.unsafeGetAttrPos "url" args; + + # If a name is not provided, use the basename of the url + name = builtins.warn "providing a URL without a name is deprecated" baseNameOf (toString url); + }); + + inheritFunctionArgs = false; + }; # TODO: move copyPathToStore docs to the Nixpkgs manual /* From 9ad38b5b4c530d5f9738afb0e0bc6e093b131660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Neumann?= Date: Tue, 10 Feb 2026 10:17:02 +0100 Subject: [PATCH 033/429] ffmpeg: Add a -bare variant Some packages, like unpaper, need a very basic ffmpeg installation without any external codec dependencies, because they do nothing more than pixel / picture manipulation. --- pkgs/development/libraries/ffmpeg/default.nix | 2 ++ pkgs/development/libraries/ffmpeg/generic.nix | 19 +++++++++++++------ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 0e82e63014c1..1e29fa97f2ec 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -54,6 +54,7 @@ rec { ffmpeg_8 = mkFFmpeg v8 "small"; ffmpeg_8-headless = mkFFmpeg v8 "headless"; ffmpeg_8-full = mkFFmpeg v8 "full"; + ffmpeg_8-bare = mkFFmpeg v8 "bare"; # Please make sure this is updated to new major versions once they # build and work on all the major platforms. If absolutely necessary @@ -68,4 +69,5 @@ rec { ffmpeg = ffmpeg_8; ffmpeg-headless = ffmpeg_8-headless; ffmpeg-full = ffmpeg_8-full; + ffmpeg-bare = ffmpeg_8-bare; } diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 203052505e5e..fc1f2277be08 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -22,6 +22,11 @@ ffmpegVariant ? "small", # Decides which dependencies are enabled by default + # Build nothing by default. Enable all features that are needed. + # To be used for purposes that don't require external dependencies, like `unpaper` + # that uses ffmpeg for image processing. + withBareDeps ? ffmpegVariant == "bare" || withHeadlessDeps, + # Build with headless deps; excludes dependencies that are only necessary for # GUI applications. To be used for purposes that don't generally need such # components and i.e. only depend on libav @@ -52,7 +57,7 @@ withAvisynth ? withFullDeps, # AviSynth script files reading withBluray ? withHeadlessDeps, # BluRay reading withBs2b ? withFullDeps, # bs2b DSP library - withBzlib ? withHeadlessDeps, + withBzlib ? withBareDeps, withCaca ? withFullDeps, # Textual display (ASCII art) withCdio ? withFullDeps && withGPL, # Audio CD grabbing withCelt ? withFullDeps, # CELT decoder @@ -169,7 +174,7 @@ withXml2 ? withHeadlessDeps, # libxml2 support, for IMF and DASH demuxers withXvid ? withHeadlessDeps && withGPL, # Xvid encoder, native encoder exists withZimg ? withHeadlessDeps, - withZlib ? withHeadlessDeps, + withZlib ? withBareDeps, withZmq ? withFullDeps, # Message passing withZvbi ? withHeadlessDeps, # Teletext support @@ -201,14 +206,14 @@ buildQtFaststart ? withFullDeps, # Build qt-faststart executable withBin ? buildFfmpeg || buildFfplay || buildFfprobe || buildQtFaststart, # Library options - buildAvcodec ? withHeadlessDeps, # Build avcodec library + buildAvcodec ? withBareDeps, # Build avcodec library buildAvdevice ? withHeadlessDeps, # Build avdevice library buildAvfilter ? withHeadlessDeps, # Build avfilter library - buildAvformat ? withHeadlessDeps, # Build avformat library + buildAvformat ? withBareDeps, # Build avformat library # Deprecated but depended upon by some packages. # https://github.com/NixOS/nixpkgs/pull/211834#issuecomment-1417435991) buildAvresample ? withHeadlessDeps && lib.versionOlder version "5", # Build avresample library - buildAvutil ? withHeadlessDeps, # Build avutil library + buildAvutil ? withBareDeps, # Build avutil library # Libpostproc is only available on versions lower than 8.0 # https://code.ffmpeg.org/FFmpeg/FFmpeg/commit/8c920c4c396163e3b9a0b428dd550d3c986236aa buildPostproc ? withHeadlessDeps && lib.versionOlder version "8.0", # Build postproc library @@ -394,6 +399,7 @@ let in assert lib.elem ffmpegVariant [ + "bare" "headless" "small" "full" @@ -992,7 +998,8 @@ stdenv.mkDerivation ( }; # tests linking broken with shaderc after https://github.com/NixOS/nixpkgs/pull/477464/changes/5a47b12dfcd1b909ba35778a866394430054319a - doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform && !withShaderc; + # tests need at least the headless deps to compile + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform && !withShaderc && withHeadlessDeps; # Fails with SIGABRT otherwise FIXME: Why? checkPhase = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6155a0f10347..883bbc7d384b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6405,9 +6405,11 @@ with pkgs; ffmpeg_8 ffmpeg_8-headless ffmpeg_8-full + ffmpeg_8-bare ffmpeg ffmpeg-headless ffmpeg-full + ffmpeg-bare ; fftwSinglePrec = fftw.override { precision = "single"; }; From 43a928c56a54bc0ed8641d2f83089284ab1f2274 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Tue, 10 Feb 2026 19:57:09 +0800 Subject: [PATCH 034/429] opencbm: fix build --- pkgs/by-name/op/opencbm/fix-dfu_bool.patch | 16 ++++++++++++++++ pkgs/by-name/op/opencbm/package.nix | 8 ++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/op/opencbm/fix-dfu_bool.patch diff --git a/pkgs/by-name/op/opencbm/fix-dfu_bool.patch b/pkgs/by-name/op/opencbm/fix-dfu_bool.patch new file mode 100644 index 000000000000..a69f8c77c1b3 --- /dev/null +++ b/pkgs/by-name/op/opencbm/fix-dfu_bool.patch @@ -0,0 +1,16 @@ +diff --git a/xum1541cfg/dfu-programmer-0.5.4/src/dfu-bool.h b/xum1541cfg/dfu-programmer-0.5.4/src/dfu-bool.h +index 3dbe5a53..c77bc686 100644 +--- a/xum1541cfg/dfu-programmer-0.5.4/src/dfu-bool.h ++++ b/xum1541cfg/dfu-programmer-0.5.4/src/dfu-bool.h +@@ -1,9 +1,6 @@ + #ifndef __DFU_BOOL_H__ + #define __DFU_BOOL_H__ + +-typedef enum { +- false = 0, +- true = 1 +-} dfu_bool; +- ++#include ++#define dfu_bool bool + #endif diff --git a/pkgs/by-name/op/opencbm/package.nix b/pkgs/by-name/op/opencbm/package.nix index c7e8c45ba390..2631a75e42be 100644 --- a/pkgs/by-name/op/opencbm/package.nix +++ b/pkgs/by-name/op/opencbm/package.nix @@ -15,10 +15,14 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "OpenCBM"; repo = "OpenCBM"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-5lj5F79Gbhrvi9dxKGobdyDyBLGcptAtxx9SANhLrKw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-5lj5F79Gbhrvi9dxKGobdyDyBLGcptAtxx9SANhLrKw="; }; + patches = [ + ./fix-dfu_bool.patch + ]; + makefile = "LINUX/Makefile"; makeFlags = [ "PREFIX=${placeholder "out"}" From c001304d6a50e87daf4e4edef9da3e39cda5de6d Mon Sep 17 00:00:00 2001 From: Ferran Aran Date: Wed, 28 Jan 2026 18:05:50 +0100 Subject: [PATCH 035/429] reqable: add wrapGAppsHook --- pkgs/by-name/re/reqable/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/re/reqable/package.nix b/pkgs/by-name/re/reqable/package.nix index 66b6eedce418..eacced666f2a 100644 --- a/pkgs/by-name/re/reqable/package.nix +++ b/pkgs/by-name/re/reqable/package.nix @@ -4,7 +4,7 @@ fetchurl, dpkg, autoPatchelfHook, - makeBinaryWrapper, + wrapGAppsHook3, fontconfig, atk, cairo, @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ dpkg autoPatchelfHook - makeBinaryWrapper + wrapGAppsHook3 ]; buildInputs = [ @@ -72,11 +72,12 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + dontWrapGApps = true; + preFixup = '' - mkdir $out/bin makeWrapper $out/share/reqable/reqable $out/bin/reqable \ - --prefix LD_LIBRARY_PATH : $out/share/reqable/lib \ - --set GIO_MODULE_DIR "${glib.out}/lib/gio/modules" + --prefix LD_LIBRARY_PATH : $out/share/reqable/lib \ + ''${gappsWrapperArgs[@]} ''; passthru.updateScript = nix-update-script { }; From 8a57f74081202d45c2c91badcee57c94507538ec Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Wed, 28 Jan 2026 14:10:10 -0500 Subject: [PATCH 036/429] offlineimap: 8.0.0 -> 8.0.1 --- pkgs/by-name/of/offlineimap/package.nix | 28 ++++++++++--------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/of/offlineimap/package.nix b/pkgs/by-name/of/offlineimap/package.nix index 03a702c6131f..de17d3633bb4 100644 --- a/pkgs/by-name/of/offlineimap/package.nix +++ b/pkgs/by-name/of/offlineimap/package.nix @@ -15,33 +15,22 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "offlineimap"; - version = "8.0.0"; + version = "8.0.1"; pyproject = true; src = fetchFromGitHub { owner = "OfflineIMAP"; repo = "offlineimap3"; rev = "v${finalAttrs.version}"; - hash = "sha256-XLxKqO5OCXsFu8S3lMp2Ke5hp6uer9npZ3ujmL6Kb3g="; + hash = "sha256-Aigh2B4MTAOeUprtcK9kOx+aG4yCmGZoWTLmYYhrfXA="; }; patches = [ (fetchpatch { - name = "sqlite-version-aware-threadsafety-check.patch"; - url = "https://github.com/OfflineIMAP/offlineimap3/pull/139/commits/7cd32cf834b34a3d4675b29bebcd32dc1e5ef128.patch"; - hash = "sha256-xNq4jFHMf9XZaa9BFF1lOzZrEGa5BEU8Dr+gMOBkJE4="; - }) - (fetchpatch { - # https://github.com/OfflineIMAP/offlineimap3/pull/120 - name = "python312-comaptibility.patch"; - url = "https://github.com/OfflineIMAP/offlineimap3/commit/a1951559299b297492b8454850fcfe6eb9822a38.patch"; - hash = "sha256-CBGMHi+ZzOBJt3TxBf6elrTRMIQ+8wr3JgptL2etkoA="; - }) - (fetchpatch { - # https://github.com/OfflineIMAP/offlineimap3/pull/161 - name = "python312-compatibility.patch"; - url = "https://github.com/OfflineIMAP/offlineimap3/commit/3dd8ebc931e3f3716a90072bd34e50ac1df629fa.patch"; - hash = "sha256-2IJ0yzESt+zk+r+Z+9js3oKhFF0+xok0xK8Jd3G/gYY="; + # https://github.com/OfflineIMAP/offlineimap3/pull/225 + name = "duplicate-bin.patch"; + url = "https://github.com/OfflineIMAP/offlineimap3/commit/64557d2251f0d911c215eb743f6bfe8de8dfc042.patch"; + hash = "sha256-Agy38fLt2k9AwPmGBoQxUD7+FD3qJzj89A13SQr0/nU="; }) ]; @@ -72,6 +61,11 @@ python3.pkgs.buildPythonApplication (finalAttrs: { urllib3 ]; + # https://github.com/OfflineIMAP/offlineimap3/pull/232 + pythonRelaxDeps = [ + "urllib3" + ]; + postInstall = '' make -C docs man installManPage docs/offlineimap.1 From fef4bdc2af7555b1dc4e68759c0f52a31b0a05cc Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Wed, 28 Jan 2026 14:12:29 -0500 Subject: [PATCH 037/429] offlineimap: install example configurations --- pkgs/by-name/of/offlineimap/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/of/offlineimap/package.nix b/pkgs/by-name/of/offlineimap/package.nix index de17d3633bb4..b3e1f193a8f8 100644 --- a/pkgs/by-name/of/offlineimap/package.nix +++ b/pkgs/by-name/of/offlineimap/package.nix @@ -70,6 +70,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: { make -C docs man installManPage docs/offlineimap.1 installManPage docs/offlineimapui.7 + install -Dm644 offlineimap.conf -T $out/share/offlineimap/offlineimap.conf + install -Dm644 offlineimap.conf.minimal -T $out/share/offlineimap/offlineimap.conf.minimal ''; # Test requires credentials From 07ff6829bbb0fbb2af9daf651fe2f82807d14cef Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Wed, 28 Jan 2026 14:20:04 -0500 Subject: [PATCH 038/429] offlineimap: add optional-dependencies --- pkgs/by-name/of/offlineimap/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/of/offlineimap/package.nix b/pkgs/by-name/of/offlineimap/package.nix index b3e1f193a8f8..be6a3f4b5b66 100644 --- a/pkgs/by-name/of/offlineimap/package.nix +++ b/pkgs/by-name/of/offlineimap/package.nix @@ -55,7 +55,10 @@ python3.pkgs.buildPythonApplication (finalAttrs: { dependencies = with python3.pkgs; [ certifi distro + gssapi imaplib2 + keyring + portalocker pysocks rfc6555 urllib3 From a94453374a1d925bd6bcc1e26da1bcb4b71bce2d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 14 Feb 2026 06:44:36 +0000 Subject: [PATCH 039/429] ax25-apps: fix `glibc-2.42` build failure Without the change the build fails in `master` as https://hydra.nixos.org/build/319882690: ``` io.c:22:10: fatal error: termio.h: No such file or directory 22 | #include | ^~~~~~~~~~ ``` --- pkgs/by-name/ax/ax25-apps/glibc-2.42.patch | 26 ++++++++++++++++++++++ pkgs/by-name/ax/ax25-apps/package.nix | 5 +++++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/by-name/ax/ax25-apps/glibc-2.42.patch diff --git a/pkgs/by-name/ax/ax25-apps/glibc-2.42.patch b/pkgs/by-name/ax/ax25-apps/glibc-2.42.patch new file mode 100644 index 000000000000..1a0c7700549e --- /dev/null +++ b/pkgs/by-name/ax/ax25-apps/glibc-2.42.patch @@ -0,0 +1,26 @@ +--- a/ax25ipd/io.c ++++ b/ax25ipd/io.c +@@ -19,20 +19,21 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include + #include + #include + #include ++#include + #include + #include + #include + + #include "ax25ipd.h" + +-static struct termio nterm; ++static struct termios nterm; + + int ttyfd = -1; + static int udpsock = -1; diff --git a/pkgs/by-name/ax/ax25-apps/package.nix b/pkgs/by-name/ax/ax25-apps/package.nix index dc71602f686f..f92d65f2051e 100644 --- a/pkgs/by-name/ax/ax25-apps/package.nix +++ b/pkgs/by-name/ax/ax25-apps/package.nix @@ -29,6 +29,11 @@ stdenv.mkDerivation { hash = "sha256-RLeFndis2OhIkJPLD+YfEUrJdZL33huVzlHq+kGq7dA="; }; + patches = [ + # Fix build against glibc-2.42 + ./glibc-2.42.patch + ]; + configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var/lib" From 4cd3967a684091febad25c9fc56d2cb29997fce6 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Sat, 14 Feb 2026 22:43:12 +0100 Subject: [PATCH 040/429] lib.systems: expose makeMuslParsedPlatform Moving this helper from pkgs/stdenv/stage.nix so it can be used for alternative variations of pkgsMusl and pkgsStatic. --- lib/systems/parse.nix | 35 +++++++++++++++++++++++++++++++++++ pkgs/top-level/stage.nix | 33 +-------------------------------- pkgs/top-level/variants.nix | 5 +++-- 3 files changed, 39 insertions(+), 34 deletions(-) diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 86f8c169d901..0fa734207f33 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -974,6 +974,41 @@ rec { in "${cpuName}-${vendor.name}-${kernelName kernel}${optExecFormat}${optAbi}"; + # This is a function from parsed platforms (like stdenv.hostPlatform.parsed) + # to parsed platforms. + makeMuslParsedPlatform = + parsed: + # The following line guarantees that the output of this function + # is a well-formed platform with no missing fields. + ( + x: + lib.trivial.pipe x [ + (x: removeAttrs x [ "_type" ]) + mkSystem + ] + ) + ( + parsed + // { + abi = + { + gnu = abis.musl; + gnueabi = abis.musleabi; + gnueabihf = abis.musleabihf; + gnuabin32 = abis.muslabin32; + gnuabi64 = abis.muslabi64; + gnuabielfv2 = abis.musl; + gnuabielfv1 = abis.musl; + # The following entries ensure that this function is idempotent. + musleabi = abis.musleabi; + musleabihf = abis.musleabihf; + muslabin32 = abis.muslabin32; + muslabi64 = abis.muslabi64; + } + .${parsed.abi.name} or abis.musl; + } + ); + ################################################################################ } diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 34edecf6d968..1576ff3dc89d 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -85,36 +85,6 @@ in }@args: let - # This is a function from parsed platforms (like - # stdenv.hostPlatform.parsed) to parsed platforms. - makeMuslParsedPlatform = - parsed: - # The following line guarantees that the output of this function - # is a well-formed platform with no missing fields. It will be - # uncommented in a separate PR, in case it breaks the build. - #(x: lib.trivial.pipe x [ (x: removeAttrs x [ "_type" ]) lib.systems.parse.mkSystem ]) - ( - parsed - // { - abi = - { - gnu = lib.systems.parse.abis.musl; - gnueabi = lib.systems.parse.abis.musleabi; - gnueabihf = lib.systems.parse.abis.musleabihf; - gnuabin32 = lib.systems.parse.abis.muslabin32; - gnuabi64 = lib.systems.parse.abis.muslabi64; - gnuabielfv2 = lib.systems.parse.abis.musl; - gnuabielfv1 = lib.systems.parse.abis.musl; - # The following two entries ensure that this function is idempotent. - musleabi = lib.systems.parse.abis.musleabi; - musleabihf = lib.systems.parse.abis.musleabihf; - muslabin32 = lib.systems.parse.abis.muslabin32; - muslabi64 = lib.systems.parse.abis.muslabi64; - } - .${parsed.abi.name} or lib.systems.parse.abis.musl; - } - ); - stdenvAdapters = self: super: let @@ -199,7 +169,6 @@ let nixpkgsFun stdenv overlays - makeMuslParsedPlatform ; } self super ); @@ -319,7 +288,7 @@ let isStatic = true; config = lib.systems.parse.tripleFromSystem ( if stdenv.hostPlatform.isLinux then - makeMuslParsedPlatform stdenv.hostPlatform.parsed + lib.systems.parse.makeMuslParsedPlatform stdenv.hostPlatform.parsed else stdenv.hostPlatform.parsed ); diff --git a/pkgs/top-level/variants.nix b/pkgs/top-level/variants.nix index e3a12fcadcf5..f908ca89402b 100644 --- a/pkgs/top-level/variants.nix +++ b/pkgs/top-level/variants.nix @@ -10,7 +10,6 @@ stdenv, nixpkgsFun, overlays, - makeMuslParsedPlatform, }: let makeLLVMParsedPlatform = @@ -84,7 +83,9 @@ self: super: { ] ++ overlays; ${if stdenv.hostPlatform == stdenv.buildPlatform then "localSystem" else "crossSystem"} = { - config = lib.systems.parse.tripleFromSystem (makeMuslParsedPlatform stdenv.hostPlatform.parsed); + config = lib.systems.parse.tripleFromSystem ( + lib.systems.parse.makeMuslParsedPlatform stdenv.hostPlatform.parsed + ); }; } else From e7695e231c93f0b4e4b2c22e13163c7ab32de968 Mon Sep 17 00:00:00 2001 From: Goldmensch Date: Mon, 16 Feb 2026 16:23:57 +0100 Subject: [PATCH 041/429] jbang: Use --prefix instead of --set for PATH --- pkgs/by-name/jb/jbang/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/jb/jbang/package.nix b/pkgs/by-name/jb/jbang/package.nix index 016581c9e6f2..501f3dbc8503 100644 --- a/pkgs/by-name/jb/jbang/package.nix +++ b/pkgs/by-name/jb/jbang/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { cp -r . $out wrapProgram $out/bin/jbang \ --set JAVA_HOME ${jdk} \ - --set PATH ${ + --prefix PATH ${ lib.makeBinPath [ (placeholder "out") coreutils From 2fc99c5cc0da16121fffc16a2a12b78badcaf1d1 Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Mon, 16 Feb 2026 17:52:24 +0100 Subject: [PATCH 042/429] apk-tools: switch to meson build system --- pkgs/by-name/ap/apk-tools/package.nix | 37 ++++++++++++--------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/ap/apk-tools/package.nix b/pkgs/by-name/ap/apk-tools/package.nix index 8dbd4be4bbe1..25260a4e9ce7 100644 --- a/pkgs/by-name/ap/apk-tools/package.nix +++ b/pkgs/by-name/ap/apk-tools/package.nix @@ -3,6 +3,10 @@ stdenv, fetchFromGitLab, pkg-config, + meson, + ninja, + python3, + cmocka, scdoc, openssl, zlib, @@ -11,7 +15,7 @@ lua5_3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "apk-tools"; version = "3.0.3"; @@ -19,41 +23,35 @@ stdenv.mkDerivation rec { domain = "gitlab.alpinelinux.org"; owner = "alpine"; repo = "apk-tools"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-ydqJiLkz80TQGyf9m/l8HSXfoTAvi0av7LHETk1c0GI="; }; nativeBuildInputs = [ + meson + ninja pkg-config - scdoc + python3 ] ++ lib.optionals luaSupport [ lua5_3 lua5_3.pkgs.lua-zlib ]; + buildInputs = [ openssl zlib zstd + scdoc + cmocka ] ++ lib.optional luaSupport lua5_3; + strictDeps = true; - makeFlags = [ - "CROSS_COMPILE=${stdenv.cc.targetPrefix}" - "SBINDIR=$(out)/bin" - "LIBDIR=$(out)/lib" - "LUA=${if luaSupport then "lua" else "no"}" - "LUA_LIBDIR=$(out)/lib/lua/${lib.versions.majorMinor lua5_3.version}" - "MANDIR=$(out)/share/man" - "DOCDIR=$(out)/share/doc/apk" - "INCLUDEDIR=$(out)/include" - "PKGCONFIGDIR=$(out)/lib/pkgconfig" - ]; - - env.NIX_CFLAGS_COMPILE = toString [ - "-Wno-error=unused-result" - "-Wno-error=deprecated-declarations" + mesonFlags = [ + (lib.mesonEnable "lua" luaSupport) + (lib.mesonOption "lua_bin" "lua") ]; enableParallelBuilding = true; @@ -63,7 +61,6 @@ stdenv.mkDerivation rec { description = "Alpine Package Keeper"; maintainers = [ ]; license = lib.licenses.gpl2Only; - platforms = lib.platforms.linux; mainProgram = "apk"; }; -} +}) From 6f26f7bd285fa828cb0d9a6220960e23332895a4 Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Mon, 16 Feb 2026 19:17:39 +0100 Subject: [PATCH 043/429] apk-tools: 3.0.3 -> 3.0.4 Diff: https://gitlab.alpinelinux.org/alpine/apk-tools/-/compare/v3.0.3...v3.0.4 --- pkgs/by-name/ap/apk-tools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ap/apk-tools/package.nix b/pkgs/by-name/ap/apk-tools/package.nix index 25260a4e9ce7..2a802b5983e4 100644 --- a/pkgs/by-name/ap/apk-tools/package.nix +++ b/pkgs/by-name/ap/apk-tools/package.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "apk-tools"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitLab { domain = "gitlab.alpinelinux.org"; owner = "alpine"; repo = "apk-tools"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-ydqJiLkz80TQGyf9m/l8HSXfoTAvi0av7LHETk1c0GI="; + sha256 = "sha256-51lBWcUSILCJZNP6LaOGyERCosNWTuEne/+xX8xHLf0="; }; nativeBuildInputs = [ From 9da6c0881b4f2c708dcc616a4c2065e6df9c5c94 Mon Sep 17 00:00:00 2001 From: Parthiv Krishna Date: Tue, 17 Feb 2026 07:04:20 +0000 Subject: [PATCH 044/429] librechat: patch publicPath to match uploads/imageOutput --- pkgs/by-name/li/librechat/0003-upload-paths.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/li/librechat/0003-upload-paths.patch b/pkgs/by-name/li/librechat/0003-upload-paths.patch index 50ec5380c545..cbba178f2bf9 100644 --- a/pkgs/by-name/li/librechat/0003-upload-paths.patch +++ b/pkgs/by-name/li/librechat/0003-upload-paths.patch @@ -10,7 +10,8 @@ index 165e9e6..fc85083 100644 + uploads: path.resolve('.', 'uploads'), clientPath: path.resolve(__dirname, '..', '..', 'client'), dist: path.resolve(__dirname, '..', '..', 'client', 'dist'), - publicPath: path.resolve(__dirname, '..', '..', 'client', 'public'), +- publicPath: path.resolve(__dirname, '..', '..', 'client', 'public'), ++ publicPath: path.resolve('.'), fonts: path.resolve(__dirname, '..', '..', 'client', 'public', 'fonts'), assets: path.resolve(__dirname, '..', '..', 'client', 'public', 'assets'), - imageOutput: path.resolve(__dirname, '..', '..', 'client', 'public', 'images'), From c21c309f0425c68e4bacd888d4b99a14071e0490 Mon Sep 17 00:00:00 2001 From: Nicolai Weitkemper Date: Tue, 17 Feb 2026 21:33:08 +0100 Subject: [PATCH 045/429] gsmartcontrol: fix runtime smartctl lookup; explain why update-smart-drivedb does not work Fixes NixOS#477289 Co-authored-by: pancaek <20342389+pancaek@users.noreply.github.com> --- pkgs/by-name/gs/gsmartcontrol/fix-paths.patch | 33 ------------------- .../nixos-update-drivedb-message.patch | 18 ++++++++++ pkgs/by-name/gs/gsmartcontrol/package.nix | 25 +++++++++----- 3 files changed, 34 insertions(+), 42 deletions(-) delete mode 100644 pkgs/by-name/gs/gsmartcontrol/fix-paths.patch create mode 100644 pkgs/by-name/gs/gsmartcontrol/nixos-update-drivedb-message.patch diff --git a/pkgs/by-name/gs/gsmartcontrol/fix-paths.patch b/pkgs/by-name/gs/gsmartcontrol/fix-paths.patch deleted file mode 100644 index b8ec19eb2563..000000000000 --- a/pkgs/by-name/gs/gsmartcontrol/fix-paths.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/data/gsmartcontrol-root.in b/data/gsmartcontrol-root.in ---- a/data/gsmartcontrol-root.in -+++ b/data/gsmartcontrol-root.in -@@ -8,7 +8,7 @@ - # Run gsmartcontrol with root, asking for root password first. - # export GSMARTCONTROL_SU to override a su command (e.g. "kdesu -c"). - --EXEC_BIN="@prefix@/sbin/gsmartcontrol"; -+EXEC_BIN="@prefix@/bin/gsmartcontrol"; - prog_name="gsmartcontrol" - - -@@ -118,7 +118,7 @@ - # Add @prefix@/sbin as well (freebsd seems to require it). - # Note that beesu won't show a GUI login box if /usr/sbin is before /usr/bin, - # so add it first as well. --EXTRA_PATHS="/usr/bin:/usr/sbin:/usr/local/sbin:@prefix@/sbin"; -+EXTRA_PATHS="/usr/bin:/usr/sbin:/usr/local/sbin:@prefix@/bin"; - export PATH="$EXTRA_PATHS:$PATH" - - -diff --git a/src/Makefile.am b/src/Makefile.am ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -24,7 +24,7 @@ - # endif - - --sbin_PROGRAMS = gsmartcontrol -+bin_PROGRAMS = gsmartcontrol - - gsmartcontrol_LDADD = $(top_builddir)/src/applib/libapplib.a \ - $(top_builddir)/src/libdebug/libdebug.a \ diff --git a/pkgs/by-name/gs/gsmartcontrol/nixos-update-drivedb-message.patch b/pkgs/by-name/gs/gsmartcontrol/nixos-update-drivedb-message.patch new file mode 100644 index 000000000000..5163bcc56aae --- /dev/null +++ b/pkgs/by-name/gs/gsmartcontrol/nixos-update-drivedb-message.patch @@ -0,0 +1,18 @@ +diff --git a/src/gui/gsc_main_window.cpp b/src/gui/gsc_main_window.cpp +index a5a6ac9..2d7a1f7 100644 +--- a/src/gui/gsc_main_window.cpp ++++ b/src/gui/gsc_main_window.cpp +@@ -955,8 +955,13 @@ void GscMainWindow::run_update_drivedb() + if (smartctl_binary.is_absolute()) { + update_binary_path = smartctl_binary.parent_path() / update_binary_path; + } +- argv = {"xterm", "-hold", "-e", hz::fs_path_to_string(update_binary_path)}; ++ ++ gui_show_error_dialog( ++ _("Error Updating Drive Database"), ++ _("Updating drivedb from GSmartControl is unavailable in nixpkgs because smartmontools in the Nix store is immutable. Please update your NixOS or nixpkgs channel/flake inputs to get a newer drive database."), ++ this); ++ return; + } + + try { diff --git a/pkgs/by-name/gs/gsmartcontrol/package.nix b/pkgs/by-name/gs/gsmartcontrol/package.nix index 27bff9bb23b3..cbb3dde6c8a6 100644 --- a/pkgs/by-name/gs/gsmartcontrol/package.nix +++ b/pkgs/by-name/gs/gsmartcontrol/package.nix @@ -3,12 +3,12 @@ stdenv, fetchFromGitHub, smartmontools, + adwaita-icon-theme, cmake, gtkmm3, + makeWrapper, pkg-config, - wrapGAppsHook3, - pcre-cpp, - adwaita-icon-theme, + # xterm, }: stdenv.mkDerivation (finalAttrs: { @@ -22,6 +22,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-eLzwFZ1PYqijFTxos9Osf7A2v4C8toM+TGV4/bU82NE="; }; + patches = [ + ./nixos-update-drivedb-message.patch + ]; + postPatch = '' substituteInPlace data/gsmartcontrol.in.desktop \ --replace-fail "@CMAKE_INSTALL_FULL_BINDIR@/" "" @@ -30,21 +34,24 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config - wrapGAppsHook3 + makeWrapper ]; buildInputs = [ gtkmm3 - pcre-cpp adwaita-icon-theme ]; enableParallelBuilding = true; - preFixup = '' - gappsWrapperArgs+=( - --prefix PATH : "${lib.makeBinPath [ smartmontools ]}" - ) + postFixup = '' + wrapProgram $out/bin/gsmartcontrol \ + --prefix PATH : ${ + lib.makeBinPath [ + smartmontools + # xterm # For `update-smart-drivedb`, which does not make sense in NixOS as it tries to overwrite /usr/share/smartmontools/drivedb.h + ] + } ''; meta = { From 275fb35e04bc978b9055ceedbcfcda18f23dd511 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Wed, 18 Feb 2026 19:36:40 -0500 Subject: [PATCH 046/429] quartz-wm: fix Picture typedef collision on darwin Drop the legacy ApplicationServices include from dock-support.h and switch stale CGError/OSStatus/noErr usages to xplugin types/constants (xp_error/XP_Success). Header include trace for reference: x-input.m -> quartz-wm.h -> dock-support.h -> ApplicationServices/ApplicationServices.h -> HIServices/HIServices.h -> HIServices/HIShape.h -> QD/Quickdraw.h: typedef struct Picture Picture x-input.m -> X11/extensions/Xrandr.h -> X11/extensions/Xrender.h -> X11/extensions/render.h: typedef XID Picture Fixes #479312 --- .../fix-picture-typedef-conflict.patch | 66 +++++++++++++++++++ pkgs/by-name/qu/quartz-wm/package.nix | 2 + 2 files changed, 68 insertions(+) create mode 100644 pkgs/by-name/qu/quartz-wm/fix-picture-typedef-conflict.patch diff --git a/pkgs/by-name/qu/quartz-wm/fix-picture-typedef-conflict.patch b/pkgs/by-name/qu/quartz-wm/fix-picture-typedef-conflict.patch new file mode 100644 index 000000000000..0c1d1ee6cc0e --- /dev/null +++ b/pkgs/by-name/qu/quartz-wm/fix-picture-typedef-conflict.patch @@ -0,0 +1,66 @@ +diff --git a/lib/dock-support.h b/lib/dock-support.h +index af18b9d..82cac38 100644 +--- a/lib/dock-support.h ++++ b/lib/dock-support.h +@@ -26,7 +26,6 @@ + #define __DOCK_SUPPORT_H__ + + #include +-#include + #include + + #ifdef XPLUGIN_DOCK_SUPPORT +diff --git a/src/x-screen.m b/src/x-screen.m +index 3d86edb..63fb094 100644 +--- a/src/x-screen.m ++++ b/src/x-screen.m +@@ -443,7 +443,7 @@ window_level_less (const void *a, const void *b) + { + x_window *w; + x_list *sl; +- CGError err; ++ xp_error err; + xp_bool isVisible; + + for(sl = _stacking_list; sl; sl = sl->next) { +diff --git a/src/x-window.m b/src/x-window.m +index 241541c..059ebd2 100644 +--- a/src/x-window.m ++++ b/src/x-window.m +@@ -2127,7 +2127,7 @@ ENABLE_EVENTS (_id, X_CLIENT_WINDOW_EVENTS) + - (void) do_collapse + { + xp_native_window_id wid; +- OSStatus err; ++ xp_error err; + char *title_c; + + DB ("_minimized: %s _animating: %s", _minimized ? "YES" : "NO", _animating ? "YES" : "NO"); +@@ -2145,7 +2145,7 @@ ENABLE_EVENTS (_id, X_CLIENT_WINDOW_EVENTS) + err = qwm_dock_minimize_item_with_title_async (wid, title_c); + free(title_c); + +- if (err == noErr) ++ if (err == XP_Success) + { + _animating = YES; + _minimized = YES; +@@ -2172,7 +2172,7 @@ ENABLE_EVENTS (_id, X_CLIENT_WINDOW_EVENTS) + + - (void) do_uncollapse_and_tell_dock:(BOOL)tell_dock with_animation:(BOOL)anim + { +- OSStatus err = noErr; ++ xp_error err = XP_Success; + long data = 1; + + DB ("tell_dock: %s with_animation: %s _animating: %s", tell_dock ? "YES" : "NO", anim ? "YES" : "NO", _animating ? "YES" : "NO"); +@@ -2205,7 +2205,7 @@ ENABLE_EVENTS (_id, X_CLIENT_WINDOW_EVENTS) + err = qwm_dock_remove_item (_minimized_osx_id); + } + +- if (err == noErr) { ++ if (err == XP_Success) { + _animating = YES; + _minimized_osx_id = XP_NULL_NATIVE_WINDOW_ID; + [self set_wm_state:NormalState]; + diff --git a/pkgs/by-name/qu/quartz-wm/package.nix b/pkgs/by-name/qu/quartz-wm/package.nix index ef06bf4f0af4..0354fc7b4b63 100644 --- a/pkgs/by-name/qu/quartz-wm/package.nix +++ b/pkgs/by-name/qu/quartz-wm/package.nix @@ -23,6 +23,8 @@ clangStdenv.mkDerivation (finalAttrs: { hash = "sha256-1+KZNeR4Gq2uWBHTN53PTITHuly1Z4buR+grzdVNwhs="; }; + patches = [ ./fix-picture-typedef-conflict.patch ]; + configureFlags = [ "--enable-xplugin-dock-support" ]; nativeBuildInputs = [ autoreconfHook From 59db8b663c9c0d9936b5ce73372c50540aee1357 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Wed, 18 Feb 2026 19:57:07 -0500 Subject: [PATCH 047/429] quartz-wm: add booxter as maintainer --- pkgs/by-name/qu/quartz-wm/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/qu/quartz-wm/package.nix b/pkgs/by-name/qu/quartz-wm/package.nix index 0354fc7b4b63..68d373ba102a 100644 --- a/pkgs/by-name/qu/quartz-wm/package.nix +++ b/pkgs/by-name/qu/quartz-wm/package.nix @@ -43,7 +43,7 @@ clangStdenv.mkDerivation (finalAttrs: { meta = { license = lib.licenses.apple-psl20; platforms = lib.platforms.darwin; - maintainers = [ ]; + maintainers = [ lib.maintainers.booxter ]; mainProgram = "quartz-wm"; }; }) From cadb798509ed0404e4d7e1a608801f2fcb42299d Mon Sep 17 00:00:00 2001 From: Manfred Macx Date: Thu, 19 Feb 2026 21:57:07 +0100 Subject: [PATCH 048/429] maintainers: add manfredmacx --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fdba52e7b39f..126e136a1f35 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16175,6 +16175,12 @@ githubId = 115060; name = "Marek Maksimczyk"; }; + manfredmacx = { + email = "mfmacx@proton.me"; + github = "manfredmacx"; + githubId = 222261305; + name = "Manfred Macx"; + }; Mange = { name = "Magnus Bergmark"; email = "me@mange.dev"; From 3436ee0382c8785fd2b80ae231df961163f340e2 Mon Sep 17 00:00:00 2001 From: Nivayu Date: Fri, 20 Feb 2026 09:37:26 +0100 Subject: [PATCH 049/429] xwayland-run: 0.0.4 -> 0.0.5 --- pkgs/by-name/xw/xwayland-run/package.nix | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/xw/xwayland-run/package.nix b/pkgs/by-name/xw/xwayland-run/package.nix index f6fc6ff93615..aeb5c2048efb 100644 --- a/pkgs/by-name/xw/xwayland-run/package.nix +++ b/pkgs/by-name/xw/xwayland-run/package.nix @@ -12,9 +12,12 @@ withKwin ? false, kdePackages, withMutter ? false, - gnome, + mutter, withDbus ? withMutter, + phoc, + withPhoc ? false, dbus, # Since 0.0.3, mutter compositors run with their own DBUS sessions + xwayland-run, }: let compositors = [ @@ -22,19 +25,20 @@ let ] ++ lib.optional withCage cage ++ lib.optional withKwin kdePackages.kwin - ++ lib.optional withMutter gnome.mutter + ++ lib.optional withMutter mutter + ++ lib.optional withPhoc phoc ++ lib.optional withDbus dbus; in python3.pkgs.buildPythonApplication (finalAttrs: { pname = "xwayland-run"; - version = "0.0.4"; + version = "0.0.5"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "ofourdan"; repo = "xwayland-run"; rev = finalAttrs.version; - hash = "sha256-FP/2KNPehZEGKXr+fKdVj4DXzRMpfc3x7K6vH6ZsGdo="; + hash = "sha256-TVoMbFQ5OIJkTX3/tuwylW+Bdx/gl1omObj0c3JjICM="; }; pyproject = false; @@ -71,6 +75,15 @@ python3.pkgs.buildPythonApplication (finalAttrs: { } ''; + passthru.tests = { + build = xwayland-run.override { + withCage = true; + withKwin = true; + withMutter = true; + withPhoc = true; + }; + }; + meta = { changelog = "https://gitlab.freedesktop.org/ofourdan/xwayland-run/-/releases/${finalAttrs.src.rev}"; description = "Set of small utilities revolving around running Xwayland and various Wayland compositor headless"; From 47bd1405251ebc3d5b37d23d1aa600eb2a9a39db Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Wed, 18 Feb 2026 16:07:49 -0500 Subject: [PATCH 050/429] libdecor: fix build on FreeBSD --- pkgs/by-name/li/libdecor/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libdecor/package.nix b/pkgs/by-name/li/libdecor/package.nix index b93d58b2992b..832cd08c5390 100644 --- a/pkgs/by-name/li/libdecor/package.nix +++ b/pkgs/by-name/li/libdecor/package.nix @@ -12,6 +12,7 @@ dbus, pango, gtk3, + evdev-proto, }: stdenv.mkDerivation (finalAttrs: { @@ -51,13 +52,14 @@ stdenv.mkDerivation (finalAttrs: { dbus pango gtk3 - ]; + ] + ++ lib.optional stdenv.hostPlatform.isFreeBSD evdev-proto; meta = { homepage = "https://gitlab.freedesktop.org/libdecor/libdecor"; description = "Client-side decorations library for Wayland clients"; license = lib.licenses.mit; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.freebsd; maintainers = with lib.maintainers; [ artturin ]; }; }) From 8a0debedb2cc83786fbf0c9d92d68f119eccd9d8 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sun, 7 Dec 2025 16:50:19 +0100 Subject: [PATCH 051/429] stremio-linux-shell: init at 1.0.0-beta.13 Co-authored-by: Fazzi --- .../allow-local-network-access.patch | 15 ++ .../better-server-path.patch | 13 ++ .../fix-getshaderinfolog-call.patch | 21 +++ .../st/stremio-linux-shell/package.nix | 142 ++++++++++++++++++ 4 files changed, 191 insertions(+) create mode 100644 pkgs/by-name/st/stremio-linux-shell/allow-local-network-access.patch create mode 100644 pkgs/by-name/st/stremio-linux-shell/better-server-path.patch create mode 100644 pkgs/by-name/st/stremio-linux-shell/fix-getshaderinfolog-call.patch create mode 100644 pkgs/by-name/st/stremio-linux-shell/package.nix diff --git a/pkgs/by-name/st/stremio-linux-shell/allow-local-network-access.patch b/pkgs/by-name/st/stremio-linux-shell/allow-local-network-access.patch new file mode 100644 index 000000000000..524d20502b3b --- /dev/null +++ b/pkgs/by-name/st/stremio-linux-shell/allow-local-network-access.patch @@ -0,0 +1,15 @@ +diff --git a/src/webview/app/mod.rs b/src/webview/app/mod.rs +index 2c6125e..26ab73f 100644 +--- a/src/webview/app/mod.rs ++++ b/src/webview/app/mod.rs +@@ -23,6 +23,10 @@ cef_impl!( + CMD_SWITCHES.iter().for_each(|switch| { + line.append_switch(Some(&CefString::from(switch.to_owned()))); + }); ++ line.append_switch_with_value( ++ Some(&CefString::from("disable-features")), ++ Some(&CefString::from("LocalNetworkAccessChecks")), ++ ); + } + } + diff --git a/pkgs/by-name/st/stremio-linux-shell/better-server-path.patch b/pkgs/by-name/st/stremio-linux-shell/better-server-path.patch new file mode 100644 index 000000000000..8e7cb8d1370b --- /dev/null +++ b/pkgs/by-name/st/stremio-linux-shell/better-server-path.patch @@ -0,0 +1,13 @@ +diff --git a/src/config.rs b/src/config.rs +index 4eda395..679699f 100644 +--- a/src/config.rs ++++ b/src/config.rs +@@ -70,7 +70,7 @@ pub struct ServerConfig { + + impl ServerConfig { + pub fn new(current_dir: &Path) -> Self { +- let file = current_dir.join(SERVER_FILE); ++ let file = Path::new("@serverjs@").to_path_buf(); + + Self { file } + } diff --git a/pkgs/by-name/st/stremio-linux-shell/fix-getshaderinfolog-call.patch b/pkgs/by-name/st/stremio-linux-shell/fix-getshaderinfolog-call.patch new file mode 100644 index 000000000000..6a0af3cb1953 --- /dev/null +++ b/pkgs/by-name/st/stremio-linux-shell/fix-getshaderinfolog-call.patch @@ -0,0 +1,21 @@ +diff --git a/src/shared/renderer/utils.rs b/src/shared/renderer/utils.rs +index be4a65d..1b944ad 100644 +--- a/src/shared/renderer/utils.rs ++++ b/src/shared/renderer/utils.rs +@@ -1,6 +1,6 @@ + use std::{mem, ptr}; + +-use gl::types::{GLenum, GLfloat, GLint, GLsizei, GLsizeiptr, GLuint}; ++use gl::types::{GLchar, GLenum, GLfloat, GLint, GLsizei, GLsizeiptr, GLuint}; + + use super::constants::BYTES_PER_PIXEL; + +@@ -139,7 +139,7 @@ pub fn compile_shader(kind: GLenum, src: &str) -> GLuint { + gl::GetShaderiv(shader, gl::INFO_LOG_LENGTH, &mut len); + + let mut buffer = vec![0u8; len as usize]; +- gl::GetShaderInfoLog(shader, len, ptr::null_mut(), buffer.as_mut_ptr() as *mut i8); ++ gl::GetShaderInfoLog(shader, len, ptr::null_mut(), buffer.as_mut_ptr() as *mut GLchar); + + panic!( + "Shader compile error: {}", diff --git a/pkgs/by-name/st/stremio-linux-shell/package.nix b/pkgs/by-name/st/stremio-linux-shell/package.nix new file mode 100644 index 000000000000..f22d7e6bfc23 --- /dev/null +++ b/pkgs/by-name/st/stremio-linux-shell/package.nix @@ -0,0 +1,142 @@ +{ + lib, + symlinkJoin, + rustPlatform, + fetchFromGitHub, + versionCheckHook, + gitUpdater, + + # buildInputs + atk, + cef-binary, + gtk3, + libayatana-appindicator, + libxkbcommon, + mpv, + openssl, + + # nativeBuildInputs + makeBinaryWrapper, + pkg-config, + wrapGAppsHook4, + + # Wrapper + addDriverRunpath, + libGL, + nodejs, +}: + +let + # Stremio expects CEF files in a specific layout + cef = symlinkJoin { + name = "stremio-linux-shell-cef"; + paths = [ + "${cef-binary}/Resources" + "${cef-binary}/Release" + ]; + }; +in +rustPlatform.buildRustPackage (finalAttrs: { + pname = "stremio-linux-shell"; + version = "1.0.0-beta.13"; + + src = fetchFromGitHub { + owner = "Stremio"; + repo = "stremio-linux-shell"; + tag = "v${finalAttrs.version}"; + hash = "sha256-1f9IBNo5gxpSqTSIf8QuQOlf+sfRhohOmQTLRbX/OU8="; + }; + + cargoHash = "sha256-wx5oF4uF9UMtKzfGxZKsy6mVjYaRD40dLuvaRtz8yE4="; + + patches = [ + # Chromium 142 stopped allowing local network access by default, which + # breaks the app's ability to communicate with the Stremio server. + ./allow-local-network-access.patch + + # GLchar is u8 on aarch64 + # Upstream PR: https://github.com/Stremio/stremio-linux-shell/pull/40 + ./fix-getshaderinfolog-call.patch + + # Patch server.js path so that we don't have to install it in $out/bin + ./better-server-path.patch + ]; + + postPatch = '' + substituteInPlace src/config.rs \ + --replace-fail "@serverjs@" "${placeholder "out"}/share/stremio/server.js" + + substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ + --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" + substituteInPlace $cargoDepsCopy/xkbcommon-dl-*/src/lib.rs \ + --replace-fail "libxkbcommon.so.0" "${libxkbcommon}/lib/libxkbcommon.so.0" + substituteInPlace $cargoDepsCopy/xkbcommon-dl-*/src/x11.rs \ + --replace-fail "libxkbcommon-x11.so.0" "${libxkbcommon}/lib/libxkbcommon-x11.so.0" + ''; + + # Don't download CEF during build + buildFeatures = [ "offline-build" ]; + + buildInputs = [ + atk + cef + gtk3 + libayatana-appindicator + libxkbcommon + mpv + openssl + ]; + + nativeBuildInputs = [ + makeBinaryWrapper + pkg-config + wrapGAppsHook4 + ]; + + env.CEF_PATH = "${cef}"; + + postInstall = '' + mkdir -p $out/share/applications + cp data/com.stremio.Stremio.desktop $out/share/applications/com.stremio.Stremio.desktop + + mkdir -p $out/share/icons/hicolor/scalable/apps + cp data/icons/com.stremio.Stremio.svg $out/share/icons/hicolor/scalable/apps/com.stremio.Stremio.svg + + mkdir -p $out/share/stremio + cp data/server.js $out/share/stremio/server.js + + mv $out/bin/stremio-linux-shell $out/bin/stremio + ''; + + # Node.js is required to run `server.js` + # Add to `gappsWrapperArgs` to avoid two layers of wrapping. + preFixup = '' + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "${addDriverRunpath.driverLink}/lib" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ + --prefix PATH : "${lib.makeBinPath [ nodejs ]}" + ) + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru = { + inherit cef; + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + + meta = { + description = "Modern media center that gives you the freedom to watch everything you want"; + homepage = "https://www.stremio.com/"; + license = with lib.licenses; [ + gpl3Only + # server.js is unfree + unfree + ]; + maintainers = with lib.maintainers; [ thunze ]; + platforms = lib.platforms.linux; + mainProgram = "stremio"; + }; +}) From 741fb40a68d9cb49f1d4c2d3af2efa25ec99430f Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Wed, 18 Feb 2026 16:42:57 -0500 Subject: [PATCH 052/429] swaybg: fix build on FreeBSD --- pkgs/by-name/sw/swaybg/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sw/swaybg/package.nix b/pkgs/by-name/sw/swaybg/package.nix index 30d4c6178dec..e4a8c4c07655 100644 --- a/pkgs/by-name/sw/swaybg/package.nix +++ b/pkgs/by-name/sw/swaybg/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + buildPackages, fetchFromGitHub, meson, ninja, @@ -53,8 +54,11 @@ stdenv.mkDerivation (finalAttrs: { "-Dman-pages=enabled" ]; + # Fortify causes header errors in ssp + hardeningDisable = lib.optionals stdenv.hostPlatform.isFreeBSD [ "fortify" ]; + # add support for webp - postInstall = '' + postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) '' export GDK_PIXBUF_MODULE_FILE="${ gnome._gdkPixbufCacheBuilder_DO_NOT_USE { extraLoaders = [ @@ -79,6 +83,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ ryan4yin ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.freebsd; }; }) From b021b23f9642283d900375b1b8f836f5c9764629 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 21 Feb 2026 17:53:36 +0800 Subject: [PATCH 053/429] mercury: move to by-name --- .../mercury/default.nix => by-name/me/mercury/package.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{development/compilers/mercury/default.nix => by-name/me/mercury/package.nix} (95%) diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/by-name/me/mercury/package.nix similarity index 95% rename from pkgs/development/compilers/mercury/default.nix rename to pkgs/by-name/me/mercury/package.nix index 9e8cd70bc075..10a1d8b570c0 100644 --- a/pkgs/development/compilers/mercury/default.nix +++ b/pkgs/by-name/me/mercury/package.nix @@ -6,7 +6,7 @@ flex, bison, texinfo, - jdk_headless, + openjdk8_headless, erlang, makeWrapper, readline, @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { flex bison texinfo - jdk_headless + openjdk8_headless erlang readline ]; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { for e in $(ls $out/bin) ; do wrapProgram $out/bin/$e \ --prefix PATH ":" "${gcc}/bin" \ - --prefix PATH ":" "${jdk_headless}/bin" \ + --prefix PATH ":" "${openjdk8_headless}/bin" \ --prefix PATH ":" "${erlang}/bin" done ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1172693508bf..db8615277228 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4580,10 +4580,6 @@ with pkgs; mkLLVMPackages ; - mercury = callPackage ../development/compilers/mercury { - jdk_headless = openjdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; - mitschemeX11 = mitscheme.override { enableX11 = true; }; From b472ee6dba6158bb6b57bdc21b7e2c74d7b8024e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 21 Feb 2026 15:34:53 +0100 Subject: [PATCH 054/429] nixos/ncps: fix signNarinfo option example --- nixos/modules/services/networking/ncps.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/ncps.nix b/nixos/modules/services/networking/ncps.nix index 96f557edd41f..93bdf4b434f6 100644 --- a/nixos/modules/services/networking/ncps.nix +++ b/nixos/modules/services/networking/ncps.nix @@ -555,7 +555,7 @@ in signNarinfo = lib.mkOption { type = lib.types.bool; default = true; - example = "false"; + example = false; description = '' Whether to sign narInfo files or passthru as-is from upstream ''; From 64a0d6b52bf901ae14f31e570c2569e83944a2dc Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 22 Feb 2026 11:35:17 +0000 Subject: [PATCH 055/429] hash_extender: fix `gcc-15` build Without the change the build fails on `master` as https://hydra.nixos.org/build/319912473: ``` In file included from hash_extender_engine.c:33: tiger.h:1: error: header guard '__TIGER_H_' followed by '#define' of a different macro [-Werror=header-guard] 1 | #ifndef __TIGER_H_ tiger.h:2: note: '__TIGER_H__' is defined here; did you mean '__TIGER_H_'? 2 | #define __TIGER_H__ ``` --- pkgs/by-name/ha/hash_extender/package.nix | 24 ++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ha/hash_extender/package.nix b/pkgs/by-name/ha/hash_extender/package.nix index 059f8d56d596..896094f26626 100644 --- a/pkgs/by-name/ha/hash_extender/package.nix +++ b/pkgs/by-name/ha/hash_extender/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, openssl, }: @@ -16,10 +17,27 @@ stdenv.mkDerivation { sha256 = "1fj118566hr1wv03az2w0iqknazsqqkak0mvlcvwpgr6midjqi9b"; }; + patches = [ + # gcc-15 build fix: + # https://github.com/iagox86/hash_extender/pull/15 + (fetchpatch { + name = "gcc-15.patch"; + url = "https://github.com/iagox86/hash_extender/commit/84d8d70eb10bcbe4dea2cf5a41d246d59a389e61.patch"; + hash = "sha256-LCzv4FK+4WoJBYYUYB+zsC6358ZpTOxbE91W/1pFe6U="; + }) + ]; + buildInputs = [ openssl ]; + enableParallelBuilding = true; doCheck = true; - checkPhase = "./hash_extender --test"; + checkPhase = '' + runHook preCheck + + ./hash_extender --test + + runHook postCheck + ''; # https://github.com/iagox86/hash_extender/issues/26 hardeningDisable = [ "fortify3" ]; @@ -27,8 +45,12 @@ stdenv.mkDerivation { env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp hash_extender $out/bin + + runHook postInstall ''; meta = { From c2ca0bed26e963faf1e21b1ecb5e58e5b1beb6b9 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Sun, 22 Feb 2026 11:38:12 -0800 Subject: [PATCH 056/429] python3Packages.cyclonedds-python: 0.10.5 -> 0.11.0; fix build --- .../python-modules/cyclonedds-python/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cyclonedds-python/default.nix b/pkgs/development/python-modules/cyclonedds-python/default.nix index 22ad399498a4..1b002fdd20c8 100644 --- a/pkgs/development/python-modules/cyclonedds-python/default.nix +++ b/pkgs/development/python-modules/cyclonedds-python/default.nix @@ -10,11 +10,12 @@ pytestCheckHook, pytest-mock, pytest-cov-stub, + pythonOlder, }: buildPythonPackage rec { pname = "cyclonedds-python"; - version = "0.10.5"; + version = "0.11.0"; pyproject = true; src = fetchFromGitHub { @@ -27,8 +28,17 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "pytest-cov" "" + '' + + lib.optionalString (!pythonOlder "3.13") '' + substituteInPlace clayer/pysertype.c \ + --replace-fail "_Py_IsFinalizing()" "Py_IsFinalizing()" ''; + disabledTests = lib.optionals (!pythonOlder "3.13") [ + "test_dynamic_subscribe_complex" + "test_dynamic_publish_complex" + ]; + build-system = [ setuptools ]; buildInputs = [ cyclonedds ]; @@ -36,6 +46,7 @@ buildPythonPackage rec { dependencies = [ rich-click ]; env.CYCLONEDDS_HOME = "${cyclonedds.out}"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=discarded-qualifiers"; nativeCheckInputs = [ pytestCheckHook @@ -43,6 +54,8 @@ buildPythonPackage rec { pytest-cov-stub ]; + disabled = (!pythonOlder "3.14"); + meta = { description = "Python binding for Eclipse Cyclone DDS"; homepage = "https://github.com/eclipse-cyclonedds/cyclonedds-python"; From 99fcdf2b9f353879567b1c5c7844c9a6024f9725 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 11 Feb 2026 17:19:03 -0500 Subject: [PATCH 057/429] ncurses: add invisible-mirror mirror --- pkgs/development/libraries/ncurses/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index bee518b5a758..b959409fde74 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -22,7 +22,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ncurses" + lib.optionalString (abiVersion == "5") "-abi5-compat"; src = fetchurl { - url = "https://invisible-island.net/archives/ncurses/ncurses-${finalAttrs.version}.tar.gz"; + urls = [ + "https://invisible-island.net/archives/ncurses/ncurses-${finalAttrs.version}.tar.gz" + # invisible-island.net may be firewall blocked on some networks + "https://invisible-mirror.net/archives/ncurses/ncurses-${finalAttrs.version}.tar.gz" + ]; hash = "sha256-NVtMu+2ICwOBoExGYXt2VuNiWF1S6c+Epn4gCbdJ/xE="; }; From 98f80aec881674ba02ea1a026a5c61b2af33d354 Mon Sep 17 00:00:00 2001 From: Tiago Ferreira Date: Sun, 22 Feb 2026 22:27:48 +0000 Subject: [PATCH 058/429] bagels: 0.3.9 -> 0.3.12 --- pkgs/by-name/ba/bagels/package.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/bagels/package.nix b/pkgs/by-name/ba/bagels/package.nix index ef4d5aa3adc6..b924959fdfbe 100644 --- a/pkgs/by-name/ba/bagels/package.nix +++ b/pkgs/by-name/ba/bagels/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "bagels"; - version = "0.3.9"; + version = "0.3.12"; pyproject = true; src = fetchFromGitHub { owner = "EnhancedJax"; repo = "bagels"; tag = finalAttrs.version; - hash = "sha256-LlEQ0by6Si37e8FvC4agjLy8eanizSA1iq44BaQ8D5o="; + hash = "sha256-w7Q7yCKffya2SyuHUaTWOugkeyTZbL9JNj/Ir3tnafE="; }; build-system = with python3Packages; [ @@ -80,13 +80,23 @@ python3Packages.buildPythonApplication (finalAttrs: { # AttributeError: 'NoneType' object has no attribute 'defaults' "test_basic_balance_calculation" "test_combined_balance_calculation" + "test_create_template" + "test_create_multiple_templates" + "test_delete_template" + "test_get_adjacent_template" + "test_get_all_templates" "test_get_days_in_period" "test_get_period_average" "test_get_period_figures" "test_get_start_end_of_period" "test_get_start_end_of_week" + "test_get_template_by_id" "test_split_balance_calculation" + "test_swap_template_order" + "test_swap_template_order_edge_cases" + "test_template_validation" "test_transfer_balance_calculation" + "test_update_template" ]; meta = { From 40a40fe335de5de3018d328213909521e62c2934 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0lkecan=20Bozdo=C4=9Fan?= Date: Mon, 23 Feb 2026 23:03:26 +0300 Subject: [PATCH 059/429] easyeffects: fix wrapper for non-gnome environments --- pkgs/by-name/ea/easyeffects/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix index 8cedc500052b..b7cd43625e69 100644 --- a/pkgs/by-name/ea/easyeffects/package.nix +++ b/pkgs/by-name/ea/easyeffects/package.nix @@ -35,7 +35,7 @@ webrtc-audio-processing, zam-plugins, zita-convolver, - wrapGAppsNoGuiHook, + wrapGAppsHook3, }: let @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { intltool ninja pkg-config - wrapGAppsNoGuiHook + wrapGAppsHook3 wrapQtAppsHook ]; From 1d9a649ed174279bcaf77d1827d3f8d06a61acbe Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 24 Feb 2026 13:39:25 +0100 Subject: [PATCH 060/429] speedtest-tracker: init at 1.13.10 Signed-off-by: Paul Meyer --- pkgs/by-name/sp/speedtest-tracker/package.nix | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 pkgs/by-name/sp/speedtest-tracker/package.nix diff --git a/pkgs/by-name/sp/speedtest-tracker/package.nix b/pkgs/by-name/sp/speedtest-tracker/package.nix new file mode 100644 index 000000000000..e27192d78402 --- /dev/null +++ b/pkgs/by-name/sp/speedtest-tracker/package.nix @@ -0,0 +1,71 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + nodejs, + fetchNpmDeps, + buildPackages, + php84, + nixosTests, + dataDir ? "/var/lib/speedtest-tracker", +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "speedtest-tracker"; + version = "1.13.10"; + + src = fetchFromGitHub { + owner = "alexjustesen"; + repo = "speedtest-tracker"; + tag = "v${finalAttrs.version}"; + hash = "sha256-X/ShdTGAb7qPqYlZ71rxGzAetPRexlaDQ4AYvwouddc="; + }; + + buildInputs = [ php84 ]; + + nativeBuildInputs = [ + nodejs + buildPackages.npmHooks.npmConfigHook + php84.packages.composer + php84.composerHooks2.composerInstallHook + ]; + + composerVendor = php84.mkComposerVendor { + inherit (finalAttrs) pname src version; + composerNoScripts = true; + composerStrictValidation = false; + strictDeps = true; + vendorHash = "sha256-fS0Wstv6uHOE5WaDWSL4nbgpHCLM442zmPoER7ZRhfg="; + }; + + npmDeps = fetchNpmDeps { + inherit (finalAttrs) src; + name = "${finalAttrs.pname}-npm-deps"; + hash = "sha256-qWBVonPKqyB6OrDkR1ihtVac/b0Qd++Q/W4nk/VPm9E="; + }; + + preInstall = '' + npm run build + ''; + + postInstall = '' + chmod -R u+w $out/share + mv $out/share/php/speedtest-tracker/* $out/ + rm -R $out/share $out/storage $out/bootstrap/cache $out/node_modules + ln -s ${dataDir}/storage $out/storage + ln -s ${dataDir}/cache $out/bootstrap/cache + ''; + + passthru = { + phpPackage = php84; + tests = nixosTests.speedtest-tracker; + }; + + meta = { + description = "Speedtest Tracker is a self-hosted application that monitors the performance and uptime of your internet connection"; + homepage = "https://github.com/alexjustesen/speedtest-tracker"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ katexochen ]; + platforms = lib.platforms.linux; + }; +}) From 1d43588b3046fc0ca6cea5963b8dfc8de5a55dc9 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 24 Feb 2026 21:44:27 +0000 Subject: [PATCH 061/429] sgfutils: fix `gcc-15` build Without the chnage the build fails on `master` as: ``` sgfinfo.c: In function 'report_on_single_game': sgfinfo.c:948:27: error: assignment to 'void (*)(void)' from incompatible pointer type 'void (*)(int)' [-Wincompatible-pointer-types] 948 | outmovefn = fns[(optM-1) % 3]; | ^ sgfinfo.c:952:25: error: too many arguments to function 'outmovefn'; expected 0, have 1 952 | outmovefn(i); | ^~~~~~~~~ ~ ``` --- pkgs/by-name/sg/sgfutils/gcc-15.patch | 26 ++++++++++++++++++++++++++ pkgs/by-name/sg/sgfutils/package.nix | 4 ++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/by-name/sg/sgfutils/gcc-15.patch diff --git a/pkgs/by-name/sg/sgfutils/gcc-15.patch b/pkgs/by-name/sg/sgfutils/gcc-15.patch new file mode 100644 index 000000000000..d1f74ec30596 --- /dev/null +++ b/pkgs/by-name/sg/sgfutils/gcc-15.patch @@ -0,0 +1,26 @@ +Generated as: +$ curl -L https://github.com/yangboz/sgfutils/pull/3.diff > gcc-15.patch + +Fix `gcc-15` build failure related to `c23` changes. +--- a/gib2sgf.c ++++ b/gib2sgf.c +@@ -433,7 +433,7 @@ static void stoline(char *buf) { + readmove(buf); + } + +-static void (*inputline[])() = { ++static void (*inputline[])(char*) = { + inline0, inline1, iniline, stoline + }; + +--- a/sgfinfo.c ++++ b/sgfinfo.c +@@ -940,7 +940,7 @@ void report_on_single_game() { + if (optM) { + int imin, imax; + void (*fns[3])(int) = { outmove, outmovec, outmovex }; +- void (*outmovefn)(); ++ void (*outmovefn)(int); + + /* 1..3 moves / 4..6 init / 7..9 both */ + imin = ((optM < 4) ? initct : 0); diff --git a/pkgs/by-name/sg/sgfutils/package.nix b/pkgs/by-name/sg/sgfutils/package.nix index 2658be5957fd..138de47b1987 100644 --- a/pkgs/by-name/sg/sgfutils/package.nix +++ b/pkgs/by-name/sg/sgfutils/package.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation { rev = "11ab171c46cc16cc71ac6fc901d38ea88d6532a4"; hash = "sha256-KWYgTxz32WK3MKouj1WAJtZmleKt5giCpzQPwfWruZQ="; }; + patches = [ + # FIx gcc-15 build failure: https://github.com/yangboz/sgfutils/pull/3 + ./gcc-15.patch + ]; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; buildPhase = '' From ba05b5bc4c05ac1e40153420a7bc575126308e8a Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 25 Feb 2026 00:06:29 +0100 Subject: [PATCH 062/429] sidplayfp: 2.16.1 -> 2.16.2 --- pkgs/by-name/si/sidplayfp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/sidplayfp/package.nix b/pkgs/by-name/si/sidplayfp/package.nix index e42ee4771568..1be50ef68557 100644 --- a/pkgs/by-name/si/sidplayfp/package.nix +++ b/pkgs/by-name/si/sidplayfp/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sidplayfp"; - version = "2.16.1"; + version = "2.16.2"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "sidplayfp"; tag = "v${finalAttrs.version}"; - hash = "sha256-W9RuAUlnMMG/ihUxM5wvFDJz0x+6Syk+8ux+dx0Bnw8="; + hash = "sha256-zvV1BIKkJF/UAZnSgHFqNSiioUH5iB8I7SDqnWQnGj0="; }; strictDeps = true; From fa80b68d50b9e05856baacb13c9baa03784b98ca Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 25 Feb 2026 00:27:07 +0100 Subject: [PATCH 063/429] sidplayfp: Make passthru.tests.version check more precise --- pkgs/by-name/si/sidplayfp/package.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/si/sidplayfp/package.nix b/pkgs/by-name/si/sidplayfp/package.nix index 1be50ef68557..d6239612262f 100644 --- a/pkgs/by-name/si/sidplayfp/package.nix +++ b/pkgs/by-name/si/sidplayfp/package.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, gitUpdater, + runCommand, testers, alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib, @@ -10,6 +11,7 @@ pulseSupport ? stdenv.hostPlatform.isLinux, libpulseaudio, libsidplayfp, + makeWrapper, out123Support ? stdenv.hostPlatform.isDarwin, mpg123, perl, @@ -56,7 +58,17 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests.version = testers.testVersion { - package = finalAttrs.finalPackage; + package = + # sidplayfp prints its own version + libsidplayfp version, lets isolate just the one we care about + runCommand "sidplayfp-print-version" + { + inherit (finalAttrs.finalPackage) pname version meta; + nativeBuildInputs = [ makeWrapper ]; + } + '' + makeWrapper ${lib.getExe finalAttrs.finalPackage} $out/bin/${finalAttrs.finalPackage.meta.mainProgram} \ + --append-flags '| head -n1' + ''; }; updateScript = gitUpdater { rev-prefix = "v"; From 6f3ce14a020f7f7feaa01d00c2b3d37de8cbc6b6 Mon Sep 17 00:00:00 2001 From: nix-julia Date: Sat, 21 Feb 2026 18:13:05 +0330 Subject: [PATCH 064/429] mtproxy: init at 1-unstable-2025-11-04 --- pkgs/by-name/mt/mtproxy/package.nix | 35 +++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/mt/mtproxy/package.nix diff --git a/pkgs/by-name/mt/mtproxy/package.nix b/pkgs/by-name/mt/mtproxy/package.nix new file mode 100644 index 000000000000..aea7ba1d370f --- /dev/null +++ b/pkgs/by-name/mt/mtproxy/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + fetchFromGitHub, + openssl, + zlib, +}: +stdenv.mkDerivation { + pname = "mtproxy"; + version = "1-unstable-2025-11-04"; + src = fetchFromGitHub { + owner = "TelegramMessenger"; + repo = "MTProxy"; + rev = "cafc3380a81671579ce366d0594b9a8e450827e9"; + hash = "sha256-tY2iwNAQIL8sCUuddy9Lm/d/W1notL27HhRtOa25VsE="; + }; + buildInputs = [ + openssl + zlib + ]; + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp objs/bin/mtproto-proxy $out/bin/ + runHook postInstall + ''; + meta = { + description = "Simple MT-Proto proxy"; + mainProgram = "mtproto-proxy"; + homepage = "https://github.com/TelegramMessenger/MTProxy"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ nix-julia ]; + platforms = [ "x86_64-linux" ]; + }; +} From 49305054805a50e9d1e815f63cfefcf20aed8fe1 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 24 Feb 2026 13:39:48 +0100 Subject: [PATCH 065/429] nixos/speedtest-tracker: init module Signed-off-by: Paul Meyer --- nixos/modules/module-list.nix | 1 + .../services/web-apps/speedtest-tracker.nix | 429 ++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/speedtest-tracker.nix | 33 ++ 4 files changed, 464 insertions(+) create mode 100644 nixos/modules/services/web-apps/speedtest-tracker.nix create mode 100644 nixos/tests/speedtest-tracker.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 5903916b62a7..2b3b8fcc1a16 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1755,6 +1755,7 @@ ./services/web-apps/snipe-it.nix ./services/web-apps/snips-sh.nix ./services/web-apps/sogo.nix + ./services/web-apps/speedtest-tracker.nix ./services/web-apps/sshwifty.nix ./services/web-apps/stash.nix ./services/web-apps/stirling-pdf.nix diff --git a/nixos/modules/services/web-apps/speedtest-tracker.nix b/nixos/modules/services/web-apps/speedtest-tracker.nix new file mode 100644 index 000000000000..310fbb52012b --- /dev/null +++ b/nixos/modules/services/web-apps/speedtest-tracker.nix @@ -0,0 +1,429 @@ +{ + pkgs, + config, + lib, + ... +}: + +let + cfg = config.services.speedtest-tracker; + + user = cfg.user; + group = cfg.group; + + defaultUser = "speedtest-tracker"; + defaultGroup = "speedtest-tracker"; + + artisan = "${cfg.package}/artisan"; + + env-file-values = lib.mapAttrs' (n: v: { + name = lib.removeSuffix "_FILE" n; + value = v; + }) (lib.filterAttrs (n: v: v != null && lib.match ".+_FILE" n != null) cfg.settings); + + env-nonfile-values = lib.filterAttrs (n: v: lib.match ".+_FILE" n == null) cfg.settings; + + speedtest-tracker-maintenance = pkgs.writeShellScript "speedtest-tracker-maintenance.sh" '' + set -a + ${lib.toShellVars env-nonfile-values} + ${lib.concatLines (lib.mapAttrsToList (n: v: "${n}=\"$(< ${v})\"") env-file-values)} + set +a + ${lib.optionalString ( + cfg.settings.DB_CONNECTION == "sqlite" + ) "touch ${cfg.dataDir}/storage/database/database.sqlite"} + rm -f ${cfg.dataDir}/cache/*.php + ${artisan} package:discover + ${artisan} migrate --force + ${artisan} optimize:clear + ${artisan} view:cache + ${artisan} config:cache + ''; + + speedtest-tracker-env-script = + command: + pkgs.writeShellScript "speedtest-tracker-${builtins.replaceStrings [ ":" " " ] [ "-" "-" ] command}.sh" '' + set -a + ${lib.toShellVars env-nonfile-values} + ${lib.concatLines (lib.mapAttrsToList (n: v: "${n}=\"$(< ${v})\"") env-file-values)} + set +a + exec ${artisan} ${command} + ''; + + commonServiceConfig = { + Type = "oneshot"; + User = user; + Group = group; + StateDirectory = "speedtest-tracker"; + ReadWritePaths = [ cfg.dataDir ]; + WorkingDirectory = cfg.package; + PrivateTmp = true; + PrivateDevices = true; + CapabilityBoundingSet = ""; + AmbientCapabilities = ""; + ProtectSystem = "strict"; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; + ProtectClock = true; + ProtectHostname = true; + ProtectHome = "tmpfs"; + ProtectKernelLogs = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + PrivateNetwork = false; + RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX"; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service @resources" + "~@obsolete @privileged" + ]; + RestrictSUIDSGID = true; + RemoveIPC = true; + NoNewPrivileges = true; + RestrictRealtime = true; + RestrictNamespaces = true; + LockPersonality = true; + PrivateUsers = true; + }; + +in +{ + options.services.speedtest-tracker = { + + enable = lib.mkEnableOption "Speedtest Tracker: A self-hosted internet performance tracking application"; + + package = + lib.mkPackageOption pkgs "speedtest-tracker" { } + // lib.mkOption { + apply = + speedtest-tracker: + speedtest-tracker.override (prev: { + dataDir = cfg.dataDir; + }); + }; + + user = lib.mkOption { + type = lib.types.str; + default = defaultUser; + description = "User account under which Speedtest Tracker runs."; + }; + + group = lib.mkOption { + type = lib.types.str; + default = if cfg.enableNginx then "nginx" else defaultGroup; + defaultText = "If `services.speedtest-tracker.enableNginx` is true then `nginx` else ${defaultGroup}"; + description = '' + Group under which Speedtest Tracker runs. It is best to set this to the group + of whatever webserver is being used as the frontend. + ''; + }; + + dataDir = lib.mkOption { + type = lib.types.path; + default = "/var/lib/speedtest-tracker"; + description = '' + The place where Speedtest Tracker stores its state. + ''; + }; + + enableNginx = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to enable nginx or not. If enabled, an nginx virtual host will + be created for access to Speedtest Tracker. If not enabled, then you may use + `''${config.services.speedtest-tracker.package}` as your document root in + whichever webserver you wish to setup. + ''; + }; + + virtualHost = lib.mkOption { + type = lib.types.str; + default = "localhost"; + description = '' + The hostname at which you wish Speedtest Tracker to be served. If you have + enabled nginx using `services.speedtest-tracker.enableNginx` then this will + be used. + ''; + }; + + poolConfig = lib.mkOption { + type = lib.types.attrsOf ( + lib.types.oneOf [ + lib.types.str + lib.types.int + lib.types.bool + ] + ); + default = { }; + defaultText = '' + { + "pm" = "dynamic"; + "pm.max_children" = 32; + "pm.start_servers" = 2; + "pm.min_spare_servers" = 2; + "pm.max_spare_servers" = 4; + "pm.max_requests" = 500; + } + ''; + description = '' + Options for the Speedtest Tracker PHP pool. See the documentation on `php-fpm.conf` + for details on configuration directives. + ''; + }; + + settings = lib.mkOption { + default = { }; + description = '' + Options for Speedtest Tracker configuration. Refer to + for + details on supported values. All `_FILE` values are supported: + append `_FILE` to the setting name to provide a path to a file + containing the secret value. + ''; + example = lib.literalExpression '' + { + APP_KEY_FILE = "/var/secrets/speedtest-tracker-app-key.txt"; + DB_CONNECTION = "mysql"; + DB_HOST = "db"; + DB_PORT = 3306; + DB_DATABASE = "speedtest-tracker"; + DB_USERNAME = "speedtest-tracker"; + DB_PASSWORD_FILE = "/var/secrets/speedtest-tracker-mysql-password.txt"; + } + ''; + type = lib.types.submodule { + freeformType = lib.types.attrsOf ( + lib.types.oneOf [ + lib.types.str + lib.types.int + lib.types.bool + ] + ); + options = { + APP_KEY_FILE = lib.mkOption { + type = lib.types.path; + description = '' + The path to your appkey. The file should contain a 32 character + random app key. This may be set using `echo "base64:$(head -c 32 + /dev/urandom | base64)" > /path/to/key-file`. + ''; + }; + APP_URL = lib.mkOption { + type = lib.types.str; + default = + if cfg.virtualHost == "localhost" then + "http://${cfg.virtualHost}" + else + "https://${cfg.virtualHost}"; + defaultText = '' + http(s)://''${config.services.speedtest-tracker.virtualHost} + ''; + description = '' + The APP_URL used by Speedtest Tracker internally. Please make sure this + URL matches the external URL of your installation. It is used to + validate specific requests and to generate URLs in notifications. + ''; + }; + DB_CONNECTION = lib.mkOption { + type = lib.types.enum [ + "sqlite" + "mysql" + "mariadb" + "pgsql" + ]; + default = "sqlite"; + example = "pgsql"; + description = '' + The type of database you wish to use. Can be one of "sqlite", + "mysql", "mariadb" or "pgsql". + ''; + }; + DB_HOST = lib.mkOption { + type = lib.types.str; + default = "localhost"; + description = '' + The IP or hostname which hosts your database. + ''; + }; + DB_PORT = lib.mkOption { + type = lib.types.nullOr lib.types.int; + default = + if cfg.settings.DB_CONNECTION == "pgsql" then + 5432 + else if cfg.settings.DB_CONNECTION == "mysql" || cfg.settings.DB_CONNECTION == "mariadb" then + 3306 + else + null; + defaultText = '' + `null` if DB_CONNECTION is "sqlite", `3306` if "mysql" or "mariadb", `5432` if "pgsql" + ''; + description = '' + The port your database is listening at. sqlite does not require + this value to be filled. + ''; + }; + DB_DATABASE = lib.mkOption { + type = lib.types.str; + default = + if cfg.settings.DB_CONNECTION == "sqlite" then + "${cfg.dataDir}/storage/database/database.sqlite" + else + "speedtest-tracker"; + defaultText = '' + "''${config.services.speedtest-tracker.dataDir}/storage/database/database.sqlite" if DB_CONNECTION is "sqlite", "speedtest-tracker" otherwise + ''; + description = '' + The name of the database, or path to the sqlite file. + ''; + }; + }; + }; + }; + }; + + config = lib.mkIf cfg.enable { + + services.phpfpm.pools.speedtest-tracker = { + inherit user group; + phpPackage = cfg.package.phpPackage; + phpOptions = '' + log_errors = on + ''; + settings = { + "listen.mode" = lib.mkDefault "0660"; + "listen.owner" = lib.mkDefault user; + "listen.group" = lib.mkDefault group; + "pm" = lib.mkDefault "dynamic"; + "pm.max_children" = lib.mkDefault 32; + "pm.start_servers" = lib.mkDefault 2; + "pm.min_spare_servers" = lib.mkDefault 2; + "pm.max_spare_servers" = lib.mkDefault 4; + "pm.max_requests" = lib.mkDefault 500; + } + // cfg.poolConfig; + }; + + systemd.services.speedtest-tracker-setup = { + after = [ + "postgresql.target" + "mysql.service" + ]; + requiredBy = [ "phpfpm-speedtest-tracker.service" ]; + before = [ "phpfpm-speedtest-tracker.service" ]; + serviceConfig = { + ExecStart = speedtest-tracker-maintenance; + RemainAfterExit = true; + } + // commonServiceConfig; + unitConfig.JoinsNamespaceOf = "phpfpm-speedtest-tracker.service"; + restartTriggers = [ cfg.package ]; + partOf = [ "phpfpm-speedtest-tracker.service" ]; + }; + + systemd.services.speedtest-tracker-scheduler = { + after = [ "speedtest-tracker-setup.service" ]; + wants = [ "speedtest-tracker-setup.service" ]; + description = "Speedtest Tracker scheduler"; + path = [ pkgs.ookla-speedtest ]; + serviceConfig = { + ExecStart = speedtest-tracker-env-script "schedule:run"; + } + // commonServiceConfig; + }; + + systemd.timers.speedtest-tracker-scheduler = { + description = "Speedtest Tracker scheduler timer"; + timerConfig = { + OnCalendar = "minutely"; + Persistent = true; + }; + wantedBy = [ "timers.target" ]; + restartTriggers = [ cfg.package ]; + }; + + systemd.services.speedtest-tracker-queue-worker = { + after = [ "speedtest-tracker-setup.service" ]; + wants = [ "speedtest-tracker-setup.service" ]; + wantedBy = [ "multi-user.target" ]; + description = "Speedtest Tracker queue worker"; + path = [ pkgs.ookla-speedtest ]; + serviceConfig = commonServiceConfig // { + Type = "simple"; + Restart = "always"; + ExecStart = speedtest-tracker-env-script "queue:work --sleep=3 --tries=3"; + }; + }; + + services.nginx = lib.mkIf cfg.enableNginx { + enable = true; + recommendedTlsSettings = lib.mkDefault true; + recommendedOptimisation = lib.mkDefault true; + recommendedGzipSettings = lib.mkDefault true; + virtualHosts.${cfg.virtualHost} = { + root = "${cfg.package}/public"; + locations = { + "/" = { + tryFiles = "$uri $uri/ /index.php?$query_string"; + index = "index.php"; + extraConfig = '' + sendfile off; + ''; + }; + "~ \\.php$" = { + extraConfig = '' + include ${config.services.nginx.package}/conf/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_param modHeadersAvailable true; + fastcgi_pass unix:${config.services.phpfpm.pools.speedtest-tracker.socket}; + ''; + }; + "~ \\.(js|css|gif|png|ico|jpg|jpeg)$" = { + extraConfig = "expires 365d;"; + }; + }; + }; + }; + + systemd.tmpfiles.settings."10-speedtest-tracker" = + lib.genAttrs + [ + "${cfg.dataDir}/storage" + "${cfg.dataDir}/storage/app" + "${cfg.dataDir}/storage/database" + "${cfg.dataDir}/storage/framework" + "${cfg.dataDir}/storage/framework/cache" + "${cfg.dataDir}/storage/framework/sessions" + "${cfg.dataDir}/storage/framework/views" + "${cfg.dataDir}/storage/logs" + "${cfg.dataDir}/cache" + ] + (n: { + d = { + inherit group; + mode = "0700"; + inherit user; + }; + }) + // { + "${cfg.dataDir}".d = { + inherit group; + mode = "0710"; + inherit user; + }; + }; + + users = { + users = lib.mkIf (user == defaultUser) { + ${defaultUser} = { + inherit group; + isSystemUser = true; + home = cfg.dataDir; + }; + }; + groups = lib.mkIf (group == defaultGroup) { ${defaultGroup} = { }; }; + }; + }; + + meta.maintainers = pkgs.speedtest-tracker.meta.maintainers; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 2296234b1b3c..21638790bfb1 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1484,6 +1484,7 @@ in sonic-server = runTest ./sonic-server.nix; spacecookie = runTest ./spacecookie.nix; spark = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./spark { }; + speedtest-tracker = runTest ./speedtest-tracker.nix; spiped = runTest ./spiped.nix; sqlite3-to-mysql = runTest ./sqlite3-to-mysql.nix; squid = runTest ./squid.nix; diff --git a/nixos/tests/speedtest-tracker.nix b/nixos/tests/speedtest-tracker.nix new file mode 100644 index 000000000000..5d5c42957300 --- /dev/null +++ b/nixos/tests/speedtest-tracker.nix @@ -0,0 +1,33 @@ +{ lib, pkgs, ... }: + +let + app-key = "base64:VGVzdFRlc3RUZXN0VGVzdFRlc3RUZXN0VGVzdFRlc3Q="; +in +{ + name = "speedtest-tracker"; + meta = { + maintainers = pkgs.speedtest-tracker.meta.maintainers; + platforms = lib.platforms.linux; + }; + + nodes.sqlite = { + environment.etc."speedtest-tracker-appkey".text = app-key; + services.speedtest-tracker = { + enable = true; + enableNginx = true; + settings = { + APP_KEY_FILE = "/etc/speedtest-tracker-appkey"; + }; + }; + }; + + testScript = '' + sqlite.wait_for_unit("phpfpm-speedtest-tracker.service") + sqlite.wait_for_unit("nginx.service") + sqlite.wait_for_unit("speedtest-tracker-queue-worker.service") + + sqlite.succeed("curl -Ls -o /dev/null -w '%{http_code}' http://localhost/admin/login | grep '200'") + sqlite.succeed("curl -Ls http://localhost/admin/login | grep -i 'login'") + sqlite.succeed("systemctl start speedtest-tracker-scheduler.service") + ''; +} From c4318f506329bad9027a3a7a8ac7c1a644de2fc1 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Wed, 25 Feb 2026 18:14:30 -0800 Subject: [PATCH 066/429] freetype: fix non-windows llvm bintools builds --- pkgs/by-name/fr/freetype/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/fr/freetype/package.nix b/pkgs/by-name/fr/freetype/package.nix index 3d9ebe3a02af..d9c4e6d121a9 100644 --- a/pkgs/by-name/fr/freetype/package.nix +++ b/pkgs/by-name/fr/freetype/package.nix @@ -90,6 +90,10 @@ stdenv.mkDerivation (finalAttrs: { CFLAGS = lib.optionalString stdenv.hostPlatform.isAarch32 "-std=gnu99" + lib.optionalString stdenv.hostPlatform.is32bit " -D_FILE_OFFSET_BITS=64"; + } + // lib.optionalAttrs (!stdenv.hostPlatform.isWindows && stdenv.cc.bintools.isLLVM) { + # Needs to be unset when using LLVM or else it tries to include Windows headers on Linux + RC = ""; }; enableParallelBuilding = true; From f65cd0848127a1b0a323171aa0d3306372db9181 Mon Sep 17 00:00:00 2001 From: Pascal Dietrich Date: Thu, 26 Feb 2026 08:05:01 +0100 Subject: [PATCH 067/429] gradia: 1.11.3 -> 1.12.0 --- pkgs/by-name/gr/gradia/package.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/gradia/package.nix b/pkgs/by-name/gr/gradia/package.nix index 8ff766c99497..0ac800e48813 100644 --- a/pkgs/by-name/gr/gradia/package.nix +++ b/pkgs/by-name/gr/gradia/package.nix @@ -18,18 +18,20 @@ webp-pixbuf-loader, libsoup_3, bash, + glib-networking, + tesseract, nix-update-script, }: python3Packages.buildPythonApplication (finalAttrs: { pname = "gradia"; - version = "1.11.3"; + version = "1.12.0"; pyproject = false; src = fetchFromGitHub { owner = "AlexanderVanhee"; repo = "Gradia"; - rev = "472a970e10c3a85f9db938719ebba121321c1d90"; - hash = "sha256-2PSpFmojAIyDNx5yYrLE3CjO/q5iBArmIRikxCGW1HM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-iYqMuqq2AmrdNMa7dkDUGg1+gCG7wL/rDEdWAPfcQnw="; }; nativeBuildInputs = [ @@ -49,8 +51,15 @@ python3Packages.buildPythonApplication (finalAttrs: { libportal-gtk4 libsoup_3 bash + glib-networking + tesseract ]; + postPatch = '' + substituteInPlace meson.build \ + --replace "/app/bin/tesseract" "${lib.getExe tesseract}" + ''; + dependencies = with python3Packages; [ pygobject3 pillow From 5357d7ecce0cbcc76621ddec1a887c0347a2b179 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Feb 2026 00:34:26 +0000 Subject: [PATCH 068/429] bazel_8: 8.5.0 -> 8.6.0 --- pkgs/by-name/ba/bazel_8/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/bazel_8/package.nix b/pkgs/by-name/ba/bazel_8/package.nix index cbed15eafdf0..56fbd1d8e729 100644 --- a/pkgs/by-name/ba/bazel_8/package.nix +++ b/pkgs/by-name/ba/bazel_8/package.nix @@ -31,7 +31,7 @@ cctools, # Allow to independently override the jdks used to build and run respectively jdk_headless, - version ? "8.5.0", + version ? "8.6.0", }: let @@ -45,7 +45,7 @@ let src = fetchzip { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - hash = "sha256-L8gnWpQAeHMUbydrrEtZ6WGIzhunDBWCNWMA+3dAKT0="; + hash = "sha256-W22eB0IzHNZe3xaF8AZOkUTDCic3NXkypdqSDY61Su0="; stripRoot = false; }; From 62efab0dada7d38f14f7147bdd6c350780e9af10 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Thu, 12 Feb 2026 10:24:54 +0100 Subject: [PATCH 069/429] wxwidgets_3_{1,2}: rename from wxGTK3{1,2} fit attrname to pname --- nixos/modules/programs/ccache.nix | 2 +- pkgs/applications/audio/espeak/edit.nix | 4 ++-- pkgs/applications/misc/opencpn/default.nix | 4 ++-- pkgs/applications/radio/limesuite/default.nix | 4 ++-- pkgs/by-name/ae/aegisub/package.nix | 6 +++--- pkgs/by-name/am/amule/package.nix | 4 ++-- pkgs/by-name/as/asc/package.nix | 4 ++-- pkgs/by-name/au/audacity/package.nix | 4 ++-- pkgs/by-name/ba/bambu-studio/package.nix | 4 ++-- pkgs/by-name/bo/bochs/package.nix | 4 ++-- pkgs/by-name/bo/boinc/package.nix | 4 ++-- pkgs/by-name/bo/bossa/package.nix | 4 ++-- pkgs/by-name/ce/cemu/package.nix | 6 +++--- pkgs/by-name/co/codeblocks/package.nix | 4 ++-- pkgs/by-name/co/comical/package.nix | 4 ++-- pkgs/by-name/cu/cubicsdr/package.nix | 4 ++-- pkgs/by-name/da/darkradiant/package.nix | 6 +++--- pkgs/by-name/dv/dvdstyler/package.nix | 4 ++-- pkgs/by-name/el/electricsheep/package.nix | 4 ++-- pkgs/by-name/es/espanso/package.nix | 6 +++--- pkgs/by-name/fa/far2l/package.nix | 4 ++-- pkgs/by-name/fi/filezilla/package.nix | 4 ++-- pkgs/by-name/fi/fityk/package.nix | 6 +++--- pkgs/by-name/fl/flamerobin/package.nix | 4 ++-- pkgs/by-name/fr/freedv/package.nix | 4 ++-- pkgs/by-name/fr/freqtweak/package.nix | 4 ++-- pkgs/by-name/fs/fsg/package.nix | 6 +++--- pkgs/by-name/ga/gambit-project/package.nix | 6 +++--- pkgs/by-name/go/golly/package.nix | 6 +++--- pkgs/by-name/gr/grandorgue/package.nix | 4 ++-- pkgs/by-name/gr/grass/package.nix | 4 ++-- pkgs/by-name/hu/hugin/package.nix | 4 ++-- pkgs/by-name/ki/kicad/package.nix | 4 ++-- pkgs/by-name/le/lenmus/package.nix | 4 ++-- pkgs/by-name/me/mediainfo-gui/package.nix | 4 ++-- pkgs/by-name/me/megaglest/package.nix | 6 +++--- pkgs/by-name/mm/mmex/package.nix | 6 +++--- pkgs/by-name/mu/multivnc/package.nix | 4 ++-- pkgs/by-name/od/odamex/package.nix | 4 ++-- pkgs/by-name/or/orca-slicer/package.nix | 4 ++-- pkgs/by-name/pc/pcem/package.nix | 4 ++-- pkgs/by-name/ph/phd2/package.nix | 4 ++-- pkgs/by-name/pl/plplot/package.nix | 4 ++-- pkgs/by-name/po/poedit/package.nix | 4 ++-- pkgs/by-name/pr/prusa-slicer/package.nix | 4 ++-- pkgs/by-name/pt/pterm/package.nix | 4 ++-- pkgs/by-name/pw/pwsafe/package.nix | 6 +++--- pkgs/by-name/ra/radiotray-ng/package.nix | 4 ++-- pkgs/by-name/ra/rapidsvn/package.nix | 4 ++-- pkgs/by-name/re/rehex/package.nix | 4 ++-- pkgs/by-name/sa/saga/package.nix | 4 ++-- pkgs/by-name/sc/scorched3d/package.nix | 4 ++-- pkgs/by-name/sl/slade-unstable/package.nix | 8 ++++---- pkgs/by-name/sl/slade/package.nix | 8 ++++---- pkgs/by-name/so/sooperlooper/package.nix | 4 ++-- pkgs/by-name/so/sound-of-sorting/package.nix | 4 ++-- pkgs/by-name/sp/spatialite-gui/package.nix | 4 ++-- pkgs/by-name/sp/spek/package.nix | 4 ++-- pkgs/by-name/su/super-slicer/package.nix | 8 ++++---- pkgs/by-name/su/survex/package.nix | 6 +++--- pkgs/by-name/te/tenacity/package.nix | 4 ++-- pkgs/by-name/th/therion/package.nix | 4 ++-- pkgs/by-name/tq/tqsl/package.nix | 4 ++-- pkgs/by-name/tr/treesheets/package.nix | 4 ++-- pkgs/by-name/uc/ucblogo/package.nix | 4 ++-- pkgs/by-name/ur/urbackup-client/package.nix | 4 ++-- pkgs/by-name/ut/ut1999/package.nix | 4 ++-- pkgs/by-name/vb/vbam/package.nix | 4 ++-- pkgs/by-name/ve/veracrypt/package.nix | 4 ++-- pkgs/by-name/wx/wxc/package.nix | 6 +++--- pkgs/by-name/wx/wxformbuilder/package.nix | 4 ++-- pkgs/by-name/wx/wxhexeditor/package.nix | 4 ++-- pkgs/by-name/wx/wxmacmolplt/package.nix | 4 ++-- pkgs/by-name/wx/wxsqlite3/package.nix | 4 ++-- pkgs/by-name/wx/wxsqliteplus/package.nix | 4 ++-- pkgs/by-name/wx/wxsvg/package.nix | 6 +++--- .../0001-fix-assertion-using-hide-in-destroy.patch | 0 .../0002-support-webkitgtk-41.patch | 0 pkgs/by-name/wx/{wxGTK31 => wxwidgets_3_1}/package.nix | 0 pkgs/by-name/wx/{wxGTK32 => wxwidgets_3_2}/package.nix | 0 pkgs/by-name/xc/xchm/package.nix | 8 ++++---- pkgs/by-name/xm/xmlcopyeditor/package.nix | 4 ++-- pkgs/by-name/xy/xylib/package.nix | 6 +++--- pkgs/by-name/ze/zeroad-unwrapped/package.nix | 4 ++-- pkgs/by-name/zo/zod/package.nix | 4 ++-- pkgs/development/haskell-modules/configuration-nix.nix | 4 ++-- pkgs/development/interpreters/erlang/generic-builder.nix | 6 +++--- pkgs/development/interpreters/gnudatalanguage/default.nix | 4 ++-- pkgs/games/spring/springlobby.nix | 4 ++-- pkgs/servers/klipper/klipper-firmware.nix | 4 ++-- pkgs/tools/graphics/gnuplot/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 4 ++-- pkgs/top-level/perl-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 +- 95 files changed, 203 insertions(+), 201 deletions(-) rename pkgs/by-name/wx/{wxGTK31 => wxwidgets_3_1}/0001-fix-assertion-using-hide-in-destroy.patch (100%) rename pkgs/by-name/wx/{wxGTK31 => wxwidgets_3_1}/0002-support-webkitgtk-41.patch (100%) rename pkgs/by-name/wx/{wxGTK31 => wxwidgets_3_1}/package.nix (100%) rename pkgs/by-name/wx/{wxGTK32 => wxwidgets_3_2}/package.nix (100%) diff --git a/nixos/modules/programs/ccache.nix b/nixos/modules/programs/ccache.nix index c758831c759e..4f6b5259afb9 100644 --- a/nixos/modules/programs/ccache.nix +++ b/nixos/modules/programs/ccache.nix @@ -23,7 +23,7 @@ in description = "Nix top-level packages to be compiled using CCache"; default = [ ]; example = [ - "wxGTK32" + "wxwidgets_3_2" "ffmpeg" "libav_all" ]; diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix index abb59307d08e..13d31d066065 100644 --- a/pkgs/applications/audio/espeak/edit.nix +++ b/pkgs/applications/audio/espeak/edit.nix @@ -5,7 +5,7 @@ pkg-config, unzip, portaudio, - wxGTK32, + wxwidgets_3_2, sox, }: @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ portaudio - wxGTK32 + wxwidgets_3_2 ]; # TODO: diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 08f2bf8bc401..1ae9cdb2a8ec 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -42,7 +42,7 @@ sqlite, tinyxml, util-linux, - wxGTK32, + wxwidgets_3_2, libxtst, libxdmcp, xz, @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { rapidjson sqlite tinyxml - wxGTK32 + wxwidgets_3_2 xz ] ++ lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index 4ff9ef72b682..c36c9c9e371a 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -5,7 +5,7 @@ fetchpatch, cmake, sqlite, - wxGTK32, + wxwidgets_3_2, libusb1, soapysdr, mesa_glu, @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { fltk libx11 mesa_glu - wxGTK32 + wxwidgets_3_2 ]; doInstallCheck = true; diff --git a/pkgs/by-name/ae/aegisub/package.nix b/pkgs/by-name/ae/aegisub/package.nix index 2f6110a33b19..0e9452051f49 100644 --- a/pkgs/by-name/ae/aegisub/package.nix +++ b/pkgs/by-name/ae/aegisub/package.nix @@ -28,7 +28,7 @@ python3, stdenv, wrapGAppsHook3, - wxGTK32, + wxwidgets_3_2, zlib, # Boolean guard flags alsaSupport ? stdenv.hostPlatform.isLinux, @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config python3 - wxGTK32 + wxwidgets_3_2 wrapGAppsHook3 ]; @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { libGL libass libuchardet - wxGTK32 + wxwidgets_3_2 zlib ] ++ lib.optionals alsaSupport [ alsa-lib ] diff --git a/pkgs/by-name/am/amule/package.nix b/pkgs/by-name/am/amule/package.nix index 92704f390d0b..680b56d16165 100644 --- a/pkgs/by-name/am/amule/package.nix +++ b/pkgs/by-name/am/amule/package.nix @@ -10,7 +10,7 @@ lib, cmake, zlib, - wxGTK32, + wxwidgets_3_2, perl, cryptopp, libupnp, @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ zlib - wxGTK32 + wxwidgets_3_2 perl cryptopp.dev libupnp diff --git a/pkgs/by-name/as/asc/package.nix b/pkgs/by-name/as/asc/package.nix index cad2d9710a09..c28bd20cd0ef 100644 --- a/pkgs/by-name/as/asc/package.nix +++ b/pkgs/by-name/as/asc/package.nix @@ -12,7 +12,7 @@ expat, freetype, libjpeg, - wxGTK32, + wxwidgets_3_2, lua, perl, pkg-config, @@ -51,7 +51,7 @@ stdenv.mkDerivation { expat freetype libjpeg - wxGTK32 + wxwidgets_3_2 lua perl zlib diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix index 9dd69e2093b0..272310aadca4 100644 --- a/pkgs/by-name/au/audacity/package.nix +++ b/pkgs/by-name/au/audacity/package.nix @@ -49,7 +49,7 @@ libxkbcommon, util-linux, wavpack, - wxGTK32, + wxwidgets_3_2, gtk3, libpng, libjpeg, @@ -129,7 +129,7 @@ stdenv.mkDerivation (finalAttrs: { twolame portaudio wavpack - wxGTK32 + wxwidgets_3_2 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib # for portaudio diff --git a/pkgs/by-name/ba/bambu-studio/package.nix b/pkgs/by-name/ba/bambu-studio/package.nix index 90a9dd160407..a4ef61e672d8 100644 --- a/pkgs/by-name/ba/bambu-studio/package.nix +++ b/pkgs/by-name/ba/bambu-studio/package.nix @@ -36,13 +36,13 @@ systemd, onetbb, webkitgtk_4_1, - wxGTK31, + wxwidgets_3_1, libx11, withSystemd ? stdenv.hostPlatform.isLinux, }: let wxGTK' = - (wxGTK31.override { + (wxwidgets_3_1.override { withCurl = true; withPrivateFonts = true; withWebKit = true; diff --git a/pkgs/by-name/bo/bochs/package.nix b/pkgs/by-name/bo/bochs/package.nix index 6b8ff52a4150..d4026a16cfa4 100644 --- a/pkgs/by-name/bo/bochs/package.nix +++ b/pkgs/by-name/bo/bochs/package.nix @@ -16,7 +16,7 @@ readline, stdenv, wget, - wxGTK32, + wxwidgets_3_2, # Boolean flags enableSDL2 ? true, enableTerm ? true, @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals enableWx [ gtk3 - wxGTK32 + wxwidgets_3_2 ] ++ lib.optionals enableX11 [ libGL diff --git a/pkgs/by-name/bo/boinc/package.nix b/pkgs/by-name/bo/boinc/package.nix index d9c277633124..1b170dfb5137 100644 --- a/pkgs/by-name/bo/boinc/package.nix +++ b/pkgs/by-name/bo/boinc/package.nix @@ -14,7 +14,7 @@ libglut, libjpeg, libtool, - wxGTK32, + wxwidgets_3_2, libxcb-util, sqlite, gtk3, @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { libxi libglut libjpeg - wxGTK32 + wxwidgets_3_2 gtk3 libxscrnsaver libnotify diff --git a/pkgs/by-name/bo/bossa/package.nix b/pkgs/by-name/bo/bossa/package.nix index e1665d6d1ef6..72b7f2a9a18b 100644 --- a/pkgs/by-name/bo/bossa/package.nix +++ b/pkgs/by-name/bo/bossa/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - wxGTK32, + wxwidgets_3_2, libx11, readline, fetchpatch, @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ bin2c ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 libx11 readline ]; diff --git a/pkgs/by-name/ce/cemu/package.nix b/pkgs/by-name/ce/cemu/package.nix index 912859780604..6d8efb1d6395 100644 --- a/pkgs/by-name/ce/cemu/package.nix +++ b/pkgs/by-name/ce/cemu/package.nix @@ -32,7 +32,7 @@ wayland, wayland-scanner, wrapGAppsHook3, - wxGTK32, + wxwidgets_3_2, zarchive, bluez, }: @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { nasm ninja pkg-config - wxGTK32 + wxwidgets_3_2 wayland-scanner ]; @@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: { rapidjson vulkan-headers wayland - wxGTK32 + wxwidgets_3_2 zarchive bluez ]; diff --git a/pkgs/by-name/co/codeblocks/package.nix b/pkgs/by-name/co/codeblocks/package.nix index ef647155ab38..f9deb48f9f77 100644 --- a/pkgs/by-name/co/codeblocks/package.nix +++ b/pkgs/by-name/co/codeblocks/package.nix @@ -6,7 +6,7 @@ pkg-config, file, zip, - wxGTK32, + wxwidgets_3_2, gtk3, contribPlugins ? false, hunspell, @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 gtk3 ] ++ lib.optionals contribPlugins [ diff --git a/pkgs/by-name/co/comical/package.nix b/pkgs/by-name/co/comical/package.nix index 12b60ba5c3f9..789288f68988 100644 --- a/pkgs/by-name/co/comical/package.nix +++ b/pkgs/by-name/co/comical/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, hexdump, - wxGTK32, + wxwidgets_3_2, zlib, }: @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 zlib ]; diff --git a/pkgs/by-name/cu/cubicsdr/package.nix b/pkgs/by-name/cu/cubicsdr/package.nix index 45865b47e42b..f7a4e54aab96 100644 --- a/pkgs/by-name/cu/cubicsdr/package.nix +++ b/pkgs/by-name/cu/cubicsdr/package.nix @@ -12,7 +12,7 @@ liquid-dsp, pkg-config, soapysdr-with-plugins, - wxGTK32, + wxwidgets_3_2, enableDigitalLab ? false, }: @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { hamlib liquid-dsp soapysdr-with-plugins - wxGTK32 + wxwidgets_3_2 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio diff --git a/pkgs/by-name/da/darkradiant/package.nix b/pkgs/by-name/da/darkradiant/package.nix index 00ca5bd6ee82..25f7f9f17809 100644 --- a/pkgs/by-name/da/darkradiant/package.nix +++ b/pkgs/by-name/da/darkradiant/package.nix @@ -6,7 +6,7 @@ pkg-config, zlib, libjpeg, - wxGTK32, + wxwidgets_3_2, libxml2, libsigcxx, libpng, @@ -41,14 +41,14 @@ stdenv.mkDerivation (finalAttrs: { pkg-config asciidoctor wrapGAppsHook3 - wxGTK32 + wxwidgets_3_2 installShellFiles ]; buildInputs = [ zlib libjpeg - wxGTK32 + wxwidgets_3_2 libxml2 libsigcxx libpng diff --git a/pkgs/by-name/dv/dvdstyler/package.nix b/pkgs/by-name/dv/dvdstyler/package.nix index 23c861c75303..c0eb99d0dbb0 100644 --- a/pkgs/by-name/dv/dvdstyler/package.nix +++ b/pkgs/by-name/dv/dvdstyler/package.nix @@ -18,7 +18,7 @@ libjpeg, pkg-config, wrapGAppsHook3, - wxGTK32, + wxwidgets_3_2, wxsvg, xine-ui, xmlto, @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { libexif libjpeg wxsvg - wxGTK32 + wxwidgets_3_2 xine-ui ] ++ optionals dvdisasterSupport [ dvdisaster ] diff --git a/pkgs/by-name/el/electricsheep/package.nix b/pkgs/by-name/el/electricsheep/package.nix index 41ec4b9f9227..82419173a056 100644 --- a/pkgs/by-name/el/electricsheep/package.nix +++ b/pkgs/by-name/el/electricsheep/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, autoreconfHook, - wxGTK32, + wxwidgets_3_2, ffmpeg, lua5_1, curl, @@ -42,7 +42,7 @@ stdenv.mkDerivation { ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 ffmpeg lua5_1 curl diff --git a/pkgs/by-name/es/espanso/package.nix b/pkgs/by-name/es/espanso/package.nix index 84130cbcb7aa..caadde2007af 100644 --- a/pkgs/by-name/es/espanso/package.nix +++ b/pkgs/by-name/es/espanso/package.nix @@ -18,7 +18,7 @@ xdotool, setxkbmap, wl-clipboard, - wxGTK32, + wxwidgets_3_2, makeWrapper, securityWrapperPath ? null, nix-update-script, @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage (finalAttrs: { extra-cmake-modules pkg-config makeWrapper - wxGTK32 + wxwidgets_3_2 ]; # Ref: https://github.com/espanso/espanso/blob/78df1b704fe2cc5ea26f88fdc443b6ae1df8a989/scripts/build_binary.rs#LL49C3-L62C4 @@ -70,7 +70,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ libpng - wxGTK32 + wxwidgets_3_2 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl diff --git a/pkgs/by-name/fa/far2l/package.nix b/pkgs/by-name/fa/far2l/package.nix index 764eb5252960..ea771b7d03cd 100644 --- a/pkgs/by-name/fa/far2l/package.nix +++ b/pkgs/by-name/fa/far2l/package.nix @@ -21,7 +21,7 @@ withTTYX ? true, libx11, withGUI ? true, - wxGTK32, + wxwidgets_3_2, withUCD ? true, libuchardet, @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optional withTTYX libx11 - ++ lib.optional withGUI wxGTK32 + ++ lib.optional withGUI wxwidgets_3_2 ++ lib.optional withUCD libuchardet ++ lib.optionals withColorer [ spdlog diff --git a/pkgs/by-name/fi/filezilla/package.nix b/pkgs/by-name/fi/filezilla/package.nix index 45c0920272a2..66ba7117e39e 100644 --- a/pkgs/by-name/fi/filezilla/package.nix +++ b/pkgs/by-name/fi/filezilla/package.nix @@ -15,7 +15,7 @@ tinyxml, boost, wrapGAppsHook3, - wxGTK32, + wxwidgets_3_2, gtk3, xdg-utils, }: @@ -52,7 +52,7 @@ stdenv.mkDerivation { pugixml sqlite tinyxml - wxGTK32 + wxwidgets_3_2 gtk3 xdg-utils ]; diff --git a/pkgs/by-name/fi/fityk/package.nix b/pkgs/by-name/fi/fityk/package.nix index 670a46b802b2..49eaf2911318 100644 --- a/pkgs/by-name/fi/fityk/package.nix +++ b/pkgs/by-name/fi/fityk/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, autoreconfHook, - wxGTK32, + wxwidgets_3_2, boost186, lua, zlib, @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { swig ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 boost186 lua zlib @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { ]; configureFlags = [ - "--with-wx-config=${lib.getExe' (lib.getDev wxGTK32) "wx-config"}" + "--with-wx-config=${lib.getExe' (lib.getDev wxwidgets_3_2) "wx-config"}" ]; env.NIX_CFLAGS_COMPILE = toString [ diff --git a/pkgs/by-name/fl/flamerobin/package.nix b/pkgs/by-name/fl/flamerobin/package.nix index 139dbd765ab3..924b04ae060f 100644 --- a/pkgs/by-name/fl/flamerobin/package.nix +++ b/pkgs/by-name/fl/flamerobin/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - wxGTK32, + wxwidgets_3_2, boost, firebird, }: @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 boost firebird ]; diff --git a/pkgs/by-name/fr/freedv/package.nix b/pkgs/by-name/fr/freedv/package.nix index a5d3af69c2d3..99d631b9ad1e 100644 --- a/pkgs/by-name/fr/freedv/package.nix +++ b/pkgs/by-name/fr/freedv/package.nix @@ -20,7 +20,7 @@ portaudio, speexdsp, hamlib_4, - wxGTK32, + wxwidgets_3_2, dbus, apple-sdk_15, nix-update-script, @@ -135,7 +135,7 @@ stdenv.mkDerivation (finalAttrs: { lpcnet speexdsp hamlib_4 - wxGTK32 + wxwidgets_3_2 python3.pkgs.numpy ] ++ ( diff --git a/pkgs/by-name/fr/freqtweak/package.nix b/pkgs/by-name/fr/freqtweak/package.nix index cc2012671fe3..7e28bd00420a 100644 --- a/pkgs/by-name/fr/freqtweak/package.nix +++ b/pkgs/by-name/fr/freqtweak/package.nix @@ -9,7 +9,7 @@ libjack2, libsigcxx, libxml2, - wxGTK32, + wxwidgets_3_2, }: @@ -34,7 +34,7 @@ stdenv.mkDerivation { libjack2 libsigcxx libxml2 - wxGTK32 + wxwidgets_3_2 ]; preConfigure = '' diff --git a/pkgs/by-name/fs/fsg/package.nix b/pkgs/by-name/fs/fsg/package.nix index d99f163a996b..cb53200d534c 100644 --- a/pkgs/by-name/fs/fsg/package.nix +++ b/pkgs/by-name/fs/fsg/package.nix @@ -7,7 +7,7 @@ pkg-config, libGLU, libGL, - wxGTK32, + wxwidgets_3_2, libx11, xorgproto, runtimeShell, @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # use correct wx-config for cross-compiling postPatch = '' substituteInPlace makefile \ - --replace-fail 'wx-config' "${lib.getExe' wxGTK32 "wx-config"}" + --replace-fail 'wx-config' "${lib.getExe' wxwidgets_3_2 "wx-config"}" ''; hardeningDisable = [ "format" ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { glib libGLU libGL - wxGTK32 + wxwidgets_3_2 libx11 xorgproto ]; diff --git a/pkgs/by-name/ga/gambit-project/package.nix b/pkgs/by-name/ga/gambit-project/package.nix index 80cfcce53714..deee39bcd247 100644 --- a/pkgs/by-name/ga/gambit-project/package.nix +++ b/pkgs/by-name/ga/gambit-project/package.nix @@ -3,7 +3,7 @@ autoreconfHook, fetchFromGitHub, stdenv, - wxGTK31, + wxwidgets_3_1, withGui ? true, }: @@ -18,9 +18,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-xoFtqPUC/qLrlEewIPeDmOH7rWMB+ak5CdVlH5t84MY="; }; - nativeBuildInputs = [ autoreconfHook ] ++ lib.optional withGui wxGTK31; + nativeBuildInputs = [ autoreconfHook ] ++ lib.optional withGui wxwidgets_3_1; - buildInputs = lib.optional withGui wxGTK31; + buildInputs = lib.optional withGui wxwidgets_3_1; strictDeps = true; diff --git a/pkgs/by-name/go/golly/package.nix b/pkgs/by-name/go/golly/package.nix index e6b1c27668c1..b694632a2853 100644 --- a/pkgs/by-name/go/golly/package.nix +++ b/pkgs/by-name/go/golly/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, wrapGAppsHook3, - wxGTK32, + wxwidgets_3_2, python3, zlib, libGLU, @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { }; buildInputs = [ - wxGTK32 + wxwidgets_3_2 python3 zlib libGLU @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { "CXX=${stdenv.cc.targetPrefix}c++" "CXXC=${stdenv.cc.targetPrefix}c++" "LD=${stdenv.cc.targetPrefix}c++" - "WX_CONFIG=${lib.getExe' (lib.getDev wxGTK32) "wx-config"}" + "WX_CONFIG=${lib.getExe' (lib.getDev wxwidgets_3_2) "wx-config"}" ]; installPhase = '' diff --git a/pkgs/by-name/gr/grandorgue/package.nix b/pkgs/by-name/gr/grandorgue/package.nix index f599a2f592fa..16dc89c16c76 100644 --- a/pkgs/by-name/gr/grandorgue/package.nix +++ b/pkgs/by-name/gr/grandorgue/package.nix @@ -9,7 +9,7 @@ alsa-lib, zlib, wavpack, - wxGTK32, + wxwidgets_3_2, udev, jackaudioSupport ? false, libjack2, @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { fftwFloat zlib wavpack - wxGTK32 + wxwidgets_3_2 yaml-cpp ] ++ lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/by-name/gr/grass/package.nix b/pkgs/by-name/gr/grass/package.nix index 97b23458ce7a..d0e064be74d4 100644 --- a/pkgs/by-name/gr/grass/package.nix +++ b/pkgs/by-name/gr/grass/package.nix @@ -33,7 +33,7 @@ python3Packages, readline, sqlite, - wxGTK32, + wxwidgets_3_2, zlib, zstd, }: @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { proj readline sqlite - wxGTK32 + wxwidgets_3_2 zlib zstd ] diff --git a/pkgs/by-name/hu/hugin/package.nix b/pkgs/by-name/hu/hugin/package.nix index 053b9c7f8f83..9d3bf5f3f330 100644 --- a/pkgs/by-name/hu/hugin/package.nix +++ b/pkgs/by-name/hu/hugin/package.nix @@ -30,8 +30,8 @@ sqlite, vigra, wrapGAppsHook3, - wxGTK32, - wxGTK' ? wxGTK32, + wxwidgets_3_2, + wxGTK' ? wxwidgets_3_2, zlib, }: diff --git a/pkgs/by-name/ki/kicad/package.nix b/pkgs/by-name/ki/kicad/package.nix index 11e14c5d7ed7..60218a56b109 100644 --- a/pkgs/by-name/ki/kicad/package.nix +++ b/pkgs/by-name/ki/kicad/package.nix @@ -12,7 +12,7 @@ adwaita-icon-theme, dconf, gtk3, - wxGTK32, + wxwidgets_3_2, librsvg, cups, gsettings-desktop-schemas, @@ -134,7 +134,7 @@ let else versionsImport.${baseName}.libVersion.version; - wxGTK = wxGTK32; + wxGTK = wxwidgets_3_2; python = python3; wxPython = python.pkgs.wxpython; addonPath = "addon.zip"; diff --git a/pkgs/by-name/le/lenmus/package.nix b/pkgs/by-name/le/lenmus/package.nix index 076eb9501d88..745f08915694 100644 --- a/pkgs/by-name/le/lenmus/package.nix +++ b/pkgs/by-name/le/lenmus/package.nix @@ -13,7 +13,7 @@ libpng, pngpp, zlib, - wxGTK32, + wxwidgets_3_2, wxsqlite3, fluidsynth, fontconfig, @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { libpng pngpp zlib - wxGTK32 + wxwidgets_3_2 wxsqlite3 fluidsynth fontconfig diff --git a/pkgs/by-name/me/mediainfo-gui/package.nix b/pkgs/by-name/me/mediainfo-gui/package.nix index 878c491e45ee..a5d7caaecea4 100644 --- a/pkgs/by-name/me/mediainfo-gui/package.nix +++ b/pkgs/by-name/me/mediainfo-gui/package.nix @@ -5,7 +5,7 @@ autoreconfHook, pkg-config, libmediainfo, - wxGTK32, + wxwidgets_3_2, desktop-file-utils, libsm, imagemagick, @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libmediainfo - wxGTK32 + wxwidgets_3_2 desktop-file-utils libsm imagemagick diff --git a/pkgs/by-name/me/megaglest/package.nix b/pkgs/by-name/me/megaglest/package.nix index d4ff02faf708..27ed4c25f9f4 100644 --- a/pkgs/by-name/me/megaglest/package.nix +++ b/pkgs/by-name/me/megaglest/package.nix @@ -11,7 +11,7 @@ lua, libvlc, libjpeg, - wxGTK32, + wxwidgets_3_2, cppunit, ftgl, glew, @@ -57,7 +57,7 @@ let stdenv.cc.cc glew libGLU - wxGTK32 + wxwidgets_3_2 ]; }; path-env = buildEnv { @@ -127,7 +127,7 @@ stdenv.mkDerivation { libpng libjpeg libvlc - wxGTK32 + wxwidgets_3_2 glib cppunit fontconfig diff --git a/pkgs/by-name/mm/mmex/package.nix b/pkgs/by-name/mm/mmex/package.nix index 4c7d3ec3fe2c..5dde256cfdb9 100644 --- a/pkgs/by-name/mm/mmex/package.nix +++ b/pkgs/by-name/mm/mmex/package.nix @@ -12,7 +12,7 @@ wrapGAppsHook3, curl, sqlite, - wxGTK32, + wxwidgets_3_2, gtk3, lua, wxsqlite3, @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper pkg-config wrapGAppsHook3 - wxGTK32 + wxwidgets_3_2 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lsb-release @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ curl sqlite - wxGTK32 + wxwidgets_3_2 gtk3 lua wxsqlite3 diff --git a/pkgs/by-name/mu/multivnc/package.nix b/pkgs/by-name/mu/multivnc/package.nix index 8428293895d8..fd2da3a2cafb 100644 --- a/pkgs/by-name/mu/multivnc/package.nix +++ b/pkgs/by-name/mu/multivnc/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, fetchpatch, - wxGTK32, + wxwidgets_3_2, gtk3, zlib, libjpeg, @@ -69,7 +69,7 @@ stdenv.mkDerivation { buildInputs = [ gtk3 - wxGTK32 + wxwidgets_3_2 zlib libjpeg libvncserver-patched diff --git a/pkgs/by-name/od/odamex/package.nix b/pkgs/by-name/od/odamex/package.nix index 8811c7ce19ac..cb9669d79184 100644 --- a/pkgs/by-name/od/odamex/package.nix +++ b/pkgs/by-name/od/odamex/package.nix @@ -30,7 +30,7 @@ portmidi, wayland-scanner, waylandpp, - wxGTK32, + wxwidgets_3_2, libx11, xorgproto, zstd, @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { libsysprof-capture pcre2 portmidi - wxGTK32 + wxwidgets_3_2 zstd ] ++ lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix index 25240b2c63a2..37268f2bb356 100644 --- a/pkgs/by-name/or/orca-slicer/package.nix +++ b/pkgs/by-name/or/orca-slicer/package.nix @@ -37,14 +37,14 @@ systemd, onetbb, webkitgtk_4_1, - wxGTK31, + wxwidgets_3_1, libx11, libnoise, withSystemd ? stdenv.hostPlatform.isLinux, }: let wxGTK' = - (wxGTK31.override { + (wxwidgets_3_1.override { withCurl = true; withPrivateFonts = true; withWebKit = true; diff --git a/pkgs/by-name/pc/pcem/package.nix b/pkgs/by-name/pc/pcem/package.nix index 65e7aec32009..5d4980d1eaf5 100644 --- a/pkgs/by-name/pc/pcem/package.nix +++ b/pkgs/by-name/pc/pcem/package.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchzip, - wxGTK32, + wxwidgets_3_2, coreutils, SDL2, openal, @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook3 ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 coreutils SDL2 openal diff --git a/pkgs/by-name/ph/phd2/package.nix b/pkgs/by-name/ph/phd2/package.nix index 75d1fabb98de..0d0c3aa74fa4 100644 --- a/pkgs/by-name/ph/phd2/package.nix +++ b/pkgs/by-name/ph/phd2/package.nix @@ -16,7 +16,7 @@ gtk3, libnova, libusb1, - wxGTK32, + wxwidgets_3_2, }: stdenv.mkDerivation (finalAttrs: { @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { gtk3 libnova libusb1 - wxGTK32 + wxwidgets_3_2 ]; cmakeFlags = [ diff --git a/pkgs/by-name/pl/plplot/package.nix b/pkgs/by-name/pl/plplot/package.nix index 5534fb0bc6d2..f4584b101e31 100644 --- a/pkgs/by-name/pl/plplot/package.nix +++ b/pkgs/by-name/pl/plplot/package.nix @@ -5,7 +5,7 @@ cmake, pkg-config, enableWX ? false, - wxGTK32, + wxwidgets_3_2, enableXWin ? false, libx11, enablePNG ? false, @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = - lib.optional enableWX wxGTK32 + lib.optional enableWX wxwidgets_3_2 ++ lib.optional enableXWin libx11 ++ lib.optionals enablePNG [ cairo diff --git a/pkgs/by-name/po/poedit/package.nix b/pkgs/by-name/po/poedit/package.nix index 29a207cc5ba3..f7522b1e1495 100644 --- a/pkgs/by-name/po/poedit/package.nix +++ b/pkgs/by-name/po/poedit/package.nix @@ -7,7 +7,7 @@ libtool, gettext, pkg-config, - wxGTK32, + wxwidgets_3_2, boost, icu, lucenepp, @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ lucenepp nlohmann_json - wxGTK32 + wxwidgets_3_2 icu pugixml gtk3 diff --git a/pkgs/by-name/pr/prusa-slicer/package.nix b/pkgs/by-name/pr/prusa-slicer/package.nix index 7b3436da5be5..ef23c31a461b 100644 --- a/pkgs/by-name/pr/prusa-slicer/package.nix +++ b/pkgs/by-name/pr/prusa-slicer/package.nix @@ -29,7 +29,7 @@ openvdb, qhull, onetbb, - wxGTK32, + wxwidgets_3_2, libx11, libbgcode, heatshrink, @@ -56,7 +56,7 @@ let hash = "sha256-WNdAYu66ggpSYJ8Kt57yEA4mSTv+Rvzj9Rm1q765HpY="; }; }); - wxGTK-override' = if wxGTK-override == null then wxGTK32 else wxGTK-override; + wxGTK-override' = if wxGTK-override == null then wxwidgets_3_2 else wxGTK-override; opencascade-override' = if opencascade-override == null then opencascade-occt_7_6_1 else opencascade-override; in diff --git a/pkgs/by-name/pt/pterm/package.nix b/pkgs/by-name/pt/pterm/package.nix index 675ae8a5934a..c7f3639f6075 100644 --- a/pkgs/by-name/pt/pterm/package.nix +++ b/pkgs/by-name/pt/pterm/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, libsndfile, - wxGTK32, + wxwidgets_3_2, SDL, }: @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libsndfile SDL - wxGTK32 + wxwidgets_3_2 ]; src = fetchurl { diff --git a/pkgs/by-name/pw/pwsafe/package.nix b/pkgs/by-name/pw/pwsafe/package.nix index dedc0249bba7..1550d70dc40f 100644 --- a/pkgs/by-name/pw/pwsafe/package.nix +++ b/pkgs/by-name/pw/pwsafe/package.nix @@ -7,7 +7,7 @@ zip, gettext, perl, - wxGTK32, + wxwidgets_3_2, libxext, libxi, libxt, @@ -41,12 +41,12 @@ stdenv.mkDerivation (finalAttrs: { gettext perl pkg-config - wxGTK32 + wxwidgets_3_2 zip ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 curl qrencode openssl diff --git a/pkgs/by-name/ra/radiotray-ng/package.nix b/pkgs/by-name/ra/radiotray-ng/package.nix index f844a04d46c3..10195ae3446e 100644 --- a/pkgs/by-name/ra/radiotray-ng/package.nix +++ b/pkgs/by-name/ra/radiotray-ng/package.nix @@ -18,7 +18,7 @@ libappindicator-gtk3, libnotify, libxdg_basedir, - wxGTK32, + wxwidgets_3_2, # GStreamer glib-networking, gst_all_1, @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { libnotify libxdg_basedir lsb-release - wxGTK32 + wxwidgets_3_2 # for https gstreamer / libsoup glib-networking ] diff --git a/pkgs/by-name/ra/rapidsvn/package.nix b/pkgs/by-name/ra/rapidsvn/package.nix index abbaeca4ef56..99bf1dafc63e 100644 --- a/pkgs/by-name/ra/rapidsvn/package.nix +++ b/pkgs/by-name/ra/rapidsvn/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, autoreconfHook, - wxGTK32, + wxwidgets_3_2, subversion, apr, aprutil, @@ -31,7 +31,7 @@ stdenv.mkDerivation { ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 subversion apr aprutil diff --git a/pkgs/by-name/re/rehex/package.nix b/pkgs/by-name/re/rehex/package.nix index dbbbc6971899..1aa827713c19 100644 --- a/pkgs/by-name/re/rehex/package.nix +++ b/pkgs/by-name/re/rehex/package.nix @@ -10,7 +10,7 @@ capstone, jansson, libunistring, - wxGTK32, + wxwidgets_3_2, lua53Packages, perlPackages, gtk3, @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { capstone jansson libunistring - wxGTK32 + wxwidgets_3_2 ] ++ (with lua53Packages; [ lua diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index 7d105488af7f..a95fc1b5935b 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -30,7 +30,7 @@ proj, qhull, vigra, - wxGTK32, + wxwidgets_3_2, xz, # darwin-specific netcdf, @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { proj qhull vigra - wxGTK32 + wxwidgets_3_2 xz ] ++ lib.optionals cudaSupport [ diff --git a/pkgs/by-name/sc/scorched3d/package.nix b/pkgs/by-name/sc/scorched3d/package.nix index d2669a36eb24..7608ac82e937 100644 --- a/pkgs/by-name/sc/scorched3d/package.nix +++ b/pkgs/by-name/sc/scorched3d/package.nix @@ -8,7 +8,7 @@ pkg-config, openal-soft, freealut, - wxGTK32, + wxwidgets_3_2, libogg, freetype, libvorbis, @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { glew openal-soft freealut - wxGTK32 + wxwidgets_3_2 libogg freetype libvorbis diff --git a/pkgs/by-name/sl/slade-unstable/package.nix b/pkgs/by-name/sl/slade-unstable/package.nix index 14eebfe9310e..4381f91192ce 100644 --- a/pkgs/by-name/sl/slade-unstable/package.nix +++ b/pkgs/by-name/sl/slade-unstable/package.nix @@ -6,7 +6,7 @@ pkg-config, which, zip, - wxGTK32, + wxwidgets_3_2, gtk3, sfml_2, fluidsynth, @@ -40,7 +40,7 @@ stdenv.mkDerivation { ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 gtk3 sfml_2 fluidsynth @@ -53,8 +53,8 @@ stdenv.mkDerivation { ]; cmakeFlags = [ - "-DwxWidgets_LIBRARIES=${wxGTK32}/lib" - (lib.cmakeFeature "CL_WX_CONFIG" (lib.getExe' (lib.getDev wxGTK32) "wx-config")) + "-DwxWidgets_LIBRARIES=${wxwidgets_3_2}/lib" + (lib.cmakeFeature "CL_WX_CONFIG" (lib.getExe' (lib.getDev wxwidgets_3_2) "wx-config")) ]; env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; diff --git a/pkgs/by-name/sl/slade/package.nix b/pkgs/by-name/sl/slade/package.nix index c8ae877a1c0a..1e3d861d0f93 100644 --- a/pkgs/by-name/sl/slade/package.nix +++ b/pkgs/by-name/sl/slade/package.nix @@ -6,7 +6,7 @@ pkg-config, which, zip, - wxGTK32, + wxwidgets_3_2, gtk3, sfml_2, fluidsynth, @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 gtk3 sfml_2 fluidsynth @@ -52,8 +52,8 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DwxWidgets_LIBRARIES=${wxGTK32}/lib" - (lib.cmakeFeature "CL_WX_CONFIG" (lib.getExe' (lib.getDev wxGTK32) "wx-config")) + "-DwxWidgets_LIBRARIES=${wxwidgets_3_2}/lib" + (lib.cmakeFeature "CL_WX_CONFIG" (lib.getExe' (lib.getDev wxwidgets_3_2) "wx-config")) ]; env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; diff --git a/pkgs/by-name/so/sooperlooper/package.nix b/pkgs/by-name/so/sooperlooper/package.nix index 0644d475067a..78b2aa4baa32 100644 --- a/pkgs/by-name/so/sooperlooper/package.nix +++ b/pkgs/by-name/so/sooperlooper/package.nix @@ -10,7 +10,7 @@ libxml2, libjack2, libsndfile, - wxGTK32, + wxwidgets_3_2, libsigcxx, libsamplerate, rubberband, @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { libxml2 libjack2 libsndfile - wxGTK32 + wxwidgets_3_2 libsigcxx libsamplerate rubberband diff --git a/pkgs/by-name/so/sound-of-sorting/package.nix b/pkgs/by-name/so/sound-of-sorting/package.nix index 4f01b6a418cb..fcee0754c92e 100644 --- a/pkgs/by-name/so/sound-of-sorting/package.nix +++ b/pkgs/by-name/so/sound-of-sorting/package.nix @@ -5,7 +5,7 @@ fetchpatch, pkg-config, SDL2, - wxGTK32, + wxwidgets_3_2, }: stdenv.mkDerivation (finalAttrs: { @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 SDL2 ]; diff --git a/pkgs/by-name/sp/spatialite-gui/package.nix b/pkgs/by-name/sp/spatialite-gui/package.nix index 42ec69fcee55..9a74ecc00beb 100644 --- a/pkgs/by-name/sp/spatialite-gui/package.nix +++ b/pkgs/by-name/sp/spatialite-gui/package.nix @@ -20,7 +20,7 @@ proj, sqlite, virtualpg, - wxGTK32, + wxwidgets_3_2, xz, zstd, }: @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { proj sqlite virtualpg - wxGTK32 + wxwidgets_3_2 xz zstd ]; diff --git a/pkgs/by-name/sp/spek/package.nix b/pkgs/by-name/sp/spek/package.nix index 1abbb0b2a2d8..735242cd96f4 100644 --- a/pkgs/by-name/sp/spek/package.nix +++ b/pkgs/by-name/sp/spek/package.nix @@ -6,7 +6,7 @@ intltool, pkg-config, ffmpeg, - wxGTK32, + wxwidgets_3_2, gtk3, wrapGAppsHook3, }: @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ ffmpeg - wxGTK32 + wxwidgets_3_2 gtk3 ]; diff --git a/pkgs/by-name/su/super-slicer/package.nix b/pkgs/by-name/su/super-slicer/package.nix index d5207b2cfe36..5f14f172aa4b 100644 --- a/pkgs/by-name/su/super-slicer/package.nix +++ b/pkgs/by-name/su/super-slicer/package.nix @@ -3,7 +3,7 @@ fetchFromGitHub, fetchpatch, makeDesktopItem, - wxGTK31, + wxwidgets_3_1, prusa-slicer, libspnav, opencascade-occt_7_6, @@ -23,7 +23,7 @@ let ./super-slicer-fix-cereal-1.3.1.patch ]; - wxGTK31-prusa = wxGTK31.overrideAttrs (old: { + wxwidgets_3_1-prusa = wxwidgets_3_1.overrideAttrs (old: { pname = "wxwidgets-prusa3d-patched"; version = "3.1.4"; src = fetchFromGitHub { @@ -44,7 +44,7 @@ let hash = "sha256-FkoGcgVoBeHSZC3W5y30TBPmPrWnZSlO66TgwskgqAU="; inherit patches; overrides = { - wxGTK-override = wxGTK31-prusa; + wxGTK-override = wxwidgets_3_1-prusa; }; }; latest = { @@ -52,7 +52,7 @@ let hash = "sha256-FkoGcgVoBeHSZC3W5y30TBPmPrWnZSlO66TgwskgqAU="; inherit patches; overrides = { - wxGTK-override = wxGTK31-prusa; + wxGTK-override = wxwidgets_3_1-prusa; }; }; beta = { diff --git a/pkgs/by-name/su/survex/package.nix b/pkgs/by-name/su/survex/package.nix index d0bc1af7736b..88641fe1357e 100644 --- a/pkgs/by-name/su/survex/package.nix +++ b/pkgs/by-name/su/survex/package.nix @@ -14,7 +14,7 @@ gdal, python3, wrapGAppsHook3, - wxGTK32, + wxwidgets_3_2, }: stdenv.mkDerivation (finalAttrs: { @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { glib proj gdal - wxGTK32 + wxwidgets_3_2 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # TODO: libGLU doesn't build for macOS because of Mesa issues @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { ''; configureFlags = [ - "WX_CONFIG=${lib.getExe' (lib.getDev wxGTK32) "wx-config"}" + "WX_CONFIG=${lib.getExe' (lib.getDev wxwidgets_3_2) "wx-config"}" ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/te/tenacity/package.nix b/pkgs/by-name/te/tenacity/package.nix index eefa424ddbdf..085c68528982 100644 --- a/pkgs/by-name/te/tenacity/package.nix +++ b/pkgs/by-name/te/tenacity/package.nix @@ -4,7 +4,7 @@ fetchFromCodeberg, cmake, ninja, - wxGTK32, + wxwidgets_3_2, gtk3, pkg-config, python3, @@ -160,7 +160,7 @@ stdenv.mkDerivation (finalAttrs: { sratom suil twolame - wxGTK32 + wxwidgets_3_2 gtk3 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/by-name/th/therion/package.nix b/pkgs/by-name/th/therion/package.nix index 09e6cef875c6..b143aef21a8f 100644 --- a/pkgs/by-name/th/therion/package.nix +++ b/pkgs/by-name/th/therion/package.nix @@ -15,7 +15,7 @@ makeWrapper, fmt, proj, - wxGTK32, + wxwidgets_3_2, vtk, freetype, libjpeg, @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { expat tclPackages.tkimg proj - wxGTK32 + wxwidgets_3_2 vtk tk freetype diff --git a/pkgs/by-name/tq/tqsl/package.nix b/pkgs/by-name/tq/tqsl/package.nix index 16879752daa8..35122d3d64ba 100644 --- a/pkgs/by-name/tq/tqsl/package.nix +++ b/pkgs/by-name/tq/tqsl/package.nix @@ -9,7 +9,7 @@ lmdb, curl, sqlite, - wxGTK32, + wxwidgets_3_2, wrapGAppsHook3, }: @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { lmdb curl sqlite - wxGTK32 + wxwidgets_3_2 ]; meta = { diff --git a/pkgs/by-name/tr/treesheets/package.nix b/pkgs/by-name/tr/treesheets/package.nix index 5aee8c97e650..06dd3e81be74 100644 --- a/pkgs/by-name/tr/treesheets/package.nix +++ b/pkgs/by-name/tr/treesheets/package.nix @@ -6,7 +6,7 @@ ninja, wrapGAppsHook3, makeWrapper, - wxGTK32, + wxwidgets_3_2, unstableGitUpdater, }: @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 ]; env.NIX_CFLAGS_COMPILE = "-DPACKAGE_VERSION=\"${ diff --git a/pkgs/by-name/uc/ucblogo/package.nix b/pkgs/by-name/uc/ucblogo/package.nix index d4cb1520e63c..53c2893ccfc9 100644 --- a/pkgs/by-name/uc/ucblogo/package.nix +++ b/pkgs/by-name/uc/ucblogo/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - wxGTK32, + wxwidgets_3_2, texinfo, tetex, wrapGAppsHook3, @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 ]; meta = { diff --git a/pkgs/by-name/ur/urbackup-client/package.nix b/pkgs/by-name/ur/urbackup-client/package.nix index 50d92d94ad87..221048d48ffa 100644 --- a/pkgs/by-name/ur/urbackup-client/package.nix +++ b/pkgs/by-name/ur/urbackup-client/package.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchzip, - wxGTK32, + wxwidgets_3_2, zlib, zstd, }: @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { ''; buildInputs = [ - wxGTK32 + wxwidgets_3_2 zlib zstd ]; diff --git a/pkgs/by-name/ut/ut1999/package.nix b/pkgs/by-name/ut/ut1999/package.nix index b069bca8eac8..5f15f39bac8d 100644 --- a/pkgs/by-name/ut/ut1999/package.nix +++ b/pkgs/by-name/ut/ut1999/package.nix @@ -11,7 +11,7 @@ imagemagick, runCommand, libgcc, - wxGTK32, + wxwidgets_3_2, libGL, SDL2, openal, @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libgcc - wxGTK32 + wxwidgets_3_2 SDL2 libGL openal diff --git a/pkgs/by-name/vb/vbam/package.nix b/pkgs/by-name/vb/vbam/package.nix index d884d63dc604..03bbc75945a7 100644 --- a/pkgs/by-name/vb/vbam/package.nix +++ b/pkgs/by-name/vb/vbam/package.nix @@ -6,7 +6,7 @@ fetchFromGitHub, ffmpeg_7, gettext, - wxGTK32, + wxwidgets_3_2, gtk3, libGLU, libGL, @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { sfml_2 zip zlib - wxGTK32 + wxwidgets_3_2 gtk3 gsettings-desktop-schemas ]; diff --git a/pkgs/by-name/ve/veracrypt/package.nix b/pkgs/by-name/ve/veracrypt/package.nix index d4d749b6645e..d55219ecf251 100644 --- a/pkgs/by-name/ve/veracrypt/package.nix +++ b/pkgs/by-name/ve/veracrypt/package.nix @@ -6,7 +6,7 @@ makeself, yasm, fuse, - wxGTK32, + wxwidgets_3_2, lvm2, replaceVars, e2fsprogs, @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ fuse lvm2 - wxGTK32 + wxwidgets_3_2 pcsclite ]; diff --git a/pkgs/by-name/wx/wxc/package.nix b/pkgs/by-name/wx/wxc/package.nix index 9628cc8ed501..a92535a62926 100644 --- a/pkgs/by-name/wx/wxc/package.nix +++ b/pkgs/by-name/wx/wxc/package.nix @@ -4,7 +4,7 @@ fetchFromCodeberg, cmake, libGL, - wxGTK32, + wxwidgets_3_2, }: stdenv.mkDerivation (finalAttrs: { @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - wxGTK32 # in nativeBuildInputs because of wx-config + wxwidgets_3_2 # in nativeBuildInputs because of wx-config ]; buildInputs = [ @@ -41,6 +41,6 @@ stdenv.mkDerivation (finalAttrs: { wxWindowsException31 ]; maintainers = with lib.maintainers; [ fgaz ]; - platforms = wxGTK32.meta.platforms; + platforms = wxwidgets_3_2.meta.platforms; }; }) diff --git a/pkgs/by-name/wx/wxformbuilder/package.nix b/pkgs/by-name/wx/wxformbuilder/package.nix index 3bda111dc931..bb23475919f7 100644 --- a/pkgs/by-name/wx/wxformbuilder/package.nix +++ b/pkgs/by-name/wx/wxformbuilder/package.nix @@ -7,7 +7,7 @@ makeWrapper, shared-mime-info, boost, - wxGTK32, + wxwidgets_3_2, }: stdenv.mkDerivation (finalAttrs: { @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost - wxGTK32 + wxwidgets_3_2 ]; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/by-name/wx/wxhexeditor/package.nix b/pkgs/by-name/wx/wxhexeditor/package.nix index 66d705ab90f1..a8ae91e8debc 100644 --- a/pkgs/by-name/wx/wxhexeditor/package.nix +++ b/pkgs/by-name/wx/wxhexeditor/package.nix @@ -8,7 +8,7 @@ gettext, libtool, python3, - wxGTK32, + wxwidgets_3_2, wrapGAppsHook3, llvmPackages, }: @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { gettext libtool python3 - wxGTK32 + wxwidgets_3_2 wrapGAppsHook3 ]; diff --git a/pkgs/by-name/wx/wxmacmolplt/package.nix b/pkgs/by-name/wx/wxmacmolplt/package.nix index 4629193946c9..bbd76bd3b89f 100644 --- a/pkgs/by-name/wx/wxmacmolplt/package.nix +++ b/pkgs/by-name/wx/wxmacmolplt/package.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchFromGitHub, - wxGTK32, + wxwidgets_3_2, libGL, libGLU, pkg-config, @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook4 ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 libGL libGLU libx11 diff --git a/pkgs/by-name/wx/wxsqlite3/package.nix b/pkgs/by-name/wx/wxsqlite3/package.nix index 18da48b8af14..da7760010b34 100644 --- a/pkgs/by-name/wx/wxsqlite3/package.nix +++ b/pkgs/by-name/wx/wxsqlite3/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, autoreconfHook, - wxGTK32, + wxwidgets_3_2, sqlite, }: @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ sqlite - wxGTK32 + wxwidgets_3_2 ]; doCheck = true; diff --git a/pkgs/by-name/wx/wxsqliteplus/package.nix b/pkgs/by-name/wx/wxsqliteplus/package.nix index 9fcd3ab13e72..4f7dad29104d 100644 --- a/pkgs/by-name/wx/wxsqliteplus/package.nix +++ b/pkgs/by-name/wx/wxsqliteplus/package.nix @@ -5,7 +5,7 @@ cmake, pkg-config, makeWrapper, - wxGTK32, + wxwidgets_3_2, wxsqlite3, sqlite, }: @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 wxsqlite3 sqlite ]; diff --git a/pkgs/by-name/wx/wxsvg/package.nix b/pkgs/by-name/wx/wxsvg/package.nix index 7897c22e7935..848622de65ba 100644 --- a/pkgs/by-name/wx/wxsvg/package.nix +++ b/pkgs/by-name/wx/wxsvg/package.nix @@ -8,7 +8,7 @@ libexif, pango, pkg-config, - wxGTK32, + wxwidgets_3_2, }: stdenv.mkDerivation (finalAttrs: { @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { ffmpeg libexif pango - wxGTK32 + wxwidgets_3_2 ]; enableParallelBuilding = true; @@ -51,6 +51,6 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl2Plus; maintainers = [ ]; - inherit (wxGTK32.meta) platforms; + inherit (wxwidgets_3_2.meta) platforms; }; }) diff --git a/pkgs/by-name/wx/wxGTK31/0001-fix-assertion-using-hide-in-destroy.patch b/pkgs/by-name/wx/wxwidgets_3_1/0001-fix-assertion-using-hide-in-destroy.patch similarity index 100% rename from pkgs/by-name/wx/wxGTK31/0001-fix-assertion-using-hide-in-destroy.patch rename to pkgs/by-name/wx/wxwidgets_3_1/0001-fix-assertion-using-hide-in-destroy.patch diff --git a/pkgs/by-name/wx/wxGTK31/0002-support-webkitgtk-41.patch b/pkgs/by-name/wx/wxwidgets_3_1/0002-support-webkitgtk-41.patch similarity index 100% rename from pkgs/by-name/wx/wxGTK31/0002-support-webkitgtk-41.patch rename to pkgs/by-name/wx/wxwidgets_3_1/0002-support-webkitgtk-41.patch diff --git a/pkgs/by-name/wx/wxGTK31/package.nix b/pkgs/by-name/wx/wxwidgets_3_1/package.nix similarity index 100% rename from pkgs/by-name/wx/wxGTK31/package.nix rename to pkgs/by-name/wx/wxwidgets_3_1/package.nix diff --git a/pkgs/by-name/wx/wxGTK32/package.nix b/pkgs/by-name/wx/wxwidgets_3_2/package.nix similarity index 100% rename from pkgs/by-name/wx/wxGTK32/package.nix rename to pkgs/by-name/wx/wxwidgets_3_2/package.nix diff --git a/pkgs/by-name/xc/xchm/package.nix b/pkgs/by-name/xc/xchm/package.nix index 679c8785d59b..449e266a34ff 100644 --- a/pkgs/by-name/xc/xchm/package.nix +++ b/pkgs/by-name/xc/xchm/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, autoreconfHook, - wxGTK32, + wxwidgets_3_2, chmlib, desktopToDarwinBundle, }: @@ -27,14 +27,14 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 chmlib ]; - configureFlags = [ "--with-wx-prefix=${wxGTK32}" ]; + configureFlags = [ "--with-wx-prefix=${wxwidgets_3_2}" ]; preConfigure = '' - export LDFLAGS="$LDFLAGS $(${wxGTK32}/bin/wx-config --libs std,aui | sed -e s@-pthread@@)" + export LDFLAGS="$LDFLAGS $(${wxwidgets_3_2}/bin/wx-config --libs std,aui | sed -e s@-pthread@@)" ''; meta = { diff --git a/pkgs/by-name/xm/xmlcopyeditor/package.nix b/pkgs/by-name/xm/xmlcopyeditor/package.nix index 156b444867e7..5542d144efa2 100644 --- a/pkgs/by-name/xm/xmlcopyeditor/package.nix +++ b/pkgs/by-name/xm/xmlcopyeditor/package.nix @@ -10,7 +10,7 @@ libxml2, libxslt, pcre2, - wxGTK32, + wxwidgets_3_2, xercesc, }: @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { libxml2 libxslt pcre2 - wxGTK32 + wxwidgets_3_2 xercesc ]; diff --git a/pkgs/by-name/xy/xylib/package.nix b/pkgs/by-name/xy/xylib/package.nix index 563dfff3b320..b62ae98ea8e9 100644 --- a/pkgs/by-name/xy/xylib/package.nix +++ b/pkgs/by-name/xy/xylib/package.nix @@ -5,7 +5,7 @@ boost, zlib, bzip2, - wxGTK32, + wxwidgets_3_2, }: stdenv.mkDerivation (finalAttrs: { @@ -21,11 +21,11 @@ stdenv.mkDerivation (finalAttrs: { boost zlib bzip2 - wxGTK32 + wxwidgets_3_2 ]; configureFlags = [ - "--with-wx-config=${lib.getExe' (lib.getDev wxGTK32) "wx-config"}" + "--with-wx-config=${lib.getExe' (lib.getDev wxwidgets_3_2) "wx-config"}" ]; meta = { diff --git a/pkgs/by-name/ze/zeroad-unwrapped/package.nix b/pkgs/by-name/ze/zeroad-unwrapped/package.nix index 6e4a62bbbb37..f0b49dd9b49d 100644 --- a/pkgs/by-name/ze/zeroad-unwrapped/package.nix +++ b/pkgs/by-name/ze/zeroad-unwrapped/package.nix @@ -34,7 +34,7 @@ cxxtest, freetype, withEditor ? true, - wxGTK32, + wxwidgets_3_2, }: # You can find more instructions on how to build 0ad here: @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { premake5 cxxtest ] - ++ lib.optional withEditor wxGTK32; + ++ lib.optional withEditor wxwidgets_3_2; env.NIX_CFLAGS_COMPILE = toString [ "-I${xorgproto}/include" diff --git a/pkgs/by-name/zo/zod/package.nix b/pkgs/by-name/zo/zod/package.nix index 2626a6d18a34..161bf682b19e 100644 --- a/pkgs/by-name/zo/zod/package.nix +++ b/pkgs/by-name/zo/zod/package.nix @@ -8,7 +8,7 @@ SDL_ttf, SDL_mixer, libmysqlclient, - wxGTK32, + wxwidgets_3_2, symlinkJoin, runCommandLocal, makeWrapper, @@ -35,7 +35,7 @@ let SDL_ttf SDL_mixer libmysqlclient - wxGTK32 + wxwidgets_3_2 coreutils ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 2e0aee58aa7b..ad945875cfb8 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -628,8 +628,8 @@ builtins.intersectAttrs super { # wxc supports wxGTX >= 3.0, but our current default version points to 2.8. # http://hydra.cryp.to/build/1331287/log/raw - wxc = (addBuildDepend self.split super.wxc).override { wxGTK = pkgs.wxGTK32; }; - wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK32; }; + wxc = (addBuildDepend self.split super.wxc).override { wxGTK = pkgs.wxwidgets_3_2; }; + wxcore = super.wxcore.override { wxGTK = pkgs.wxwidgets_3_2; }; shellify = enableSeparateBinOutput super.shellify; specup = enableSeparateBinOutput super.specup; diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 5d6b0f3eb699..de761f5be030 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -40,7 +40,7 @@ systemd, unixODBC, wrapGAppsHook3, - wxGTK32, + wxwidgets_3_2, libx11, zlib, }: @@ -53,12 +53,12 @@ let wxPackages2 = if stdenv.hostPlatform.isDarwin then - [ wxGTK32 ] + [ wxwidgets_3_2 ] else [ libGL libGLU - wxGTK32 + wxwidgets_3_2 libx11 wrapGAppsHook3 ]; diff --git a/pkgs/development/interpreters/gnudatalanguage/default.nix b/pkgs/development/interpreters/gnudatalanguage/default.nix index ce3d127517ae..2b0d720c7df7 100644 --- a/pkgs/development/interpreters/gnudatalanguage/default.nix +++ b/pkgs/development/interpreters/gnudatalanguage/default.nix @@ -60,7 +60,7 @@ # wxWidgets is preferred over X11 for this project but we only have it on Linux # and Darwin. enableWX ? (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin), - wxGTK32, + wxwidgets_3_2, # X11: OFF by default for platform consistency. Use X where WX is not available enableXWin ? (!stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isDarwin), }: @@ -170,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional enableXWin plplot-with-drivers.libx11 ++ lib.optional enableGRIB eccodes ++ lib.optional enableGLPK glpk - ++ lib.optional enableWX wxGTK32 + ++ lib.optional enableWX wxwidgets_3_2 ++ lib.optional enableMPI mpi ++ lib.optional enableLibtirpc hdf4-custom.libtirpc ++ lib.optional enableSzip szip; diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 3b5fe45441b0..8c4d7ac369f7 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, cmake, - wxGTK32, + wxwidgets_3_2, openal, pkg-config, curl, @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { makeWrapper ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 openal curl libtorrent-rasterbar diff --git a/pkgs/servers/klipper/klipper-firmware.nix b/pkgs/servers/klipper/klipper-firmware.nix index 6b812db3a336..90b29f33d987 100644 --- a/pkgs/servers/klipper/klipper-firmware.nix +++ b/pkgs/servers/klipper/klipper-firmware.nix @@ -7,7 +7,7 @@ args@{ bintools-unwrapped, libffi, libusb1, - wxGTK32, + wxwidgets_3_2, python3, gcc-arm-embedded, klipper, @@ -41,7 +41,7 @@ stdenv.mkDerivation { avrdude stm32flash pkg-config - wxGTK32 # Required for bossac + wxwidgets_3_2 # Required for bossac ]; configurePhase = '' diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index c1c75403d5fa..8a1fb92d513c 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -23,7 +23,7 @@ libxaw, aquaterm ? false, withWxGTK ? false, - wxGTK32, + wxwidgets_3_2, fontconfig, gnused, coreutils, @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { qtbase qtsvg ] - ++ lib.optional withWxGTK wxGTK32; + ++ lib.optional withWxGTK wxwidgets_3_2; postPatch = '' # lrelease is in qttools, not in qtbase. diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4b735b0af592..81402dbf0a26 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2043,6 +2043,8 @@ mapAliases { wrapGradle = throw "'wrapGradle' has been removed; use `gradle-packages.wrapGradle` or `(gradle-packages.mkGradle { ... }).wrapped` instead"; # Added 2025-11-02 wring = throw "'wring' has been removed since it has been abandoned upstream"; # Added 2025-11-07 write_stylus = throw "'write_stylus' has been renamed to/replaced by 'styluslabs-write-bin'"; # Converted to throw 2025-10-27 + wxGTK31 = warnAlias "'wxGTK31' has been renamed to 'wxwidgets_3_1'" wxwidgets_3_1; # Added 2026-02-12 + wxGTK32 = warnAlias "'wxGTK32' has been renamed to 'wxwidgets_3_2'" wxwidgets_3_2; # Added 2026-02-12 wxGTK33 = wxwidgets_3_3; # Added 2025-07-20 wxSVG = warnAlias "'wxSVG' has been renamed to 'wxsvg'" wxsvg; xbrightness = throw "'xbrightness' has been removed as it is unmaintained"; # Added 2025-08-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5e2785c51cd..129b11192e8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10342,7 +10342,7 @@ with pkgs; diffpdf = libsForQt5.callPackage ../applications/misc/diffpdf { }; diff-pdf = callPackage ../applications/misc/diff-pdf { - wxGTK = wxGTK32; + wxGTK = wxwidgets_3_2; }; mypaint-brushes1 = callPackage ../development/libraries/mypaint-brushes/1.0.nix { }; @@ -12067,7 +12067,7 @@ with pkgs; }; wxmaxima = callPackage ../applications/science/math/wxmaxima { - wxGTK = wxGTK32.override { + wxGTK = wxwidgets_3_2.override { withWebKit = true; }; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 942dc19f5172..b3da3950b9dc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -604,7 +604,7 @@ with self; propagatedBuildInputs = [ pkgs.pkg-config pkgs.gtk3 - pkgs.wxGTK32 + pkgs.wxwidgets_3_2 ModulePluggable ]; buildInputs = [ LWPProtocolHttps ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1bcb6529dc79..b61cd0202d38 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20972,7 +20972,7 @@ self: super: with self; { wurlitzer = callPackage ../development/python-modules/wurlitzer { }; wxpython = callPackage ../development/python-modules/wxpython/4.2.nix { - wxGTK = pkgs.wxGTK32.override { withWebKit = true; }; + wxGTK = pkgs.wxwidgets_3_2.override { withWebKit = true; }; }; wyoming = callPackage ../development/python-modules/wyoming { }; From aec7ec604b6b6bbba36b0012ded742690b6f202d Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Tue, 24 Feb 2026 18:22:10 +0100 Subject: [PATCH 070/429] lomiri.mediascanner2: 0.118 -> 0.200 --- .../lomiri/services/mediascanner2/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix index 56370d078c1d..fa17efbedac3 100644 --- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix +++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mediascanner2"; - version = "0.118"; + version = "0.200"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/mediascanner2"; tag = finalAttrs.version; - hash = "sha256-ZJXJNDZUDor5EJ+rn7pQt7lLzoszZUQM3B+u1gBSMs8="; + hash = "sha256-tTEbH5gXK+0y3r1LCxsZ6vr1FVyXWZaNAXaR6jcIP0Y="; }; outputs = [ @@ -45,7 +45,13 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace src/qml/MediaScanner.*/CMakeLists.txt \ - --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" + --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" + '' + # https://gitlab.com/ubports/development/core/mediascanner2/-/commit/4268b8c0a7e99c1d12f43599b1ae76b5b27572ec + # Remove when version > 0.200 + + '' + substituteInPlace src/extractor/CMakeLists.txt src/qml/MediaScanner.0.1/CMakeLists.txt \ + --replace-fail 'msg(' 'message(' ''; strictDeps = true; @@ -82,7 +88,10 @@ stdenv.mkDerivation (finalAttrs: { checkInputs = [ gtest ]; - cmakeFlags = [ (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) ]; + cmakeFlags = [ + (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6")) + (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) + ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; From 6c8472556e33b67454cb514aa678dee70f776d1c Mon Sep 17 00:00:00 2001 From: Silvio Ankermann Date: Fri, 27 Feb 2026 19:17:33 +0100 Subject: [PATCH 071/429] koffan: init at 2.1.1 --- pkgs/by-name/ko/koffan/package.nix | 32 ++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/by-name/ko/koffan/package.nix diff --git a/pkgs/by-name/ko/koffan/package.nix b/pkgs/by-name/ko/koffan/package.nix new file mode 100644 index 000000000000..29f935c1ccec --- /dev/null +++ b/pkgs/by-name/ko/koffan/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "koffan"; + version = "2.1.1"; + + src = fetchFromGitHub { + owner = "PanSalut"; + repo = "Koffan"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ZFA/++iKJm7zrijDhNgvEK7rOUGfA2decG/BaK2Z8rk="; + }; + + vendorHash = "sha256-9QNqW1Cif5sNuI5rvM5JoBTdEwWWXROcmMOVP2eOc2M="; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Free selfhosted groceries list for families and shared households"; + mainProgram = "shopping-list"; + homepage = "https://github.com/PanSalut/Koffan"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lykos153 ]; + }; +}) From cea1b086f08ed2d8df14be0d00e0cd907a0cd095 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Fri, 27 Feb 2026 20:00:31 +0100 Subject: [PATCH 072/429] dataexplorer: 3.9.3 -> 4.0.2 --- pkgs/by-name/da/dataexplorer/package.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/da/dataexplorer/package.nix b/pkgs/by-name/da/dataexplorer/package.nix index f9c8890fc3f9..14cf687bcc53 100644 --- a/pkgs/by-name/da/dataexplorer/package.nix +++ b/pkgs/by-name/da/dataexplorer/package.nix @@ -3,33 +3,34 @@ stdenv, fetchurl, ant, - # executable fails to start for jdk > 17 - jdk17, + openjdk25, swt, makeWrapper, strip-nondeterminism, udevCheckHook, }: let - swt-jdk17 = swt.override { jdk = jdk17; }; + swt-jdk = swt.override { jdk = openjdk25; }; in stdenv.mkDerivation (finalAttrs: { pname = "dataexplorer"; - version = "3.9.3"; + version = "4.0.2"; src = fetchurl { url = "mirror://savannah/dataexplorer/dataexplorer-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-NfbhamhRx78MW5H4BpKMDfrV2d082UkaIBFfbemOSOY="; + hash = "sha256-HaupE8tCbmlUVMd0ZFt7QwY1AKEx+op21fUeGBpR+UY="; }; nativeBuildInputs = [ ant - jdk17 + openjdk25 makeWrapper strip-nondeterminism udevCheckHook ]; + dontConfigure = true; + buildPhase = '' runHook preBuild ant -f build/build.xml dist @@ -49,18 +50,18 @@ stdenv.mkDerivation (finalAttrs: { ant -Dprefix=$out/share/ -f build/build.xml install # Use SWT from nixpkgs - ln -sf '${swt-jdk17}/jars/swt.jar' "$out/share/DataExplorer/java/ext/swt.jar" + ln -sf '${swt-jdk}/jars/swt.jar' "$out/share/DataExplorer/java/ext/swt.jar" # The sources contain a wrapper script in $out/share/DataExplorer/DataExplorer # but it hardcodes bash shebang and does not pin the java path. # So we create our own wrapper, using similar cmdline args as upstream. mkdir -p $out/bin - makeWrapper ${jdk17}/bin/java $out/bin/DataExplorer \ - --prefix LD_LIBRARY_PATH : '${swt-jdk17}/lib' \ + makeWrapper ${openjdk25}/bin/java $out/bin/DataExplorer \ + --prefix LD_LIBRARY_PATH : '${swt-jdk}/lib' \ --add-flags "-Xms64m -Xmx3092m -jar $out/share/DataExplorer/DataExplorer.jar" \ --set SWT_GTK3 0 - makeWrapper ${jdk17}/bin/java $out/bin/DevicePropertiesEditor \ + makeWrapper ${openjdk25}/bin/java $out/bin/DevicePropertiesEditor \ --add-flags "-Xms32m -Xmx512m -classpath $out/share/DataExplorer/DataExplorer.jar gde.ui.dialog.edit.DevicePropertiesEditor" \ --set SWT_GTK3 0 \ --set LIBOVERLAY_SCROLLBAR 0 From 08823f7bd20809de6210056643f3f6fed45b29d5 Mon Sep 17 00:00:00 2001 From: loner <2788892716@qq.com> Date: Sat, 28 Feb 2026 15:48:29 +0800 Subject: [PATCH 073/429] conan: 2.22.2 -> 2.26.1 https://github.com/conan-io/conan/releases/tag/2.26.1 --- pkgs/by-name/co/conan/package.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/co/conan/package.nix b/pkgs/by-name/co/conan/package.nix index 47c7bc473609..56147185caed 100644 --- a/pkgs/by-name/co/conan/package.nix +++ b/pkgs/by-name/co/conan/package.nix @@ -12,18 +12,19 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "conan"; - version = "2.22.2"; + version = "2.26.1"; pyproject = true; src = fetchFromGitHub { owner = "conan-io"; repo = "conan"; tag = finalAttrs.version; - hash = "sha256-4OKrAfhHgtAS606P88JFYCjgYYlSAH8RReqFs6N2V5s="; + hash = "sha256-PBrVt8SM3AFdi/w18c4ZExzNnfTANtAdTUHIquk1At0="; }; pythonRelaxDeps = [ "distro" + "patch-ng" "urllib3" ]; @@ -82,6 +83,7 @@ python3Packages.buildPythonApplication (finalAttrs: { "test_shared_windows_find_libraries" # 'cmake' tool version 'Any' is not available "test_build" + "test_conan_new" "test_conan_new_compiles" # 'cmake' tool version '3.27' is not available "test_metabuild" @@ -104,6 +106,7 @@ python3Packages.buildPythonApplication (finalAttrs: { # Requires cmake, meson, autotools, apt-get, etc. "test/functional/command/runner_test.py" "test/functional/command/test_install_deploy.py" + "test/functional/command/test_new.py" "test/functional/layout/test_editable_cmake.py" "test/functional/layout/test_editable_cmake_components.py" "test/functional/layout/test_in_subfolder.py" @@ -113,12 +116,16 @@ python3Packages.buildPythonApplication (finalAttrs: { "test/functional/toolchains/" "test/functional/tools/scm/test_git.py" "test/functional/tools/system/package_manager_test.py" + "test/functional/sbom/test_cyclonedx.py" + "test/functional/workspace/test_workspace.py" "test/functional/tools_versions_test.py" "test/functional/util/test_cmd_args_to_string.py" - "test/performance/test_large_graph.py" + + # Requires network access to PyPI + "test/functional/tools/system/python_manager_test.py" + + # Test failure "test/unittests/tools/env/test_env_files.py" - # pipenv will attempt to access the network. - "test/functional/tools/system/pip_manager_test.py" ]; meta = { From f807114e6eb06b20b55f6bc364385b9ff6444883 Mon Sep 17 00:00:00 2001 From: Dmitry Ivankov Date: Fri, 27 Feb 2026 22:35:45 +0100 Subject: [PATCH 074/429] bazel_8.examples: fix FOD hashes for rust --- pkgs/by-name/ba/bazel_8/examples.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ba/bazel_8/examples.nix b/pkgs/by-name/ba/bazel_8/examples.nix index d859784b4714..689bb9c0a753 100644 --- a/pkgs/by-name/ba/bazel_8/examples.nix +++ b/pkgs/by-name/ba/bazel_8/examples.nix @@ -108,10 +108,10 @@ in bazelVendorDepsFOD = { outputHash = { - aarch64-darwin = "sha256-0QtaPtcBljyhiJGwA8ctSpi+UQp/9q/ZoHUHORizmlY="; - aarch64-linux = "sha256-zpiwQ8OB8KhY+kxSXlSOd/zmoH1VGYDGgojf4Or04pQ="; - x86_64-darwin = "sha256-+tCDSuYkon1DEARwWTYABJbmysSNAK9vy0tCm8YsGjQ="; - x86_64-linux = "sha256-wCWSRc20Yr/hdXn8szbhLAX7Oy3G5keyHTTdO0msnks="; + aarch64-darwin = "sha256-wjVwHQEtIoApY01s9AEVExmRhy+LLQv0/B2vAxmXz+o="; + aarch64-linux = "sha256-Z7Y8bBEaPgp9y6RZoC5Ewqvzi//vnamkpeHXGpoBFAQ="; + x86_64-darwin = "sha256-aUTfOrsa59zUE0Wb+u5TORQR0nAGQ/7MWSRHc2hcXoo="; + x86_64-linux = "sha256-yrXIJocCGq4NYW0jg5s2cMDEvknrtjtBQo6cZFbz8CE="; } .${stdenv.hostPlatform.system}; outputHashAlgo = "sha256"; From b53377300ee3b4a3aee482fb740722c7a1170a99 Mon Sep 17 00:00:00 2001 From: Bad3r <25513724+Bad3r@users.noreply.github.com> Date: Sat, 28 Feb 2026 14:36:05 +0300 Subject: [PATCH 075/429] dwarfs: 0.12.4 -> 0.14.0 https://github.com/mhx/dwarfs/releases/tag/v0.14.0 --- pkgs/by-name/dw/dwarfs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dw/dwarfs/package.nix b/pkgs/by-name/dw/dwarfs/package.nix index c0d7424775f1..18fd1fca30f4 100644 --- a/pkgs/by-name/dw/dwarfs/package.nix +++ b/pkgs/by-name/dw/dwarfs/package.nix @@ -34,14 +34,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "dwarfs"; - version = "0.12.4"; + version = "0.14.0"; src = fetchFromGitHub { owner = "mhx"; repo = "dwarfs"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-EYNnmv0QKdWddIRFRsuwsazHep3nrJ8lInlR4S67rME="; + hash = "sha256-4Ec1AqumTSPZpPEi528OaO3bOU1Soc8ZHuuKXIDvCUA="; }; cmakeFlags = [ From 5aa26611e773b360c02c0711504ebddef2b16ec2 Mon Sep 17 00:00:00 2001 From: Bad3r <25513724+Bad3r@users.noreply.github.com> Date: Sat, 28 Feb 2026 14:36:40 +0300 Subject: [PATCH 076/429] dwarfs: drop date input and align license metadata v0.14.0 source files now use GPL-3.0-or-later SPDX, and the v0.14.0 release notes mention dropping the hard dependency on the date library.\n\nhttps://github.com/mhx/dwarfs/releases/tag/v0.13.0\nhttps://github.com/mhx/dwarfs/releases/tag/v0.14.0 --- pkgs/by-name/dw/dwarfs/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/dw/dwarfs/package.nix b/pkgs/by-name/dw/dwarfs/package.nix index 18fd1fca30f4..22af1db71825 100644 --- a/pkgs/by-name/dw/dwarfs/package.nix +++ b/pkgs/by-name/dw/dwarfs/package.nix @@ -12,7 +12,6 @@ flac, glog, gtest, - howard-hinnant-date, jemalloc, libarchive, libevent, @@ -57,7 +56,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ bison cmake - howard-hinnant-date # uses only the header-only parts pkg-config range-v3 # header-only library ronn @@ -118,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Fast high compression read-only file system"; homepage = "https://github.com/mhx/dwarfs"; changelog = "https://github.com/mhx/dwarfs/blob/v${finalAttrs.version}/CHANGES.md"; - license = lib.licenses.gpl3Only; + license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.luftmensch-luftmensch ]; platforms = lib.platforms.linux; }; From ced010799e569299a8f1c17c46a85f177b8c121c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Sat, 28 Feb 2026 18:49:11 +0700 Subject: [PATCH 077/429] =?UTF-8?q?h2o:=202.3.0-rolling-2026-01-19=20?= =?UTF-8?q?=E2=86=92=202.3.0-rolling-2026-02-28?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/h2/h2o/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index 91e796183994..83b1fc777d83 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "h2o"; - version = "2.3.0-rolling-2026-01-19"; + version = "2.3.0-rolling-2026-02-28"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; - rev = "a9ba592b904684b8d12e9a825e4a579c31999c2b"; - hash = "sha256-ZLoZgMIhBtLJ0GS6leyTegNauAczGB0Ua1pU6PE31yE="; + rev = "725e54bc932fbe0c6e208db4e71eb1df79ec43ff"; + hash = "sha256-SAH7AZYy6ZRRa8zhhe8voKJCqM5CxSuZA/XwT1Nb9NI="; }; outputs = [ From 7c7666010b7fbffd8aa58e876d933b5211015083 Mon Sep 17 00:00:00 2001 From: Bad3r <25513724+Bad3r@users.noreply.github.com> Date: Sat, 28 Feb 2026 14:51:12 +0300 Subject: [PATCH 078/429] dwarfs: skip fuse and xattr tests in sandbox dwarfs 0.14.0 introduces additional tests that require a FUSE device/fusermount3 and xattr support not available in Nix sandbox builds. Exclude those cases through GTEST_FILTER, consistent with existing sandbox-specific test filtering in this derivation. --- pkgs/by-name/dw/dwarfs/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/dw/dwarfs/package.nix b/pkgs/by-name/dw/dwarfs/package.nix index 22af1db71825..c583315c7b77 100644 --- a/pkgs/by-name/dw/dwarfs/package.nix +++ b/pkgs/by-name/dw/dwarfs/package.nix @@ -104,6 +104,15 @@ stdenv.mkDerivation (finalAttrs: { "dwarfs/tools_test.end_to_end/*" "dwarfs/tools_test.mutating_and_error_ops/*" "dwarfs/tools_test.categorize/*" + # Requires a working FUSE device and fusermount3, unavailable in sandbox. + "dwarfs/tools_test.timestamps_fuse*" + "dwarfs/tools_test.dwarfs_automount*" + "dwarfs/tools_test.dwarfs_fsname_and_subtype*" + "dwarfs/sparse_files_test.random_large_files*" + "dwarfs/sparse_files_test.random_small_files_fuse*" + "dwarfs/sparse_files_test.huge_holes_fuse*" + # Requires xattr support unavailable in sandbox. + "dwarfs/xattr_test.portable_xattr" ]; in "-${lib.concatStringsSep ":" disabledTests}"; From 58a13f6d2d33f0c25892fa0f7152fca7388652ac Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 28 Feb 2026 13:31:32 +0100 Subject: [PATCH 079/429] atinout: move LANG into env for structuredAttrs --- pkgs/by-name/at/atinout/package.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/at/atinout/package.nix b/pkgs/by-name/at/atinout/package.nix index 64609395b210..e349edaf2658 100644 --- a/pkgs/by-name/at/atinout/package.nix +++ b/pkgs/by-name/at/atinout/package.nix @@ -10,8 +10,13 @@ stdenv.mkDerivation { pname = "atinout"; version = "0.9.2-alpha"; - env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.cc.isClang) "-Werror=implicit-fallthrough=0"; - LANG = if stdenv.hostPlatform.isDarwin then "en_US.UTF-8" else "C.UTF-8"; + env = { + LANG = if stdenv.hostPlatform.isDarwin then "en_US.UTF-8" else "C.UTF-8"; + } + // lib.optionalAttrs (!stdenv.cc.isClang) { + NIX_CFLAGS_COMPILE = "-Werror=implicit-fallthrough=0"; + }; + nativeBuildInputs = [ ronn mount From f64a4875acf86e74e4e4efdd2ecc5f41147be14e Mon Sep 17 00:00:00 2001 From: Bad3r <25513724+Bad3r@users.noreply.github.com> Date: Sat, 28 Feb 2026 16:15:04 +0300 Subject: [PATCH 080/429] dwarfs: fix 0.14.0 sandbox test and mount helper handling Update the new 0.14.0 GTest exclusions to match actual test names in sandbox runs, keep sbin behavior stable for mount helper links, and force relative CMAKE_INSTALL_SBINDIR so upstream create_link logic does not create nested nix/store paths.\n\nThis preserves passing checks in sandbox and keeps mount.dwarfs valid. --- pkgs/by-name/dw/dwarfs/package.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/dw/dwarfs/package.nix b/pkgs/by-name/dw/dwarfs/package.nix index c583315c7b77..657b1f05b435 100644 --- a/pkgs/by-name/dw/dwarfs/package.nix +++ b/pkgs/by-name/dw/dwarfs/package.nix @@ -49,6 +49,10 @@ stdenv.mkDerivation (finalAttrs: { # Needs to be set so `dwarfs` does not try to download `gtest`; it is not # a submodule, see: https://github.com/mhx/dwarfs/issues/188#issuecomment-1907657083 "-DPREFER_SYSTEM_GTEST=ON" + # Upstream composes DESTDIR + CMAKE_INSTALL_PREFIX + CMAKE_INSTALL_SBINDIR + # in a create_link() install script. Keep SBINDIR relative to avoid + # nested nix/store path creation in the output. + "-DCMAKE_INSTALL_SBINDIR=sbin" "-DWITH_LEGACY_FUSE=ON" "-DWITH_TESTS=ON" ]; @@ -105,14 +109,14 @@ stdenv.mkDerivation (finalAttrs: { "dwarfs/tools_test.mutating_and_error_ops/*" "dwarfs/tools_test.categorize/*" # Requires a working FUSE device and fusermount3, unavailable in sandbox. - "dwarfs/tools_test.timestamps_fuse*" - "dwarfs/tools_test.dwarfs_automount*" - "dwarfs/tools_test.dwarfs_fsname_and_subtype*" - "dwarfs/sparse_files_test.random_large_files*" - "dwarfs/sparse_files_test.random_small_files_fuse*" - "dwarfs/sparse_files_test.huge_holes_fuse*" + "tools_test.timestamps_fuse*" + "tools_test.dwarfs_automount*" + "tools_test.dwarfs_fsname_and_subtype*" + "sparse_files_test.random_large_files*" + "sparse_files_test.random_small_files_fuse*" + "sparse_files_test.huge_holes_fuse*" # Requires xattr support unavailable in sandbox. - "dwarfs/xattr_test.portable_xattr" + "xattr_test.portable_xattr" ]; in "-${lib.concatStringsSep ":" disabledTests}"; @@ -120,6 +124,7 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/dwarfs"; + dontMoveSbin = true; meta = { description = "Fast high compression read-only file system"; From 30b9cb9c8a41d251004af08c8193e29b44eff6e3 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 28 Feb 2026 14:22:05 +0100 Subject: [PATCH 081/429] bionic: move env variable into env for structuredAttrs --- pkgs/os-specific/linux/bionic-prebuilt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/bionic-prebuilt/default.nix b/pkgs/os-specific/linux/bionic-prebuilt/default.nix index a647ea98db36..2dd81b9704d0 100644 --- a/pkgs/os-specific/linux/bionic-prebuilt/default.nix +++ b/pkgs/os-specific/linux/bionic-prebuilt/default.nix @@ -81,7 +81,7 @@ stdenvNoCC.mkDerivation rec { stripRoot = false; }; - NIX_DONT_SET_RPATH = true; + env.NIX_DONT_SET_RPATH = true; dontConfigure = true; dontBuild = true; From ee4651b046b9243c1273db029dd121397999e58d Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 28 Feb 2026 14:30:01 +0100 Subject: [PATCH 082/429] bionic: modernize --- .../linux/bionic-prebuilt/default.nix | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/os-specific/linux/bionic-prebuilt/default.nix b/pkgs/os-specific/linux/bionic-prebuilt/default.nix index 2dd81b9704d0..ba741f060bea 100644 --- a/pkgs/os-specific/linux/bionic-prebuilt/default.nix +++ b/pkgs/os-specific/linux/bionic-prebuilt/default.nix @@ -18,12 +18,12 @@ let prebuilt_crt = choosePlatform { aarch64 = fetchzip { url = "https://android.googlesource.com/platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/+archive/98dce673ad97a9640c5d90bbb1c718e75c21e071/lib/gcc/aarch64-linux-android/4.9.x.tar.gz"; - sha256 = "sha256-LLD2OJi78sNN5NulOsJZl7Ei4F1EUYItGG6eUsKWULc="; + hash = "sha256-LLD2OJi78sNN5NulOsJZl7Ei4F1EUYItGG6eUsKWULc="; stripRoot = false; }; x86_64 = fetchzip { url = "https://android.googlesource.com/platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/+archive/7e8507d2a2d4df3bced561b894576de70f065be4/lib/gcc/x86_64-linux-android/4.9.x.tar.gz"; - sha256 = "sha256-y7CFLF76pTlj+oYev9taBnL2nlT3+Tx8c6wmicWmKEw="; + hash = "sha256-y7CFLF76pTlj+oYev9taBnL2nlT3+Tx8c6wmicWmKEw="; stripRoot = false; }; }; @@ -31,12 +31,12 @@ let prebuilt_libs = choosePlatform { aarch64 = fetchzip { url = "https://android.googlesource.com/platform/prebuilts/ndk/+archive/f2c77d8ba8a7f5c2d91771e31164f29be0b8ff98/platform/platforms/android-30/arch-arm64/usr/lib.tar.gz"; - sha256 = "sha256-TZBV7+D1QvKOCEi+VNGT5SStkgj0xRbyWoLH65zSrjw="; + hash = "sha256-TZBV7+D1QvKOCEi+VNGT5SStkgj0xRbyWoLH65zSrjw="; stripRoot = false; }; x86_64 = fetchzip { url = "https://android.googlesource.com/platform/prebuilts/ndk/+archive/f2c77d8ba8a7f5c2d91771e31164f29be0b8ff98/platform/platforms/android-30/arch-x86_64/usr/lib64.tar.gz"; - sha256 = "sha256-n2EuOKy3RGKmEYofNlm+vDDBuiQRuAJEJT6wq6NEJQs="; + hash = "sha256-n2EuOKy3RGKmEYofNlm+vDDBuiQRuAJEJT6wq6NEJQs="; stripRoot = false; }; }; @@ -44,19 +44,19 @@ let prebuilt_ndk_crt = choosePlatform { aarch64 = fetchzip { url = "https://android.googlesource.com/toolchain/prebuilts/ndk/r23/+archive/6c5fa4c0d3999b9ee932f6acbd430eb2f31f3151/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/30.tar.gz"; - sha256 = "sha256-KHw+cCwAwlm+5Nwp1o8WONqdi4BBDhFaVVr+7GxQ5uE="; + hash = "sha256-KHw+cCwAwlm+5Nwp1o8WONqdi4BBDhFaVVr+7GxQ5uE="; stripRoot = false; }; x86_64 = fetchzip { url = "https://android.googlesource.com/toolchain/prebuilts/ndk/r23/+archive/6c5fa4c0d3999b9ee932f6acbd430eb2f31f3151/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/30.tar.gz"; - sha256 = "sha256-XEd7L3cBzn+1pKfji40V92G/uZhHSMMuZcRZaiKkLnk="; + hash = "sha256-XEd7L3cBzn+1pKfji40V92G/uZhHSMMuZcRZaiKkLnk="; stripRoot = false; }; }; ndk_support_headers = fetchzip { url = "https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+archive/0e7f808fa26cce046f444c9616d9167dafbfb272/clang-r416183b/include/c++/v1/support.tar.gz"; - sha256 = "sha256-NBv7Pk1CEaz8ns9moleEERr3x/rFmVmG33LgFSeO6fY="; + hash = "sha256-NBv7Pk1CEaz8ns9moleEERr3x/rFmVmG33LgFSeO6fY="; stripRoot = false; }; @@ -70,10 +70,10 @@ let }; in -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "bionic-prebuilt"; version = "ndk-release-r23"; - name = "${stdenv.hostPlatform.parsed.cpu.name}-${pname}-${version}"; + name = "${stdenv.hostPlatform.parsed.cpu.name}-${finalAttrs.pname}-${finalAttrs.version}"; src = fetchzip { url = "https://android.googlesource.com/platform/bionic/+archive/00e8ce1142d8823b0d2fc8a98b40119b0f1f02cd.tar.gz"; @@ -91,9 +91,9 @@ stdenvNoCC.mkDerivation rec { ]; postPatch = '' - substituteInPlace libc/include/sys/cdefs.h --replace \ + substituteInPlace libc/include/sys/cdefs.h --replace-fail \ "__has_builtin(__builtin_umul_overflow)" "1" - substituteInPlace libc/include/bits/ioctl.h --replace \ + substituteInPlace libc/include/bits/ioctl.h --replace-fail \ "!defined(BIONIC_IOCTL_NO_SIGNEDNESS_OVERLOAD)" "0" ''; @@ -113,9 +113,9 @@ stdenvNoCC.mkDerivation rec { sed -i 's,union semun {,union Xsemun {,' $out/include/linux/sem.h sed -i 's,struct __kernel_sockaddr_storage,#define sockaddr_storage __kernel_sockaddr_storage\nstruct __kernel_sockaddr_storage,' $out/include/linux/socket.h sed -i 's,#ifndef __UAPI_DEF_.*$,#if 1,' $out/include/linux/libc-compat.h - substituteInPlace $out/include/linux/in.h --replace "__be32 imr_" "struct in_addr imr_" - substituteInPlace $out/include/linux/in.h --replace "__be32 imsf_" "struct in_addr imsf_" - substituteInPlace $out/include/linux/sysctl.h --replace "__unused" "_unused" + substituteInPlace $out/include/linux/in.h --replace-fail "__be32 imr_" "struct in_addr imr_" + substituteInPlace $out/include/linux/in.h --replace-fail "__be32 imsf_" "struct in_addr imsf_" + substituteInPlace $out/include/linux/sysctl.h --replace-fail "__unused" "_unused" # what could possibly live in touch $out/include/linux/compiler.h @@ -158,4 +158,4 @@ stdenvNoCC.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ s1341 ]; }; -} +}) From 34e2c8798d5ac9785ef64dccc76223a75bcb4c55 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 28 Feb 2026 14:30:16 +0100 Subject: [PATCH 083/429] bionic: convert hashes to sri --- pkgs/os-specific/linux/bionic-prebuilt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bionic-prebuilt/default.nix b/pkgs/os-specific/linux/bionic-prebuilt/default.nix index ba741f060bea..aa03ca4e81e7 100644 --- a/pkgs/os-specific/linux/bionic-prebuilt/default.nix +++ b/pkgs/os-specific/linux/bionic-prebuilt/default.nix @@ -64,7 +64,7 @@ let version = "android-common-11-5.4"; src = fetchzip { url = "https://android.googlesource.com/kernel/common/+archive/48ffcbf0b9e7f0280bfb8c32c68da0aaf0fdfef6.tar.gz"; - sha256 = "1y7cmlmcr5vdqydd9n785s139yc4aylc3zhqa59xsylmkaf5habk"; + hash = "sha256-cylYnJqVet1TURj+wahXhPk0gi7o2NSax22XzCqt7Pg="; stripRoot = false; }; }; @@ -77,7 +77,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchzip { url = "https://android.googlesource.com/platform/bionic/+archive/00e8ce1142d8823b0d2fc8a98b40119b0f1f02cd.tar.gz"; - sha256 = "10z5mp4w0acvjvgxv7wlqa7m70hcyarmjdlfxbd9rwzf4mrsr8d1"; + hash = "sha256-oaGscyXu85za6o42WbPyDIJTj8KUn93flpspwMmt5YM="; stripRoot = false; }; From 640f98f762fea5798f00179443936379a4c0db1a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Feb 2026 18:01:30 +0000 Subject: [PATCH 084/429] vue-language-server: 3.2.4 -> 3.2.5 --- pkgs/by-name/vu/vue-language-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix index efaf36d47cee..8143c12ae141 100644 --- a/pkgs/by-name/vu/vue-language-server/package.nix +++ b/pkgs/by-name/vu/vue-language-server/package.nix @@ -11,19 +11,19 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vue-language-server"; - version = "3.2.4"; + version = "3.2.5"; src = fetchFromGitHub { owner = "vuejs"; repo = "language-tools"; rev = "v${finalAttrs.version}"; - hash = "sha256-GxIIqRK8wBVlo8jvCox6Fdp705EMg1YoHB46bvs5kkE="; + hash = "sha256-WvxZz3Rtv1AWWVJjPiUaddoyBQXUsnucg/QXCKtNXbk="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-QLey523pqhjOBn4xhN9mZTKRAC96imVka+li7C4BXQY="; + hash = "sha256-rc0oq+dujIhCa+axSj5RjXsHKzh5BCpNAJ6w1vnCtt8="; }; nativeBuildInputs = [ From 7430acae630e51f44aac429394782e8ad5f9e68f Mon Sep 17 00:00:00 2001 From: Liam <119797945+liamthexpl0rer@users.noreply.github.com> Date: Sat, 28 Feb 2026 22:17:20 +0100 Subject: [PATCH 085/429] maintainers: add liamthexpl0rer --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c304ebff9c23..af31a6be7faf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15076,6 +15076,12 @@ github = "Liamolucko"; githubId = 43807659; }; + liamthexpl0rer = { + name = "Liam"; + matrix = "@liamthexpl0rer:matrix.org"; + github = "liamthexpl0rer"; + githubId = 119797945; + }; liarokapisv = { email = "liarokapis.v@gmail.com"; github = "liarokapisv"; From 429d6cb7f2dec09c7c88806802b72fca169525d5 Mon Sep 17 00:00:00 2001 From: Liam <119797945+liamthexpl0rer@users.noreply.github.com> Date: Sat, 28 Feb 2026 22:18:59 +0100 Subject: [PATCH 086/429] colorfuldarkglobal6-kde: init at 0-unstable-2026-01-29 --- .../co/colorfuldarkglobal6-kde/package.nix | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 pkgs/by-name/co/colorfuldarkglobal6-kde/package.nix diff --git a/pkgs/by-name/co/colorfuldarkglobal6-kde/package.nix b/pkgs/by-name/co/colorfuldarkglobal6-kde/package.nix new file mode 100644 index 000000000000..0fb62c7f69a0 --- /dev/null +++ b/pkgs/by-name/co/colorfuldarkglobal6-kde/package.nix @@ -0,0 +1,44 @@ +{ + stdenvNoCC, + fetchFromGitHub, + lib, +}: + +stdenvNoCC.mkDerivation { + pname = "colorfuldarkglobal6-kde"; + version = "0-unstable-2026-01-29"; + + src = fetchFromGitHub { + owner = "L4ki"; + repo = "Colorful-Plasma-Themes"; + rev = "67fe0058dc44c3b86898fee1c930d718fcc834dc"; + hash = "sha256-bC4uAHnR4xZ50nEmG4Xyr0APvgL2r0BMD6b4a8UJbD0="; + }; + + installPhase = '' + mkdir -p "$out/share/plasma/desktoptheme/Colorful-Dark-Global-6" + mkdir -p "$out/share/aurorae/themes/Colorful-Dark-6" + mkdir -p "$out/share/color-schemes" + mkdir -p "$out/share/konsole" + mkdir -p "$out/share/icons/Colorful-Dark-6" + + cp -rd "Colorful Global Themes/Colorful-Dark-Global-6"/* -t "$out/share/plasma/desktoptheme/Colorful-Dark-Global-6/" + + cp -rd "Colorful Window Decorations/Colorful-Blur-Dark-Aurorae-6" -t "$out/share/aurorae/themes/" + cp -rd "Colorful Window Decorations/Colorful-Dark-Aurorae-6" -t "$out/share/aurorae/themes/" + cp -rd "Colorful Window Decorations/Colorful-Dark-Color-Aurorae-6" -t "$out/share/aurorae/themes/" + + cp -rd "Colorful Konsole Color Schemes"/* -t "$out/share/konsole" + + cp -rd "Colorful Color Schemes"/* -t "$out/share/color-schemes/" + cp -rd "Colorful Icons Themes/Colorful-Dark-Icons" -t "$out/share/icons/" + ''; + + meta = { + description = "Port of the Colorful-Dark-Global-6 theme for Plasma"; + homepage = "https://github.com/L4ki/Colorful-Plasma-Themes/"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.liamthexpl0rer ]; + platforms = lib.platforms.all; + }; +} From e4cc0d39c79545e6319e79682ba1a60467548728 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Feb 2026 23:48:43 +0000 Subject: [PATCH 087/429] troubadix: 26.2.1 -> 26.2.2 --- pkgs/by-name/tr/troubadix/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/troubadix/package.nix b/pkgs/by-name/tr/troubadix/package.nix index ace6058eab7d..305a4879c24e 100644 --- a/pkgs/by-name/tr/troubadix/package.nix +++ b/pkgs/by-name/tr/troubadix/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "troubadix"; - version = "26.2.1"; + version = "26.2.2"; pyproject = true; src = fetchFromGitHub { owner = "greenbone"; repo = "troubadix"; tag = "v${finalAttrs.version}"; - hash = "sha256-plJCw4PRRXAHzZNnira0IDxcLzrW2Sfy0biDl2h/lqw="; + hash = "sha256-N287cfQcqnlB9c4VM80XU2I2o2+buspkkL8w4zob8Js="; }; pythonRelaxDeps = [ From 5f7c43320c6559972104f74c5ba495cdbf91f608 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Feb 2026 21:28:35 +0000 Subject: [PATCH 088/429] python3Packages.tempest: 46.0.0 -> 46.1.1 --- pkgs/development/python-modules/tempest/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix index b5050fa94bb6..c3fe3ad2cfbd 100644 --- a/pkgs/development/python-modules/tempest/default.nix +++ b/pkgs/development/python-modules/tempest/default.nix @@ -32,12 +32,12 @@ buildPythonPackage rec { pname = "tempest"; - version = "46.0.0"; + version = "46.1.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ddm1OE7BDwDM4T9GIB0+qK8WvU/+aC+FBIGWDm3ObHM="; + hash = "sha256-E61jqj0Wy1f81ackoFnnEZI2UCw70YIGYxQA1ME++xU="; }; postPatch = '' @@ -88,6 +88,11 @@ buildPythonPackage rec { chmod +x bin/* stestr --test-path tempest/tests run -e <(echo " + tempest.tests.common.test_concurrency.TestConcurrency.test_run_concurrent_tasks_dict_return_values + tempest.tests.common.test_concurrency.TestConcurrency.test_run_concurrent_tasks_multiple_workers + tempest.tests.common.test_concurrency.TestConcurrency.test_run_concurrent_tasks_single_process + tempest.tests.common.test_concurrency.TestConcurrency.test_run_concurrent_tasks_success + tempest.tests.common.test_concurrency.TestConcurrency.test_run_concurrent_tasks_with_exception tempest.tests.lib.cli.test_execute.TestExecute.test_execute_with_prefix ") ''; From 3a3b88407b01ba8bdb1ccba529b0dacfccf08693 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 1 Mar 2026 00:57:17 +0100 Subject: [PATCH 089/429] python313Packages.dogpile-cache: speed up test execution, ignore more flaky tests Following upstream https://github.com/sqlalchemy/dogpile.cache/blob/rel_1_5_0/pyproject.toml#L68 --- .../python-modules/dogpile-cache/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dogpile-cache/default.nix b/pkgs/development/python-modules/dogpile-cache/default.nix index a68fcad4bdb3..ebea5ee74068 100644 --- a/pkgs/development/python-modules/dogpile-cache/default.nix +++ b/pkgs/development/python-modules/dogpile-cache/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchPypi, setuptools, + pytest-xdist, pytestCheckHook, mako, decorator, @@ -31,8 +32,14 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook mako + pytest-xdist + pytestCheckHook + ]; + + disabledTestPaths = lib.optionals stdenv.hostPlatform.isLinux [ + # flaky + "tests/cache/test_dbm_backend.py" ]; disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ @@ -44,6 +51,8 @@ buildPythonPackage rec { "test_get_value_plus_created_registry_safe_cache_slow" "test_get_value_plus_created_registry_unsafe_cache" "test_quick" + "test_region_set_get_value" + "test_region_set_multiple_values" "test_return_while_in_progress" "test_slow" ]; From 520693dd32cdc78386c4970b2f2eb06ad9dddb61 Mon Sep 17 00:00:00 2001 From: Angel J <78835633+Iamanaws@users.noreply.github.com> Date: Sun, 1 Mar 2026 11:41:34 -0800 Subject: [PATCH 090/429] lucky-commit: fix build on aarch64-darwin --- pkgs/by-name/lu/lucky-commit/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/lu/lucky-commit/package.nix b/pkgs/by-name/lu/lucky-commit/package.nix index 99fef8610c6a..ab5adb72164d 100644 --- a/pkgs/by-name/lu/lucky-commit/package.nix +++ b/pkgs/by-name/lu/lucky-commit/package.nix @@ -20,6 +20,15 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-zuWPkaYltxOOLaR6NTVkf1WbKzUQByml45jNL+e5UJ0="; + # LLVM Apple assembler rejects `:lo12:` combined with `@PAGEOFF`. + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' + substituteInPlace "$cargoDepsCopy"/sha1-asm-*/src/aarch64_apple.S \ + --replace-fail "#:lo12:.K0@PAGEOFF" ".K0@PAGEOFF" \ + --replace-fail "#:lo12:.K1@PAGEOFF" ".K1@PAGEOFF" \ + --replace-fail "#:lo12:.K2@PAGEOFF" ".K2@PAGEOFF" \ + --replace-fail "#:lo12:.K3@PAGEOFF" ".K3@PAGEOFF" + ''; + buildInputs = lib.optional (withOpenCL && (!stdenv.hostPlatform.isDarwin)) ocl-icd; buildNoDefaultFeatures = !withOpenCL; From 516a14cd33a4665fbc89ad25846e49f9a53ab0da Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 7 Feb 2026 16:27:07 +0100 Subject: [PATCH 091/429] modules/generic/meta-maintainers.nix: Simplify There was no need for it to be this complicated. Notably the maintainer check was never used anyways, because only its merge function was used, which doesn't do a check There is a minor functional change with this commit, which is that even if explicitly `meta.maintainers = []`, that module will be in the result when it wasn't before. I deem this insignificant. --- modules/generic/meta-maintainers.nix | 35 ++++------------------------ 1 file changed, 4 insertions(+), 31 deletions(-) diff --git a/modules/generic/meta-maintainers.nix b/modules/generic/meta-maintainers.nix index f9e8a19aea82..75365d07ce7a 100644 --- a/modules/generic/meta-maintainers.nix +++ b/modules/generic/meta-maintainers.nix @@ -4,39 +4,12 @@ let inherit (lib) mkOption - mkOptionType types ; - maintainer = mkOptionType { - name = "maintainer"; - check = email: lib.elem email (lib.attrValues lib.maintainers); - merge = loc: defs: { - # lib.last: Perhaps this could be merged instead, if "at most once per module" - # is a problem (see option description). - ${(lib.last defs).file} = (lib.last defs).value; - }; - }; - - listOfMaintainers = types.listOf maintainer // { - merge = - loc: defs: - lib.zipAttrs ( - lib.flatten ( - lib.imap1 ( - n: def: - lib.imap1 ( - m: def': - maintainer.merge (loc ++ [ "[${toString n}-${toString m}]" ]) [ - { - inherit (def) file; - value = def'; - } - ] - ) def.value - ) defs - ) - ); + # The resulting value of this type shows where all values were defined + sourceList = types.listOf types.raw // { + merge = loc: defs: lib.listToAttrs (lib.map ({ file, value }: lib.nameValuePair file value) defs); }; in { @@ -44,7 +17,7 @@ in options = { meta = { maintainers = mkOption { - type = listOfMaintainers; + type = sourceList; default = [ ]; example = lib.literalExpression "[ lib.maintainers.alice lib.maintainers.bob ]"; description = '' From 3dc5545d5178ada55859f9897fd0ffda8f5b0cbe Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 7 Feb 2026 16:41:58 +0100 Subject: [PATCH 092/429] modules/generic/meta-maintainers.nix: Check validity of meta.maintainers And fix a case where it wasn't valid --- modules/generic/meta-maintainers.nix | 9 ++++++++- modules/generic/meta-maintainers/test.nix | 10 +++++++++- nixos/modules/services/databases/clickhouse.nix | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/modules/generic/meta-maintainers.nix b/modules/generic/meta-maintainers.nix index 75365d07ce7a..ff8ce87b004b 100644 --- a/modules/generic/meta-maintainers.nix +++ b/modules/generic/meta-maintainers.nix @@ -17,7 +17,14 @@ in options = { meta = { maintainers = mkOption { - type = sourceList; + type = + let + allMaintainers = lib.attrValues lib.maintainers; + in + lib.types.addCheck sourceList (lib.all (v: lib.elem v allMaintainers)) + // { + description = "list of lib.maintainers"; + }; default = [ ]; example = lib.literalExpression "[ lib.maintainers.alice lib.maintainers.bob ]"; description = '' diff --git a/modules/generic/meta-maintainers/test.nix b/modules/generic/meta-maintainers/test.nix index e4b37780ca83..a9859a6ee2dc 100644 --- a/modules/generic/meta-maintainers/test.nix +++ b/modules/generic/meta-maintainers/test.nix @@ -14,9 +14,17 @@ let }; in rec { - lib = import ../../../lib; + # Inject ghost into lib.maintainers so it passes the addCheck validation + lib = (import ../../../lib).extend ( + final: prev: { + maintainers = prev.maintainers // { + inherit ghost; + }; + } + ); example = lib.evalModules { + specialArgs.lib = lib; modules = [ ../meta-maintainers.nix { diff --git a/nixos/modules/services/databases/clickhouse.nix b/nixos/modules/services/databases/clickhouse.nix index de9371de513a..50c291a10be6 100644 --- a/nixos/modules/services/databases/clickhouse.nix +++ b/nixos/modules/services/databases/clickhouse.nix @@ -13,7 +13,7 @@ let in { - meta.maintainers = [ "thevar1able" ]; + meta.maintainers = with lib.maintainers; [ thevar1able ]; ###### interface From b486dfb1ab003e95746b68e1d904f82b1dd27e7e Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 7 Feb 2026 16:28:10 +0100 Subject: [PATCH 093/429] modules/generic/meta-maintainers.nix: Remove Nixpkgs prefix from module path This is a functional change, but there's no known consumer of this interface, and if we want to trigger review request for PRs it's convenient for these paths to be absolute ci: Trigger review requests for module maintainers --- ci/eval/compare/maintainers.nix | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix index daecc1c154da..e202e47ae118 100644 --- a/ci/eval/compare/maintainers.nix +++ b/ci/eval/compare/maintainers.nix @@ -13,6 +13,14 @@ let config.allowAliases = false; }; + nixpkgsRoot = toString ../../.. + "/"; + + fileMaintainers = + # Currently just nixos module maintainers, but in the future we can use this for code owners too + lib.mapAttrs' ( + file: maintainers: lib.nameValuePair (lib.removePrefix nixpkgsRoot file) maintainers + ) (pkgs.nixos { }).config.meta.maintainers; + changedpaths = lib.importJSON changedpathsjson; # Extract attributes that changed from by-name paths. @@ -94,39 +102,42 @@ let attrsWithModifiedFiles = lib.filter (pkg: anyMatchingFiles pkg.filenames) attrsWithFilenames; userPings = - pkg: + context: map (maintainer: { type = "user"; userId = maintainer.githubId; - packageName = pkg.name; + inherit context; }); teamPings = - pkg: team: + context: team: if team ? github then [ { type = "team"; teamId = team.githubId; - packageName = pkg.name; + inherit context; } ] else - userPings pkg team.members; + userPings context team.members; - maintainersToPing = lib.concatMap ( - pkg: userPings pkg pkg.users ++ lib.concatMap (teamPings pkg) pkg.teams - ) attrsWithModifiedFiles; + maintainersToPing = + lib.concatMap ( + pkg: + userPings { attr = pkg.name; } pkg.users ++ lib.concatMap (teamPings { pkg = pkg.name; }) pkg.teams + ) attrsWithModifiedFiles + ++ lib.concatMap (path: userPings { file = path; } (fileMaintainers.${path} or [ ])) changedpaths; byType = lib.groupBy (ping: ping.type) maintainersToPing; byUser = lib.pipe (byType.user or [ ]) [ (lib.groupBy (ping: toString ping.userId)) - (lib.mapAttrs (_user: lib.map (pkg: pkg.packageName))) + (lib.mapAttrs (_user: lib.map (pkg: pkg.context))) ]; byTeam = lib.pipe (byType.team or [ ]) [ (lib.groupBy (ping: toString ping.teamId)) - (lib.mapAttrs (_team: lib.map (pkg: pkg.packageName))) + (lib.mapAttrs (_team: lib.map (pkg: pkg.context))) ]; in { From 5991eab94f05841f55bb364fade93878f2d0ea7a Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 7 Feb 2026 16:56:42 +0100 Subject: [PATCH 094/429] modules/generic/meta-maintainers.nix: Introduce meta.teams And trigger review requests for it --- ci/eval/compare/maintainers.nix | 19 +++++++++++++------ modules/generic/meta-maintainers.nix | 16 ++++++++++++++++ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix index e202e47ae118..73c36c7f9196 100644 --- a/ci/eval/compare/maintainers.nix +++ b/ci/eval/compare/maintainers.nix @@ -14,12 +14,15 @@ let }; nixpkgsRoot = toString ../../.. + "/"; + stripNixpkgsRootFromKeys = lib.mapAttrs' ( + file: value: lib.nameValuePair (lib.removePrefix nixpkgsRoot file) value + ); - fileMaintainers = - # Currently just nixos module maintainers, but in the future we can use this for code owners too - lib.mapAttrs' ( - file: maintainers: lib.nameValuePair (lib.removePrefix nixpkgsRoot file) maintainers - ) (pkgs.nixos { }).config.meta.maintainers; + moduleMeta = (pkgs.nixos { }).config.meta; + + # Currently just nixos module maintainers, but in the future we can use this for code owners too + fileMaintainers = stripNixpkgsRootFromKeys moduleMeta.maintainers; + fileTeams = stripNixpkgsRootFromKeys moduleMeta.teams; changedpaths = lib.importJSON changedpathsjson; @@ -127,7 +130,11 @@ let pkg: userPings { attr = pkg.name; } pkg.users ++ lib.concatMap (teamPings { pkg = pkg.name; }) pkg.teams ) attrsWithModifiedFiles - ++ lib.concatMap (path: userPings { file = path; } (fileMaintainers.${path} or [ ])) changedpaths; + ++ lib.concatMap ( + path: + userPings { file = path; } (fileMaintainers.${path} or [ ]) + ++ lib.concatMap (teamPings { file = path; }) (fileTeams.${path} or [ ]) + ) changedpaths; byType = lib.groupBy (ping: ping.type) maintainersToPing; diff --git a/modules/generic/meta-maintainers.nix b/modules/generic/meta-maintainers.nix index ff8ce87b004b..ce37dae03db6 100644 --- a/modules/generic/meta-maintainers.nix +++ b/modules/generic/meta-maintainers.nix @@ -34,6 +34,22 @@ in The option value is not a list of maintainers, but an attribute set that maps module file names to lists of maintainers. ''; }; + teams = mkOption { + type = + let + allTeams = lib.attrValues lib.teams; + in + lib.types.addCheck sourceList (lib.all (v: lib.elem v allTeams)) + // { + description = "list of lib.teams"; + }; + default = [ ]; + example = lib.literalExpression "[ lib.teams.acme lib.teams.haskell ]"; + description = '' + List of team maintainers of each module. + This option should be defined at most once per module. + ''; + }; }; }; meta.maintainers = with lib.maintainers; [ From dbb164c7590ebbf7e997322e155273aeac1c98ba Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 7 Feb 2026 17:12:21 +0100 Subject: [PATCH 095/429] nixos/modules: Use meta.teams over meta.maintainers = lib.teams.*.members This allows getting the team itself requested for a review instead of the individual members --- nixos/modules/config/vte.nix | 2 +- nixos/modules/config/xdg/autostart.nix | 2 +- nixos/modules/config/xdg/icons.nix | 2 +- nixos/modules/config/xdg/menus.nix | 2 +- nixos/modules/config/xdg/mime.nix | 2 +- nixos/modules/config/xdg/portal.nix | 2 +- nixos/modules/config/xdg/portals/lxqt.nix | 2 +- nixos/modules/config/xdg/sounds.nix | 2 +- nixos/modules/programs/dsearch.nix | 2 +- nixos/modules/programs/geary.nix | 2 +- nixos/modules/programs/gnome-disks.nix | 2 +- nixos/modules/programs/gnome-terminal.nix | 2 +- nixos/modules/programs/nm-applet.nix | 2 +- nixos/modules/programs/steam.nix | 2 +- nixos/modules/programs/thunar.nix | 2 +- nixos/modules/programs/wayland/dms-shell.nix | 2 +- nixos/modules/programs/wayland/hyprland.nix | 2 +- nixos/modules/programs/wayland/hyprlock.nix | 2 +- nixos/modules/programs/xfconf.nix | 2 +- nixos/modules/security/acme/default.nix | 2 +- nixos/modules/security/apparmor.nix | 2 +- nixos/modules/services/cluster/rancher/default.nix | 3 ++- .../continuous-integration/buildbot/master.nix | 2 +- .../continuous-integration/buildbot/worker.nix | 2 +- .../continuous-integration/gitlab-runner/runner.nix | 2 +- nixos/modules/services/desktop-managers/budgie.nix | 2 +- nixos/modules/services/desktop-managers/cosmic.nix | 2 +- nixos/modules/services/desktop-managers/gnome.nix | 2 +- nixos/modules/services/desktop-managers/lomiri.nix | 2 +- nixos/modules/services/desktop-managers/pantheon.nix | 2 +- nixos/modules/services/desktops/accountsservice.nix | 2 +- nixos/modules/services/desktops/geoclue2.nix | 2 +- nixos/modules/services/desktops/gnome/at-spi2-core.nix | 2 +- .../services/desktops/gnome/evolution-data-server.nix | 2 +- .../modules/services/desktops/gnome/gcr-ssh-agent.nix | 2 +- .../services/desktops/gnome/glib-networking.nix | 2 +- .../desktops/gnome/gnome-browser-connector.nix | 2 +- .../services/desktops/gnome/gnome-initial-setup.nix | 2 +- .../modules/services/desktops/gnome/gnome-keyring.nix | 2 +- .../services/desktops/gnome/gnome-online-accounts.nix | 2 +- .../services/desktops/gnome/gnome-remote-desktop.nix | 2 +- .../services/desktops/gnome/gnome-settings-daemon.nix | 2 +- .../modules/services/desktops/gnome/gnome-software.nix | 2 +- .../services/desktops/gnome/gnome-user-share.nix | 2 +- nixos/modules/services/desktops/gnome/localsearch.nix | 2 +- nixos/modules/services/desktops/gnome/rygel.nix | 2 +- nixos/modules/services/desktops/gnome/sushi.nix | 2 +- nixos/modules/services/desktops/gnome/tinysparql.nix | 2 +- nixos/modules/services/desktops/gvfs.nix | 2 +- nixos/modules/services/desktops/pipewire/pipewire.nix | 3 ++- nixos/modules/services/desktops/tumbler.nix | 2 +- nixos/modules/services/desktops/zeitgeist.nix | 2 +- .../services/display-managers/cosmic-greeter.nix | 2 +- .../modules/services/display-managers/dms-greeter.nix | 2 +- nixos/modules/services/display-managers/gdm.nix | 2 +- .../services/home-automation/home-assistant.nix | 2 +- nixos/modules/services/matrix/dendrite.nix | 2 +- nixos/modules/services/misc/forgejo.nix | 2 +- nixos/modules/services/misc/gitlab.nix | 2 +- nixos/modules/services/networking/epmd.nix | 2 +- nixos/modules/services/networking/jibri/default.nix | 2 +- nixos/modules/services/networking/jicofo.nix | 2 +- nixos/modules/services/networking/jigasi.nix | 2 +- .../modules/services/networking/jitsi-videobridge.nix | 2 +- nixos/modules/services/networking/modemmanager.nix | 2 +- nixos/modules/services/networking/networkmanager.nix | 5 ++--- nixos/modules/services/security/reaction.nix | 10 ++++------ nixos/modules/services/wayland/hypridle.nix | 2 +- nixos/modules/services/web-apps/jitsi-meet.nix | 2 +- nixos/modules/services/web-apps/nextcloud.nix | 2 +- nixos/modules/services/web-apps/peertube-runner.nix | 2 +- .../services/x11/desktop-managers/enlightenment.nix | 2 +- nixos/modules/services/x11/desktop-managers/lumina.nix | 2 +- nixos/modules/services/x11/desktop-managers/lxqt.nix | 2 +- nixos/modules/services/x11/desktop-managers/xfce.nix | 2 +- .../x11/display-managers/account-service-util.nix | 2 +- .../x11/display-managers/lightdm-greeters/lomiri.nix | 2 +- .../x11/display-managers/lightdm-greeters/pantheon.nix | 2 +- .../modules/services/x11/display-managers/lightdm.nix | 2 +- nixos/modules/services/x11/touchegg.nix | 2 +- nixos/modules/virtualisation/containers.nix | 2 +- nixos/modules/virtualisation/cri-o.nix | 2 +- nixos/modules/virtualisation/incus-agent.nix | 2 +- nixos/modules/virtualisation/incus-virtual-machine.nix | 2 +- nixos/modules/virtualisation/incus.nix | 2 +- nixos/modules/virtualisation/lxc-container.nix | 2 +- nixos/modules/virtualisation/lxc-image-metadata.nix | 2 +- nixos/modules/virtualisation/lxc-instance-common.nix | 2 +- nixos/modules/virtualisation/lxc.nix | 2 +- nixos/modules/virtualisation/lxcfs.nix | 2 +- nixos/modules/virtualisation/podman/default.nix | 2 +- .../podman/network-socket-ghostunnel.nix | 3 ++- nixos/modules/virtualisation/podman/network-socket.nix | 3 ++- nixos/modules/virtualisation/xen-dom0.nix | 2 +- 94 files changed, 102 insertions(+), 101 deletions(-) diff --git a/nixos/modules/config/vte.nix b/nixos/modules/config/vte.nix index 8ed746d4966d..f3ec58012b0d 100644 --- a/nixos/modules/config/vte.nix +++ b/nixos/modules/config/vte.nix @@ -22,7 +22,7 @@ in { meta = { - maintainers = lib.teams.gnome.members; + teams = [ lib.teams.gnome ]; }; options = { diff --git a/nixos/modules/config/xdg/autostart.nix b/nixos/modules/config/xdg/autostart.nix index 8fc3cb9920fa..8310c377d43b 100644 --- a/nixos/modules/config/xdg/autostart.nix +++ b/nixos/modules/config/xdg/autostart.nix @@ -1,7 +1,7 @@ { config, lib, ... }: { meta = { - maintainers = lib.teams.freedesktop.members; + teams = [ lib.teams.freedesktop ]; }; options = { diff --git a/nixos/modules/config/xdg/icons.nix b/nixos/modules/config/xdg/icons.nix index 7810c57ef386..41eee42767f4 100644 --- a/nixos/modules/config/xdg/icons.nix +++ b/nixos/modules/config/xdg/icons.nix @@ -6,7 +6,7 @@ }: { meta = { - maintainers = lib.teams.freedesktop.members; + teams = [ lib.teams.freedesktop ]; }; options = { diff --git a/nixos/modules/config/xdg/menus.nix b/nixos/modules/config/xdg/menus.nix index 6c05d49189ad..efbfdc5f2383 100644 --- a/nixos/modules/config/xdg/menus.nix +++ b/nixos/modules/config/xdg/menus.nix @@ -1,7 +1,7 @@ { config, lib, ... }: { meta = { - maintainers = lib.teams.freedesktop.members; + teams = [ lib.teams.freedesktop ]; }; options = { diff --git a/nixos/modules/config/xdg/mime.nix b/nixos/modules/config/xdg/mime.nix index 79955a03ef2f..59d62a32010b 100644 --- a/nixos/modules/config/xdg/mime.nix +++ b/nixos/modules/config/xdg/mime.nix @@ -13,7 +13,7 @@ in { meta = { - maintainers = lib.teams.freedesktop.members ++ [ ]; + teams = [ lib.teams.freedesktop ]; }; options = { diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix index 5fd9d7fdd1bb..6bc6ce5e33e7 100644 --- a/nixos/modules/config/xdg/portal.nix +++ b/nixos/modules/config/xdg/portal.nix @@ -32,7 +32,7 @@ in ]; meta = { - maintainers = teams.freedesktop.members; + teams = [ teams.freedesktop ]; }; options.xdg.portal = { diff --git a/nixos/modules/config/xdg/portals/lxqt.nix b/nixos/modules/config/xdg/portals/lxqt.nix index 77a5f144730d..423fcae1b2b1 100644 --- a/nixos/modules/config/xdg/portals/lxqt.nix +++ b/nixos/modules/config/xdg/portals/lxqt.nix @@ -10,7 +10,7 @@ let in { meta = { - maintainers = lib.teams.lxqt.members; + teams = [ lib.teams.lxqt ]; }; options.xdg.portal.lxqt = { diff --git a/nixos/modules/config/xdg/sounds.nix b/nixos/modules/config/xdg/sounds.nix index 8b5bb67e4109..e23ced7f76dd 100644 --- a/nixos/modules/config/xdg/sounds.nix +++ b/nixos/modules/config/xdg/sounds.nix @@ -6,7 +6,7 @@ }: { meta = { - maintainers = lib.teams.freedesktop.members; + teams = [ lib.teams.freedesktop ]; }; options = { diff --git a/nixos/modules/programs/dsearch.nix b/nixos/modules/programs/dsearch.nix index f1597189fa38..5e99478054d3 100644 --- a/nixos/modules/programs/dsearch.nix +++ b/nixos/modules/programs/dsearch.nix @@ -49,5 +49,5 @@ in systemd.user.services.dsearch.wantedBy = mkIf cfg.systemd.enable [ cfg.systemd.target ]; }; - meta.maintainers = lib.teams.danklinux.members; + meta.teams = [ lib.teams.danklinux ]; } diff --git a/nixos/modules/programs/geary.nix b/nixos/modules/programs/geary.nix index 0cbfe5b0605c..6c881dc8ccaf 100644 --- a/nixos/modules/programs/geary.nix +++ b/nixos/modules/programs/geary.nix @@ -11,7 +11,7 @@ let in { meta = { - maintainers = lib.teams.gnome.members; + teams = [ lib.teams.gnome ]; }; options = { diff --git a/nixos/modules/programs/gnome-disks.nix b/nixos/modules/programs/gnome-disks.nix index e6f93c6fdfe6..c6de53d844f3 100644 --- a/nixos/modules/programs/gnome-disks.nix +++ b/nixos/modules/programs/gnome-disks.nix @@ -10,7 +10,7 @@ { meta = { - maintainers = lib.teams.gnome.members; + teams = [ lib.teams.gnome ]; }; ###### interface diff --git a/nixos/modules/programs/gnome-terminal.nix b/nixos/modules/programs/gnome-terminal.nix index aea0e97c3634..f7ade6a184c4 100644 --- a/nixos/modules/programs/gnome-terminal.nix +++ b/nixos/modules/programs/gnome-terminal.nix @@ -16,7 +16,7 @@ in { meta = { - maintainers = lib.teams.gnome.members; + teams = [ lib.teams.gnome ]; }; options = { diff --git a/nixos/modules/programs/nm-applet.nix b/nixos/modules/programs/nm-applet.nix index 7aecbadd2ebf..a1c69f52f624 100644 --- a/nixos/modules/programs/nm-applet.nix +++ b/nixos/modules/programs/nm-applet.nix @@ -10,7 +10,7 @@ let in { meta = { - maintainers = lib.teams.freedesktop.members; + teams = [ lib.teams.freedesktop ]; }; options.programs.nm-applet = { diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix index 6fa66f681457..2ae30243c432 100644 --- a/nixos/modules/programs/steam.nix +++ b/nixos/modules/programs/steam.nix @@ -285,5 +285,5 @@ in ]; }; - meta.maintainers = lib.teams.steam.members; + meta.teams = [ lib.teams.steam ]; } diff --git a/nixos/modules/programs/thunar.nix b/nixos/modules/programs/thunar.nix index 76da7d94c67c..c565f3ef1cec 100644 --- a/nixos/modules/programs/thunar.nix +++ b/nixos/modules/programs/thunar.nix @@ -11,7 +11,7 @@ let in { meta = { - maintainers = lib.teams.xfce.members; + teams = [ lib.teams.xfce ]; }; options = { diff --git a/nixos/modules/programs/wayland/dms-shell.nix b/nixos/modules/programs/wayland/dms-shell.nix index 53f84c1a41b1..b24253b57c23 100644 --- a/nixos/modules/programs/wayland/dms-shell.nix +++ b/nixos/modules/programs/wayland/dms-shell.nix @@ -226,5 +226,5 @@ in hardware.graphics.enable = lib.mkDefault true; }; - meta.maintainers = lib.teams.danklinux.members; + meta.teams = [ lib.teams.danklinux ]; } diff --git a/nixos/modules/programs/wayland/hyprland.nix b/nixos/modules/programs/wayland/hyprland.nix index 44aedc3d248e..744f7af70fe5 100644 --- a/nixos/modules/programs/wayland/hyprland.nix +++ b/nixos/modules/programs/wayland/hyprland.nix @@ -130,5 +130,5 @@ in ] "Nvidia patches are no longer needed") ]; - meta.maintainers = lib.teams.hyprland.members; + meta.teams = [ lib.teams.hyprland ]; } diff --git a/nixos/modules/programs/wayland/hyprlock.nix b/nixos/modules/programs/wayland/hyprlock.nix index e05d8f826a4c..c1ba14ddf771 100644 --- a/nixos/modules/programs/wayland/hyprlock.nix +++ b/nixos/modules/programs/wayland/hyprlock.nix @@ -26,5 +26,5 @@ in security.pam.services.hyprlock = { }; }; - meta.maintainers = lib.teams.hyprland.members; + meta.teams = [ lib.teams.hyprland ]; } diff --git a/nixos/modules/programs/xfconf.nix b/nixos/modules/programs/xfconf.nix index cc9b6ddf7ac7..74a05cc1a798 100644 --- a/nixos/modules/programs/xfconf.nix +++ b/nixos/modules/programs/xfconf.nix @@ -11,7 +11,7 @@ let in { meta = { - maintainers = lib.teams.xfce.members; + teams = [ lib.teams.xfce ]; }; options = { diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix index 1b262e285e19..cb3a0010a758 100644 --- a/nixos/modules/security/acme/default.nix +++ b/nixos/modules/security/acme/default.nix @@ -1218,7 +1218,7 @@ in ]; meta = { - maintainers = lib.teams.acme.members; + teams = [ lib.teams.acme ]; doc = ./default.md; }; } diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index 6b059c2bd522..d446bb37a722 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -272,5 +272,5 @@ in }; }; - meta.maintainers = lib.teams.apparmor.members; + meta.teams = [ lib.teams.apparmor ]; } diff --git a/nixos/modules/services/cluster/rancher/default.nix b/nixos/modules/services/cluster/rancher/default.nix index 3ed0f75d081e..c511da5a62f5 100644 --- a/nixos/modules/services/cluster/rancher/default.nix +++ b/nixos/modules/services/cluster/rancher/default.nix @@ -962,5 +962,6 @@ in (import ./rke2.nix args) ]; - meta.maintainers = pkgs.rke2.meta.maintainers ++ lib.teams.k3s.members; + meta.teams = [ lib.teams.k3s ]; + meta.maintainers = pkgs.rke2.meta.maintainers; } diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index 42e88e9ddbe3..1cf585604b5e 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -313,5 +313,5 @@ in '') ]; - meta.maintainers = lib.teams.buildbot.members; + meta.teams = [ lib.teams.buildbot ]; } diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix index b1e1e7e254b5..c16720b0bf67 100644 --- a/nixos/modules/services/continuous-integration/buildbot/worker.nix +++ b/nixos/modules/services/continuous-integration/buildbot/worker.nix @@ -196,6 +196,6 @@ in }; }; - meta.maintainers = lib.teams.buildbot.members; + meta.teams = [ lib.teams.buildbot ]; } diff --git a/nixos/modules/services/continuous-integration/gitlab-runner/runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner/runner.nix index b95d30ceea4a..693229b87d97 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner/runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner/runner.nix @@ -893,5 +893,5 @@ in ) ]; - meta.maintainers = teams.gitlab.members; + meta.teams = [ teams.gitlab ]; } diff --git a/nixos/modules/services/desktop-managers/budgie.nix b/nixos/modules/services/desktop-managers/budgie.nix index 160ac04ecd6d..36f2946970bd 100644 --- a/nixos/modules/services/desktop-managers/budgie.nix +++ b/nixos/modules/services/desktop-managers/budgie.nix @@ -61,7 +61,7 @@ let notExcluded = pkg: utils.disablePackageByName pkg config.environment.budgie.excludePackages; in { - meta.maintainers = lib.teams.budgie.members; + meta.teams = [ lib.teams.budgie ]; imports = [ (lib.mkRenamedOptionModule diff --git a/nixos/modules/services/desktop-managers/cosmic.nix b/nixos/modules/services/desktop-managers/cosmic.nix index 26b185cc7742..c780a5164922 100644 --- a/nixos/modules/services/desktop-managers/cosmic.nix +++ b/nixos/modules/services/desktop-managers/cosmic.nix @@ -44,7 +44,7 @@ let ]; in { - meta.maintainers = lib.teams.cosmic.members; + meta.teams = [ lib.teams.cosmic ]; options = { services.desktopManager.cosmic = { diff --git a/nixos/modules/services/desktop-managers/gnome.nix b/nixos/modules/services/desktop-managers/gnome.nix index 5c11388eb97b..ddd13354612e 100644 --- a/nixos/modules/services/desktop-managers/gnome.nix +++ b/nixos/modules/services/desktop-managers/gnome.nix @@ -82,7 +82,7 @@ in { meta = { doc = ./gnome.md; - maintainers = lib.teams.gnome.members; + teams = [ lib.teams.gnome ]; }; imports = [ diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index b82c194be92c..1f40afb3732a 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -292,5 +292,5 @@ in }) ]; - meta.maintainers = lib.teams.lomiri.members; + meta.teams = [ lib.teams.lomiri ]; } diff --git a/nixos/modules/services/desktop-managers/pantheon.nix b/nixos/modules/services/desktop-managers/pantheon.nix index 1fe99c0f66ac..b9498a0adb83 100644 --- a/nixos/modules/services/desktop-managers/pantheon.nix +++ b/nixos/modules/services/desktop-managers/pantheon.nix @@ -25,7 +25,7 @@ in meta = { doc = ./pantheon.md; - maintainers = teams.pantheon.members; + teams = [ teams.pantheon ]; }; imports = [ diff --git a/nixos/modules/services/desktops/accountsservice.nix b/nixos/modules/services/desktops/accountsservice.nix index 758f7383ca63..fd328e357ce2 100644 --- a/nixos/modules/services/desktops/accountsservice.nix +++ b/nixos/modules/services/desktops/accountsservice.nix @@ -7,7 +7,7 @@ }: { meta = { - maintainers = lib.teams.freedesktop.members; + teams = [ lib.teams.freedesktop ]; }; ###### interface diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix index ffc48d6b9435..e44816cf2542 100644 --- a/nixos/modules/services/desktops/geoclue2.nix +++ b/nixos/modules/services/desktops/geoclue2.nix @@ -373,6 +373,6 @@ in }; meta = { - maintainers = [ ] ++ lib.teams.pantheon.members; + teams = [ lib.teams.pantheon ]; }; } diff --git a/nixos/modules/services/desktops/gnome/at-spi2-core.nix b/nixos/modules/services/desktops/gnome/at-spi2-core.nix index 293a3166b187..77070843e04e 100644 --- a/nixos/modules/services/desktops/gnome/at-spi2-core.nix +++ b/nixos/modules/services/desktops/gnome/at-spi2-core.nix @@ -10,7 +10,7 @@ { meta = { - maintainers = lib.teams.gnome.members; + teams = [ lib.teams.gnome ]; }; ###### interface diff --git a/nixos/modules/services/desktops/gnome/evolution-data-server.nix b/nixos/modules/services/desktops/gnome/evolution-data-server.nix index 539fcf25342e..4437be835604 100644 --- a/nixos/modules/services/desktops/gnome/evolution-data-server.nix +++ b/nixos/modules/services/desktops/gnome/evolution-data-server.nix @@ -10,7 +10,7 @@ { meta = { - maintainers = lib.teams.gnome.members; + teams = [ lib.teams.gnome ]; }; ###### interface diff --git a/nixos/modules/services/desktops/gnome/gcr-ssh-agent.nix b/nixos/modules/services/desktops/gnome/gcr-ssh-agent.nix index d88f1a618049..eb1bad3b15c4 100644 --- a/nixos/modules/services/desktops/gnome/gcr-ssh-agent.nix +++ b/nixos/modules/services/desktops/gnome/gcr-ssh-agent.nix @@ -13,7 +13,7 @@ let in { meta = { - maintainers = lib.teams.gnome.members; + teams = [ lib.teams.gnome ]; }; options = { diff --git a/nixos/modules/services/desktops/gnome/glib-networking.nix b/nixos/modules/services/desktops/gnome/glib-networking.nix index 558abca0aa31..048db8cf54a3 100644 --- a/nixos/modules/services/desktops/gnome/glib-networking.nix +++ b/nixos/modules/services/desktops/gnome/glib-networking.nix @@ -10,7 +10,7 @@ { meta = { - maintainers = lib.teams.gnome.members; + teams = [ lib.teams.gnome ]; }; ###### interface diff --git a/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix b/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix index 335ebc9a144d..17c1dd9045e8 100644 --- a/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix +++ b/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix @@ -16,7 +16,7 @@ in { meta = { - maintainers = teams.gnome.members; + teams = [ teams.gnome ]; }; options = { diff --git a/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix index 3df01b59738d..e72574795e65 100644 --- a/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix +++ b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix @@ -48,7 +48,7 @@ in { meta = { - maintainers = lib.teams.gnome.members; + teams = [ lib.teams.gnome ]; }; ###### interface diff --git a/nixos/modules/services/desktops/gnome/gnome-keyring.nix b/nixos/modules/services/desktops/gnome/gnome-keyring.nix index 550c6ba8eff5..9140d261a770 100644 --- a/nixos/modules/services/desktops/gnome/gnome-keyring.nix +++ b/nixos/modules/services/desktops/gnome/gnome-keyring.nix @@ -12,7 +12,7 @@ in { meta = { - maintainers = lib.teams.gnome.members; + teams = [ lib.teams.gnome ]; }; options = { diff --git a/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix b/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix index 920c4cf8133e..7ec9c7e06296 100644 --- a/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix +++ b/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix @@ -10,7 +10,7 @@ { meta = { - maintainers = lib.teams.gnome.members; + teams = [ lib.teams.gnome ]; }; ###### interface diff --git a/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix b/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix index 6e685557ecf0..958fbb546dc3 100644 --- a/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix +++ b/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix @@ -8,7 +8,7 @@ { meta = { - maintainers = lib.teams.gnome.members; + teams = [ lib.teams.gnome ]; }; ###### interface diff --git a/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix b/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix index 06d001ab8134..7d6f7f7f3478 100644 --- a/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix +++ b/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix @@ -16,7 +16,7 @@ in { meta = { - maintainers = lib.teams.gnome.members; + teams = [ lib.teams.gnome ]; }; ###### interface diff --git a/nixos/modules/services/desktops/gnome/gnome-software.nix b/nixos/modules/services/desktops/gnome/gnome-software.nix index ced2549a9e21..6bbe4d5487ab 100644 --- a/nixos/modules/services/desktops/gnome/gnome-software.nix +++ b/nixos/modules/services/desktops/gnome/gnome-software.nix @@ -7,7 +7,7 @@ { meta = { - maintainers = lib.teams.gnome.members; + teams = [ lib.teams.gnome ]; }; options = { diff --git a/nixos/modules/services/desktops/gnome/gnome-user-share.nix b/nixos/modules/services/desktops/gnome/gnome-user-share.nix index c6d0f723c047..eb869106c818 100644 --- a/nixos/modules/services/desktops/gnome/gnome-user-share.nix +++ b/nixos/modules/services/desktops/gnome/gnome-user-share.nix @@ -10,7 +10,7 @@ { meta = { - maintainers = lib.teams.gnome.members; + teams = [ lib.teams.gnome ]; }; ###### interface diff --git a/nixos/modules/services/desktops/gnome/localsearch.nix b/nixos/modules/services/desktops/gnome/localsearch.nix index 9160d1f06431..90018c557ec1 100644 --- a/nixos/modules/services/desktops/gnome/localsearch.nix +++ b/nixos/modules/services/desktops/gnome/localsearch.nix @@ -7,7 +7,7 @@ { meta = { - maintainers = lib.teams.gnome.members; + teams = [ lib.teams.gnome ]; }; imports = [ diff --git a/nixos/modules/services/desktops/gnome/rygel.nix b/nixos/modules/services/desktops/gnome/rygel.nix index e8a147ed6e76..410550b8990c 100644 --- a/nixos/modules/services/desktops/gnome/rygel.nix +++ b/nixos/modules/services/desktops/gnome/rygel.nix @@ -14,7 +14,7 @@ in { meta = { - maintainers = lib.teams.gnome.members; + teams = [ lib.teams.gnome ]; }; ###### interface diff --git a/nixos/modules/services/desktops/gnome/sushi.nix b/nixos/modules/services/desktops/gnome/sushi.nix index ea99c7ce30f0..d8aff2a7a0bd 100644 --- a/nixos/modules/services/desktops/gnome/sushi.nix +++ b/nixos/modules/services/desktops/gnome/sushi.nix @@ -10,7 +10,7 @@ { meta = { - maintainers = lib.teams.gnome.members; + teams = [ lib.teams.gnome ]; }; ###### interface diff --git a/nixos/modules/services/desktops/gnome/tinysparql.nix b/nixos/modules/services/desktops/gnome/tinysparql.nix index 551b5800e84c..3811780ddbc4 100644 --- a/nixos/modules/services/desktops/gnome/tinysparql.nix +++ b/nixos/modules/services/desktops/gnome/tinysparql.nix @@ -10,7 +10,7 @@ let in { meta = { - maintainers = lib.teams.gnome.members; + teams = [ lib.teams.gnome ]; }; imports = [ diff --git a/nixos/modules/services/desktops/gvfs.nix b/nixos/modules/services/desktops/gvfs.nix index 315141705546..004810327798 100644 --- a/nixos/modules/services/desktops/gvfs.nix +++ b/nixos/modules/services/desktops/gvfs.nix @@ -16,7 +16,7 @@ in { meta = { - maintainers = lib.teams.gnome.members; + teams = [ lib.teams.gnome ]; }; ###### interface diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix index 3f4cf2af05b2..77cdfa9a573e 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -85,7 +85,8 @@ let }; in { - meta.maintainers = teams.freedesktop.members ++ [ maintainers.k900 ]; + meta.teams = [ teams.freedesktop ]; + meta.maintainers = [ maintainers.k900 ]; ###### interface options = { diff --git a/nixos/modules/services/desktops/tumbler.nix b/nixos/modules/services/desktops/tumbler.nix index 12b0184d42c9..9143466fafef 100644 --- a/nixos/modules/services/desktops/tumbler.nix +++ b/nixos/modules/services/desktops/tumbler.nix @@ -18,7 +18,7 @@ in ]; meta = { - maintainers = [ ] ++ lib.teams.pantheon.members; + teams = [ lib.teams.pantheon ]; }; ###### interface diff --git a/nixos/modules/services/desktops/zeitgeist.nix b/nixos/modules/services/desktops/zeitgeist.nix index 227287dd2377..fe065c4a4d7a 100644 --- a/nixos/modules/services/desktops/zeitgeist.nix +++ b/nixos/modules/services/desktops/zeitgeist.nix @@ -8,7 +8,7 @@ { meta = { - maintainers = [ ] ++ lib.teams.pantheon.members; + teams = [ lib.teams.pantheon ]; }; ###### interface diff --git a/nixos/modules/services/display-managers/cosmic-greeter.nix b/nixos/modules/services/display-managers/cosmic-greeter.nix index 8886a4766e4e..93320b9be90a 100644 --- a/nixos/modules/services/display-managers/cosmic-greeter.nix +++ b/nixos/modules/services/display-managers/cosmic-greeter.nix @@ -16,7 +16,7 @@ let in { - meta.maintainers = lib.teams.cosmic.members; + meta.teams = [ lib.teams.cosmic ]; options.services.displayManager.cosmic-greeter = { enable = lib.mkEnableOption "COSMIC greeter"; diff --git a/nixos/modules/services/display-managers/dms-greeter.nix b/nixos/modules/services/display-managers/dms-greeter.nix index d049daa9b24f..abdd6e2ddf3b 100644 --- a/nixos/modules/services/display-managers/dms-greeter.nix +++ b/nixos/modules/services/display-managers/dms-greeter.nix @@ -321,5 +321,5 @@ in services.libinput.enable = mkDefault true; }; - meta.maintainers = lib.teams.danklinux.members; + meta.teams = [ lib.teams.danklinux ]; } diff --git a/nixos/modules/services/display-managers/gdm.nix b/nixos/modules/services/display-managers/gdm.nix index e46c8cf72fe7..9fc92e91018c 100644 --- a/nixos/modules/services/display-managers/gdm.nix +++ b/nixos/modules/services/display-managers/gdm.nix @@ -105,7 +105,7 @@ in ]; meta = { - maintainers = lib.teams.gnome.members; + teams = [ lib.teams.gnome ]; }; ###### interface diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index dc1900f52c1e..eb4b475d4187 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -171,7 +171,7 @@ in meta = { buildDocsInSandbox = false; - maintainers = lib.teams.home-assistant.members; + teams = [ lib.teams.home-assistant ]; }; options.services.home-assistant = { diff --git a/nixos/modules/services/matrix/dendrite.nix b/nixos/modules/services/matrix/dendrite.nix index 2c31266457df..302bd42b5e37 100644 --- a/nixos/modules/services/matrix/dendrite.nix +++ b/nixos/modules/services/matrix/dendrite.nix @@ -341,5 +341,5 @@ in }; }; }; - meta.maintainers = lib.teams.matrix.members; + meta.teams = [ lib.teams.matrix ]; } diff --git a/nixos/modules/services/misc/forgejo.nix b/nixos/modules/services/misc/forgejo.nix index 9b85fc8dc133..6834ca2008ea 100644 --- a/nixos/modules/services/misc/forgejo.nix +++ b/nixos/modules/services/misc/forgejo.nix @@ -849,5 +849,5 @@ in }; meta.doc = ./forgejo.md; - meta.maintainers = lib.teams.forgejo.members; + meta.teams = [ lib.teams.forgejo ]; } diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index c353caed9e03..0601454e9b2e 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -1911,5 +1911,5 @@ in }; meta.doc = ./gitlab.md; - meta.maintainers = teams.gitlab.members; + meta.teams = [ teams.gitlab ]; } diff --git a/nixos/modules/services/networking/epmd.nix b/nixos/modules/services/networking/epmd.nix index c17a7c974fa7..d2aceb5a9bb1 100644 --- a/nixos/modules/services/networking/epmd.nix +++ b/nixos/modules/services/networking/epmd.nix @@ -63,5 +63,5 @@ in }; }; - meta.maintainers = lib.teams.beam.members; + meta.teams = [ lib.teams.beam ]; } diff --git a/nixos/modules/services/networking/jibri/default.nix b/nixos/modules/services/networking/jibri/default.nix index e07bf5131a92..861a6713b017 100644 --- a/nixos/modules/services/networking/jibri/default.nix +++ b/nixos/modules/services/networking/jibri/default.nix @@ -444,5 +444,5 @@ in }; }; - meta.maintainers = lib.teams.jitsi.members; + meta.teams = [ lib.teams.jitsi ]; } diff --git a/nixos/modules/services/networking/jicofo.nix b/nixos/modules/services/networking/jicofo.nix index 9d0fbfd74081..9c2139eff1ab 100644 --- a/nixos/modules/services/networking/jicofo.nix +++ b/nixos/modules/services/networking/jicofo.nix @@ -166,5 +166,5 @@ in lib.mkDefault "${pkgs.jicofo}/etc/jitsi/jicofo/logging.properties-journal"; }; - meta.maintainers = lib.teams.jitsi.members; + meta.teams = [ lib.teams.jitsi ]; } diff --git a/nixos/modules/services/networking/jigasi.nix b/nixos/modules/services/networking/jigasi.nix index 54b2f36685f6..c6bcbd28dead 100644 --- a/nixos/modules/services/networking/jigasi.nix +++ b/nixos/modules/services/networking/jigasi.nix @@ -243,5 +243,5 @@ in lib.mkDefault "${stateDir}/logging.properties-journal"; }; - meta.maintainers = lib.teams.jitsi.members; + meta.teams = [ lib.teams.jitsi ]; } diff --git a/nixos/modules/services/networking/jitsi-videobridge.nix b/nixos/modules/services/networking/jitsi-videobridge.nix index a55760d5cae2..bd9692e6338a 100644 --- a/nixos/modules/services/networking/jitsi-videobridge.nix +++ b/nixos/modules/services/networking/jitsi-videobridge.nix @@ -331,5 +331,5 @@ in ]; }; - meta.maintainers = lib.teams.jitsi.members; + meta.teams = [ lib.teams.jitsi ]; } diff --git a/nixos/modules/services/networking/modemmanager.nix b/nixos/modules/services/networking/modemmanager.nix index fefee7a448eb..604340fd0748 100644 --- a/nixos/modules/services/networking/modemmanager.nix +++ b/nixos/modules/services/networking/modemmanager.nix @@ -9,7 +9,7 @@ let in { meta = { - maintainers = lib.teams.freedesktop.members; + teams = [ lib.teams.freedesktop ]; }; options = with lib; { diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 1f3773c70b00..2cb3532471c8 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -142,9 +142,8 @@ in { meta = { - maintainers = teams.freedesktop.members ++ [ - lib.maintainers.frontear - ]; + teams = [ lib.teams.freedesktop ]; + maintainers = [ lib.maintainers.frontear ]; }; ###### interface diff --git a/nixos/modules/services/security/reaction.nix b/nixos/modules/services/security/reaction.nix index 039e507ae57f..ba0cc6581dbc 100644 --- a/nixos/modules/services/security/reaction.nix +++ b/nixos/modules/services/security/reaction.nix @@ -299,10 +299,8 @@ in environment.systemPackages = [ cfg.package ]; }; - meta.maintainers = - with lib.maintainers; - [ - ppom - ] - ++ lib.teams.ngi.members; + meta.teams = [ lib.teams.ngi ]; + meta.maintainers = with lib.maintainers; [ + ppom + ]; } diff --git a/nixos/modules/services/wayland/hypridle.nix b/nixos/modules/services/wayland/hypridle.nix index 4ccb126b56f2..29e77c6be34f 100644 --- a/nixos/modules/services/wayland/hypridle.nix +++ b/nixos/modules/services/wayland/hypridle.nix @@ -28,5 +28,5 @@ in }; }; - meta.maintainers = lib.teams.hyprland.members; + meta.teams = [ lib.teams.hyprland ]; } diff --git a/nixos/modules/services/web-apps/jitsi-meet.nix b/nixos/modules/services/web-apps/jitsi-meet.nix index b7993cfc46dc..18da068fa5c6 100644 --- a/nixos/modules/services/web-apps/jitsi-meet.nix +++ b/nixos/modules/services/web-apps/jitsi-meet.nix @@ -756,5 +756,5 @@ in }; meta.doc = ./jitsi-meet.md; - meta.maintainers = lib.teams.jitsi.members; + meta.teams = [ lib.teams.jitsi ]; } diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index cff0f6ff1872..d069480f3d70 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -1774,5 +1774,5 @@ in ); meta.doc = ./nextcloud.md; - meta.maintainers = lib.teams.nextcloud.members; + meta.teams = [ lib.teams.nextcloud ]; } diff --git a/nixos/modules/services/web-apps/peertube-runner.nix b/nixos/modules/services/web-apps/peertube-runner.nix index 9b126b7fa97c..4756569d9d9c 100644 --- a/nixos/modules/services/web-apps/peertube-runner.nix +++ b/nixos/modules/services/web-apps/peertube-runner.nix @@ -252,5 +252,5 @@ in }; }; - meta.maintainers = lib.teams.ngi.members; + meta.teams = [ lib.teams.ngi ]; } diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index bc5c2b0273e7..df132f95e95c 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -25,7 +25,7 @@ in { meta = { - maintainers = teams.enlightenment.members; + teams = [ teams.enlightenment ]; }; imports = [ diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixos/modules/services/x11/desktop-managers/lumina.nix index 74fabced3af3..a0cd79f7aae7 100644 --- a/nixos/modules/services/x11/desktop-managers/lumina.nix +++ b/nixos/modules/services/x11/desktop-managers/lumina.nix @@ -16,7 +16,7 @@ in { meta = { - maintainers = teams.lumina.members; + teams = [ teams.lumina ]; }; options = { diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix index 1ccaa28f8642..8948eff23d46 100644 --- a/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -15,7 +15,7 @@ in { meta = { - maintainers = teams.lxqt.members; + teams = [ teams.lxqt ]; }; options = { diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 941f06ae6edf..9c5b1d0d0fee 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -15,7 +15,7 @@ let in { meta = { - maintainers = teams.xfce.members; + teams = [ teams.xfce ]; }; imports = [ diff --git a/nixos/modules/services/x11/display-managers/account-service-util.nix b/nixos/modules/services/x11/display-managers/account-service-util.nix index 0f4d1c0729ad..697d5b9e940d 100644 --- a/nixos/modules/services/x11/display-managers/account-service-util.nix +++ b/nixos/modules/services/x11/display-managers/account-service-util.nix @@ -40,6 +40,6 @@ python3.pkgs.buildPythonApplication { ''; meta = { - maintainers = [ ] ++ lib.teams.pantheon.members; + teams = [ lib.teams.pantheon ]; }; } diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/lomiri.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/lomiri.nix index 387f485e2fea..d8db7706d89f 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/lomiri.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/lomiri.nix @@ -13,7 +13,7 @@ let in { - meta.maintainers = lib.teams.lomiri.members; + meta.teams = [ lib.teams.lomiri ]; options = { services.xserver.displayManager.lightdm.greeters.lomiri = { diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix index 05e03befdad6..3c61ba1556c8 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix @@ -16,7 +16,7 @@ let in { meta = { - maintainers = [ ] ++ lib.teams.pantheon.members; + teams = [ lib.teams.pantheon ]; }; options = { diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 1ace9c1b8c1f..467207ecd92b 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -73,7 +73,7 @@ let in { meta = { - maintainers = [ ] ++ lib.teams.pantheon.members; + teams = [ lib.teams.pantheon ]; }; # Note: the order in which lightdm greeter modules are imported diff --git a/nixos/modules/services/x11/touchegg.nix b/nixos/modules/services/x11/touchegg.nix index def3dac738e0..cb1b9eb4adc8 100644 --- a/nixos/modules/services/x11/touchegg.nix +++ b/nixos/modules/services/x11/touchegg.nix @@ -13,7 +13,7 @@ let in { meta = { - maintainers = teams.pantheon.members; + teams = [ teams.pantheon ]; }; ###### interface diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index a0c7e826223d..6386a57079f2 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -13,7 +13,7 @@ let in { meta = { - maintainers = [ ] ++ lib.teams.podman.members; + teams = [ lib.teams.podman ]; }; options.virtualisation.containers = { diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index ddaccf8199a1..68cfc2ccaad9 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -21,7 +21,7 @@ let in { meta = { - maintainers = teams.podman.members; + teams = [ teams.podman ]; }; options.virtualisation.cri-o = { diff --git a/nixos/modules/virtualisation/incus-agent.nix b/nixos/modules/virtualisation/incus-agent.nix index bfb9eeb75d33..34c08e8ee014 100644 --- a/nixos/modules/virtualisation/incus-agent.nix +++ b/nixos/modules/virtualisation/incus-agent.nix @@ -10,7 +10,7 @@ let in { meta = { - maintainers = lib.teams.lxc.members; + teams = [ lib.teams.lxc ]; }; options = { diff --git a/nixos/modules/virtualisation/incus-virtual-machine.nix b/nixos/modules/virtualisation/incus-virtual-machine.nix index 8899fc34bb85..d714b7fdc36c 100644 --- a/nixos/modules/virtualisation/incus-virtual-machine.nix +++ b/nixos/modules/virtualisation/incus-virtual-machine.nix @@ -10,7 +10,7 @@ let in { meta = { - maintainers = lib.teams.lxc.members; + teams = [ lib.teams.lxc ]; }; imports = [ diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix index 7101407fb5bc..1b8908d0d3d6 100644 --- a/nixos/modules/virtualisation/incus.nix +++ b/nixos/modules/virtualisation/incus.nix @@ -176,7 +176,7 @@ let in { meta = { - maintainers = lib.teams.lxc.members; + teams = [ lib.teams.lxc ]; }; options = { diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix index a6964b8b2c9a..ec206d6a5ece 100644 --- a/nixos/modules/virtualisation/lxc-container.nix +++ b/nixos/modules/virtualisation/lxc-container.nix @@ -7,7 +7,7 @@ { meta = { - maintainers = lib.teams.lxc.members; + teams = [ lib.teams.lxc ]; }; imports = [ diff --git a/nixos/modules/virtualisation/lxc-image-metadata.nix b/nixos/modules/virtualisation/lxc-image-metadata.nix index d27f476a59b8..1ac1bd2e4e5e 100644 --- a/nixos/modules/virtualisation/lxc-image-metadata.nix +++ b/nixos/modules/virtualisation/lxc-image-metadata.nix @@ -71,7 +71,7 @@ in ]; meta = { - maintainers = lib.teams.lxc.members; + teams = [ lib.teams.lxc ]; }; options = { diff --git a/nixos/modules/virtualisation/lxc-instance-common.nix b/nixos/modules/virtualisation/lxc-instance-common.nix index ff27b1931f8b..d3056be46fe3 100644 --- a/nixos/modules/virtualisation/lxc-instance-common.nix +++ b/nixos/modules/virtualisation/lxc-instance-common.nix @@ -2,7 +2,7 @@ { meta = { - maintainers = lib.teams.lxc.members; + teams = [ lib.teams.lxc ]; }; imports = [ diff --git a/nixos/modules/virtualisation/lxc.nix b/nixos/modules/virtualisation/lxc.nix index 903006a6dabf..eca2eb8115ab 100644 --- a/nixos/modules/virtualisation/lxc.nix +++ b/nixos/modules/virtualisation/lxc.nix @@ -13,7 +13,7 @@ in { meta = { - maintainers = lib.teams.lxc.members; + teams = [ lib.teams.lxc ]; }; options.virtualisation.lxc = { diff --git a/nixos/modules/virtualisation/lxcfs.nix b/nixos/modules/virtualisation/lxcfs.nix index f7347af19148..711bcf655d22 100644 --- a/nixos/modules/virtualisation/lxcfs.nix +++ b/nixos/modules/virtualisation/lxcfs.nix @@ -12,7 +12,7 @@ let in { meta = { - maintainers = lib.teams.lxc.members; + teams = [ lib.teams.lxc ]; }; ###### interface diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix index 63cc4c5e3f63..c0acbe4cac3d 100644 --- a/nixos/modules/virtualisation/podman/default.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -63,7 +63,7 @@ in ]; meta = { - maintainers = lib.teams.podman.members; + teams = [ lib.teams.podman ]; }; options.virtualisation.podman = { diff --git a/nixos/modules/virtualisation/podman/network-socket-ghostunnel.nix b/nixos/modules/virtualisation/podman/network-socket-ghostunnel.nix index d5b4bef5f0d9..962ca39b1598 100644 --- a/nixos/modules/virtualisation/podman/network-socket-ghostunnel.nix +++ b/nixos/modules/virtualisation/podman/network-socket-ghostunnel.nix @@ -35,5 +35,6 @@ in }; - meta.maintainers = lib.teams.podman.members ++ [ lib.maintainers.roberth ]; + meta.teams = [ lib.teams.podman ]; + meta.maintainers = [ lib.maintainers.roberth ]; } diff --git a/nixos/modules/virtualisation/podman/network-socket.nix b/nixos/modules/virtualisation/podman/network-socket.nix index 39434216d780..d3a49d204f8a 100644 --- a/nixos/modules/virtualisation/podman/network-socket.nix +++ b/nixos/modules/virtualisation/podman/network-socket.nix @@ -95,5 +95,6 @@ in networking.firewall.allowedTCPPorts = lib.optional (cfg.enable && cfg.openFirewall) cfg.port; }; - meta.maintainers = lib.teams.podman.members ++ [ lib.maintainers.roberth ]; + meta.teams = [ lib.teams.podman ]; + meta.maintainers = [ lib.maintainers.roberth ]; } diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index bbd6bfb57751..2cc939631f84 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -937,6 +937,6 @@ in }; meta = { doc = ./xen.md; - maintainers = teams.xen.members; + teams = [ teams.xen ]; }; } From c0d434bf4025fc81b6adb873e8e666d0a4c66d5a Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 24 Feb 2026 10:54:26 +0100 Subject: [PATCH 096/429] ci/eval/compare/maintainers.nix: Improve interface and document --- ci/eval/compare/default.nix | 11 ++++--- ci/eval/compare/maintainers.nix | 52 ++++++++++++++++++++------------- 2 files changed, 36 insertions(+), 27 deletions(-) diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix index f1473367a7d9..ed1129d75f2e 100644 --- a/ci/eval/compare/default.nix +++ b/ci/eval/compare/default.nix @@ -123,9 +123,7 @@ let # - values: lists of `packagePlatformPath`s diffAttrs = builtins.fromJSON (builtins.readFile "${combined}/combined-diff.json"); - changedPackagePlatformAttrs = convertToPackagePlatformAttrs diffAttrs.changed; rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs diffAttrs.rebuilds; - removedPackagePlatformAttrs = convertToPackagePlatformAttrs diffAttrs.removed; changed-paths = let @@ -162,9 +160,10 @@ let inherit (callPackage ./maintainers.nix { - changedattrs = lib.attrNames (lib.groupBy (a: a.name) changedPackagePlatformAttrs); - changedpathsjson = touchedFilesJson; - removedattrs = lib.attrNames (lib.groupBy (a: a.name) removedPackagePlatformAttrs); + affectedAttrPaths = map (a: a.packagePath) ( + convertToPackagePlatformAttrs (diffAttrs.changed ++ diffAttrs.removed) + ); + changedFiles = lib.importJSON touchedFilesJson; }) users teams @@ -181,7 +180,7 @@ runCommand "compare" ]; users = builtins.toJSON users; teams = builtins.toJSON teams; - packages = builtins.toJSON packages; + packages = builtins.toJSON (lib.map (lib.concatStringsSep ".") packages); passAsFile = [ "users" "teams" diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix index 73c36c7f9196..1d83ecfd4258 100644 --- a/ci/eval/compare/maintainers.nix +++ b/ci/eval/compare/maintainers.nix @@ -1,18 +1,29 @@ +# Figure out which maintainers (users/teams) are relevant for a PR: +# - All maintainers that can be linked directly to changedFiles +# - Maintainers of affectedAttrPaths if a file directly related to the attribute is in changedFiles +# +# Files and attributes are linked in various ways: +# - pkgs/by-name//* is linked to pkgs. +# - The file position of various attributes of pkgs. +# - Explicitly specified file positions in derivations { - lib, - changedattrs, - changedpathsjson, - removedattrs, -}: -let - pkgs = import ../../.. { + # Files that were changed + # Type: ListOf (Nixpkgs-root-relative path) + changedFiles, + # Attributes whose value was affected by the change + # Type: ListOf (ListOf String) + affectedAttrPaths, + + pkgs ? import ../../.. { system = "x86_64-linux"; # We should never try to ping maintainers through package aliases, this can only lead to errors. # One example case is, where an attribute is a throw alias, but then re-introduced in a PR. # This would trigger the throw. By disabling aliases, we can fallback gracefully below. config.allowAliases = false; - }; - + }, + lib, +}: +let nixpkgsRoot = toString ../../.. + "/"; stripNixpkgsRootFromKeys = lib.mapAttrs' ( file: value: lib.nameValuePair (lib.removePrefix nixpkgsRoot file) value @@ -24,37 +35,35 @@ let fileMaintainers = stripNixpkgsRootFromKeys moduleMeta.maintainers; fileTeams = stripNixpkgsRootFromKeys moduleMeta.teams; - changedpaths = lib.importJSON changedpathsjson; - # Extract attributes that changed from by-name paths. # This allows pinging reviewers for pure refactors. - touchedattrs = lib.pipe changedpaths [ + touchedattrs = lib.pipe changedFiles [ (lib.filter (changed: lib.hasPrefix "pkgs/by-name/" changed && changed != "pkgs/by-name/README.md")) (map (lib.splitString "/")) (map (path: lib.elemAt path 3)) + (map lib.singleton) lib.unique ]; - anyMatchingFile = filename: lib.any (lib.hasPrefix filename) changedpaths; + anyMatchingFile = filename: lib.any (lib.hasPrefix filename) changedFiles; anyMatchingFiles = files: lib.any anyMatchingFile files; sharded = name: "${lib.substring 0 2 name}/${name}"; - attrsWithMaintainers = lib.pipe (changedattrs ++ removedattrs ++ touchedattrs) [ + attrsWithMaintainers = lib.pipe (affectedAttrPaths ++ touchedattrs) [ # An attribute can appear in changed/removed *and* touched lib.unique (map ( - name: + path: let - path = lib.splitString "." name; # Some packages might be reported as changed on a different platform, but # not even have an attribute on the platform the maintainers are requested on. # Fallback to `null` for these to filter them out below. package = lib.attrByPath path null pkgs; in { - inherit name package; + inherit path package; # Adds all files in by-name to each package, no matter whether they are discoverable # via meta attributes below. For example, this allows pinging maintainers for # updates to .json files. @@ -114,7 +123,7 @@ let teamPings = context: team: - if team ? github then + if team ? githubId then [ { type = "team"; @@ -128,13 +137,14 @@ let maintainersToPing = lib.concatMap ( pkg: - userPings { attr = pkg.name; } pkg.users ++ lib.concatMap (teamPings { pkg = pkg.name; }) pkg.teams + userPings { attrPath = pkg.path; } pkg.users + ++ lib.concatMap (teamPings { attrPath = pkg.path; }) pkg.teams ) attrsWithModifiedFiles ++ lib.concatMap ( path: userPings { file = path; } (fileMaintainers.${path} or [ ]) ++ lib.concatMap (teamPings { file = path; }) (fileTeams.${path} or [ ]) - ) changedpaths; + ) changedFiles; byType = lib.groupBy (ping: ping.type) maintainersToPing; @@ -150,5 +160,5 @@ in { users = byUser; teams = byTeam; - packages = lib.catAttrs "name" attrsWithModifiedFiles; + packages = lib.catAttrs "path" attrsWithModifiedFiles; } From ee016757f578ffb2cc01832f9386dfda3188e5df Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 24 Feb 2026 10:54:43 +0100 Subject: [PATCH 097/429] ci/eval/compare/maintainers.nix: Add tests --- ci/eval/compare/maintainers.nix | 5 + ci/eval/compare/test.nix | 228 ++++++++++++++++++++++++++++++++ 2 files changed, 233 insertions(+) create mode 100644 ci/eval/compare/test.nix diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix index 1d83ecfd4258..8c594b9532df 100644 --- a/ci/eval/compare/maintainers.nix +++ b/ci/eval/compare/maintainers.nix @@ -6,6 +6,11 @@ # - pkgs/by-name//* is linked to pkgs. # - The file position of various attributes of pkgs. # - Explicitly specified file positions in derivations +# +# Test with +# nix-instantiate --eval --strict --json test.nix -A result | jq +# +# Empty list as an output means success { # Files that were changed # Type: ListOf (Nixpkgs-root-relative path) diff --git a/ci/eval/compare/test.nix b/ci/eval/compare/test.nix new file mode 100644 index 000000000000..323d71d87680 --- /dev/null +++ b/ci/eval/compare/test.nix @@ -0,0 +1,228 @@ +{ + pkgs ? import ../../.. { + config = { }; + overlays = [ ]; + }, + lib ? pkgs.lib, +}: +let + fun = import ./maintainers.nix; + + mockPkgs = + { + packages ? [ ], + modules ? [ ], + githubTeams ? true, + }: + lib.updateManyAttrsByPath + (lib.imap0 (i: p: { + path = p; + update = _: { + meta.maintainersPosition.file = lib.concatStringsSep "/" p; + meta.nonTeamMaintainers = [ { githubId = i; } ]; + meta.teams = + if githubTeams then [ { githubId = i + 100; } ] else [ { members = [ { githubId = i + 100; } ]; } ]; + }; + }) packages) + { + nixos = + { }: + { + config.meta.maintainers = lib.listToAttrs ( + lib.imap0 (i: m: lib.nameValuePair m [ { githubId = i; } ]) modules + ); + config.meta.teams = lib.listToAttrs ( + lib.imap0 ( + i: m: + lib.nameValuePair m ( + if githubTeams then [ { githubId = i + 100; } ] else [ { members = [ { githubId = i + 100; } ]; } ] + ) + ) modules + ); + }; + }; + + tests = { + testEmpty = { + expr = fun { + pkgs = mockPkgs { }; + inherit lib; + changedFiles = [ ]; + affectedAttrPaths = [ ]; + }; + expected = { + packages = [ ]; + teams = { }; + users = { }; + }; + }; + testNonExistentAffected = { + expr = fun { + pkgs = mockPkgs { }; + inherit lib; + changedFiles = [ "a" ]; + affectedAttrPaths = [ [ "b" ] ]; + }; + expected = { + packages = [ ]; + teams = { }; + users = { }; + }; + }; + testIrrelevantAffected = { + expr = fun { + pkgs = mockPkgs { + packages = [ [ "b" ] ]; + }; + inherit lib; + changedFiles = [ "a" ]; + affectedAttrPaths = [ [ "b" ] ]; + }; + expected = { + packages = [ ]; + teams = { }; + users = { }; + }; + }; + testRelevantAffected = { + expr = fun { + pkgs = mockPkgs { + packages = [ [ "b" ] ]; + }; + inherit lib; + # Also tests that subpaths work + changedFiles = [ "b/c" ]; + affectedAttrPaths = [ [ "b" ] ]; + }; + expected = { + packages = [ [ "b" ] ]; + teams."100" = [ + { attrPath = [ "b" ]; } + ]; + users."0" = [ + { attrPath = [ "b" ]; } + ]; + }; + }; + testRelevantAffectedNonGitHub = { + expr = fun { + pkgs = mockPkgs { + packages = [ [ "b" ] ]; + githubTeams = false; + }; + inherit lib; + changedFiles = [ "b/c" ]; + affectedAttrPaths = [ [ "b" ] ]; + }; + expected = { + packages = [ [ "b" ] ]; + teams = { }; + users."0" = [ + { attrPath = [ "b" ]; } + ]; + users."100" = [ + { attrPath = [ "b" ]; } + ]; + }; + }; + testByNameChanged = { + expr = fun { + pkgs = mockPkgs { + packages = [ [ "hello" ] ]; + }; + inherit lib; + changedFiles = [ "pkgs/by-name/he/hello/sources.json" ]; + affectedAttrPaths = [ ]; + }; + expected = { + packages = [ [ "hello" ] ]; + teams."100" = [ + { attrPath = [ "hello" ]; } + ]; + users."0" = [ + { attrPath = [ "hello" ]; } + ]; + }; + }; + testByNameReadmeChanged = { + expr = fun { + pkgs = mockPkgs { + packages = [ [ "hello" ] ]; + }; + inherit lib; + changedFiles = [ "pkgs/by-name/README.md" ]; + affectedAttrPaths = [ ]; + }; + expected = { + packages = [ ]; + teams = { }; + users = { }; + }; + }; + testNoDuplicates = { + expr = fun { + pkgs = mockPkgs { + packages = [ [ "hello" ] ]; + }; + inherit lib; + changedFiles = [ + "hello" + "pkgs/by-name/he/hello/sources.json" + ]; + affectedAttrPaths = [ [ "hello" ] ]; + }; + expected = { + packages = [ [ "hello" ] ]; + teams."100" = [ + { attrPath = [ "hello" ]; } + ]; + users."0" = [ + { attrPath = [ "hello" ]; } + ]; + }; + }; + testModuleMaintainers = { + expr = fun { + pkgs = mockPkgs { + modules = [ "a" ]; + }; + inherit lib; + changedFiles = [ "a" ]; + affectedAttrPaths = [ ]; + }; + expected = { + packages = [ ]; + teams."100" = [ + { file = "a"; } + ]; + users."0" = [ + { file = "a"; } + ]; + }; + }; + testModuleMaintainersNonGithub = { + expr = fun { + pkgs = mockPkgs { + modules = [ "a" ]; + githubTeams = false; + }; + inherit lib; + changedFiles = [ "a" ]; + affectedAttrPaths = [ ]; + }; + expected = { + packages = [ ]; + teams = { }; + users."100" = [ + { file = "a"; } + ]; + users."0" = [ + { file = "a"; } + ]; + }; + }; + }; +in +{ + result = lib.runTests tests; +} From 7fe44998ab73c1620e0410c22bd831ee13fcef80 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 24 Feb 2026 11:03:55 +0100 Subject: [PATCH 098/429] ci/eval/compare/maintainers.nix: Refactor Was more complicated than needed. Tests still succeed --- ci/eval/compare/maintainers.nix | 107 ++++++++++++++------------------ 1 file changed, 45 insertions(+), 62 deletions(-) diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix index 8c594b9532df..903e42f733f6 100644 --- a/ci/eval/compare/maintainers.nix +++ b/ci/eval/compare/maintainers.nix @@ -25,6 +25,7 @@ # One example case is, where an attribute is a throw alias, but then re-introduced in a PR. # This would trigger the throw. By disabling aliases, we can fallback gracefully below. config.allowAliases = false; + overlays = [ ]; }, lib, }: @@ -37,59 +38,17 @@ let moduleMeta = (pkgs.nixos { }).config.meta; # Currently just nixos module maintainers, but in the future we can use this for code owners too - fileMaintainers = stripNixpkgsRootFromKeys moduleMeta.maintainers; + fileUsers = stripNixpkgsRootFromKeys moduleMeta.maintainers; fileTeams = stripNixpkgsRootFromKeys moduleMeta.teams; - # Extract attributes that changed from by-name paths. - # This allows pinging reviewers for pure refactors. - touchedattrs = lib.pipe changedFiles [ - (lib.filter (changed: lib.hasPrefix "pkgs/by-name/" changed && changed != "pkgs/by-name/README.md")) - (map (lib.splitString "/")) - (map (path: lib.elemAt path 3)) - (map lib.singleton) - lib.unique - ]; - anyMatchingFile = filename: lib.any (lib.hasPrefix filename) changedFiles; anyMatchingFiles = files: lib.any anyMatchingFile files; - sharded = name: "${lib.substring 0 2 name}/${name}"; - - attrsWithMaintainers = lib.pipe (affectedAttrPaths ++ touchedattrs) [ - # An attribute can appear in changed/removed *and* touched - lib.unique - (map ( - path: - let - # Some packages might be reported as changed on a different platform, but - # not even have an attribute on the platform the maintainers are requested on. - # Fallback to `null` for these to filter them out below. - package = lib.attrByPath path null pkgs; - in - { - inherit path package; - # Adds all files in by-name to each package, no matter whether they are discoverable - # via meta attributes below. For example, this allows pinging maintainers for - # updates to .json files. - # TODO: Support by-name package sets. - filenames = lib.optional (lib.length path == 1) "pkgs/by-name/${sharded (lib.head path)}/"; - # meta.maintainers also contains all individual team members. - # We only want to ping individuals if they're added individually as maintainers, not via teams. - users = package.meta.nonTeamMaintainers or [ ]; - teams = package.meta.teams or [ ]; - } - )) - # No need to match up packages without maintainers with their files. - # This also filters out attributes where `package = null`, which is the - # case for libintl, for example. - (lib.filter (pkg: pkg.users != [ ] || pkg.teams != [ ])) - ]; - relevantFilenames = drv: (lib.unique ( - map (pos: lib.removePrefix "${toString ../../..}/" pos.file) ( + map (pos: lib.removePrefix nixpkgsRoot pos.file) ( lib.filter (x: x != null) [ (drv.meta.maintainersPosition or null) (drv.meta.teamsPosition or null) @@ -112,11 +71,47 @@ let ) )); - attrsWithFilenames = map ( - pkg: pkg // { filenames = pkg.filenames ++ relevantFilenames pkg.package; } - ) attrsWithMaintainers; + relevantAffectedAttrPaths = lib.filter ( + attrPath: + # Some packages might be reported as changed on a different platform, but + # not even have an attribute on the platform the maintainers are requested on. + # Fallback to `null` for these to filter them out + let + package = lib.attrByPath attrPath null pkgs; + in + package != null && anyMatchingFiles (relevantFilenames package) + ) affectedAttrPaths; - attrsWithModifiedFiles = lib.filter (pkg: anyMatchingFiles pkg.filenames) attrsWithFilenames; + # Extract attributes that changed from by-name paths. + # This allows pinging reviewers for pure refactors. + changedByNameAttrPaths = lib.pipe changedFiles [ + (lib.filter (changed: lib.hasPrefix "pkgs/by-name/" changed)) + (map (lib.splitString "/")) + # Filters out e.g. pkgs/by-name/README.md + (lib.filter (path: lib.length path > 3)) + (map (path: lib.elemAt path 3)) + (map lib.singleton) + ]; + + # An attribute can appear in affected *and* touched + attrPathsToGetMaintainersFor = lib.unique (relevantAffectedAttrPaths ++ changedByNameAttrPaths); + + attrPathEntities = lib.concatMap ( + attrPath: + let + package = lib.getAttrFromPath attrPath pkgs; + in + # meta.maintainers also contains all individual team members. + # We only want to ping individuals if they're added individually as maintainers, not via teams. + userPings { inherit attrPath; } (package.meta.nonTeamMaintainers or [ ]) + ++ lib.concatMap (teamPings { inherit attrPath; }) (package.meta.teams or [ ]) + ) attrPathsToGetMaintainersFor; + + changedFileEntities = lib.concatMap ( + file: + userPings { inherit file; } (fileUsers.${file} or [ ]) + ++ lib.concatMap (teamPings { inherit file; }) (fileTeams.${file} or [ ]) + ) changedFiles; userPings = context: @@ -139,19 +134,7 @@ let else userPings context team.members; - maintainersToPing = - lib.concatMap ( - pkg: - userPings { attrPath = pkg.path; } pkg.users - ++ lib.concatMap (teamPings { attrPath = pkg.path; }) pkg.teams - ) attrsWithModifiedFiles - ++ lib.concatMap ( - path: - userPings { file = path; } (fileMaintainers.${path} or [ ]) - ++ lib.concatMap (teamPings { file = path; }) (fileTeams.${path} or [ ]) - ) changedFiles; - - byType = lib.groupBy (ping: ping.type) maintainersToPing; + byType = lib.groupBy (ping: ping.type) (attrPathEntities ++ changedFileEntities); byUser = lib.pipe (byType.user or [ ]) [ (lib.groupBy (ping: toString ping.userId)) @@ -165,5 +148,5 @@ in { users = byUser; teams = byTeam; - packages = lib.catAttrs "path" attrsWithModifiedFiles; + packages = attrPathsToGetMaintainersFor; } From 81d99730ad0d497fffeed58b9ba58178df04039c Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Mon, 2 Mar 2026 02:32:01 -0800 Subject: [PATCH 099/429] mighty-mike: fix build, move icon to spec-compliant location --- pkgs/by-name/mi/mighty-mike/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/mighty-mike/package.nix b/pkgs/by-name/mi/mighty-mike/package.nix index 5abe538e8424..7a9dde75e34b 100644 --- a/pkgs/by-name/mi/mighty-mike/package.nix +++ b/pkgs/by-name/mi/mighty-mike/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, SDL2, cmake, + libGL, makeWrapper, unstableGitUpdater, }: @@ -26,7 +27,10 @@ stdenv.mkDerivation { makeWrapper ]; - buildInputs = [ SDL2 ]; + buildInputs = [ + SDL2 + libGL + ]; strictDeps = true; @@ -40,8 +44,7 @@ stdenv.mkDerivation { wrapProgram $out/bin/MightyMike --chdir "$out/share/MightyMike" install -Dm644 $src/packaging/io.jor.mightymike.desktop $out/share/applications/mightymike.desktop - install -Dm644 $src/packaging/io.jor.mightymike.png $out/share/pixmaps/mightymike-desktopicon.png - + install -Dm644 $src/packaging/io.jor.mightymike.png -t $out/share/icons/hicolor/512x512/apps runHook postInstall ''; From 1c0cc9d7c79d117ece7da23517bc5b4e2b45d7ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Mar 2026 11:46:49 +0000 Subject: [PATCH 100/429] github-runner: 2.331.0 -> 2.332.0 --- pkgs/by-name/gi/github-runner/deps.json | 13 +++++++++---- pkgs/by-name/gi/github-runner/package.nix | 4 ++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/gi/github-runner/deps.json b/pkgs/by-name/gi/github-runner/deps.json index 4c0dc03597f2..2a267236fb96 100644 --- a/pkgs/by-name/gi/github-runner/deps.json +++ b/pkgs/by-name/gi/github-runner/deps.json @@ -29,6 +29,11 @@ "version": "8.0.0", "hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw=" }, + { + "pname": "Microsoft.Bcl.Cryptography", + "version": "10.0.2", + "hash": "sha256-+OYtcWsd1qZcEXadYeA4t6+pyADg1APQCxpKUtP002M=" + }, { "pname": "Microsoft.CodeCoverage", "version": "17.14.1", @@ -506,8 +511,8 @@ }, { "pname": "System.Formats.Asn1", - "version": "8.0.1", - "hash": "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM=" + "version": "10.0.2", + "hash": "sha256-PY875Po9vWaGTNbyZaxo9AbKFc8pg1eKf9akGQnJ5cc=" }, { "pname": "System.Globalization", @@ -796,8 +801,8 @@ }, { "pname": "System.Security.Cryptography.Pkcs", - "version": "8.0.0", - "hash": "sha256-yqfIIeZchsII2KdcxJyApZNzxM/VKknjs25gDWlweBI=" + "version": "10.0.2", + "hash": "sha256-B33jrdvy1mvc8CnZJvnGp438K8wBI/d9x2IGxijefuU=" }, { "pname": "System.Security.Cryptography.Primitives", diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix index 710f952a5223..9942dc5eedd4 100644 --- a/pkgs/by-name/gi/github-runner/package.nix +++ b/pkgs/by-name/gi/github-runner/package.nix @@ -35,13 +35,13 @@ assert builtins.all ( buildDotnetModule (finalAttrs: { pname = "github-runner"; - version = "2.331.0"; + version = "2.332.0"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; tag = "v${finalAttrs.version}"; - hash = "sha256-Qn3sOzZVBf/UfmMEkTPDfAWBtJzZv/xp9kCmiSowgUc="; + hash = "sha256-jxeuyomWBzynwYHvmNi5CcP9+z2odl7W3uXOGVgv2PY="; leaveDotGit = true; postFetch = '' git -C $out rev-parse --short HEAD > $out/.git-revision From 0cf8c665a6b8267f62514e9d30cf4cd193ca20a2 Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Sun, 25 Jan 2026 12:36:53 +0100 Subject: [PATCH 101/429] mago: 1.1.0 -> 1.13.3 --- pkgs/by-name/ma/mago/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix index a6e5319e844d..97cf36319596 100644 --- a/pkgs/by-name/ma/mago/package.nix +++ b/pkgs/by-name/ma/mago/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mago"; - version = "1.1.0"; + version = "1.13.3"; src = fetchFromGitHub { owner = "carthage-software"; repo = "mago"; tag = finalAttrs.version; - hash = "sha256-27+hUA7FNgkpzn9zIH78tuCGT/k3RC2x+Yiuoj/ez6Q="; + hash = "sha256-t1KowYGQgrsVroPUpUq8dZYPwVhGVImnzmbnUOlzPAY="; forceFetchGit = true; # Does not download all files otherwise }; - cargoHash = "sha256-IL5/OG23/53DUNbFWkx5gul99uAzVtPDyvodJds0Tao="; + cargoHash = "sha256-UIz+q9u8gKXP+ewp8uXew5/cAMWOr3VGWWLjV/fip9M="; env = { # Get openssl-sys to use pkg-config From 959987ed7f58d3d0dd80b61cae99b440d9f52872 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Mon, 2 Mar 2026 13:58:54 +0100 Subject: [PATCH 102/429] beszel: 0.18.3 -> 0.18.4 Fixes https://github.com/NixOS/nixpkgs/issues/495282 / CVE-2026-27734 https://github.com/henrygd/beszel/releases/tag/v0.18.4 --- pkgs/by-name/be/beszel/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/be/beszel/package.nix b/pkgs/by-name/be/beszel/package.nix index bf90aba94d43..018dc284d5b4 100644 --- a/pkgs/by-name/be/beszel/package.nix +++ b/pkgs/by-name/be/beszel/package.nix @@ -1,20 +1,20 @@ { - buildGoModule, + buildGo126Module, lib, fetchFromGitHub, nix-update-script, buildNpmPackage, nixosTests, }: -buildGoModule rec { +buildGo126Module rec { pname = "beszel"; - version = "0.18.3"; + version = "0.18.4"; src = fetchFromGitHub { owner = "henrygd"; repo = "beszel"; tag = "v${version}"; - hash = "sha256-/rFVH3kWf9OB3/iJNOARG85y1WH03hW8LvsIRzq1vnU="; + hash = "sha256-Ugxy23bLrKIDclrYRFJc6Nq4Ak2S3OLeyMaxuRkS/tY="; }; webui = buildNpmPackage { @@ -51,7 +51,7 @@ buildGoModule rec { npmDepsHash = "sha256-509/n5OH4z6LZH+jlmDLl2DlqKrD7M5ajtalmF/4n1o="; }; - vendorHash = "sha256-O5gFpQ90AQFSAidPTWPrODZ4LWuwrOMpzEH/8HrjBig="; + vendorHash = "sha256-V9P3VP4CsboaWPIt/MhtxYDsYH3pwKL4xK5YcLKgbI8="; preBuild = '' mkdir -p internal/site/dist From b75a8c392655b93bfa23902bd01de7b82578188a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Mar 2026 13:42:15 +0000 Subject: [PATCH 103/429] ast-grep: 0.40.5 -> 0.41.0 --- pkgs/by-name/as/ast-grep/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index acf0467f76ce..09994cf1ebeb 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ast-grep"; - version = "0.40.5"; + version = "0.41.0"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; tag = finalAttrs.version; - hash = "sha256-O4f9PjGtwK6poFIbtz26q8q4fiYjfQEtobXmghQZAfw="; + hash = "sha256-cL7RtGFhIKTlfP7wEjdjT8uTxB/tG2joob+HN5NG1G8="; }; # error: linker `aarch64-linux-gnu-gcc` not found @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm .cargo/config.toml ''; - cargoHash = "sha256-N5WrItW/yeZ+GDTw5yFy4eB11BzOlcuePGAefhJaG6I="; + cargoHash = "sha256-zPl9fUG+RdddB7r4nWHETHsULf/hDDFpTf8h3xe7UiI="; nativeBuildInputs = [ installShellFiles ]; From 2a625b2b8ad686cd818d7b2fa63274021fd52d23 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Mon, 2 Mar 2026 15:01:18 +0100 Subject: [PATCH 104/429] beszel: move to finalAttrs --- pkgs/by-name/be/beszel/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/be/beszel/package.nix b/pkgs/by-name/be/beszel/package.nix index 018dc284d5b4..a14c962232d8 100644 --- a/pkgs/by-name/be/beszel/package.nix +++ b/pkgs/by-name/be/beszel/package.nix @@ -6,19 +6,19 @@ buildNpmPackage, nixosTests, }: -buildGo126Module rec { +buildGo126Module (finalAttrs: { pname = "beszel"; version = "0.18.4"; src = fetchFromGitHub { owner = "henrygd"; repo = "beszel"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Ugxy23bLrKIDclrYRFJc6Nq4Ak2S3OLeyMaxuRkS/tY="; }; webui = buildNpmPackage { - inherit + inherit (finalAttrs) pname version src @@ -46,7 +46,7 @@ buildGo126Module rec { runHook postInstall ''; - sourceRoot = "${src.name}/internal/site"; + sourceRoot = "${finalAttrs.src.name}/internal/site"; npmDepsHash = "sha256-509/n5OH4z6LZH+jlmDLl2DlqKrD7M5ajtalmF/4n1o="; }; @@ -55,7 +55,7 @@ buildGo126Module rec { preBuild = '' mkdir -p internal/site/dist - cp -r ${webui}/* internal/site/dist + cp -r ${finalAttrs.webui}/* internal/site/dist ''; postInstall = '' @@ -75,7 +75,7 @@ buildGo126Module rec { meta = { homepage = "https://github.com/henrygd/beszel"; - changelog = "https://github.com/henrygd/beszel/releases/tag/v${version}"; + changelog = "https://github.com/henrygd/beszel/releases/tag/v${finalAttrs.version}"; description = "Lightweight server monitoring hub with historical data, docker stats, and alerts"; maintainers = with lib.maintainers; [ bot-wxt1221 @@ -84,4 +84,4 @@ buildGo126Module rec { ]; license = lib.licenses.mit; }; -} +}) From f831f8edadf49aa6eac8222e6f7a32d64c4f7ade Mon Sep 17 00:00:00 2001 From: robert jakub Date: Mon, 2 Mar 2026 15:43:43 +0100 Subject: [PATCH 105/429] python31{3,4}.pkgs.meshcore: 2.2.5 -> 2.2.8 --- .../python-modules/meshcore/default.nix | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/meshcore/default.nix b/pkgs/development/python-modules/meshcore/default.nix index 3a45c35ad729..9d5a7330b5bb 100644 --- a/pkgs/development/python-modules/meshcore/default.nix +++ b/pkgs/development/python-modules/meshcore/default.nix @@ -1,25 +1,24 @@ { lib, buildPythonPackage, - fetchPypi, - - # build-system + fetchFromGitHub, hatchling, - # dependencies bleak, pycayennelpp, - pyserial-asyncio, + pyserial-asyncio-fast, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "meshcore"; - version = "2.2.5"; + version = "2.2.8"; pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-FYGBUKaoOAiDwrJyNW+rrQurEH87lDjP1mW8nKA9HRc="; + src = fetchFromGitHub { + owner = "meshcore-dev"; + repo = "meshcore_py"; + tag = "v${finalAttrs.version}"; + hash = "sha256-S3hyA2TsgEHwB0gv5xFMTbwnAoGbceq0C5+8MBedD70="; }; build-system = [ hatchling ]; @@ -27,7 +26,7 @@ buildPythonPackage rec { dependencies = [ bleak pycayennelpp - pyserial-asyncio + pyserial-asyncio-fast ]; pythonImportsCheck = [ "meshcore" ]; @@ -35,7 +34,8 @@ buildPythonPackage rec { meta = { description = "Python library for communicating with meshcore companion radios"; homepage = "https://github.com/meshcore-dev/meshcore_py"; + changelog = "https://github.com/meshcore-dev/meshcore_py/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.haylin ]; + maintainers = with lib.maintainers; [ haylin ]; }; -} +}) From 9db9098601e1ceb072aaa01c1bd3f2ef71306f5c Mon Sep 17 00:00:00 2001 From: rucadi Date: Mon, 2 Mar 2026 20:22:46 +0100 Subject: [PATCH 106/429] devcontainer: fix build and upgrade to nodejs 24 --- pkgs/by-name/de/devcontainer/package.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/by-name/de/devcontainer/package.nix b/pkgs/by-name/de/devcontainer/package.nix index 63b4ca0d7ddd..ff4b6d705edd 100644 --- a/pkgs/by-name/de/devcontainer/package.nix +++ b/pkgs/by-name/de/devcontainer/package.nix @@ -4,7 +4,7 @@ fetchYarnDeps, fetchFromGitHub, fixup-yarn-lock, - nodejs_20, + nodejs, node-gyp, python3, makeBinaryWrapper, @@ -14,10 +14,6 @@ docker-compose, nix-update-script, }: - -let - nodejs = nodejs_20; # does not build with 22 -in stdenv.mkDerivation (finalAttrs: { pname = "devcontainer"; version = "0.83.0"; From 80366561d0da383177268f595605c41686f09378 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 2 Mar 2026 21:28:29 +0100 Subject: [PATCH 107/429] ocamlPackages.mparser-re: init at 1.3 --- pkgs/development/ocaml-modules/mparser/re.nix | 19 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/ocaml-modules/mparser/re.nix diff --git a/pkgs/development/ocaml-modules/mparser/re.nix b/pkgs/development/ocaml-modules/mparser/re.nix new file mode 100644 index 000000000000..8e18f2a19528 --- /dev/null +++ b/pkgs/development/ocaml-modules/mparser/re.nix @@ -0,0 +1,19 @@ +{ + buildDunePackage, + mparser, + re, +}: + +buildDunePackage { + pname = "mparser-re"; + inherit (mparser) src version; + + propagatedBuildInputs = [ + mparser + re + ]; + + meta = mparser.meta // { + description = "MParser plugin: RE-based regular expressions"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 689501fd0c6f..4291d4e63904 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1371,6 +1371,8 @@ let mparser-pcre = callPackage ../development/ocaml-modules/mparser/pcre.nix { }; + mparser-re = callPackage ../development/ocaml-modules/mparser/re.nix { }; + msgpck = callPackage ../development/ocaml-modules/msgpck { }; mrmime = callPackage ../development/ocaml-modules/mrmime { }; From edb8f57fe4d5922d840fe07bb9fe799bb9ef5473 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Mar 2026 05:01:37 +0000 Subject: [PATCH 108/429] sketchybar-app-font: 2.0.53 -> 2.0.55 --- pkgs/by-name/sk/sketchybar-app-font/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sk/sketchybar-app-font/package.nix b/pkgs/by-name/sk/sketchybar-app-font/package.nix index 71a55def26b7..428e4c9a04d2 100644 --- a/pkgs/by-name/sk/sketchybar-app-font/package.nix +++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix @@ -10,13 +10,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "sketchybar-app-font"; - version = "2.0.53"; + version = "2.0.55"; src = fetchFromGitHub { owner = "kvndrsslr"; repo = "sketchybar-app-font"; tag = "v${finalAttrs.version}"; - hash = "sha256-4ZiFJDNb/VyQhxCbvp1H/BZG0Kc0zffYc3xtUJ6W/IU="; + hash = "sha256-Gr0+wPvVeRF4GztRPIsdOhknoq5xjaj8lcLnClIzZ/U="; }; pnpmDeps = fetchPnpmDeps { From f9129daad8ae87f40016d8cee50b1ae715c0ba22 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Tue, 3 Mar 2026 12:00:00 +0000 Subject: [PATCH 109/429] libnids: fix build with gcc15 Fixes: https://github.com/NixOS/nixpkgs/issues/496058 --- pkgs/by-name/li/libnids/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libnids/package.nix b/pkgs/by-name/li/libnids/package.nix index d7603cc138a6..163bf61a4855 100644 --- a/pkgs/by-name/li/libnids/package.nix +++ b/pkgs/by-name/li/libnids/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { this is necessary for dsniff to compile; otherwise g_thread_init is a missing symbol when linking (?!?) */ - env.NIX_CFLAGS_COMPILE = "-Dg_thread_init= "; + env.NIX_CFLAGS_COMPILE = "-Dg_thread_init= -std=gnu17 "; meta = { description = "E-component of Network Intrusion Detection System which emulates the IP stack of Linux 2.0.x"; From a4382f4b412e47d304adfaf2d64e0f2517c374f8 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 2 Mar 2026 08:07:24 -0600 Subject: [PATCH 110/429] git-annex-metadata-gui: migrate to by-name --- .../gi/git-annex-metadata-gui/package.nix} | 10 ++++------ pkgs/top-level/all-packages.nix | 6 ------ 2 files changed, 4 insertions(+), 12 deletions(-) rename pkgs/{applications/version-management/git-annex-metadata-gui/default.nix => by-name/gi/git-annex-metadata-gui/package.nix} (87%) diff --git a/pkgs/applications/version-management/git-annex-metadata-gui/default.nix b/pkgs/by-name/gi/git-annex-metadata-gui/package.nix similarity index 87% rename from pkgs/applications/version-management/git-annex-metadata-gui/default.nix rename to pkgs/by-name/gi/git-annex-metadata-gui/package.nix index d92ee4662222..e5ad93ce0e2c 100644 --- a/pkgs/applications/version-management/git-annex-metadata-gui/default.nix +++ b/pkgs/by-name/gi/git-annex-metadata-gui/package.nix @@ -1,13 +1,11 @@ { lib, - buildPythonApplication, + python3Packages, fetchFromGitHub, - pyqt5, qt5, - git-annex-adapter, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "git-annex-metadata-gui"; version = "0.2.0"; format = "setuptools"; @@ -30,8 +28,8 @@ buildPythonApplication rec { ''; propagatedBuildInputs = [ - pyqt5 - git-annex-adapter + python3Packages.pyqt5 + python3Packages.git-annex-adapter ]; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7dd32a0c162..ec1ab7b3f31b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1123,12 +1123,6 @@ with pkgs; github-cli = gh; - git-annex-metadata-gui = - libsForQt5.callPackage ../applications/version-management/git-annex-metadata-gui - { - inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter; - }; - git-annex-remote-dbx = callPackage ../applications/version-management/git-annex-remote-dbx { inherit (python3Packages) buildPythonApplication From 9ba2d6a74bba15dadd4bb86ed5d4806c74adced1 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 2 Mar 2026 08:11:01 -0600 Subject: [PATCH 111/429] git-annex-metadata-gui: modernize derivation, switch to PEP517 --- .../gi/git-annex-metadata-gui/package.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/gi/git-annex-metadata-gui/package.nix b/pkgs/by-name/gi/git-annex-metadata-gui/package.nix index e5ad93ce0e2c..084377bb1819 100644 --- a/pkgs/by-name/gi/git-annex-metadata-gui/package.nix +++ b/pkgs/by-name/gi/git-annex-metadata-gui/package.nix @@ -5,16 +5,16 @@ qt5, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "git-annex-metadata-gui"; version = "0.2.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "alpernebbi"; repo = "git-annex-metadata-gui"; - rev = "v${version}"; - sha256 = "03kch67k0q9lcs817906g864wwabkn208aiqvbiyqp1qbg99skam"; + tag = "v${finalAttrs.version}"; + hash = "sha256-VU2d0ls4XOzj2jgqBISdS3FODHoGpBOQZjRhMI+BbA4="; }; prePatch = '' @@ -27,7 +27,11 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; - propagatedBuildInputs = [ + build-system = [ + python3Packages.setuptools + ]; + + dependencies = [ python3Packages.pyqt5 python3Packages.git-annex-adapter ]; @@ -43,4 +47,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.gpl3Plus; platforms = with lib.platforms; linux; }; -} +}) From 5c994fe2b1e540ff83aa59ba370918ad5aae4776 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Mar 2026 16:55:00 +0100 Subject: [PATCH 112/429] python312: 3.12.12 -> 3.12.13 https://docs.python.org/release/3.12.13/whatsnew/changelog.html --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 2f97f6fbc6f0..ef04c5aeee44 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -59,10 +59,10 @@ sourceVersion = { major = "3"; minor = "12"; - patch = "12"; + patch = "13"; suffix = ""; }; - hash = "sha256-+4WhNBSwKMSboYu9UjwtBVowtWsYuSzkVOosUe3GVsQ="; + hash = "sha256-wIvGWoGXHB3VeDGCgmUDNpRmx+ZzdNFkZRmt8FIHtoQ="; inherit passthruFun; }; From f751ae3d2531bc9243b0f4cabe424b924d4b74cd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Mar 2026 17:05:55 +0100 Subject: [PATCH 113/429] python311: 3.11.14 -> 3.11.15 https://docs.python.org/release/3.11.15/whatsnew/changelog.html --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index ef04c5aeee44..ea11b6058949 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -47,10 +47,10 @@ sourceVersion = { major = "3"; minor = "11"; - patch = "14"; + patch = "15"; suffix = ""; }; - hash = "sha256-jT7Y7FyIwclfXlWGEqclRQ0kUoE92tXlj9saU7Egm3g="; + hash = "sha256-JyF53dmi5BoPyOQuM9+9ygs3EapavzctPy1RVD0JtiU="; inherit passthruFun; }; From 568c11e3a1086be8d377f1ead8b20661a483468e Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 3 Mar 2026 09:41:07 -0600 Subject: [PATCH 114/429] sssd: migrate to by-name --- .../linux => by-name/ss}/sssd/fix-kerberos-version.patch | 0 .../linux/sssd/default.nix => by-name/ss/sssd/package.nix} | 4 +++- pkgs/top-level/all-packages.nix | 5 ----- 3 files changed, 3 insertions(+), 6 deletions(-) rename pkgs/{os-specific/linux => by-name/ss}/sssd/fix-kerberos-version.patch (100%) rename pkgs/{os-specific/linux/sssd/default.nix => by-name/ss/sssd/package.nix} (97%) diff --git a/pkgs/os-specific/linux/sssd/fix-kerberos-version.patch b/pkgs/by-name/ss/sssd/fix-kerberos-version.patch similarity index 100% rename from pkgs/os-specific/linux/sssd/fix-kerberos-version.patch rename to pkgs/by-name/ss/sssd/fix-kerberos-version.patch diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/by-name/ss/sssd/package.nix similarity index 97% rename from pkgs/os-specific/linux/sssd/default.nix rename to pkgs/by-name/ss/sssd/package.nix index fa7ddbd97817..8a4acc859ec4 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/by-name/ss/sssd/package.nix @@ -46,7 +46,7 @@ p11-kit, nss_wrapper, ncurses, - Po4a, + perlPackages, jansson, jose, docbook_xsl, @@ -60,6 +60,8 @@ let docbookFiles = "${docbook_xsl}/share/xml/docbook-xsl/catalog.xml:${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; + # NOTE: freeipa and sssd need to be built with the same version of python + inherit (perlPackages) Po4a; in stdenv.mkDerivation (finalAttrs: { pname = "sssd"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7dd32a0c162..8e1cbd4ffd8f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3568,11 +3568,6 @@ with pkgs; libsForQt5.callPackage ../tools/networking/globalprotect-openconnect { }; - sssd = callPackage ../os-specific/linux/sssd { - # NOTE: freeipa and sssd need to be built with the same version of python - inherit (perlPackages) Po4a; - }; - buildWasmBindgenCli = callPackage ../build-support/wasm-bindgen-cli { }; woodpecker-agent = callPackage ../development/tools/continuous-integration/woodpecker/agent.nix { }; From f33349ad68e25eda6a15bf2a68b56302ad331f2c Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 3 Mar 2026 09:47:59 -0600 Subject: [PATCH 115/429] freeipa: migrate to by-name --- .../default.nix => by-name/fr/freeipa/package.nix} | 14 +++++++++++--- pkgs/top-level/all-packages.nix | 11 ----------- 2 files changed, 11 insertions(+), 14 deletions(-) rename pkgs/{os-specific/linux/freeipa/default.nix => by-name/fr/freeipa/package.nix} (94%) diff --git a/pkgs/os-specific/linux/freeipa/default.nix b/pkgs/by-name/fr/freeipa/package.nix similarity index 94% rename from pkgs/os-specific/linux/freeipa/default.nix rename to pkgs/by-name/fr/freeipa/package.nix index d6a25e26aa24..fa66da6d8212 100644 --- a/pkgs/os-specific/linux/freeipa/default.nix +++ b/pkgs/by-name/fr/freeipa/package.nix @@ -6,10 +6,10 @@ pkg-config, autoconf, automake, - kerberos, + krb5, openldap, popt, - sasl, + cyrus_sasl, curl, xmlrpc_c, ding-libs, @@ -22,7 +22,7 @@ libuuid, talloc, tevent, - samba, + samba4, libunistring, libverto, libpwquality, @@ -64,6 +64,14 @@ let samba ifaddr ]; + # NOTE: freeipa and sssd need to be built with the same version of python + kerberos = krb5.override { + withVerto = true; + }; + sasl = cyrus_sasl; + samba = samba4.override { + enableLDAP = true; + }; in stdenv.mkDerivation rec { pname = "freeipa"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e1cbd4ffd8f..3b83791cffa5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6362,17 +6362,6 @@ with pkgs; fmt = fmt_12; - freeipa = callPackage ../os-specific/linux/freeipa { - # NOTE: freeipa and sssd need to be built with the same version of python - kerberos = krb5.override { - withVerto = true; - }; - sasl = cyrus_sasl; - samba = samba4.override { - enableLDAP = true; - }; - }; - fontconfig = callPackage ../development/libraries/fontconfig { }; makeFontsConf = callPackage ../development/libraries/fontconfig/make-fonts-conf.nix { }; From eabd21e434140ec58bdca220ffede64e1019ce76 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 3 Mar 2026 10:05:41 -0600 Subject: [PATCH 116/429] freeipa: modernize derivation --- pkgs/by-name/fr/freeipa/package.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/fr/freeipa/package.nix b/pkgs/by-name/fr/freeipa/package.nix index fa66da6d8212..6813e656de96 100644 --- a/pkgs/by-name/fr/freeipa/package.nix +++ b/pkgs/by-name/fr/freeipa/package.nix @@ -27,7 +27,7 @@ libverto, libpwquality, systemd, - python3, + python3Packages, bind, sssd, jre, @@ -39,7 +39,7 @@ }: let - pythonInputs = with python3.pkgs; [ + pythonInputs = with python3Packages; [ distutils six python-ldap @@ -73,12 +73,12 @@ let enableLDAP = true; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freeipa"; version = "4.12.5"; src = fetchurl { - url = "https://releases.pagure.org/freeipa/freeipa-${version}.tar.gz"; + url = "https://releases.pagure.org/freeipa/freeipa-${finalAttrs.version}.tar.gz"; hash = "sha256-jvXS9Hx9VGFccFL19HogfH15JVIW7pc3/TY1pOvJglM="; }; @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - python3.pkgs.wrapPython + python3Packages.wrapPython jre rhino lesscpy @@ -115,7 +115,6 @@ stdenv.mkDerivation rec { xmlrpc_c ding-libs p11-kit - python3 nspr nss _389-ds-base @@ -178,7 +177,7 @@ stdenv.mkDerivation rec { nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; + versionCheckProgram = "${placeholder "out"}/bin/ipa"; doInstallCheck = true; meta = { @@ -199,4 +198,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "ipa"; }; -} +}) From 490cad4329363c5954d3f345d36adfd6dedecf20 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Tue, 24 Feb 2026 19:55:14 +0100 Subject: [PATCH 117/429] mir: Fix remaining reference to boost_system --- pkgs/servers/mir/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix index 86e5c791a886..fd220dbc6e41 100644 --- a/pkgs/servers/mir/default.nix +++ b/pkgs/servers/mir/default.nix @@ -8,6 +8,15 @@ in version = "2.25.2"; hash = "sha256-+nahWuAcGWgxBM6/a2HWwDw5DkQpUt5i/CEGzTLwNQw="; cargoHash = "sha256-fVD+RGU/2UGVihIktKg2+eDWmlWomDOAcrY6k2XwF1c="; + patches = [ + # Fix leftover boost_system references when linking miracle-wm (library no longer exists) + # https://github.com/canonical/mir/pull/4721 + (fetchpatch { + name = "mir-tests-mirtest.pc.in-Drop-remaining-references-to-boost_system.patch"; + url = "https://github.com/canonical/mir/commit/14d396ecef4611e9182d78890a2d908439478799.patch"; + hash = "sha256-IpX/7lkuYwoITzOz/gF5q7TAFUg4YH0IY2fWkorIEiM="; + }) + ]; }; mir_2_15 = common { From 8c008588212cd52ed625b374d6182e4ef1139eed Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Tue, 24 Feb 2026 20:19:53 +0100 Subject: [PATCH 118/429] miracle-wm: 0.8.2 -> 0.8.3 --- pkgs/by-name/mi/miracle-wm/package.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix index 13c076ccd551..0524b964ef30 100644 --- a/pkgs/by-name/mi/miracle-wm/package.nix +++ b/pkgs/by-name/mi/miracle-wm/package.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, gitUpdater, nixosTests, boost, @@ -32,24 +31,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "miracle-wm"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "miracle-wm-org"; repo = "miracle-wm"; tag = "v${finalAttrs.version}"; - hash = "sha256-RzqF3UDC4MY85ex9TOD2L0Zd7T6mgiZ+ImJuJG+xtjo="; + hash = "sha256-N8FDoQDEfv0xGjtnKx+jNfRwxvJdb4ETvQnZuBvlccQ="; }; - patches = [ - # Fix compat with newer Mir - # Remove when version > 0.8.2 - (fetchpatch { - url = "https://github.com/miracle-wm-org/miracle-wm/commit/3f3389bf49ad780d258d34109f87e73ef7c02344.patch"; - hash = "sha256-dxrYfn/MhpCkgsmunMAl5TrPxY8FO0dqQf4LYcuiFGk="; - }) - ]; - postPatch = '' substituteInPlace CMakeLists.txt \ --replace-fail 'DESTINATION /usr/lib' 'DESTINATION ''${CMAKE_INSTALL_LIBDIR}' \ @@ -57,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { '' # Fix compat with newer Mir # https://github.com/miracle-wm-org/miracle-wm/commit/aaae6e64261d8a00c2a1df47e2eab99400382d69 - # Remove when version > 0.8.2 + # Remove when version > 0.8.3 + '' substituteInPlace CMakeLists.txt \ --replace-fail 'pkg_check_modules(MIRRENDERER REQUIRED mirrenderer' 'pkg_check_modules(MIRRENDERER mirrenderer' From 20ad6d5364eb9e5ee7a3d3cf023c31350482ed4a Mon Sep 17 00:00:00 2001 From: Dom Rodriguez Date: Sun, 23 Nov 2025 19:19:30 +0000 Subject: [PATCH 119/429] davmail: Various tweaks to Davmail package - Remove verbosity flag for `cp` invocations. - We only need ant to run the task `prepare-dist`, as per upstream's RPM spec. - Revert change to copy files from `./dist` and reference directly. --- pkgs/by-name/da/davmail/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/da/davmail/package.nix b/pkgs/by-name/da/davmail/package.nix index c4deac4af9bb..4f84ba6f1ab6 100644 --- a/pkgs/by-name/da/davmail/package.nix +++ b/pkgs/by-name/da/davmail/package.nix @@ -35,9 +35,8 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - ant compile prepare-dist - cp -Rv dist/{lib,davmail{,.jar}} . - sed -i -e '/^JAVA_OPTS/d' davmail + ant prepare-dist + sed -i -e '/^JAVA_OPTS/d' ./dist/davmail runHook postBuild ''; @@ -55,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall mkdir -p $out/share/davmail - cp -vR ./{lib,davmail{,.jar}} $out/share/davmail + cp -R ./dist/{lib,davmail{,.jar}} $out/share/davmail chmod +x $out/share/davmail/davmail makeWrapper $out/share/davmail/davmail $out/bin/davmail \ --set-default JAVA_OPTS "-Xmx512M -Dsun.net.inetaddr.ttl=60 -Djdk.gtk.version=${lib.versions.major gtk'.version}" \ From 1ccac2805fa1a786a8ccf5c0628304a2dde6d31d Mon Sep 17 00:00:00 2001 From: Dom Rodriguez Date: Sun, 23 Nov 2025 12:46:03 +0000 Subject: [PATCH 120/429] hyprproxlock: init at 0.1.1 Add `hyprproxlock` to Nixpkgs for Hyprland Bluetooth-based proxmity automatic locking. --- pkgs/by-name/hy/hyprproxlock/package.nix | 48 ++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 pkgs/by-name/hy/hyprproxlock/package.nix diff --git a/pkgs/by-name/hy/hyprproxlock/package.nix b/pkgs/by-name/hy/hyprproxlock/package.nix new file mode 100644 index 000000000000..6fb6c49d8d9c --- /dev/null +++ b/pkgs/by-name/hy/hyprproxlock/package.nix @@ -0,0 +1,48 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, + + # nativeBuildInputs + pkg-config, + + # buildInputs + dbus, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "hyprproxlock"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "Da4ndo"; + repo = "hyprproxlock"; + tag = finalAttrs.version; + hash = "sha256-EoMxYMQBRP1fDfUorrkrgKDrVI88Ctusp2+1a7tnSU0="; + }; + + cargoHash = "sha256-rBZ3acHStmUzEU+lsFhNYvLVPeeZe6P+4OHyxHRe4CU="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + dbus + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/Da4ndo/hyprproxlock"; + description = "Proximity-based daemon for Hyprland that triggers screen locking and unlocking through hyprlock based on Bluetooth device proximity"; + longDescription = '' + A proximity-based daemon for Hyprland that triggers screen locking and unlocking through hyprlock based on Bluetooth device proximity. + It monitors connected devices' signal strength to automatically control your screen lock state. + ''; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ shymega ]; + mainProgram = "hyprproxlock"; + }; +}) From 1d7e7748a6c6c58ef3b9554fa2d71c836c14ecf8 Mon Sep 17 00:00:00 2001 From: eljamm Date: Tue, 3 Mar 2026 20:14:25 +0100 Subject: [PATCH 121/429] yazi: get correct position by inheriting meta attrs Inheriting `yazi-unwrapped`'s meta means we also inherit its position, which is not correct and could lead to confusions (e.g. in the NixOS search). Instead, we should inherit the individual attributes, thus giving us the corrrect position. ``` # before nix-repl> yazi.meta.position "/path/to/nixpkgs/pkgs/by-name/ya/yazi-unwrapped/package.nix:63" ``` ``` # after nix-repl> yazi.meta.position "/path/to/nixpkgs/pkgs/by-name/ya/yazi/package.nix:100" ``` --- pkgs/by-name/ya/yazi/package.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ya/yazi/package.nix b/pkgs/by-name/ya/yazi/package.nix index 2b08089ee729..917605f0bfc6 100644 --- a/pkgs/by-name/ya/yazi/package.nix +++ b/pkgs/by-name/ya/yazi/package.nix @@ -93,7 +93,17 @@ let in runCommand yazi-unwrapped.name { - inherit (yazi-unwrapped) pname version meta; + inherit (yazi-unwrapped) pname version; + + meta = { + inherit (yazi-unwrapped.meta) + description + homepage + license + maintainers + mainProgram + ; + }; nativeBuildInputs = [ makeWrapper ]; } From 6a59f2c189c2004a9cfc980ffbac0b1569e88d79 Mon Sep 17 00:00:00 2001 From: Manfred Macx Date: Tue, 3 Mar 2026 21:27:39 +0100 Subject: [PATCH 122/429] picoclaw: init at 0.2.0 --- pkgs/by-name/pi/picoclaw/package.nix | 57 ++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 pkgs/by-name/pi/picoclaw/package.nix diff --git a/pkgs/by-name/pi/picoclaw/package.nix b/pkgs/by-name/pi/picoclaw/package.nix new file mode 100644 index 000000000000..e67e36479e08 --- /dev/null +++ b/pkgs/by-name/pi/picoclaw/package.nix @@ -0,0 +1,57 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, +}: + +buildGoModule (finalAttrs: { + pname = "picoclaw"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "sipeed"; + repo = "picoclaw"; + tag = "v${finalAttrs.version}"; + hash = "sha256-zCeURNN152yL3Qi1UFDvSB85xflbLAMzQUTwGThALss="; + }; + + proxyVendor = true; + vendorHash = "sha256-CsTGC5Ajo9RV6rJPQgnFqA+bQ2TEafI4tt3iXpVwaeY="; + + preBuild = '' + go generate ./... + ''; + + ldflags = [ + "-s" + "-w" + "-X github.com/sipeed/picoclaw/cmd/picoclaw/internal.version=${finalAttrs.version}" + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "version"; + + checkFlags = + let + skippedTests = [ + "TestGetVersion" + "TestCodexCliProvider_MockCLI_Success" + "TestCodexCliProvider_MockCLI_Error" + "TestCodexCliProvider_MockCLI_WithModel" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + + meta = { + description = "Tiny, Fast, and Deployable anywhere - automate the mundane, unleash your creativity"; + homepage = "https://github.com/sipeed/picoclaw"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + manfredmacx + drupol + ]; + mainProgram = "picoclaw"; + }; +}) From 9585e8547435be8d062e7aa7755a009fa244773b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Mar 2026 21:28:40 +0000 Subject: [PATCH 123/429] unityhub: 3.16.2 -> 3.16.3 --- pkgs/by-name/un/unityhub/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/un/unityhub/package.nix b/pkgs/by-name/un/unityhub/package.nix index e1e425c5f734..b63409e0f537 100644 --- a/pkgs/by-name/un/unityhub/package.nix +++ b/pkgs/by-name/un/unityhub/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "unityhub"; - version = "3.16.2"; + version = "3.16.3"; src = fetchurl { url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/UnityHubSetup-${version}-amd64.deb"; - hash = "sha256-SvHnIIqNfT2PhyNuKliBl7CsokZE4lrsnbhwtf+1YsA="; + hash = "sha256-Sfgzx2K+38T0v31K4SdtbMS6alAVuOyTS9O89OYjozU="; }; nativeBuildInputs = [ From 18bdf2ed81bfc3f50297d02f3487f7c6449bcaf1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 00:34:14 +0000 Subject: [PATCH 124/429] heptabase: 1.84.0 -> 1.84.3 --- pkgs/by-name/he/heptabase/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/he/heptabase/package.nix b/pkgs/by-name/he/heptabase/package.nix index aad2dc870841..97246ca0c025 100644 --- a/pkgs/by-name/he/heptabase/package.nix +++ b/pkgs/by-name/he/heptabase/package.nix @@ -5,10 +5,10 @@ }: let pname = "heptabase"; - version = "1.84.0"; + version = "1.84.3"; src = fetchurl { url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage"; - hash = "sha256-sk9YN2vNr9jiGzVQOcst+oRLEYjEaZO4nGgD8TxdfIc="; + hash = "sha256-ddkNmKWORgIeX7jkskP4f386Imp9CX3q7Kbe+SEGTpQ="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From 4ab498b27e81f0e78c02b7739842e6e377bb7d09 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 00:35:33 +0000 Subject: [PATCH 125/429] grafana-image-renderer: 5.6.0 -> 5.6.2 --- pkgs/by-name/gr/grafana-image-renderer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/grafana-image-renderer/package.nix b/pkgs/by-name/gr/grafana-image-renderer/package.nix index 842ae7ababeb..7bd633ce3bbf 100644 --- a/pkgs/by-name/gr/grafana-image-renderer/package.nix +++ b/pkgs/by-name/gr/grafana-image-renderer/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "grafana-image-renderer"; - version = "5.6.0"; + version = "5.6.2"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; tag = "v${finalAttrs.version}"; - hash = "sha256-54ZW81QSsun7t0HhLTub2QVz7jA7PsueoAUeXuQXOqM="; + hash = "sha256-rbR+TGkTWIpHeGxOQtVQFIeTv1/p8rGfbFp6hSSXQco="; }; - vendorHash = "sha256-kGLvstSkucM0tN5l+Vp78IP9EwDx62kukAiOwYD4Vfs="; + vendorHash = "sha256-nRwd1luj8AFjDM67KtinVxRd31lUO+Vv3PDnsv2BMZU="; postPatch = '' substituteInPlace go.mod --replace-fail 'go 1.25.6' 'go 1.25.5' From b7910c114700deeda0b2a3438bc4f056d03f0d0a Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 3 Mar 2026 19:32:59 -0600 Subject: [PATCH 126/429] ffado,ffado-mixer: migrate to by-name --- pkgs/by-name/ff/ffado-mixer/package.nix | 7 +++++++ .../ffado/default.nix => by-name/ff/ffado/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/ff/ffado-mixer/package.nix rename pkgs/{os-specific/linux/ffado/default.nix => by-name/ff/ffado/package.nix} (100%) diff --git a/pkgs/by-name/ff/ffado-mixer/package.nix b/pkgs/by-name/ff/ffado-mixer/package.nix new file mode 100644 index 000000000000..40314ba49aac --- /dev/null +++ b/pkgs/by-name/ff/ffado-mixer/package.nix @@ -0,0 +1,7 @@ +{ + ffado, +}: + +ffado.override { + withMixer = true; +} diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/by-name/ff/ffado/package.nix similarity index 100% rename from pkgs/os-specific/linux/ffado/default.nix rename to pkgs/by-name/ff/ffado/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 788e8b7fd30f..4b138b42dcc6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8602,8 +8602,6 @@ with pkgs; error-inject = recurseIntoAttrs (callPackages ../os-specific/linux/error-inject { }); - ffado = callPackage ../os-specific/linux/ffado { }; - ffado-mixer = callPackage ../os-specific/linux/ffado { withMixer = true; }; libffado = ffado; freefall = callPackage ../os-specific/linux/freefall { From 248868a25a371c2a6fc4745502a3b4050950c94c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 01:41:37 +0000 Subject: [PATCH 127/429] minijinja: 2.16.0 -> 2.17.0 --- pkgs/by-name/mi/minijinja/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix index 0b7bde4c4299..1aeca54ea6f0 100644 --- a/pkgs/by-name/mi/minijinja/package.nix +++ b/pkgs/by-name/mi/minijinja/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "minijinja"; - version = "2.16.0"; + version = "2.17.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "minijinja"; rev = finalAttrs.version; - hash = "sha256-55Zo8mVgMhCgYzE6662oTXfn7W908LplZv6ys/aHveY="; + hash = "sha256-Q8s9NH2Su2IL2GlZIDUUmkwnfluMjOY/ULuLoL4+lEE="; }; - cargoHash = "sha256-aSszdJCOdO8xvypBGXm2kItjl9HojyxC8/BeKrOAImU="; + cargoHash = "sha256-7uzSuBpRWIWmtCO81i7RXP9k8mp6tTe/lMHP5nKMX1I="; # The tests relies on the presence of network connection doCheck = false; From dce2d9dc7ed505dbb0dcd069573111003de7e0e3 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Tue, 3 Mar 2026 18:02:03 -0800 Subject: [PATCH 128/429] p3x-onenote: move icon to spec-compliant location --- pkgs/by-name/p3/p3x-onenote/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/p3/p3x-onenote/package.nix b/pkgs/by-name/p3/p3x-onenote/package.nix index 13d1e2bb6ff3..3ed251572bca 100644 --- a/pkgs/by-name/p3/p3x-onenote/package.nix +++ b/pkgs/by-name/p3/p3x-onenote/package.nix @@ -39,14 +39,14 @@ appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mkdir -p $out/share/pixmaps $out/share/licenses/p3x-onenote - cp ${appimageContents}/p3x-onenote.png $out/share/pixmaps/ + mkdir -p $out/share/licenses/p3x-onenote + install -D ${appimageContents}/p3x-onenote.png -t $out/share/icons/hicolor/512x512/apps/ cp ${appimageContents}/p3x-onenote.desktop $out cp ${appimageContents}/LICENSE.electron.txt $out/share/licenses/p3x-onenote/LICENSE ${desktop-file-utils}/bin/desktop-file-install --dir $out/share/applications \ - --set-key Exec --set-value $out/bin/p3x-onenote \ --set-key Comment --set-value "P3X OneNote Linux" \ + --set-key Exec --set-value "p3x-onenote" \ --delete-original $out/p3x-onenote.desktop ''; From f1b2f08479ea62c396373deba2373780d5632d8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 02:13:48 +0000 Subject: [PATCH 129/429] selene: 0.30.0 -> 0.30.1 --- pkgs/by-name/se/selene/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/selene/package.nix b/pkgs/by-name/se/selene/package.nix index b19324ca4bbb..070a5668835b 100644 --- a/pkgs/by-name/se/selene/package.nix +++ b/pkgs/by-name/se/selene/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "selene"; - version = "0.30.0"; + version = "0.30.1"; src = fetchFromGitHub { owner = "kampfkarren"; repo = "selene"; tag = finalAttrs.version; - hash = "sha256-zsqgLE9igxGGjymMJSt6JR453bw63TWeZwRVmkDm6ag="; + hash = "sha256-6NjEE5r9vILnWIyALN8b3aiYWJ9hGzAoYEv+lxNL32Y="; }; - cargoHash = "sha256-RxIDFE+FGKUDvM1Fy/doSy/mf2JuklhoMGpSqoHhAV4="; + cargoHash = "sha256-0BZroMbaRtpfOf2p33S830T2V+/eobezX0HVsZ/qtnI="; nativeBuildInputs = lib.optionals robloxSupport [ pkg-config From 59cae0665e98a08d050d6b65d60283134520f302 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 02:25:48 +0000 Subject: [PATCH 130/429] spire: 1.14.1 -> 1.14.2 --- pkgs/by-name/sp/spire/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/spire/package.nix b/pkgs/by-name/sp/spire/package.nix index 2f0770f2a841..827c1f545b95 100644 --- a/pkgs/by-name/sp/spire/package.nix +++ b/pkgs/by-name/sp/spire/package.nix @@ -8,7 +8,7 @@ buildGoModule (finalAttrs: { pname = "spire"; - version = "1.14.1"; + version = "1.14.2"; outputs = [ "out" @@ -21,7 +21,7 @@ buildGoModule (finalAttrs: { owner = "spiffe"; repo = "spire"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-aefYVK8dPBrLBlAzh33bIZkuIClLj8Cs1p+CHXMxWcU="; + sha256 = "sha256-EQ9QMAhF/HR8Za5K08c52FsktIeBzKOIIueN5XamhL8="; }; # Needed for github.co/google/go-tpm-tools/simulator which contains non-go files that `go mod vendor` strips From 24ced627833d899b508d01b8f7771e6f8a636eb2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 03:04:10 +0000 Subject: [PATCH 131/429] python3Packages.coiled: 1.131.0 -> 1.132.0 --- pkgs/development/python-modules/coiled/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coiled/default.nix b/pkgs/development/python-modules/coiled/default.nix index 46021a130bc4..b0664b74edde 100644 --- a/pkgs/development/python-modules/coiled/default.nix +++ b/pkgs/development/python-modules/coiled/default.nix @@ -39,12 +39,12 @@ buildPythonPackage (finalAttrs: { pname = "coiled"; - version = "1.131.0"; + version = "1.132.0"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-rokc9qDfWymnuwLoLHPJHpKc4ekwO7EPbSd3WuN4Xgg="; + hash = "sha256-VEyXOCiKANzf34ZjPZ3JGj4rvHkninF9sG5NTUVjONI="; }; build-system = [ From 568debaa5f9e4ceeea47a4619bd86fef00fcfd56 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Tue, 3 Mar 2026 19:09:56 -0800 Subject: [PATCH 132/429] pixeluvo: move icon to spec-compliant location --- pkgs/by-name/pi/pixeluvo/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/pi/pixeluvo/package.nix b/pkgs/by-name/pi/pixeluvo/package.nix index 4e8d08d71845..56860a50ebd1 100644 --- a/pkgs/by-name/pi/pixeluvo/package.nix +++ b/pkgs/by-name/pi/pixeluvo/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { mv usr $out mv opt $out - install -Dm644 $out/opt/pixeluvo/pixeluvo.png -t $out/share/pixmaps/ + install -Dm644 $out/opt/pixeluvo/pixeluvo.png -t $out/share/icons/hicolor/48x48/apps substituteInPlace $out/share/applications/pixeluvo.desktop \ --replace '/opt/pixeluvo/pixeluvo.png' pixeluvo From d4aa020939221a0ec432b7734127fea545982087 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 03:25:16 +0000 Subject: [PATCH 133/429] python3Packages.boto3-stubs: 1.42.59 -> 1.42.60 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index eaf3691b90a2..d10ee5394815 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -358,13 +358,13 @@ buildPythonPackage (finalAttrs: { pname = "boto3-stubs"; - version = "1.42.59"; + version = "1.42.60"; pyproject = true; src = fetchPypi { pname = "boto3_stubs"; inherit (finalAttrs) version; - hash = "sha256-Sm/FIFYO5qLLngW9/NRdTgfZ+5HPSD3706Wrh+/muGA="; + hash = "sha256-a20mFPRNBCJ11QcLsNWQAbtmWt41OqSarbNJ94B38Ig="; }; build-system = [ setuptools ]; From ba7ac8b5fb054dd3029417f3c4fc8d6d6df4d37d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 04:30:51 +0000 Subject: [PATCH 134/429] framework-tool-tui: 0.7.7 -> 0.8.0 --- pkgs/by-name/fr/framework-tool-tui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/framework-tool-tui/package.nix b/pkgs/by-name/fr/framework-tool-tui/package.nix index fb049d3399f1..023ee486b57b 100644 --- a/pkgs/by-name/fr/framework-tool-tui/package.nix +++ b/pkgs/by-name/fr/framework-tool-tui/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "framework-tool-tui"; - version = "0.7.7"; + version = "0.8.0"; src = fetchFromGitHub { owner = "grouzen"; repo = "framework-tool-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-XzOwShPMTyQjuoJ6fGW39kOF0Cnf3n8IEOQql0cEBvc="; + hash = "sha256-hTNSpjY0WkyXZpDGEM1eKQLFt/bhB5l/PSGd6bbDPAo="; }; - cargoHash = "sha256-geLxSMtSucJ5SO5u9yvbV6lT+O2a/JVbq3HxTZGYhQE="; + cargoHash = "sha256-SkZpYFu9yJX2qTeTNoCEFJP1jQNqfK7DQj3JlBCqDmo="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; From b76f2ca6796b9f8f63067e4b96d71f36386d2a63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 04:35:30 +0000 Subject: [PATCH 135/429] brainflow: 5.20.1 -> 5.21.0 --- pkgs/by-name/br/brainflow/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/br/brainflow/package.nix b/pkgs/by-name/br/brainflow/package.nix index 811748e10e8f..c308ec735302 100644 --- a/pkgs/by-name/br/brainflow/package.nix +++ b/pkgs/by-name/br/brainflow/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "brainflow"; - version = "5.20.1"; + version = "5.21.0"; src = fetchFromGitHub { owner = "brainflow-dev"; repo = "brainflow"; tag = finalAttrs.version; - hash = "sha256-eQgjEFYEuJXLNB+qeWLeN3ZRmq1lR5qpcFcPgHn8Az8="; + hash = "sha256-AE8c2ArkNipoAJSCj3NHEM91rulfbWGyANunPESKc/E="; }; patches = [ ]; From d36f2fb168da190221076ef8c2d636081ae66c59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 05:20:26 +0000 Subject: [PATCH 136/429] dex-oidc: 2.45.0 -> 2.45.1 --- pkgs/by-name/de/dex-oidc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/dex-oidc/package.nix b/pkgs/by-name/de/dex-oidc/package.nix index 951b02cf731f..4fa0922bcb4a 100644 --- a/pkgs/by-name/de/dex-oidc/package.nix +++ b/pkgs/by-name/de/dex-oidc/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "dex"; - version = "2.45.0"; + version = "2.45.1"; src = fetchFromGitHub { owner = "dexidp"; repo = "dex"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-qBVrOFb/Nb2CRuMwSoy5QXN5EAuKyTEGVocnEtvZdgE="; + sha256 = "sha256-A6PHuo3cr9m7/u/o8agOL+BiKdOKuLDvlS62O7zt/Jk="; }; vendorHash = "sha256-1D20aZhNUi7MUPfRTmSV4CZjLr0lUzbX4TI2LFcPY3U="; From 0043a3bde179a066366f0bb895ae09d8e305e5c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 07:11:40 +0000 Subject: [PATCH 137/429] templ: 0.3.977 -> 0.3.1001 --- pkgs/by-name/te/templ/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/templ/package.nix b/pkgs/by-name/te/templ/package.nix index bfc8f4d1e490..9b6ccadb996f 100644 --- a/pkgs/by-name/te/templ/package.nix +++ b/pkgs/by-name/te/templ/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "templ"; - version = "0.3.977"; + version = "0.3.1001"; src = fetchFromGitHub { owner = "a-h"; repo = "templ"; rev = "v${finalAttrs.version}"; - hash = "sha256-KABEveISMy31B4kXoYY5IwFouoI4L9Jco5qMcnpeL2s="; + hash = "sha256-146QxN+osvlzp8NTGm5TN2yvbu3cOodXfIVeIKsS+7I="; }; vendorHash = "sha256-pVZjZCXT/xhBCMyZdR7kEmB9jqhTwRISFp63bQf6w5A="; From b9a175d51ccffc056487c32b38c4f8d35d74d6bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 07:15:13 +0000 Subject: [PATCH 138/429] screenly-cli: 1.1.0 -> 1.1.1 --- pkgs/by-name/sc/screenly-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sc/screenly-cli/package.nix b/pkgs/by-name/sc/screenly-cli/package.nix index 324affbf886d..f266522a8b02 100644 --- a/pkgs/by-name/sc/screenly-cli/package.nix +++ b/pkgs/by-name/sc/screenly-cli/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "screenly-cli"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "screenly"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-Icx0Nkn0ScbNTmXllkUj6DPhGqzh8HnIQPpej4ABJac="; + hash = "sha256-g8qVlZVsHA0FiAK58AWH/LDyCopBBFPO4ocbz4rCivk="; }; - cargoHash = "sha256-XYXWbwuoPqL93R8Bre26kBPxkiXpJ0Dg06cBOyDK8ok="; + cargoHash = "sha256-yM7ueeYvJANBOaV/j7tlp+vVke/C2FepZ5Sd1IIqYX8="; nativeBuildInputs = [ pkg-config From a3d4baad773e4a6d6da77e5d085e6459f3ef5379 Mon Sep 17 00:00:00 2001 From: "Burfeind, Jan-Niklas" Date: Fri, 20 Feb 2026 14:43:08 +0100 Subject: [PATCH 139/429] labgrid.coordinator.service: Provide the service based on the example in contrib/ in the project repo. Provide three new options: - enable (default: False) - debug (default: False) - bindAddress (default: 0.0.0.0) - package (default: python313Packages.labgrid) - port (default: 22408) Co-authored-by: Rouven Czerwinski --- nixos/modules/module-list.nix | 1 + .../development/labgrid/coordinator.nix | 96 +++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 nixos/modules/services/development/labgrid/coordinator.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 8ea3e232594a..ff6978d5b751 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -604,6 +604,7 @@ ./services/development/hoogle.nix ./services/development/jupyter/default.nix ./services/development/jupyterhub/default.nix + ./services/development/labgrid/coordinator.nix ./services/development/livebook.nix ./services/development/lorri.nix ./services/development/nixseparatedebuginfod2.nix diff --git a/nixos/modules/services/development/labgrid/coordinator.nix b/nixos/modules/services/development/labgrid/coordinator.nix new file mode 100644 index 000000000000..472d631b7bed --- /dev/null +++ b/nixos/modules/services/development/labgrid/coordinator.nix @@ -0,0 +1,96 @@ +{ + config, + pkgs, + lib, + ... +}: + +let + cfg = config.services.labgrid.coordinator; +in +{ + meta = { + maintainers = with lib.maintainers; [ + aiyion + emantor + ]; + }; + + options = { + services.labgrid.coordinator = { + bindAddress = lib.mkOption { + default = "0.0.0.0"; + type = lib.types.str; + description = "Bind address for the labgrid coordinator."; + }; + + debug = lib.mkOption { + default = false; + type = with lib.types; bool; + description = '' + Whether to enable debug mode. + ''; + }; + + enable = lib.mkEnableOption "Labgrid Coordinator"; + + openFirewall = lib.mkOption { + default = false; + type = with lib.types; bool; + description = '' + Whether to automatically open the coordinator listen port in the firewall. + ''; + }; + + package = lib.mkPackageOption pkgs [ "python3Packages" "labgrid" ] { }; + + port = lib.mkOption { + default = 20408; + type = lib.types.port; + description = "Coordinator port to bind to."; + }; + }; + }; + + config = lib.mkIf cfg.enable { + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.port ]; + + systemd.services.labgrid-coordinator = { + after = [ "network-online.target" ]; + description = "Labgrid Coordinator"; + serviceConfig = { + Environment = ''"PYTHONUNBUFFERED=1"''; + ExecStart = "${lib.getBin cfg.package}/bin/labgrid-coordinator ${lib.optionalString cfg.debug "--debug"} --listen ${cfg.bindAddress}:${toString cfg.port}"; + Restart = "on-failure"; + DynamicUser = "yes"; + StateDirectory = "labgrid-coordinator"; + WorkingDirectory = "/var/lib/labgrid-coordinator"; + CapabilityBoundingSet = ""; + LockPersonality = true; + MemoryDenyWriteExecute = true; + PrivateDevices = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + RestrictRealtime = true; + RestrictAddressFamilies = "AF_INET AF_INET6"; + RestrictNamespaces = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + "~@resources" + ]; + }; + wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; + }; + }; +} From 336b6be1476abc05b56c198f9b344b6c653c912d Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Sat, 21 Feb 2026 00:14:29 +0100 Subject: [PATCH 140/429] nixosTests.labgrid: init Co-authored-by: Burfeind, Jan-Niklas --- nixos/tests/all-tests.nix | 1 + nixos/tests/labgrid.nix | 61 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 nixos/tests/labgrid.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 763441391abb..f145d3a75554 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -853,6 +853,7 @@ in inherit runTest; inherit (pkgs) lib; }; + labgrid = runTest ./labgrid.nix; lact = runTest ./lact.nix; ladybird = runTest ./ladybird.nix; languagetool = runTest ./languagetool.nix; diff --git a/nixos/tests/labgrid.nix b/nixos/tests/labgrid.nix new file mode 100644 index 000000000000..d92639fefa4b --- /dev/null +++ b/nixos/tests/labgrid.nix @@ -0,0 +1,61 @@ +{ pkgs, ... }: +{ + name = "Labgrid"; + meta.maintainers = with pkgs.lib.maintainers; [ + aiyion + emantor + ]; + + nodes.coordinator = + { pkgs, ... }: + { + services.labgrid.coordinator.enable = true; + services.labgrid.coordinator.openFirewall = true; + }; + + nodes.client = + { pkgs, ... }: + { + environment.variables = { + LG_COORDINATOR = "coordinator:20408"; + }; + environment.systemPackages = [ pkgs.python3Packages.labgrid ]; + }; + + testScript = + { nodes, ... }: + #python + '' + def assert_contains(haystack, needle): + if needle not in haystack: + print("The haystack that will cause the following exception is:") + print("---") + print(haystack) + print("---") + raise Exception(f"Expected string '{needle}' was not found") + + with subtest("Wait for coordinator startup"): + coordinator.start() + coordinator.wait_for_unit("labgrid-coordinator.service") + coordinator.wait_for_open_port(20408) + + with subtest("Connect from client"): + client.start() + out = client.succeed("labgrid-client resources") + + with subtest("Create place"): + client.succeed("labgrid-client -p testplace create") + out = client.succeed("labgrid-client places") + assert_contains(out, "testplace") + # Give the coordinator enough time to persist place creation + coordinator.wait_until_succeeds("grep -q testplace /var/lib/labgrid-coordinator/places.yaml") + + with subtest("Test coordinator persistence"): + coordinator.shutdown() + coordinator.start() + coordinator.wait_for_unit("labgrid-coordinator.service") + coordinator.wait_for_open_port(20408) + out = client.succeed("labgrid-client places") + assert_contains(out, "testplace") + ''; +} From ad603b16de0a867412a3fc58d51e71a6a0f4fdaa Mon Sep 17 00:00:00 2001 From: "Burfeind, Jan-Niklas" Date: Mon, 2 Mar 2026 11:52:16 +0100 Subject: [PATCH 141/429] nixosTests.labgrid: Add systemd hardening test to prevent unnoticed degradation. The limit '11' matches the current exposure level '1.1'. --- nixos/tests/labgrid.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/tests/labgrid.nix b/nixos/tests/labgrid.nix index d92639fefa4b..1b405dc0c51c 100644 --- a/nixos/tests/labgrid.nix +++ b/nixos/tests/labgrid.nix @@ -57,5 +57,10 @@ coordinator.wait_for_open_port(20408) out = client.succeed("labgrid-client places") assert_contains(out, "testplace") + + with subtest("Check systemd hardening does not degrade unnoticed"): + exact_threshold = 11 + out = coordinator.fail(f"systemd-analyze security labgrid-coordinator.service --threshold={exact_threshold-1}") + out = coordinator.succeed(f"systemd-analyze security labgrid-coordinator.service --threshold={exact_threshold}") ''; } From 643ec44ee8d16da813937b61b43f30de26a5a149 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Mar 2026 09:20:50 +0100 Subject: [PATCH 142/429] nerva: init at 1.0.0 Fingerprinting CLI tool for various protocols https://github.com/praetorian-inc/nerva --- pkgs/by-name/ne/nerva/package.nix | 39 +++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/ne/nerva/package.nix diff --git a/pkgs/by-name/ne/nerva/package.nix b/pkgs/by-name/ne/nerva/package.nix new file mode 100644 index 000000000000..55173202f9cb --- /dev/null +++ b/pkgs/by-name/ne/nerva/package.nix @@ -0,0 +1,39 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule (finalAttrs: { + pname = "nerva"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "praetorian-inc"; + repo = "nerva"; + tag = "v${finalAttrs.version}"; + hash = "sha256-EZQQLXN9eixL3BUSn6VAaKPe9uA3uW1l6zfzq3bG+vk="; + }; + + vendorHash = "sha256-h3pxl84P7dUmXJJ9t/Rnzx0oJcGnA+7ytGWhk401ecY="; + + ldflags = [ + "-s" + "-w" + "-X=main.version=${finalAttrs.version}" + "-X=main.commit=${finalAttrs.src.rev}" + "-X=main.date=1970-01-01T00:00:00Z" + ]; + + # Tests require a docker setup + doCheck = false; + + meta = { + description = "Fingerprinting CLI tool for various protocols"; + homepage = "https://github.com/praetorian-inc/nerva"; + changelog = "https://github.com/praetorian-inc/nerva/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "nerva"; + }; +}) From a7aee8fae17a4ffb8a83d346b0b9c7c1ef629248 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 08:30:14 +0000 Subject: [PATCH 143/429] ruffle: 0.2.0-nightly-2026-02-23 -> 0.2.0-nightly-2026-03-04 --- pkgs/by-name/ru/ruffle/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix index d49a2e6ead28..f0977cebb46b 100644 --- a/pkgs/by-name/ru/ruffle/package.nix +++ b/pkgs/by-name/ru/ruffle/package.nix @@ -27,13 +27,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ruffle"; - version = "0.2.0-nightly-2026-02-23"; + version = "0.2.0-nightly-2026-03-04"; src = fetchFromGitHub { owner = "ruffle-rs"; repo = "ruffle"; tag = lib.strings.removePrefix "0.2.0-" finalAttrs.version; - hash = "sha256-q7d4Nb967W0O42lr5T6AltlKumgmBZ8cHN0lIO5i6Xk="; + hash = "sha256-IEldR8Pze17scKkKAfLrAPyZW7aak/6EKHSaO2t5MxY="; }; postPatch = @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "OpenH264Version(${major}, ${minor}, ${patch})" ''; - cargoHash = "sha256-ZZ5Utf2awzOLZP27fzGqKVChMwy1UesEkF5WAnXi1WE="; + cargoHash = "sha256-w2uzH9b/zuWPeRBpo/KgAXYUOC2OnFRSHGewsbfVVww="; cargoBuildFlags = lib.optional withRuffleTools "--workspace"; env = From e7301c3bbd31db3c871ac715f1c98798ec95dfbb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 08:38:50 +0000 Subject: [PATCH 144/429] ttdl: 4.23.0 -> 4.24.1 --- pkgs/by-name/tt/ttdl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tt/ttdl/package.nix b/pkgs/by-name/tt/ttdl/package.nix index 0767888960fb..99105ff48404 100644 --- a/pkgs/by-name/tt/ttdl/package.nix +++ b/pkgs/by-name/tt/ttdl/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ttdl"; - version = "4.23.0"; + version = "4.24.1"; src = fetchFromGitHub { owner = "VladimirMarkelov"; repo = "ttdl"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-a7roS7eCh6p3hoWmUaeMWinqyJe2g3iI2hQeNxJx9lc="; + sha256 = "sha256-tfyfFwHnIS5nCYobVu49AmjVKvxhngqD5woxyiv5FEc="; }; - cargoHash = "sha256-gLZlzOJxGmwWzmhVggw/SyfJUR7QVIZz5rcHbQFHG3E="; + cargoHash = "sha256-XH/F0ffWmIvesR0sA+AdnLV3IaLWrgin4YDJtkfbVDI="; meta = { description = "CLI tool to manage todo lists in todo.txt format"; From 428d5101b292e8317dff19935c4cb62afd025bf2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 11:22:39 +0000 Subject: [PATCH 145/429] xpipe: 21.3 -> 21.4 --- pkgs/by-name/xp/xpipe/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xp/xpipe/package.nix b/pkgs/by-name/xp/xpipe/package.nix index 86cced5fd073..2be8bedc99f4 100644 --- a/pkgs/by-name/xp/xpipe/package.nix +++ b/pkgs/by-name/xp/xpipe/package.nix @@ -39,7 +39,7 @@ let hash = { - x86_64-linux = "sha256-+sBAEtt4GFzzxQm+DH7Em+m1E89QQKKhIcuCA69FaXg="; + x86_64-linux = "sha256-72pXA+r9xMY1DeO9/NgvQGGI6BrQE84HfsFKqu2G6XQ="; } .${system} or throwSystem; @@ -48,7 +48,7 @@ let in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "21.3"; + version = "21.4"; src = fetchzip { url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; From 30b5477024f331fe77834659c6cd556aa701cd44 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 11:45:30 +0000 Subject: [PATCH 146/429] chatbox: 1.19.0 -> 1.19.1 --- pkgs/by-name/ch/chatbox/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/chatbox/package.nix b/pkgs/by-name/ch/chatbox/package.nix index 96eb7cc56491..f9b26d324c1a 100644 --- a/pkgs/by-name/ch/chatbox/package.nix +++ b/pkgs/by-name/ch/chatbox/package.nix @@ -6,11 +6,11 @@ }: let pname = "chatbox"; - version = "1.19.0"; + version = "1.19.1"; src = fetchurl { url = "https://download.chatboxai.app/releases/Chatbox-${version}-x86_64.AppImage"; - hash = "sha256-ETquOwdYRWTbXyQChtXo1vz/xqvog3fYgOmSnWenJxE="; + hash = "sha256-xR653w7jiJlSHvbDcJG5pFjbgf/jZzbyx8C+pa0cPp4="; }; appimageContents = appimageTools.extract { inherit pname version src; }; From be2b30f9c348c3624de06c432af320e166916da3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 12:32:49 +0000 Subject: [PATCH 147/429] python3Packages.fasthtml: 0.12.47 -> 0.12.48 --- pkgs/development/python-modules/fasthtml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fasthtml/default.nix b/pkgs/development/python-modules/fasthtml/default.nix index cc939fda4141..3f47dd2ce5a7 100644 --- a/pkgs/development/python-modules/fasthtml/default.nix +++ b/pkgs/development/python-modules/fasthtml/default.nix @@ -31,14 +31,14 @@ buildPythonPackage (finalAttrs: { pname = "fasthtml"; - version = "0.12.47"; + version = "0.12.48"; pyproject = true; src = fetchFromGitHub { owner = "AnswerDotAI"; repo = "fasthtml"; tag = finalAttrs.version; - hash = "sha256-dlG6pOVsd9RSmy/rgr7lUANRllND4tZDnsOecsI4bh8="; + hash = "sha256-lMAuIw4sMkS3XSG/0Bs0iQPSjMusbmjUKv0w4cINwas="; }; build-system = [ From 3ceda6217cbafeb91eac78ad88a1b86e1acce448 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 12:41:02 +0000 Subject: [PATCH 148/429] libgbinder: 1.1.43 -> 1.1.44 --- pkgs/by-name/li/libgbinder/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libgbinder/package.nix b/pkgs/by-name/li/libgbinder/package.nix index 0736a50e1048..800d5c6a9b90 100644 --- a/pkgs/by-name/li/libgbinder/package.nix +++ b/pkgs/by-name/li/libgbinder/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libgbinder"; - version = "1.1.43"; + version = "1.1.44"; src = fetchFromGitHub { owner = "mer-hybris"; repo = "libgbinder"; rev = finalAttrs.version; - sha256 = "sha256-a4lQzWOVdlXQeoJzvNaELiVXLvXsx4reigKrhsrcafM="; + sha256 = "sha256-6xyNbHPPN/KtyejMoVfAj0bi1dEWVO2nboj1RpqnFIA="; }; outputs = [ From c664cabf67fc7503a30a43597ffe17997a4287be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 12:44:50 +0000 Subject: [PATCH 149/429] kdiff3: 1.12.3 -> 1.12.4 --- pkgs/by-name/kd/kdiff3/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/kd/kdiff3/package.nix b/pkgs/by-name/kd/kdiff3/package.nix index c3686a36f503..460dd66312c6 100644 --- a/pkgs/by-name/kd/kdiff3/package.nix +++ b/pkgs/by-name/kd/kdiff3/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "kdiff3"; - version = "1.12.3"; + version = "1.12.4"; src = fetchurl { url = "mirror://kde/stable/kdiff3/kdiff3-${finalAttrs.version}.tar.xz"; - hash = "sha256-4iZUxFeIF5mAgwVSnGtZbAydw4taLswULsdtRvaHP0w="; + hash = "sha256-RpCjWqkzsZJ1HdWQprT1P+86qVAkY3ERKtbocvaybss="; }; nativeBuildInputs = [ From ec4bc7000ad708af3942547d286cd1bf02eec45b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 13:19:26 +0000 Subject: [PATCH 150/429] libre: 4.5.0 -> 4.6.0 --- pkgs/by-name/li/libre/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libre/package.nix b/pkgs/by-name/li/libre/package.nix index 68eb7dd1c5a0..072f48477384 100644 --- a/pkgs/by-name/li/libre/package.nix +++ b/pkgs/by-name/li/libre/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "4.5.0"; + version = "4.6.0"; pname = "libre"; src = fetchFromGitHub { owner = "baresip"; repo = "re"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-7cHEEExdQQFS3Nm1dKO9FZrcZ0hUj1i3BVpWOy9yfAI="; + sha256 = "sha256-+0ZVNWfcB8yU8cQdSkxfgOuzwapQ4ZyahtSSWfEb25w="; }; buildInputs = [ From 708a5711f8dcf95b018cba67aee5171135c47a94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 13:21:45 +0000 Subject: [PATCH 151/429] baresip: 4.5.0 -> 4.6.0 --- pkgs/by-name/ba/baresip/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/baresip/package.nix b/pkgs/by-name/ba/baresip/package.nix index b48e824f8d98..fcfa695e7097 100644 --- a/pkgs/by-name/ba/baresip/package.nix +++ b/pkgs/by-name/ba/baresip/package.nix @@ -31,14 +31,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "4.5.0"; + version = "4.6.0"; pname = "baresip"; src = fetchFromGitHub { owner = "baresip"; repo = "baresip"; rev = "v${finalAttrs.version}"; - hash = "sha256-tut6HC4wn749BqIoRMhk/O2iN4y2hr6MVEnOICroKEM="; + hash = "sha256-ikfSr9chbkv+5XPlDZKH/80N98tBzHvyNf29kENXOFI="; }; patches = [ From a62c14a903a5c93a9a6e0acf6a457fb950bf15d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 13:34:26 +0000 Subject: [PATCH 152/429] fuzzel: 1.14.0 -> 1.14.1 --- pkgs/by-name/fu/fuzzel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fu/fuzzel/package.nix b/pkgs/by-name/fu/fuzzel/package.nix index 8f83f6f4b4e5..5daea3dd9a1c 100644 --- a/pkgs/by-name/fu/fuzzel/package.nix +++ b/pkgs/by-name/fu/fuzzel/package.nix @@ -28,13 +28,13 @@ assert (svgSupport && svgBackend == "nanosvg") -> enableCairo; stdenv.mkDerivation (finalAttrs: { pname = "fuzzel"; - version = "1.14.0"; + version = "1.14.1"; src = fetchFromCodeberg { owner = "dnkl"; repo = "fuzzel"; rev = finalAttrs.version; - hash = "sha256-9O6CABh149ZtNu3sEhuycsM7pinVrBzU+rLxCAbxobs="; + hash = "sha256-VhUYNi0/NTrx84KxBgPP1bE2sN1HXqtayg4oY7BLZK4="; }; depsBuildBuild = [ From 1516202089eca8de5b5128a4f07991e371f1f8ce Mon Sep 17 00:00:00 2001 From: yuxqiu Date: Wed, 4 Mar 2026 22:23:55 +0800 Subject: [PATCH 153/429] earlyoom: fix patch for version 1.9.0 --- pkgs/by-name/ea/earlyoom/0000-fix-dbus-path.patch | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ea/earlyoom/0000-fix-dbus-path.patch b/pkgs/by-name/ea/earlyoom/0000-fix-dbus-path.patch index 2b9e45dfb1c9..02d6e00454f2 100644 --- a/pkgs/by-name/ea/earlyoom/0000-fix-dbus-path.patch +++ b/pkgs/by-name/ea/earlyoom/0000-fix-dbus-path.patch @@ -1,6 +1,15 @@ --- a/kill.c +++ b/kill.c -@@ -175,7 +175,7 @@ static void notify_dbus(const char* body) +@@ -153,7 +153,7 @@ static void notify_spawn_subprocess(const char* script, char* const argv[], cons + } + + debug("%s: exec %s\n", __func__, script); +- execv(script, argv); ++ execvp(script, argv); + warn("%s: exec %s failed: %s\n", __func__, script, strerror(errno)); + exit(1); + } +@@ -177,7 +177,7 @@ static void notify_dbus(const char* body) body2, NULL }; From 436fbcca2f5e21bc73dbeb33f4055961bc084a18 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 14:29:19 +0000 Subject: [PATCH 154/429] sickgear: 3.34.11 -> 3.34.12 --- pkgs/by-name/si/sickgear/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/sickgear/package.nix b/pkgs/by-name/si/sickgear/package.nix index fe45138683f6..65625aefd016 100644 --- a/pkgs/by-name/si/sickgear/package.nix +++ b/pkgs/by-name/si/sickgear/package.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "sickgear"; - version = "3.34.11"; + version = "3.34.12"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; tag = "release_${finalAttrs.version}"; - hash = "sha256-7Jfm/NM5ij/YofU1bpQ8npX6exR1/W6PxvPpulauoMw="; + hash = "sha256-EdJCPuILAiz7jVTC4ZKY+ziiUEqrRyZOqZOGUtyCmLw="; }; dontBuild = true; From ed3af005ba04e541baa14f6cf6c67be8533f4f98 Mon Sep 17 00:00:00 2001 From: eymeric Date: Tue, 3 Mar 2026 12:04:59 +0100 Subject: [PATCH 155/429] cinny-unwrapped: skip rebuilding native modules --- pkgs/by-name/ci/cinny-unwrapped/package.nix | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix index f55428608294..433a166dbb07 100644 --- a/pkgs/by-name/ci/cinny-unwrapped/package.nix +++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix @@ -2,13 +2,7 @@ lib, buildNpmPackage, fetchFromGitHub, - giflib, - python3, - pkg-config, - pixman, nodejs_22, - cairo, - pango, stdenv, }: @@ -29,18 +23,11 @@ buildNpmPackage rec { npmDepsHash = "sha256-2Lrd0jAwAH6HkwLHyivqwaEhcpFAIALuno+MchSIfxo="; - nativeBuildInputs = [ - python3 - pkg-config + # Skip rebuilding native modules since they're not needed for the web app + npmRebuildFlags = [ + "--ignore-scripts" ]; - buildInputs = [ - pixman - cairo - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ giflib ]; - installPhase = '' runHook preInstall From ade7d275b60618549e7092eb4009e8a668af95f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 15:11:22 +0000 Subject: [PATCH 156/429] chirp: 0.4.0-unstable-2026-02-19 -> 0.4.0-unstable-2026-03-03 --- pkgs/by-name/ch/chirp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix index b9d8a50804ed..3a19a5fb2a25 100644 --- a/pkgs/by-name/ch/chirp/package.nix +++ b/pkgs/by-name/ch/chirp/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication { pname = "chirp"; - version = "0.4.0-unstable-2026-02-19"; + version = "0.4.0-unstable-2026-03-03"; pyproject = true; src = fetchFromGitHub { owner = "kk7ds"; repo = "chirp"; - rev = "1467519e792e8ebcc9a33dc40df0b2e273ce9a53"; - hash = "sha256-hUcuWanQEsDhwpN0UrPpnfn8ff+o5KZr7hgl54CmWSI="; + rev = "60f3edae35afe0b9542c8ef2eef047d6d42211ac"; + hash = "sha256-b2dAb8RjV2X+j13tcCvmq0Nn0Xp5l6GNGPLRC/KMVao="; }; nativeBuildInputs = [ From 12bfc3421ccf8658281051376a4d40e059240c25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 15:14:27 +0000 Subject: [PATCH 157/429] vscode-extensions.danielgavin.ols: 0.1.45 -> 0.1.46 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 708fd4dd2927..09b546507a7e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1143,8 +1143,8 @@ let mktplcRef = { publisher = "DanielGavin"; name = "ols"; - version = "0.1.45"; - hash = "sha256-YfaP9QCLW4vZKfMyE/MEqEyiA9M5xlnS5Uxph+RT89s="; + version = "0.1.46"; + hash = "sha256-X2Tp0rsPp0UoKW4Yz7Ht/7b1zO0bL92u6CtyKRy+hDY="; }; meta = { description = "Visual Studio Code extension for Odin language"; From 2def77c11cbaab8382d582c3fb15e78407f95533 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 15:15:16 +0000 Subject: [PATCH 158/429] k3sup: 0.13.11 -> 0.13.12 --- pkgs/by-name/k3/k3sup/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/k3/k3sup/package.nix b/pkgs/by-name/k3/k3sup/package.nix index 8706fc91847a..2d2a1613dc2e 100644 --- a/pkgs/by-name/k3/k3sup/package.nix +++ b/pkgs/by-name/k3/k3sup/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "k3sup"; - version = "0.13.11"; + version = "0.13.12"; src = fetchFromGitHub { owner = "alexellis"; repo = "k3sup"; rev = finalAttrs.version; - sha256 = "sha256-MLGgH9Tg3lcl/nDGlGgfvgjoxjXRux79Cz6Tig0kDM4="; + sha256 = "sha256-+YJacemEnUBEUZBKYgr/lBzt6Y8+U1rqgs/3vDxpLfs="; }; nativeBuildInputs = [ From 039f33f2996108056486f5c4029a326fb23298b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 15:32:57 +0000 Subject: [PATCH 159/429] gat: 0.26.1 -> 0.26.2 --- pkgs/by-name/ga/gat/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ga/gat/package.nix b/pkgs/by-name/ga/gat/package.nix index 126ea3b9d004..5e656faf4eca 100644 --- a/pkgs/by-name/ga/gat/package.nix +++ b/pkgs/by-name/ga/gat/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "gat"; - version = "0.26.1"; + version = "0.26.2"; src = fetchFromGitHub { owner = "koki-develop"; repo = "gat"; tag = "v${finalAttrs.version}"; - hash = "sha256-tlRXWI8jdns+MFLBl5ZzcGo2qli6dKhlT9ekwSrxi+s="; + hash = "sha256-qg6X02MgtK97tY5G74gojHu6mD8qEEWPotep985grsA="; }; vendorHash = "sha256-0kNtZOTpWpeFVyRHFIf6ybM7gAWb5/JWVljm0FO5fK8="; From a8b88d67af69e5e533c35053c7740789dd749239 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 16:18:20 +0000 Subject: [PATCH 160/429] ultralytics: 8.4.16 -> 8.4.19 --- pkgs/development/python-modules/ultralytics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ultralytics/default.nix b/pkgs/development/python-modules/ultralytics/default.nix index 26e7c18b8082..adb200e4fc4a 100644 --- a/pkgs/development/python-modules/ultralytics/default.nix +++ b/pkgs/development/python-modules/ultralytics/default.nix @@ -34,14 +34,14 @@ buildPythonPackage (finalAttrs: { pname = "ultralytics"; - version = "8.4.16"; + version = "8.4.19"; pyproject = true; src = fetchFromGitHub { owner = "ultralytics"; repo = "ultralytics"; tag = "v${finalAttrs.version}"; - hash = "sha256-pMsRs/YIogZxb6JUdDEhXG5CitMdQ8IDEU5CewE98TU="; + hash = "sha256-z/FKG3e/hF+dj3wu+JQd/rrq1qWFyX1FkOV7cJcaFZU="; }; build-system = [ setuptools ]; From 3db79eb91998d0c1e113df71e90c2f89542c46f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 16:28:49 +0000 Subject: [PATCH 161/429] python3Packages.ansible-compat: 25.12.0 -> 25.12.1 --- pkgs/development/python-modules/ansible-compat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix index de2a7f1f76f5..0f725f9d0b34 100644 --- a/pkgs/development/python-modules/ansible-compat/default.nix +++ b/pkgs/development/python-modules/ansible-compat/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "ansible-compat"; - version = "25.12.0"; + version = "25.12.1"; pyproject = true; src = fetchFromGitHub { owner = "ansible"; repo = "ansible-compat"; tag = "v${version}"; - hash = "sha256-nn0NKX6rqNKrSZd+p/oq/LmESAgvTkSOA08wq1xLY2I="; + hash = "sha256-TBq+4iwffA8cUWwtFuw+8XYdOJgpdq77IxSa/btV4K8="; }; build-system = [ From 817ee36ce69c9bff9b0b43be786871668d198230 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 16:50:33 +0000 Subject: [PATCH 162/429] vscode-extensions.amazonwebservices.amazon-q-vscode: 1.109.0 -> 1.111.0 --- .../extensions/amazonwebservices.amazon-q-vscode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix index 4b493103e290..656bdf7b572e 100644 --- a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { mktplcRef = { name = "amazon-q-vscode"; publisher = "AmazonWebServices"; - version = "1.109.0"; - hash = "sha256-y7iUWFKYTLZVS9Zjoy9NtqtgfQTJLWij9JD20pjyTXY="; + version = "1.111.0"; + hash = "sha256-f4GVY3vL7ienn/pWzcbXcDHNHCrPPmFWeVpVDVVNF5c="; }; meta = { From f3882575ff155e012969e0a583af44d5d7c343ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 18:16:54 +0000 Subject: [PATCH 163/429] dracula-theme: 4.0.0-unstable-2026-02-09 -> 4.0.0-unstable-2026-03-01 --- pkgs/by-name/dr/dracula-theme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dr/dracula-theme/package.nix b/pkgs/by-name/dr/dracula-theme/package.nix index 7e5d0fe8e66a..44c708d3252a 100644 --- a/pkgs/by-name/dr/dracula-theme/package.nix +++ b/pkgs/by-name/dr/dracula-theme/package.nix @@ -8,7 +8,7 @@ let themeName = "Dracula"; - version = "4.0.0-unstable-2026-02-09"; + version = "4.0.0-unstable-2026-03-01"; in stdenvNoCC.mkDerivation { pname = "dracula-theme"; @@ -17,8 +17,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "dracula"; repo = "gtk"; - rev = "f590e017d366466323a26c5cb8360ffca026aac0"; - hash = "sha256-eP+GTmDNPeXc3SE8MrQC4jzwz2a0yDA89msIkPalp1w="; + rev = "1188c8eabdfc33c42738862b91caf7fab884c767"; + hash = "sha256-Z3dMgkk5SvpCWjxdm8hd5FBeEvq0uCJuj3zC5boQEdk="; }; propagatedUserEnvPkgs = [ From b211a99e776999280abcd7870cbda724c8200f24 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 18:17:42 +0000 Subject: [PATCH 164/429] vals: 0.43.5 -> 0.43.6 --- pkgs/by-name/va/vals/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/va/vals/package.nix b/pkgs/by-name/va/vals/package.nix index 383c6381c453..48801590c488 100644 --- a/pkgs/by-name/va/vals/package.nix +++ b/pkgs/by-name/va/vals/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "vals"; - version = "0.43.5"; + version = "0.43.6"; src = fetchFromGitHub { rev = "v${finalAttrs.version}"; owner = "helmfile"; repo = "vals"; - sha256 = "sha256-QioyZTYmTN1S/XvIkWVUelD+Pm3O//gwicj5sT7/YcY="; + sha256 = "sha256-ZDZ6WpCJX946BFvmgyTIhAJ0lBilkUiE9Aid8T0a8Lw="; }; - vendorHash = "sha256-PLUicPdMsn2MG2j/v/pnMNyUQhLGwu5qtS0nPKwI8UI="; + vendorHash = "sha256-HwEB+R68DvM7iQQvmidli2zyJPsoQp6FQoTlPVpK4g8="; proxyVendor = true; From 091e212ae1ed00edabba522de79cd587b84a3084 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 18:27:54 +0000 Subject: [PATCH 165/429] ord: 0.25.0 -> 0.26.0 --- pkgs/by-name/or/ord/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/or/ord/package.nix b/pkgs/by-name/or/ord/package.nix index 2a586de465f6..9f458020a21d 100644 --- a/pkgs/by-name/or/ord/package.nix +++ b/pkgs/by-name/or/ord/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ord"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "ordinals"; repo = "ord"; rev = finalAttrs.version; - hash = "sha256-wRc3KauVHvl1Lc1ATXZYtCb2v6LdX1qT+ABTN7BdjAQ="; + hash = "sha256-9ElAq+1Bc3y+97rHIQqpDNm81aZzncgJMo2WvDuoUxc="; }; - cargoHash = "sha256-3p7K0Zc7/ZnnoOhQedWrg3xm+EK1QE3h4g4Y3idBREo="; + cargoHash = "sha256-OIZgCTHGrPWyAD5is9FyDwt3DGwxCcr0gjfvzyZyRBE="; nativeBuildInputs = [ pkg-config From 96abc904711ebef0d5fc7db42bf1b0076eb26e31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 18:42:46 +0000 Subject: [PATCH 166/429] grafanaPlugins.victoriametrics-metrics-datasource: 0.22.0 -> 0.23.1 --- .../plugins/victoriametrics-metrics-datasource/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix index 39247c201642..332eb1a13c92 100644 --- a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "victoriametrics-metrics-datasource"; - version = "0.22.0"; - zipHash = "sha256-wawH2b95KX7KXIJot4tThTB1tT0XKzUjFsL2hzM5TX8="; + version = "0.23.1"; + zipHash = "sha256-SjQ71hRzjTnfxopspx2su29J6rBh2LT+hpzfM9EX7S8="; meta = { description = "VictoriaMetrics metrics datasource for Grafana"; license = lib.licenses.agpl3Only; From 42dcd8b87ce80be13c2b16825cea9af66b1cec86 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Wed, 4 Mar 2026 19:55:30 +0100 Subject: [PATCH 167/429] python3Packages.pynitrokey: add panicgh as maintainer --- pkgs/development/python-modules/pynitrokey/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pynitrokey/default.nix b/pkgs/development/python-modules/pynitrokey/default.nix index c661fe0a73d5..93f6df23fedf 100644 --- a/pkgs/development/python-modules/pynitrokey/default.nix +++ b/pkgs/development/python-modules/pynitrokey/default.nix @@ -90,6 +90,7 @@ buildPythonPackage { ]; maintainers = with lib.maintainers; [ frogamic + panicgh ]; inherit mainProgram; }; From b3f76c859767d6921fabc75c3f5a64d328a4a0f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 18:56:21 +0000 Subject: [PATCH 168/429] steam-rom-manager: 2.5.33 -> 2.5.34 --- pkgs/by-name/st/steam-rom-manager/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/steam-rom-manager/package.nix b/pkgs/by-name/st/steam-rom-manager/package.nix index 2cad0592feec..41de43fb215f 100644 --- a/pkgs/by-name/st/steam-rom-manager/package.nix +++ b/pkgs/by-name/st/steam-rom-manager/package.nix @@ -6,11 +6,11 @@ appimageTools.wrapType2 rec { pname = "steam-rom-manager"; - version = "2.5.33"; + version = "2.5.34"; src = fetchurl { url = "https://github.com/SteamGridDB/steam-rom-manager/releases/download/v${version}/Steam-ROM-Manager-${version}.AppImage"; - sha256 = "sha256-gaE19+z7pOr55b4Ub+ynxtAlFxmF+n3LkY8SDvfgc6o="; + sha256 = "sha256-QbXwfT91BQ15/DL3IYC3qZcahlsQvkUKTwMUUpZY+U8="; }; extraInstallCommands = From 97b1b53e656270e120249fd5696fe613c6530557 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 19:07:43 +0000 Subject: [PATCH 169/429] prometheus-pgbouncer-exporter: 0.11.1 -> 0.12.0 --- pkgs/by-name/pr/prometheus-pgbouncer-exporter/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/prometheus-pgbouncer-exporter/package.nix b/pkgs/by-name/pr/prometheus-pgbouncer-exporter/package.nix index 6a37c00aea93..ad0c5b606d4a 100644 --- a/pkgs/by-name/pr/prometheus-pgbouncer-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-pgbouncer-exporter/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pgbouncer-exporter"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = "pgbouncer_exporter"; rev = "v${version}"; - hash = "sha256-cLCoEREGZ81a6CBcSyuQ4x4lDMusHoP7BB0MyPaTVJ8="; + hash = "sha256-Kt3eM8CxDOTWgMppAs+ajt4RL6Q/7jMcKYQIFzlRW8g="; }; - vendorHash = "sha256-qAsmPMANBiswF2/+rCZnqFETD0snnPHQGUaVOXErLfc="; + vendorHash = "sha256-h9IJAjTCSKrREolo4DVOzULguz4gj6UbkFSR9yuivQY="; meta = { description = "Prometheus exporter for PgBouncer"; From 0556bafe6411e8599f80a4729a20d90dcc35bf8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 19:10:50 +0000 Subject: [PATCH 170/429] vscode-extensions.intellsmi.comment-translate: 3.0.0 -> 3.1.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 708fd4dd2927..185d07448207 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2310,8 +2310,8 @@ let mktplcRef = { publisher = "intellsmi"; name = "comment-translate"; - version = "3.0.0"; - hash = "sha256-AtM56NkivTK4cGyKBsaZTHYvDwiJb4CrEuiJiw5hTcI="; + version = "3.1.0"; + hash = "sha256-hn3G2arNr3LWMOeMLkRdR/GTWobeczaIzGI59x9/oK8="; }; meta = { description = "Visual Studio Code extension to translate the comments for computer language"; From 136b0886f18b75a9c1cb8c10736f2f1aff737004 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 19:17:54 +0000 Subject: [PATCH 171/429] ranger: 1.9.4-unstable-2026-01-22 -> 1.9.4-unstable-2026-02-25 --- pkgs/by-name/ra/ranger/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/ranger/package.nix b/pkgs/by-name/ra/ranger/package.nix index 014f25c05b60..3f1c32c1a289 100644 --- a/pkgs/by-name/ra/ranger/package.nix +++ b/pkgs/by-name/ra/ranger/package.nix @@ -19,14 +19,14 @@ python3Packages.buildPythonApplication { pname = "ranger"; - version = "1.9.4-unstable-2026-01-22"; + version = "1.9.4-unstable-2026-02-25"; pyproject = true; src = fetchFromGitHub { owner = "ranger"; repo = "ranger"; - rev = "46c4fde3831dcf00ed85ee4e089df28601932229"; - hash = "sha256-9/9TSLXcFC+ItCCCQGaYoCjOyPH9Zx3JCKJJXf0SINI="; + rev = "126d3ee487b5c291c49d5ef25176fbe8207d71e3"; + hash = "sha256-SRr+vABEm6J+YT0ALw6F0dPrJ0RJQQGRTCbzPhgjB0A="; }; build-system = with python3Packages; [ From 61d2e85ecf69d180d5f917eabd33b57f12e5bd2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 19:34:29 +0000 Subject: [PATCH 172/429] spacectl: 1.18.4 -> 1.18.5 --- pkgs/by-name/sp/spacectl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/spacectl/package.nix b/pkgs/by-name/sp/spacectl/package.nix index ad9b93c33156..6606d39400cb 100644 --- a/pkgs/by-name/sp/spacectl/package.nix +++ b/pkgs/by-name/sp/spacectl/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "spacectl"; - version = "1.18.4"; + version = "1.18.5"; src = fetchFromGitHub { owner = "spacelift-io"; repo = "spacectl"; rev = "v${finalAttrs.version}"; - hash = "sha256-9CsC9xkMz8BfIegahQ1cpSODqL1yl10Lncn8RdceWcU="; + hash = "sha256-KPCMOkMiJ3qYb/nykAEG36k7lNZHok5+rqG2h22MIw8="; }; vendorHash = "sha256-f/09XZiaYNUZzKM0jITFdUmKt8UQy90K4PGhC6ZupCk="; From e52c5b2b6ffe87be1224214ebbf92d7248ba1043 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Tue, 3 Mar 2026 19:03:42 -0800 Subject: [PATCH 173/429] pineflash: move icon to spec-compliant location --- pkgs/by-name/pi/pineflash/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pi/pineflash/package.nix b/pkgs/by-name/pi/pineflash/package.nix index 25f00f8c091c..59d5b32c7d23 100644 --- a/pkgs/by-name/pi/pineflash/package.nix +++ b/pkgs/by-name/pi/pineflash/package.nix @@ -12,6 +12,7 @@ gtk3, openssl, systemd, + imagemagick, libGL, libxkbcommon, nix-update-script, @@ -32,6 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ pkg-config + imagemagick ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; @@ -67,10 +69,9 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; postInstall = '' - mkdir -p "$out/share/applications" - cp ./assets/Pineflash.desktop "$out/share/applications/Pineflash.desktop" - mkdir -p "$out/share/pixmaps" - cp ./assets/pine64logo.png "$out/share/pixmaps/pine64logo.png" + mkdir -p $out/share/icons/hicolor/128x128/apps + install -D ./assets/Pineflash.desktop -t $out/share/applications + magick ./assets/pine64logo.png -resize 128x128 $out/share/icons/hicolor/128x128/apps/pine64logo.png ''; passthru = { From 3cb13baf000ef5819f1f642354e608bc1a7fafce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 19:50:27 +0000 Subject: [PATCH 174/429] python3Packages.lifelines: 0.30.1 -> 0.30.2 --- pkgs/development/python-modules/lifelines/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lifelines/default.nix b/pkgs/development/python-modules/lifelines/default.nix index 26b13d4b2ee4..c8c83e99d44d 100644 --- a/pkgs/development/python-modules/lifelines/default.nix +++ b/pkgs/development/python-modules/lifelines/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "lifelines"; - version = "0.30.1"; + version = "0.30.2"; pyproject = true; src = fetchFromGitHub { owner = "CamDavidsonPilon"; repo = "lifelines"; tag = "v${version}"; - hash = "sha256-zEkXuv0GmYvvDntgVVHHZdjE04uCKKp2ia+p0zAVB9s="; + hash = "sha256-g7XgUxKBn5T0RTOXYFwL1Jum4QelhDJ9bZTafboxjtA="; }; build-system = [ setuptools ]; From dcd155e68451083ad183a5d991f8d6b794171d1d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 20:04:39 +0000 Subject: [PATCH 175/429] gh-dash: 4.22.0 -> 4.23.0 --- pkgs/by-name/gh/gh-dash/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gh/gh-dash/package.nix b/pkgs/by-name/gh/gh-dash/package.nix index 9b81bd73f703..d1bb88646666 100644 --- a/pkgs/by-name/gh/gh-dash/package.nix +++ b/pkgs/by-name/gh/gh-dash/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "gh-dash"; - version = "4.22.0"; + version = "4.23.0"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${finalAttrs.version}"; - hash = "sha256-vfp0AUSNl11w9jo7UeYDt+AdSxPzwPdeX7bWcZUkOGc="; + hash = "sha256-MkZ3HfJ+lt05fNKCb6Xpi+x30ZtgapPcoXvGhq8nj6k="; }; vendorHash = "sha256-4AbeoH0l7eIS7d0yyJxM7+woC7Q/FCh0BOJj3d1zyX4="; From 70d1c5091ecfc7356d9a2794cdd0db115afc3a37 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Mar 2026 21:18:57 +0100 Subject: [PATCH 176/429] python3Packages.llama-index-graph-stores-neo4j: 0.5.2 -> 0.6.0 --- .../python-modules/llama-index-graph-stores-neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix index 22564440cbc3..60ff2e75cdfa 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix @@ -9,13 +9,13 @@ buildPythonPackage (finalAttrs: { pname = "llama-index-graph-stores-neo4j"; - version = "0.5.2"; + version = "0.6.0"; pyproject = true; src = fetchPypi { pname = "llama_index_graph_stores_neo4j"; inherit (finalAttrs) version; - hash = "sha256-TPPZyKD6sFX/qsHSTiidT6idXnW1edSv1ZbOXopa3lI="; + hash = "sha256-iLK5DLsctmoQ9dDXYSraZtwVycs5GxzEtjJLuyOYRuw="; }; pythonRelaxDeps = [ "neo4j" ]; From 0a1210c34b09bd82637e4474d77ae40188b18762 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 20:26:28 +0000 Subject: [PATCH 177/429] dyff: 1.10.5 -> 1.11.2 --- pkgs/by-name/dy/dyff/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dy/dyff/package.nix b/pkgs/by-name/dy/dyff/package.nix index fd8d7a29d9d0..6b2283b2d385 100644 --- a/pkgs/by-name/dy/dyff/package.nix +++ b/pkgs/by-name/dy/dyff/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "dyff"; - version = "1.10.5"; + version = "1.11.2"; src = fetchFromGitHub { owner = "homeport"; repo = "dyff"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-6DmRNaquyAKaitmgkw6wXS4127PpMgSrFep/2d0yegY="; + sha256 = "sha256-+z9AaoSu7FNRI+jPwW6s0qRHz2roPXq4/CTNDOQW77Y="; }; - vendorHash = "sha256-3aaiiT87hPa3+u3E2wQrdLDb+eM49z3VnehQoxn/tbI="; + vendorHash = "sha256-vpmgSQKmnvaos4ZVuk4R419doAdULjtg95y5ORRwhZg="; subPackages = [ "cmd/dyff" From 28e68a05225e0afcd84faada0bc0657343fe6415 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Mar 2026 21:28:13 +0100 Subject: [PATCH 178/429] python3Packages.pyexploitdb: 0.3.15 -> 0.3.16 Changelog: https://github.com/Hackman238/pyExploitDb/blob/master/ChangeLog.md --- pkgs/development/python-modules/pyexploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 676673c787cc..5bdb2de4717b 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -9,12 +9,12 @@ buildPythonPackage (finalAttrs: { pname = "pyexploitdb"; - version = "0.3.15"; + version = "0.3.16"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-8ifQNytDODC98yD6eXjLQOr9pQFztgbxUrRPRMGqrHA="; + hash = "sha256-KNnKMCHhHrnqQ5YQ10Zk3LV89SZKC2g69m/pIY+zHRY="; }; build-system = [ setuptools ]; From 0bf27e47e1f9cd7266cbe4d09a6f6e0fd8a45de1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Mar 2026 21:31:49 +0100 Subject: [PATCH 179/429] python3Packages.starlette-context: 0.4.0 -> 0.5.1 Changelog: https://github.com/tomwojcik/starlette-context/releases/tag/v0.5.1 --- .../python-modules/starlette-context/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/starlette-context/default.nix b/pkgs/development/python-modules/starlette-context/default.nix index 1aa054adc8a3..730c9185ff3b 100644 --- a/pkgs/development/python-modules/starlette-context/default.nix +++ b/pkgs/development/python-modules/starlette-context/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, httpx, - poetry-core, + hatchling, pytest-asyncio, pytestCheckHook, starlette, @@ -11,17 +11,17 @@ buildPythonPackage rec { pname = "starlette-context"; - version = "0.4.0"; + version = "0.5.1"; pyproject = true; src = fetchFromGitHub { owner = "tomwojcik"; repo = "starlette-context"; tag = "v${version}"; - hash = "sha256-PzVZ458TdBLdbFJDN+X8hVU5zsRxcesihoDB+jRaKAg="; + hash = "sha256-cxhTrLLIjlqaR07VVgHmvYctk7+7fDjbGb39PbJbGgk="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ starlette ]; From 6cd81a1e69b7abfdec250b910db5888fcf132b78 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Mar 2026 21:33:48 +0100 Subject: [PATCH 180/429] python3Packages.starlette-context: migrate to finalAttrs --- .../python-modules/starlette-context/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/starlette-context/default.nix b/pkgs/development/python-modules/starlette-context/default.nix index 730c9185ff3b..a18225be77ab 100644 --- a/pkgs/development/python-modules/starlette-context/default.nix +++ b/pkgs/development/python-modules/starlette-context/default.nix @@ -9,7 +9,7 @@ starlette, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "starlette-context"; version = "0.5.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tomwojcik"; repo = "starlette-context"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-cxhTrLLIjlqaR07VVgHmvYctk7+7fDjbGb39PbJbGgk="; }; @@ -36,8 +36,8 @@ buildPythonPackage rec { meta = { description = "Middleware for Starlette that allows you to store and access the context data of a request"; homepage = "https://github.com/tomwojcik/starlette-context"; - changelog = "https://github.com/tomwojcik/starlette-context/releases/tag/v${version}"; + changelog = "https://github.com/tomwojcik/starlette-context/releases/tag/v${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) From b095d3e0cc18fcb53c0676bf2f2cfeccf5a55921 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Wed, 4 Mar 2026 21:00:39 +0100 Subject: [PATCH 181/429] jasp-desktop: 0.95.4 -> 0.96.0 --- pkgs/by-name/ja/jasp-desktop/boost.patch | 40 +----- pkgs/by-name/ja/jasp-desktop/modules.nix | 169 +++++++++++------------ pkgs/by-name/ja/jasp-desktop/package.nix | 18 ++- 3 files changed, 104 insertions(+), 123 deletions(-) diff --git a/pkgs/by-name/ja/jasp-desktop/boost.patch b/pkgs/by-name/ja/jasp-desktop/boost.patch index d69bc3f0a402..321c96660f82 100644 --- a/pkgs/by-name/ja/jasp-desktop/boost.patch +++ b/pkgs/by-name/ja/jasp-desktop/boost.patch @@ -1,41 +1,15 @@ -diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt -index 4251554..1600f77 100644 ---- a/Common/CMakeLists.txt -+++ b/Common/CMakeLists.txt -@@ -31,7 +31,6 @@ target_include_directories( - target_link_libraries( - Common - PUBLIC -- Boost::system - Boost::date_time - Boost::timer - Boost::chrono -diff --git a/Engine/CMakeLists.txt b/Engine/CMakeLists.txt -index f3a87e1..1949b2a 100644 ---- a/Engine/CMakeLists.txt -+++ b/Engine/CMakeLists.txt -@@ -34,7 +34,6 @@ target_link_libraries( - QMLComponents - CommonData - Common -- Boost::system - Boost::date_time - Boost::timer - Boost::chrono diff --git a/Tools/CMake/Libraries.cmake b/Tools/CMake/Libraries.cmake -index 3b950e1..149747b 100644 +index 3f0fa28..6cdcfad 100644 --- a/Tools/CMake/Libraries.cmake +++ b/Tools/CMake/Libraries.cmake -@@ -67,11 +67,10 @@ if((NOT LibArchive_FOUND) AND (NOT WIN32)) +@@ -67,8 +67,8 @@ if((NOT LibArchive_FOUND) AND (NOT WIN32)) endif() endif() -set(Boost_USE_STATIC_LIBS ON) +-find_package(Boost 1.78 REQUIRED COMPONENTS system) +add_definitions(-DBOOST_LOG_DYN_LINK) - find_package( - Boost 1.78 REQUIRED - COMPONENTS filesystem -- system - date_time - timer - chrono) ++find_package(Boost 1.78 REQUIRED) + find_package(Qt6 REQUIRED COMPONENTS Core) + + get_target_property(QT_TARGET_TYPE Qt6::Core TYPE) diff --git a/pkgs/by-name/ja/jasp-desktop/modules.nix b/pkgs/by-name/ja/jasp-desktop/modules.nix index c0d9684f40ab..8c5f350abe84 100644 --- a/pkgs/by-name/ja/jasp-desktop/modules.nix +++ b/pkgs/by-name/ja/jasp-desktop/modules.nix @@ -32,13 +32,6 @@ let ]; }; - jaspColumnEncoder-src = fetchFromGitHub { - owner = "jasp-stats"; - repo = "jaspColumnEncoder"; - rev = "32c53153da95087feb109c0f5f69534ffa3f32b7"; - hash = "sha256-VOMcoXpLH24auQfZCWW6hQ10u6n2GxuEQHMaXrvGTnI="; - }; - jaspBase = buildRPackage { pname = "jaspBase"; version = jasp-version; @@ -46,11 +39,10 @@ let src = jasp-src; sourceRoot = "${jasp-src.name}/Engine/jaspBase"; - env.INCLUDE_DIR = "../inst/include/jaspColumnEncoder"; - - postPatch = '' - mkdir -p inst/include - cp -r --no-preserve=all ${jaspColumnEncoder-src} inst/include/jaspColumnEncoder + preConfigure = '' + mkdir -p ./inst/include/ + cp -r --no-preserve=all ../../Common ./inst/include/Common + export INCLUDE_DIR=$(pwd)/inst/include/Common/ ''; propagatedBuildInputs = [ @@ -120,13 +112,13 @@ let flexplot = buildRPackage { pname = "flexplot"; - version = "0.25.5"; + version = "0.26.3"; src = fetchFromGitHub { owner = "dustinfife"; repo = "flexplot"; - rev = "9a39de871d48364dd5f096b2380a4c9907adf4c3"; - hash = "sha256-yf5wbhfffztT5iF6h/JSg4NSbuaexk+9JEOfT5Is1vE="; + rev = "cae36ba45502ce1794ad35cfeaf0155275db3056"; + hash = "sha256-aOCYy21EQ/lGDWQvkGAspTSZiJif8mlS2lCwS180dUA="; }; propagatedBuildInputs = [ @@ -200,8 +192,8 @@ in modules = rec { jaspAcceptanceSampling = buildJaspModule { pname = "jaspAcceptanceSampling"; - version = "0.95.3"; - hash = "sha256-Z0NyUPAmgCYC3+w2JX2vSmkyFWdJERd5NckXfF46n5o="; + version = "0.96.0"; + hash = "sha256-sbLzTuGr7r/OsIMliOfvwVsmgUgZxL+6rqiq4W+BIBc="; deps = [ abtest BayesFactor @@ -218,8 +210,8 @@ in }; jaspAnova = buildJaspModule { pname = "jaspAnova"; - version = "0.95.3"; - hash = "sha256-d0m/mGyRkcBlk3961lafQ+X10yTvsWvQnExVDraW28M="; + version = "0.96.0"; + hash = "sha256-K695RXTxzbYVF+gh8gzFTsceTTNdx976yF6WiPHm3No="; deps = [ afex BayesFactor @@ -247,8 +239,8 @@ in }; jaspAudit = buildJaspModule { pname = "jaspAudit"; - version = "0.95.3"; - hash = "sha256-XnQFmf5xdUqClpaJ6Qz0zJAHs1ieeYd4nffxDKX7ReE="; + version = "0.96.0"; + hash = "sha256-1j6Na7Ikk8XJQjbTRRuK28K3jMVdUVe0FwTzo5ywppY="; deps = [ bstats extraDistr @@ -261,8 +253,8 @@ in }; jaspBain = buildJaspModule { pname = "jaspBain"; - version = "0.95.3"; - hash = "sha256-kt0s2VJQGhVeD+ALY4FTtU1+7hYw81cXM1WvJ99lnZQ="; + version = "0.96.0"; + hash = "sha256-CcelkJJD/rr5BOx8MaCkHfbUKp7/tvWOSSC+Ilsopc8="; deps = [ bain lavaan @@ -276,8 +268,8 @@ in }; jaspBFF = buildJaspModule { pname = "jaspBFF"; - version = "0.95.3"; - hash = "sha256-E+CYTFfiAM7Fng4vY39cceU2IUFcXKn+uejLufnwcOc="; + version = "0.96.0"; + hash = "sha256-bh3uLZcjfYpwaNmEzqVW5eNdPFq/Ig3bh7+1DgXYoF8="; deps = [ BFF jaspBase @@ -286,8 +278,8 @@ in }; jaspBfpack = buildJaspModule { pname = "jaspBfpack"; - version = "0.95.3"; - hash = "sha256-9biiB/m8QsSjlAheoo3hllxYyAIgoeEb1W0KXUEa5C8="; + version = "0.96.0"; + hash = "sha256-S1lKrMC6BG6cjJWuxVYVtUciZIeePX0Nx/IvwCjixHY="; deps = [ BFpack bain @@ -300,8 +292,8 @@ in }; jaspBsts = buildJaspModule { pname = "jaspBsts"; - version = "0.95.3"; - hash = "sha256-TJi0fqZ3abV9mM9XyRiuQfK1tkOJ7VluyKilUdHHj0Y="; + version = "0.96.0"; + hash = "sha256-sFbn0yOr7ZaaO2APYNOshBcs1zvgIZUT89BvdRrN/+4="; deps = [ Boom bsts @@ -314,8 +306,8 @@ in }; jaspCircular = buildJaspModule { pname = "jaspCircular"; - version = "0.95.3"; - hash = "sha256-L3WVErysIMtRLDRzaRd+MCYL9smzWERMTiyzrPHGPjQ="; + version = "0.96.0"; + hash = "sha256-fqBSR/um02+BXuu7gucd7WWG/RSOeLmhXHQl2wXiVGw="; deps = [ jaspBase jaspGraphs @@ -325,8 +317,8 @@ in }; jaspCochrane = buildJaspModule { pname = "jaspCochrane"; - version = "0.95.3"; - hash = "sha256-MAIj0ThgUdo07gHBs0a5tzEsJTrtPS3XnyW2Wj+xp3g="; + version = "0.96.0"; + hash = "sha256-z6rglW4wItG9akHWplpDBzB5yzRko/ze+DcQotJmHTg="; deps = [ jaspBase jaspGraphs @@ -336,8 +328,8 @@ in }; jaspDescriptives = buildJaspModule { pname = "jaspDescriptives"; - version = "0.95.3"; - hash = "sha256-W4LWha+GTVSrOAJLIv9Uy3wOnyHxoT0O/yxj9Zw8/Tg="; + version = "0.96.0"; + hash = "sha256-cJCTglQhU5fCH7henOKA0h39VuA07zVVfATtuct8tqY="; deps = [ ggplot2 ggrepel @@ -347,6 +339,7 @@ in forecast flexplot ggrain + ggh4x ggpp ggtext dplyr @@ -359,8 +352,8 @@ in jaspDistributions = buildJaspModule { pname = "jaspDistributions"; - version = "0.95.3"; - hash = "sha256-EutMd5cD3jEW/3e3Ch9IClo1LaNsuvmnvh9cy8hG5Bc="; + version = "0.96.0"; + hash = "sha256-uZWCVCOFfNkLNjJJ82x4H5rKH1m7KE3UDX1p/7dn4uY="; deps = [ car fitdistrplus @@ -377,8 +370,8 @@ in }; jaspEquivalenceTTests = buildJaspModule { pname = "jaspEquivalenceTTests"; - version = "0.95.3"; - hash = "sha256-cTVPephc/9IIJ8eUP3Ma1d215E6bI1MOWtlQDGqPN70="; + version = "0.96.0"; + hash = "sha256-4XFN6ikBfOZWHMTLbNPBwgMoYiLVULQE0XyNaoPQ40k="; deps = [ BayesFactor ggplot2 @@ -391,8 +384,8 @@ in }; jaspEsci = buildJaspModule { pname = "jaspEsci"; - version = "0.95.3"; - hash = "sha256-wgbp1iZRWfm6dRVkVhK6iC0hHu73pFm3Hk9pN7Z6ej8="; + version = "0.96.0"; + hash = "sha256-pH1neP1GmL3usXP5ycQKGeLNzvfMV/UBrrKF718QaGI="; deps = [ jaspBase jaspGraphs @@ -404,8 +397,8 @@ in }; jaspFactor = buildJaspModule { pname = "jaspFactor"; - version = "0.95.3"; - hash = "sha256-1e4HYst/G5JqN7fksFR907LqysdyTCcUXLgRfiSBCd0="; + version = "0.96.0"; + hash = "sha256-AU9nTrxZNseN0Wsp3932V3N+ax5CzfJMoEB128AR5LM="; deps = [ ggplot2 jaspBase @@ -423,8 +416,8 @@ in }; jaspFrequencies = buildJaspModule { pname = "jaspFrequencies"; - version = "0.95.3"; - hash = "sha256-3JznrmKqAJJop57gNQw7eOLjbS7B41AriUdZTttoSkM="; + version = "0.96.0"; + hash = "sha256-qolgiJjiODzheW04fXdtxNqAreEny7ln+GlwV4ztRik="; deps = [ abtest BayesFactor @@ -443,8 +436,8 @@ in }; jaspJags = buildJaspModule { pname = "jaspJags"; - version = "0.95.3"; - hash = "sha256-wZsc3NSiNKa35R7c/mrnp+crA8OkNk/2JRiiEW8DZq4="; + version = "0.96.0"; + hash = "sha256-f26njMClIUWNc4fGsPgwitzKbqdU6Ld+Ys6ukWAHE/M="; deps = [ coda ggplot2 @@ -460,8 +453,8 @@ in }; jaspLearnBayes = buildJaspModule { pname = "jaspLearnBayes"; - version = "0.95.3"; - hash = "sha256-YRzoF4FrPrSeDcKq7V9N8FcNtCKZ4n5e2O9u9aseAik="; + version = "0.96.0"; + hash = "sha256-zqMcWFML/iexmegMtGWCe/OCGqwmWW98/XZfKVs6N8w="; deps = [ extraDistr ggplot2 @@ -483,8 +476,8 @@ in }; jaspLearnStats = buildJaspModule { pname = "jaspLearnStats"; - version = "0.95.3"; - hash = "sha256-PSrLmRlvd0U7hkFXRvzi5hFz7/Czj3iOSdWyGGoOHVI="; + version = "0.96.0"; + hash = "sha256-Yvqhv269Uvr087IjiGMBzTHZj+4Wu5A8dN/F9+8odqY="; deps = [ extraDistr ggplot2 @@ -502,8 +495,8 @@ in }; jaspMachineLearning = buildJaspModule { pname = "jaspMachineLearning"; - version = "0.95.3"; - hash = "sha256-ZZKEO+FMx5uycD1JBln6HG5qLqbzRCnr/B2/yDUqhYs="; + version = "0.96.0"; + hash = "sha256-Wg1C/ZJL98U8JkMfeZcc4/83DmCHRYOIn2OglsMqImw="; deps = [ kknn AUC @@ -541,8 +534,8 @@ in }; jaspMetaAnalysis = buildJaspModule { pname = "jaspMetaAnalysis"; - version = "0.95.3"; - hash = "sha256-JxO3jvEVcYIkOPncCYLHJFbu0i2HYx7ltqEBzSNKRjM="; + version = "0.96.0"; + hash = "sha256-bXHlYiGEtNMqr833ve3Qrdv+TCm7G4let07McMETUv8="; deps = [ dplyr ggplot2 @@ -575,13 +568,12 @@ in }; jaspMixedModels = buildJaspModule { pname = "jaspMixedModels"; - version = "0.95.3"; - hash = "sha256-rc0l9aYKVjpSruxutYxYHLRmDN045fBYXD3itKbzDYA="; + version = "0.96.0"; + hash = "sha256-F7NEyqA+vW+66l/ZmWaVvTSbG+0fxI+SsgfV6GmwJLs="; deps = [ afex emmeans ggplot2 - ggpol jaspBase jaspGraphs lme4 @@ -595,8 +587,8 @@ in }; jaspNetwork = buildJaspModule { pname = "jaspNetwork"; - version = "0.95.3"; - hash = "sha256-16qRhOgzFRgbImeIfTKZJyn8ZlGnohPp4/whabdDHeM="; + version = "0.96.0"; + hash = "sha256-alF9pDjBqrJvqDaJIOf9F/SWu/wrmspSFY/chE8/U9k="; deps = [ bootnet easybgm @@ -619,8 +611,8 @@ in }; jaspPower = buildJaspModule { pname = "jaspPower"; - version = "0.95.3"; - hash = "sha256-2PrPaksHMAFVYCPN+xigLDSyALarzrO4FTylMmi4+vk="; + version = "0.96.0"; + hash = "sha256-Q5CBXoHr6jPs/UNMpyQXzhMm5a48G8LTYr37VKfzrrc="; deps = [ pwr jaspBase @@ -630,8 +622,8 @@ in }; jaspPredictiveAnalytics = buildJaspModule { pname = "jaspPredictiveAnalytics"; - version = "0.95.3"; - hash = "sha256-mQx/LsFDaD9zS2DqqiXfFNT019/J3HPdNsPzxWn2Pwc="; + version = "0.96.0"; + hash = "sha256-CrpozVhA+vTv15dWUH9CqK37BdO7okE8XML6BYRsoYw="; deps = [ jaspBase jaspGraphs @@ -651,8 +643,8 @@ in }; jaspProcess = buildJaspModule { pname = "jaspProcess"; - version = "0.95.3"; - hash = "sha256-wWMpqOXOKEx3z0juBXfnfJvbKCeI+H/Wnhh24dNWJWw="; + version = "0.96.0"; + hash = "sha256-ZO3Y+3qA84s0wUdL9iRqnc4vljzg69crH34eCbGWmOo="; deps = [ blavaan dagitty @@ -666,8 +658,8 @@ in }; jaspProphet = buildJaspModule { pname = "jaspProphet"; - version = "0.95.3"; - hash = "sha256-AOm0oNqCHmkUdhC8Cqb4O9HkUoC9L8TFaSNcZ/DzoYQ="; + version = "0.96.0"; + hash = "sha256-rEBXWEVpavXiMljtvNfKLVvI8VIaTk+yymaGx4w/li8="; deps = [ rstan ggplot2 @@ -679,8 +671,8 @@ in }; jaspQualityControl = buildJaspModule { pname = "jaspQualityControl"; - version = "0.95.3"; - hash = "sha256-zFxC3icKd84jjilwZBCe7JRV8S1eb4AO8UyBENXsF/U="; + version = "0.96.0"; + hash = "sha256-5DNz827MZHfmLnFXNUTFweMmOdDftxm6S8ZJwzCCDa8="; deps = [ car cowplot @@ -708,11 +700,12 @@ in tibble vipor weibullness + flexsurv ]; }; jaspRegression = buildJaspModule { pname = "jaspRegression"; - version = "0.95.3"; + version = "0.96.0"; rev = "b0ecad26bb248964e778ee6d4486d671b83930b2"; hash = "sha256-wm/Fz/wA7B96bzj8UylZjFgrrZgwOTdGnCsmfaCPGp0="; deps = [ @@ -742,8 +735,8 @@ in }; jaspReliability = buildJaspModule { pname = "jaspReliability"; - version = "0.95.3"; - hash = "sha256-80G8Z8JWxwyAer1GsQgzytEcSquCBW8Zmu92KKiHu1I="; + version = "0.96.0"; + hash = "sha256-WZW9CAAKdEYUTwGC1zmtChvntgRTkLL6xwrpukDoqSo="; deps = [ Bayesrel coda @@ -761,8 +754,8 @@ in }; jaspRobustTTests = buildJaspModule { pname = "jaspRobustTTests"; - version = "0.95.3"; - hash = "sha256-txcItwNHq41ifdjvyY9Jhp2sfHJYA/YStTxpyk/lUPQ="; + version = "0.96.0"; + hash = "sha256-U6qH0tKC7lLFvnTGK9mNli7Azh/SA6pUEJdsUoOCsYo="; deps = [ RoBTT ggplot2 @@ -772,8 +765,8 @@ in }; jaspSem = buildJaspModule { pname = "jaspSem"; - version = "0.95.3"; - hash = "sha256-QI1OGAfyBJ9p3Nb/sI3A5sISXc4ZpsN1sPaJL/3chP8="; + version = "0.96.0"; + hash = "sha256-acSH/0IbqDxSOZi30zBjDgU3I6jxUYCgVG9B7dbkAh8="; deps = [ forcats ggplot2 @@ -788,12 +781,14 @@ in tibble tidyr SEMsens + mxsem + OpenMx ]; }; jaspSummaryStatistics = buildJaspModule { pname = "jaspSummaryStatistics"; - version = "0.95.3"; - hash = "sha256-6OEnYhp4NBd8mr518Mz63F7eZ297unDRYLiOoWzlAbc="; + version = "0.96.0"; + hash = "sha256-UuC26atGRnRHwp1xhAJtj5vkdPvYjcs2WIPgAq/0Uvg="; deps = [ BayesFactor bstats @@ -810,8 +805,8 @@ in }; jaspSurvival = buildJaspModule { pname = "jaspSurvival"; - version = "0.95.3"; - hash = "sha256-rrbzd8Iws7lhKPJGRtFLuFgRkqHa8B0R6ZH/HdHDk44="; + version = "0.96.0"; + hash = "sha256-P652YSopruDje69vXfeBMSBMU/GPmYCuRp7jd2ZneEI="; deps = [ survival ggsurvfit @@ -822,8 +817,8 @@ in }; jaspTTests = buildJaspModule { pname = "jaspTTests"; - version = "0.95.3"; - hash = "sha256-yuNLBi56qKCTCh/UNoYjA7YlyL/1B0QXsgN4C8SzQbs="; + version = "0.96.0"; + hash = "sha256-K1thMejBibf8nzP07QbKyS/j3FbbrGQNPdiBpkhKf1w="; deps = [ BayesFactor car @@ -848,8 +843,8 @@ in }; jaspTimeSeries = buildJaspModule { pname = "jaspTimeSeries"; - version = "0.95.3"; - hash = "sha256-qOrLihjSH7cEazTiFJZIfMe9uGZ6ltZ3uMm+1fwPN7E="; + version = "0.96.0"; + hash = "sha256-FZEEa1n7B9Kt74L7dw+oYWmHBGobI78wUBzQ1wsKos8="; deps = [ jaspBase jaspGraphs @@ -859,8 +854,8 @@ in }; jaspVisualModeling = buildJaspModule { pname = "jaspVisualModeling"; - version = "0.95.3"; - hash = "sha256-KwFfgwBlukRmSltHt1LVzIMB/x2iCvRMc/Rrhmmxw98="; + version = "0.96.0"; + hash = "sha256-lhvH69LUIzXsFQ730hqcWnkTK0aeMhal3VhSTrr4eHc="; deps = [ flexplot jaspBase diff --git a/pkgs/by-name/ja/jasp-desktop/package.nix b/pkgs/by-name/ja/jasp-desktop/package.nix index 76eb48ebde5f..86cb7b932e15 100644 --- a/pkgs/by-name/ja/jasp-desktop/package.nix +++ b/pkgs/by-name/ja/jasp-desktop/package.nix @@ -6,6 +6,7 @@ buildEnv, linkFarm, + writers, cmake, ninja, @@ -23,17 +24,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "jasp-desktop"; - version = "0.95.4"; + version = "0.96.0"; src = fetchFromGitHub { owner = "jasp-stats"; repo = "jasp-desktop"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-n7lXedICK+sAuSW6hODy+TngAZpDIObWDhTtOjiTXgc="; + hash = "sha256-5yvnlhPHssWfO9xxgBRULAMe6e5EyAWr8JVY0BQxKog="; }; patches = [ - ./boost.patch # link boost dynamically, don't try to link removed system stub library + ./boost.patch # link boost dynamically, don't try to find removed system stub library ./disable-module-install-logic.patch # don't try to install modules via cmake ./disable-renv-logic.patch ./dont-check-for-module-deps.patch # dont't check for dependencies required for building modules @@ -80,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: { # symlink modules from the store ln -s ${finalAttrs.passthru.moduleLibs} $out/Modules/module_libs + ln -s ${finalAttrs.passthru.moduleManifests} $out/Modules/manifests ''; passthru = { @@ -110,6 +112,16 @@ stdenv.mkDerivation (finalAttrs: { path = "${drv}/library"; }) finalAttrs.passthru.modules ); + + moduleManifests = linkFarm "jasp-desktop-${finalAttrs.version}-module-manifests" ( + lib.mapAttrsToList (name: drv: { + name = "${name}_manifest.json"; + path = writers.writeJSON "${name}_manifest.json" { + name = name; + version = drv.version; + }; + }) finalAttrs.passthru.modules + ); }; meta = { From 2af097fa5d9cf5410522e16db200eeaf7b672b15 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Wed, 4 Mar 2026 21:59:06 +0100 Subject: [PATCH 182/429] rPackages.ggpol: remark as broken --- pkgs/development/r-modules/cran-packages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/r-modules/cran-packages.json b/pkgs/development/r-modules/cran-packages.json index c1f411130d5f..335b57f7018d 100644 --- a/pkgs/development/r-modules/cran-packages.json +++ b/pkgs/development/r-modules/cran-packages.json @@ -157220,7 +157220,7 @@ "version": "0.0.7", "sha256": "11xr26kwmkjjb51wm44ydv0vcinc6k6faqwx4s2faj4iwidlys1m", "depends": ["dplyr", "ggplot2", "glue", "gtable", "plyr", "rlang", "tibble"], - "broken": false + "broken": true }, "ggseas": { "name": "ggseas", From 57e7fc6494b855bf4403cf384c4342924e42f79b Mon Sep 17 00:00:00 2001 From: Vladislav Grechannik Date: Wed, 4 Mar 2026 22:11:38 +0100 Subject: [PATCH 183/429] python313Packages.bgutil-ytdlp-pot-provider: 1.2.2 -> 1.3.0 Diff: https://github.com/Brainicism/bgutil-ytdlp-pot-provider/compare/1.2.2...1.3.0 --- .../python-modules/bgutil-ytdlp-pot-provider/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bgutil-ytdlp-pot-provider/default.nix b/pkgs/development/python-modules/bgutil-ytdlp-pot-provider/default.nix index 2b067e2d7b40..b7f7e416aa11 100644 --- a/pkgs/development/python-modules/bgutil-ytdlp-pot-provider/default.nix +++ b/pkgs/development/python-modules/bgutil-ytdlp-pot-provider/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "bgutil-ytdlp-pot-provider"; - version = "1.2.2"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "Brainicism"; repo = "bgutil-ytdlp-pot-provider"; tag = version; - hash = "sha256-KKImGxFGjClM2wAk/L8nwauOkM/gEwRVMZhTP62ETqY="; + hash = "sha256-WPLNjfVYDbPsEMVhjuF3dVarahdIKT7pt518SePfB8A="; }; sourceRoot = "${src.name}/plugin"; From b0209eec4c7db75934bf397d69476473db2b24a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 21:14:01 +0000 Subject: [PATCH 184/429] python3Packages.inscriptis: 2.7.0 -> 2.7.1 --- pkgs/development/python-modules/inscriptis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/inscriptis/default.nix b/pkgs/development/python-modules/inscriptis/default.nix index 57318a912e09..3fb1e747349c 100644 --- a/pkgs/development/python-modules/inscriptis/default.nix +++ b/pkgs/development/python-modules/inscriptis/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "inscriptis"; - version = "2.7.0"; + version = "2.7.1"; pyproject = true; src = fetchFromGitHub { owner = "weblyzard"; repo = "inscriptis"; tag = version; - hash = "sha256-m1LZiGu79I9fMQXtL1MuzHxUd6KSwuc87Edkt9sp0DE="; + hash = "sha256-hNNPY2/SroVQnf04SJ/2yYorBgQJk6d0X616+w41Y1c="; }; build-system = [ hatchling ]; From fbe38cf0ce9a34e44bbe8c3339faaffc1af9ef50 Mon Sep 17 00:00:00 2001 From: Jaakko Paju <36770267+JPaju@users.noreply.github.com> Date: Wed, 4 Mar 2026 23:30:19 +0200 Subject: [PATCH 185/429] metals: 1.6.5 -> 1.6.6 --- pkgs/by-name/me/metals/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/metals/package.nix b/pkgs/by-name/me/metals/package.nix index 10f7cf4243c6..da2d7e95e762 100644 --- a/pkgs/by-name/me/metals/package.nix +++ b/pkgs/by-name/me/metals/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "metals"; - version = "1.6.5"; + version = "1.6.6"; deps = stdenv.mkDerivation { name = "metals-deps-${finalAttrs.version}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-NOS1HUS4TJXnleZTEji3HAHUa9WOGmJDX2yT7zwmX08="; + outputHash = "sha256-Snx4JvWOTkJcihVRwj25op4BJqmChz+1fZH/PrCCbt0="; }; nativeBuildInputs = [ From 200039e8e2c5074fa4d59dd71e98b7129a095a1a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 21:48:40 +0000 Subject: [PATCH 186/429] railway: 4.30.4 -> 4.30.5 --- pkgs/by-name/ra/railway/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix index bcaf95a3d282..5dee8a0d0c9a 100644 --- a/pkgs/by-name/ra/railway/package.nix +++ b/pkgs/by-name/ra/railway/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "railway"; - version = "4.30.4"; + version = "4.30.5"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-XzCgfjjpm79wpRGzVmXwd8cX1R9KqtjMac7EhfIpqh0="; + hash = "sha256-0krjgyJfQQ53ihe6FKxEGpTasCibGXe0DCxOD5IJDOI="; }; - cargoHash = "sha256-I+fz459knRi0MNPxNpRMhYSVbe7oTRI8j9AHyTJ9Tlk="; + cargoHash = "sha256-dPWTtJPw71MYUeemS/DLL2Tu4V1F59LLmcpRAtjivOE="; nativeBuildInputs = [ pkg-config ]; From 7063d80fefb9f647eb3c9e52013c9432e805a695 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 21:51:33 +0000 Subject: [PATCH 187/429] libdaq: 3.0.24 -> 3.0.25 --- pkgs/by-name/li/libdaq/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libdaq/package.nix b/pkgs/by-name/li/libdaq/package.nix index b48f6f2cb33c..5a3c686be11b 100644 --- a/pkgs/by-name/li/libdaq/package.nix +++ b/pkgs/by-name/li/libdaq/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libdaq"; - version = "3.0.24"; + version = "3.0.25"; src = fetchFromGitHub { owner = "snort3"; repo = "libdaq"; tag = "v${finalAttrs.version}"; - hash = "sha256-LIdELWQZ76bA0GZne0IMr+GHisUksBYXwzSqVB5nMsA="; + hash = "sha256-BG86HeprNtc3hnNPNH4AJX7Q9zy8VYvlVmsXsio9O5E="; }; nativeBuildInputs = [ From c11df9f0bd16849cad05e3bf2f0867b5ef436bec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Mar 2026 22:39:04 +0000 Subject: [PATCH 188/429] concessio: 0.2.1 -> 0.3.0 --- pkgs/by-name/co/concessio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/concessio/package.nix b/pkgs/by-name/co/concessio/package.nix index f7b95b14a577..6a31f57378b6 100644 --- a/pkgs/by-name/co/concessio/package.nix +++ b/pkgs/by-name/co/concessio/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "concessio"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "ronniedroid"; repo = "concessio"; tag = "v${finalAttrs.version}"; - hash = "sha256-vPHL46mZj6idIv9VXY73jrcA2GEpPdG5hn0ZzAZjo6A="; + hash = "sha256-jFmGl5g54cZ9yDbcm+yi/o3htLYHMffQJL74AH271TM="; }; strictDeps = true; From be11661938f040004545a1f5e00a8dbd626bd33d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 00:16:11 +0000 Subject: [PATCH 189/429] python3Packages.pydaikin: 2.18.0 -> 2.18.1 --- pkgs/development/python-modules/pydaikin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix index 292c43d00a4b..073979ec0b61 100644 --- a/pkgs/development/python-modules/pydaikin/default.nix +++ b/pkgs/development/python-modules/pydaikin/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pydaikin"; - version = "2.18.0"; + version = "2.18.1"; pyproject = true; src = fetchFromGitHub { owner = "fredrike"; repo = "pydaikin"; tag = "v${version}"; - hash = "sha256-JESTwtrDuBydXIzRfbtnvbb4Hsumt1wMRpppU2xdWJQ="; + hash = "sha256-sTcdgbthDAyyWLxPtS344xR8a7UoN+zrfes6FXSo9g4="; }; __darwinAllowLocalNetworking = true; From 72d6586381844b7cbb6e75eb955f4d469382e32e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 00:32:46 +0000 Subject: [PATCH 190/429] scc: 3.6.0 -> 3.7.0 --- pkgs/by-name/sc/scc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sc/scc/package.nix b/pkgs/by-name/sc/scc/package.nix index e98f674225b9..9e78a3a34e8f 100644 --- a/pkgs/by-name/sc/scc/package.nix +++ b/pkgs/by-name/sc/scc/package.nix @@ -5,13 +5,13 @@ }: buildGoModule (finalAttrs: { pname = "scc"; - version = "3.6.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "boyter"; repo = "scc"; rev = "v${finalAttrs.version}"; - hash = "sha256-tFhYFHMscK3zfoQlaSxnA0pVuNQC1Xjn9jcZWkEV6XI="; + hash = "sha256-gOr09UzPfmNDUqvGJtmXYdn0gWfcvvVyoBfyRBDSy88="; }; vendorHash = null; From a89c8e48b7ffeb122ee53691131ddb74402b92f3 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Wed, 4 Mar 2026 18:33:07 -0600 Subject: [PATCH 191/429] device-tree_rpi: migrate to by-name --- .../raspberrypi.nix => by-name/de/device-tree_rpi/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{os-specific/linux/device-tree/raspberrypi.nix => by-name/de/device-tree_rpi/package.nix} (100%) diff --git a/pkgs/os-specific/linux/device-tree/raspberrypi.nix b/pkgs/by-name/de/device-tree_rpi/package.nix similarity index 100% rename from pkgs/os-specific/linux/device-tree/raspberrypi.nix rename to pkgs/by-name/de/device-tree_rpi/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d57ac640cf35..5f728ab0a41e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -382,8 +382,6 @@ with pkgs; ollama-cuda = callPackage ../by-name/ol/ollama/package.nix { acceleration = "cuda"; }; ollama-vulkan = callPackage ../by-name/ol/ollama/package.nix { acceleration = "vulkan"; }; - device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix { }; - diffPlugins = (callPackage ../build-support/plugins.nix { }).diffPlugins; dieHook = makeSetupHook { From bb07489cffb76ae784ec9e2e98d8c1814fe1f4a8 Mon Sep 17 00:00:00 2001 From: shellhazard Date: Thu, 5 Mar 2026 00:48:01 +0000 Subject: [PATCH 192/429] rmfakecloud: 0.0.26 -> 0.0.27 --- pkgs/by-name/rm/rmfakecloud/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/rm/rmfakecloud/package.nix b/pkgs/by-name/rm/rmfakecloud/package.nix index 627640ac1fb2..34f8b91cc68a 100644 --- a/pkgs/by-name/rm/rmfakecloud/package.nix +++ b/pkgs/by-name/rm/rmfakecloud/package.nix @@ -11,16 +11,16 @@ }: buildGoModule rec { pname = "rmfakecloud"; - version = "0.0.26"; + version = "0.0.27"; src = fetchFromGitHub { owner = "ddvk"; repo = "rmfakecloud"; rev = "v${version}"; - hash = "sha256-QV8RFg6gATyjIESwO3r5M3Yd9qWFsA6X6bYLmNpLek0="; + hash = "sha256-Umh5MwFCKJ8Nr0uhPEvlTAn7SpMmvAh6N2l74bS6BYw="; }; - vendorHash = "sha256-ColOCdKa/sKoLnF/3idBIEyFB2JWYM+1y5TdC/LZT4A="; + vendorHash = "sha256-XksCJ9b5NDIutwqnWP63R2udp/Y5qkkgo2a4TPUi0Z4="; # if using webUI build it # use env because of https://github.com/NixOS/nixpkgs/issues/358844 @@ -35,7 +35,7 @@ buildGoModule rec { pnpmLock = "${src}/ui/pnpm-lock.yaml"; pnpm = pnpm_9; fetcherVersion = 3; - hash = "sha256-YhcPR7aObZiV0FibcogjrOGNo2+syUuusaW+yx1HRv8="; + hash = "sha256-5dsrf6Iff8z4ujzUccuNFwChChbWzXeXDilh8uZyl+U="; }; preBuild = lib.optionals enableWebui '' # using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart From d5688ac4f549ccbfece2ebe639fce1bab48e5e7a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 00:50:27 +0000 Subject: [PATCH 193/429] codespelunker: 3.0.0 -> 3.1.0 --- pkgs/by-name/co/codespelunker/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/codespelunker/package.nix b/pkgs/by-name/co/codespelunker/package.nix index 016da6473715..01161c52996b 100644 --- a/pkgs/by-name/co/codespelunker/package.nix +++ b/pkgs/by-name/co/codespelunker/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "codespelunker"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "boyter"; repo = "cs"; rev = "v${finalAttrs.version}"; - hash = "sha256-iRp5H+lZXks3MUxA1v/ZLMJnh/4T2KljOCylBcL05yc="; + hash = "sha256-cPaAuZJ/Flea4BZ2LTprE5BFtHqgVCuF+2VLShgkCrQ="; }; vendorHash = null; From b52eb3ffc6547d6f1316a0051a0844c9de90a59b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Mar 2026 01:57:49 +0100 Subject: [PATCH 194/429] python314Packages.publicsuffixlist: 1.0.2.20260228 -> 1.0.2.20260303 Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20260303-gha/CHANGES.md --- pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 92dc955ddd38..6ac9d9676dce 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,12 +11,12 @@ buildPythonPackage (finalAttrs: { pname = "publicsuffixlist"; - version = "1.0.2.20260228"; + version = "1.0.2.20260303"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-D3WM8ZIAErvf/R/SuI3CIFD4w7YN511Vm+rNcxl1dE4="; + hash = "sha256-6+6YSEb67K1R9eADW6zZAd6JgSPabY49Fp5s3CRBoo0="; }; postPatch = '' From 6c8c34122aa8651814b2770eedb8a2017788507f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Mar 2026 01:59:32 +0100 Subject: [PATCH 195/429] python3Packages.pydaikin: migrate to finalAttrs --- pkgs/development/python-modules/pydaikin/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix index 073979ec0b61..079f555fcd67 100644 --- a/pkgs/development/python-modules/pydaikin/default.nix +++ b/pkgs/development/python-modules/pydaikin/default.nix @@ -13,7 +13,7 @@ tenacity, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pydaikin"; version = "2.18.1"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fredrike"; repo = "pydaikin"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-sTcdgbthDAyyWLxPtS344xR8a7UoN+zrfes6FXSo9g4="; }; @@ -54,9 +54,9 @@ buildPythonPackage rec { meta = { description = "Python Daikin HVAC appliances interface"; homepage = "https://github.com/fredrike/pydaikin"; - changelog = "https://github.com/fredrike/pydaikin/releases/tag/${src.tag}"; - license = with lib.licenses; [ gpl3Only ]; + changelog = "https://github.com/fredrike/pydaikin/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "pydaikin"; }; -} +}) From b6756a77833cb0030be0e40c327cf5ca680e1e09 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 01:42:33 +0000 Subject: [PATCH 196/429] python3Packages.llm-anthropic: 0.23 -> 0.24 --- pkgs/development/python-modules/llm-anthropic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llm-anthropic/default.nix b/pkgs/development/python-modules/llm-anthropic/default.nix index 503e61ad99fd..ea3a04318252 100644 --- a/pkgs/development/python-modules/llm-anthropic/default.nix +++ b/pkgs/development/python-modules/llm-anthropic/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "llm-anthropic"; - version = "0.23"; + version = "0.24"; pyproject = true; src = fetchFromGitHub { owner = "simonw"; repo = "llm-anthropic"; tag = finalAttrs.version; - hash = "sha256-ZO9hoDv3YLl8ZCcd5UEDdD5VNPa83N639z1ZxJaFt7Y="; + hash = "sha256-0nI/J7gGTUyrvluez9H8WD4kCuMFgWR5zFHRMxh9DXQ="; }; build-system = [ From faad8694de332ba0e747287b9868bae9a1a0a600 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 02:02:56 +0000 Subject: [PATCH 197/429] protoc-gen-go-ttrpc: 1.2.7 -> 1.2.8 --- pkgs/by-name/pr/protoc-gen-go-ttrpc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/protoc-gen-go-ttrpc/package.nix b/pkgs/by-name/pr/protoc-gen-go-ttrpc/package.nix index 265a85b4ee82..94e73cc450ba 100644 --- a/pkgs/by-name/pr/protoc-gen-go-ttrpc/package.nix +++ b/pkgs/by-name/pr/protoc-gen-go-ttrpc/package.nix @@ -6,17 +6,17 @@ buildGoModule (finalAttrs: { pname = "protoc-gen-go-ttrpc"; - version = "1.2.7"; + version = "1.2.8"; src = fetchFromGitHub { owner = "containerd"; repo = "ttrpc"; tag = "v${finalAttrs.version}"; - hash = "sha256-oQamR59cQrcuw9tervKrf+2vYnweRRNgST8GObFNjTk="; + hash = "sha256-B7tEuRHBMzZZ7NZ3zliFpXqtZcApDEYz6T4ZHzd4bD0="; }; proxyVendor = true; - vendorHash = "sha256-ecEO3ZM4RWl6fXvCkncetjgUZB4+LBzSFVTgiYO3tOU="; + vendorHash = "sha256-fDq1lYp1JB5CQUOQcM1KCO0W1d37u3x22MSJCzUCYdE="; subPackages = [ "cmd/protoc-gen-go-ttrpc" From f9e218a4114fb82bec61801f2c9f39b685090d54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 02:14:27 +0000 Subject: [PATCH 198/429] rke: 1.8.10 -> 1.8.11 --- pkgs/by-name/rk/rke/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rk/rke/package.nix b/pkgs/by-name/rk/rke/package.nix index 34dcc81597a6..0d90f3d89fee 100644 --- a/pkgs/by-name/rk/rke/package.nix +++ b/pkgs/by-name/rk/rke/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "rke"; - version = "1.8.10"; + version = "1.8.11"; src = fetchFromGitHub { owner = "rancher"; repo = "rke"; rev = "v${finalAttrs.version}"; - hash = "sha256-FSkEsoo0k8G/tv1EkSXVBn8p16n7M88WtFvD4WgqDl4="; + hash = "sha256-8EvXrkUvj/iJLyjZWIiQLzS3pSbERFUDuUsLcJ+zKKY="; }; vendorHash = "sha256-OWC8OZhORHwntAR2YHd4KfQgB2Wtma6ayBWfY94uOA4="; From 54e2f5be0c2b9cf3e444e3780c89ad8cc4eb47a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 02:30:53 +0000 Subject: [PATCH 199/429] uptime-kuma: 2.1.3 -> 2.2.0 --- pkgs/by-name/up/uptime-kuma/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/up/uptime-kuma/package.nix b/pkgs/by-name/up/uptime-kuma/package.nix index 0634ee4ac69b..1754472d87c6 100644 --- a/pkgs/by-name/up/uptime-kuma/package.nix +++ b/pkgs/by-name/up/uptime-kuma/package.nix @@ -9,16 +9,16 @@ buildNpmPackage (finalAttrs: { pname = "uptime-kuma"; - version = "2.1.3"; + version = "2.2.0"; src = fetchFromGitHub { owner = "louislam"; repo = "uptime-kuma"; tag = finalAttrs.version; - hash = "sha256-frs5Pn3Zalroto40P2c1igew3/pALeUvSgqcxFapclQ="; + hash = "sha256-L1YDh5yBEoqjIeHkuLZe0uo6xMRuMh2Eu15wS6yhLDQ="; }; - npmDepsHash = "sha256-SfkSCITDrigEJ4MTqs3JYGDuMKY531sPfvNyVNn5JYQ="; + npmDepsHash = "sha256-E8lPxLYn74BOgfIW8wPoiUGYXbnFnSanY45wQUxPHd4="; patches = [ # Fixes the permissions of the database being not set correctly From 583d57b59eb205c23ef334c5edb0940129ab3c42 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 03:41:15 +0000 Subject: [PATCH 200/429] jx: 3.16.45 -> 3.16.56 --- pkgs/by-name/jx/jx/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/jx/jx/package.nix b/pkgs/by-name/jx/jx/package.nix index 4856190f8caa..67c13e322a0a 100644 --- a/pkgs/by-name/jx/jx/package.nix +++ b/pkgs/by-name/jx/jx/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "jx"; - version = "3.16.45"; + version = "3.16.56"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "sha256-xPbGRi4Z4M1mnvCyriG6h2n6IILq131JYNug2rESGhQ="; + sha256 = "sha256-boCljgzKLtCuLsgUwrDidKjZYvDnqnJYRnERMzN6Dgw="; }; vendorHash = "sha256-1ErjD+1MdbKN4EPaQX0jxNzoN9dB8beH1csdx1IPKl8="; From d2eadbe1f911066a18bcaeccfaee54189081944e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 03:42:25 +0000 Subject: [PATCH 201/429] runpodctl: 2.0.0 -> 2.1.4 --- pkgs/by-name/ru/runpodctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/runpodctl/package.nix b/pkgs/by-name/ru/runpodctl/package.nix index 9565f9eed333..fd4a776df55d 100644 --- a/pkgs/by-name/ru/runpodctl/package.nix +++ b/pkgs/by-name/ru/runpodctl/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "runpodctl"; - version = "2.0.0"; + version = "2.1.4"; src = fetchFromGitHub { owner = "runpod"; repo = "runpodctl"; rev = "v${finalAttrs.version}"; - hash = "sha256-NvGv4B/FT137fVrj67wPe2CZHIxcADjbPHAOK2T8vIw="; + hash = "sha256-PhOMszLROYqkd8+tcHdTe4nnB3q3AJkzVNOJFP96vSA="; }; - vendorHash = "sha256-UVM3eDtgysyoLHS21wUqqR7jOB64gClGyIytrNLcQn8="; + vendorHash = "sha256-8Cdj5ZXmfooEh+MlaROjxVsAW6rZfPW7HNy86qnvAJA="; postInstall = '' rm $out/bin/docs # remove the docs binary From 0090ad8709ddec2a5ea46d4951088dc58c7cb188 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Wed, 4 Mar 2026 22:45:53 -0500 Subject: [PATCH 202/429] brave: 1.87.191 -> 1.87.192 https://community.brave.app/t/release-channel-1-87-192/650188 --- pkgs/by-name/br/brave/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index 6f40737b9633..31a41b34ec88 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -3,24 +3,24 @@ let pname = "brave"; - version = "1.87.191"; + version = "1.87.192"; allArchives = { aarch64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-mwczK2IYt+88VfSyNLwSWRxBuGS+AzMcAGE2C8Bafno="; + hash = "sha256-h5V+f/o0QFQG9PbwNUM0Kdnf5wMrdBQbhDErBv1vghk="; }; x86_64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-p2gdKzk0YTZYciSvlpO0Q31w8/eNOE1WmhvWm0pop1I="; + hash = "sha256-HSHHITkgDWzjeVotqJ1fNBjohC6CWNHlT32Vg7ZlRNQ="; }; aarch64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; - hash = "sha256-ZXjEPtb6WV+izKbyaaR4MtcI0dS+tOlYQ/B8ngKt0GY="; + hash = "sha256-IQIOJH6m6iX2a/7VC2Eh/HUiGuco19aIBqANbKNLfa8="; }; x86_64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip"; - hash = "sha256-yDyzzTVlB2hHFzECe3C4Lv5RZTSqgyBOdN1HBdmI2aA="; + hash = "sha256-Lir4ZaZoawWm0vbCDPPW+1dKvGKhWnP3lAqAcS4ImFs="; }; }; From 273a0d1f72dd105e736db8e15eee93c3727fa8a6 Mon Sep 17 00:00:00 2001 From: Philip White Date: Wed, 4 Mar 2026 20:54:37 -0800 Subject: [PATCH 203/429] rustic: 0.11.0 -> 0.11.1 --- pkgs/by-name/ru/rustic/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/rustic/package.nix b/pkgs/by-name/ru/rustic/package.nix index f2c76c47c080..6818f7ce3b91 100644 --- a/pkgs/by-name/ru/rustic/package.nix +++ b/pkgs/by-name/ru/rustic/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rustic"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "rustic-rs"; repo = "rustic"; tag = "v${finalAttrs.version}"; - hash = "sha256-2xSQ+nbP7/GsIWvj9sgG+jgIIIesfEW8T9z5Tijd90E="; + hash = "sha256-Iih6qZglnsD6aSQQUoCfYtGvz2CcmWeCVmwbWkgW5Hg="; }; - cargoHash = "sha256-4yiWIlibYldr3qny0KRRIHBqHCx6R9gDiiheGkJrwEY="; + cargoHash = "sha256-osVyOFO+vHbcXEp44VH7XI8y4Ir8/IkCr/cF0FMPQvQ="; nativeBuildInputs = [ installShellFiles ]; From 9daf8a312b8451515ff3b175b48e8dabed356689 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Wed, 4 Mar 2026 21:37:04 -0800 Subject: [PATCH 204/429] python3Packages.monarchmoneycommunity: init at 1.3.0 Community fork of monarchmoney. The upstream monarchmoney package is no longer maintained. This fork fixes issues including the Monarch Money domain change to api.monarch.com, auth persistence, and GraphQL queries. https://github.com/bradleyseanf/monarchmoneycommunity/releases/tag/v1.3.0 --- .../monarchmoneycommunity/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/monarchmoneycommunity/default.nix diff --git a/pkgs/development/python-modules/monarchmoneycommunity/default.nix b/pkgs/development/python-modules/monarchmoneycommunity/default.nix new file mode 100644 index 000000000000..a24baf51897f --- /dev/null +++ b/pkgs/development/python-modules/monarchmoneycommunity/default.nix @@ -0,0 +1,43 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + aiohttp, + gql, + oathtool, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "monarchmoneycommunity"; + version = "1.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bradleyseanf"; + repo = "monarchmoneycommunity"; + tag = "v${finalAttrs.version}"; + hash = "sha256-xJKsA6YCcwWeqGiNYuMUjrPnj1kYtR6odB/JU1vZ/3c="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + gql + oathtool + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "monarchmoney" ]; + + meta = { + description = "Monarch Money API for Python"; + homepage = "https://github.com/bradleyseanf/monarchmoneycommunity"; + changelog = "https://github.com/bradleyseanf/monarchmoneycommunity/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c607fec6cde6..56f15afcf949 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10092,6 +10092,8 @@ self: super: with self; { monarchmoney = callPackage ../development/python-modules/monarchmoney { }; + monarchmoneycommunity = callPackage ../development/python-modules/monarchmoneycommunity { }; + monero = callPackage ../development/python-modules/monero { }; mongodict = callPackage ../development/python-modules/mongodict { }; From 55284d966cbaa0a64154a1471c4e95af91f87b2d Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Wed, 4 Mar 2026 21:34:16 -0800 Subject: [PATCH 205/429] python3Packages.typedmonarchmoney: 0.4.4 -> 0.5.0 Switched build system from poetry-core to hatchling and dependency from monarchmoney to monarchmoneycommunity, following upstream changes. https://github.com/jeeftor/monarchmoney-typed/releases/tag/v0.5.0 --- .../typedmonarchmoney/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/typedmonarchmoney/default.nix b/pkgs/development/python-modules/typedmonarchmoney/default.nix index ebde8735c40e..6035806e06f9 100644 --- a/pkgs/development/python-modules/typedmonarchmoney/default.nix +++ b/pkgs/development/python-modules/typedmonarchmoney/default.nix @@ -2,28 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, - poetry-core, - monarchmoney, + hatchling, + monarchmoneycommunity, rich, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "typedmonarchmoney"; - version = "0.4.4"; + version = "0.5.0"; pyproject = true; src = fetchFromGitHub { owner = "jeeftor"; repo = "monarchmoney-typed"; - tag = "v${version}"; - hash = "sha256-AM6d7oecKf5aG8zO3I6BGY3/rgtrdzNabCwX8AOlEs4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-pe/j6UnW9N3x/TYp4VyyVTwk2hTGHLTlnEYL6MNziuw="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ - monarchmoney + monarchmoneycommunity rich ]; @@ -34,8 +34,8 @@ buildPythonPackage rec { meta = { description = "Typed wrapper around the Monarch Money API"; homepage = "https://github.com/jeeftor/monarchmoney-typed"; - changelog = "https://github.com/jeeftor/monarchmoney-typed/releases/tag/v${version}"; + changelog = "https://github.com/jeeftor/monarchmoney-typed/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = [ lib.maintainers.jamiemagee ]; }; -} +}) From c4212e705ff2599f316ac9c6aaf1a222e883aeed Mon Sep 17 00:00:00 2001 From: Uriel Date: Mon, 24 Nov 2025 17:12:09 -0300 Subject: [PATCH 206/429] pupdate: 3.20.0 -> 4.7.0 --- pkgs/by-name/pu/pupdate/deps.json | 915 +--------------------------- pkgs/by-name/pu/pupdate/package.nix | 10 +- 2 files changed, 20 insertions(+), 905 deletions(-) diff --git a/pkgs/by-name/pu/pupdate/deps.json b/pkgs/by-name/pu/pupdate/deps.json index ddcb1a19d8bd..2fc7ef863962 100644 --- a/pkgs/by-name/pu/pupdate/deps.json +++ b/pkgs/by-name/pu/pupdate/deps.json @@ -1,4 +1,9 @@ [ + { + "pname": "Aspose.Zip", + "version": "24.11.0", + "hash": "sha256-wPxD7K7bc0K1BqJweWgEaXJOX4F/hgRjrFSXLs+UnMs=" + }, { "pname": "CommandLineParser", "version": "2.9.1", @@ -14,165 +19,15 @@ "version": "1.2.0", "hash": "sha256-sMQNIppJXHU2mULn5b//uRbbPMyguH9QlG6HKVIYUmE=" }, - { - "pname": "Libuv", - "version": "1.9.1", - "hash": "sha256-bQdVn50eId1GzSQa9CFth0meKAQMYCFQ98zLN9pqL0k=" - }, - { - "pname": "Microsoft.AspNetCore.App.Ref", - "version": "7.0.20", - "hash": "sha256-OEDXXjQ1HDRPiA4Y1zPr1xUeH6wlzTCJpts+DZL61wI=" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64", - "version": "7.0.20", - "hash": "sha256-ewal9R6o20GV0R02ylSijVFdWZAbdN8TK1PCc/ltHBQ=" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", - "version": "7.0.20", - "hash": "sha256-vq59xMfrET8InzUhkAsbs2xp3ML+SO9POsbwAiYKzkA=" - }, - { - "pname": "Microsoft.CodeAnalysis.Analyzers", - "version": "1.1.0", - "hash": "sha256-7KrZfK3kUbmeT82eVadvHurZcaFq3FDj4qkIIeExJiM=" - }, - { - "pname": "Microsoft.CodeAnalysis.Common", - "version": "1.3.0", - "hash": "sha256-Jcw54WWyfPKdkeqRAG4xjihiGP/djjAkvpR6KM2I+CQ=" - }, - { - "pname": "Microsoft.CodeAnalysis.CSharp", - "version": "1.3.0", - "hash": "sha256-OqqvMHNj9Xql4YTEPMlzoGXXELoLC7JkRGjS0pil+m4=" - }, - { - "pname": "Microsoft.CodeAnalysis.VisualBasic", - "version": "1.3.0", - "hash": "sha256-lIKN1dG59aY8zeYgkY8Kdnv4UBgSwVbghz5ngPyEzKA=" - }, - { - "pname": "Microsoft.CSharp", - "version": "4.0.1", - "hash": "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8=" - }, - { - "pname": "Microsoft.NET.ILLink.Analyzers", - "version": "7.0.100-1.23401.1", - "hash": "sha256-jGyhmj7DZxTv9Hir6YonkpL+SDsRore8Ph4RNN+2q94=" - }, - { - "pname": "Microsoft.NET.ILLink.Tasks", - "version": "7.0.100-1.23401.1", - "hash": "sha256-n95rHugj0BOtCBvv5209zJ5ttPX0A2+RWLjEwwtxgRA=" - }, - { - "pname": "Microsoft.NETCore.App", - "version": "1.0.4", - "hash": "sha256-NqJEOTW98eO0UlbiZcIVrsZCY4MUa+CkSmtAx3e2g3k=" - }, - { - "pname": "Microsoft.NETCore.App.Host.linux-arm64", - "version": "7.0.20", - "hash": "sha256-/20dMbO1Ft0WVhl+Lv1916Thvr4kPP9LuuX4bKE+czE=" - }, - { - "pname": "Microsoft.NETCore.App.Host.linux-x64", - "version": "7.0.20", - "hash": "sha256-Y1Dg8Sqhya86xD+9aJOuznT4mJUyFmoF/YZc0+5LBdc=" - }, - { - "pname": "Microsoft.NETCore.App.Ref", - "version": "7.0.20", - "hash": "sha256-W9RU3bja4BQLAbsaIhANQPJJh6DycDiBR+WZ3mK6Zrs=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.linux-arm64", - "version": "7.0.20", - "hash": "sha256-TemMvbNrDzJVHWwxVgnNN2CnTyI6TcvvZDpF4ts6IAw=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.linux-x64", - "version": "7.0.20", - "hash": "sha256-L+WaGvoXVMT3tZ7R5xFE06zaLcC3SI7LEf4ATBkUAGQ=" - }, - { - "pname": "Microsoft.NETCore.DotNetHost", - "version": "1.0.1", - "hash": "sha256-yiyZ4KGVRDZRgAuoSl4ZNWnRR3ityniyRPvzS799JOM=" - }, - { - "pname": "Microsoft.NETCore.DotNetHostPolicy", - "version": "1.0.3", - "hash": "sha256-doP+2c5SFVldt/EzgWW3nqKK+NNZKvBnanJbn2SKr2Q=" - }, - { - "pname": "Microsoft.NETCore.DotNetHostResolver", - "version": "1.0.1", - "hash": "sha256-hGJLA8Q6R+up9zHzk+Up2KF1a+fXZeEWrAZ+iNfQP4E=" - }, - { - "pname": "Microsoft.NETCore.Jit", - "version": "1.0.6", - "hash": "sha256-MuphzrzUdSpgyB3ZU2Ly3DwaGSRuLUvonovIzBasB6o=" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "1.0.2", - "hash": "sha256-YLJ2+BONtCWb0lY4Rttdqzbcm4z+5N5uNr3byRWQOZ8=" - }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.1.0", "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" }, { - "pname": "Microsoft.NETCore.Runtime.CoreCLR", - "version": "1.0.6", - "hash": "sha256-iZnxpUpUJDoEE/NjktTFfOYmi25RwC32NMu/OKXG3gA=" - }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "1.0.1", - "hash": "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4=" - }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "1.1.0", - "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" - }, - { - "pname": "Microsoft.NETCore.Windows.ApiSets", - "version": "1.0.1", - "hash": "sha256-6PR4o/wQxBaJ5eRdt/awSO80EP3QqpWIk0XkCR9kaJo=" - }, - { - "pname": "Microsoft.VisualBasic", - "version": "10.0.1", - "hash": "sha256-7HHzZcWLVTTQ1K1rCIyoB+UxLHMvOIz+O5av6XDa22A=" - }, - { - "pname": "Microsoft.Win32.Primitives", - "version": "4.0.1", - "hash": "sha256-B4t5El/ViBdxALMcpZulewc4j/3SIXf71HhJWhm4Ctk=" - }, - { - "pname": "Microsoft.Win32.Primitives", - "version": "4.3.0", - "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" - }, - { - "pname": "Microsoft.Win32.Registry", - "version": "4.0.0", - "hash": "sha256-M/06F/Z2wTHCh4pZOgtCjUGLD1FJXEJKCmzOeFMl7uo=" - }, - { - "pname": "NETStandard.Library", - "version": "1.6.0", - "hash": "sha256-ExWI1EKDCRishcfAeHVS/RoJphqSqohmJIC/wz3ZtVo=" + "pname": "Microsoft.NETCore.Platforms", + "version": "2.0.0", + "hash": "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro=" }, { "pname": "NETStandard.Library", @@ -184,759 +39,19 @@ "version": "13.0.3", "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=" }, - { - "pname": "runtime.any.System.Collections", - "version": "4.3.0", - "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" - }, - { - "pname": "runtime.any.System.Diagnostics.Tools", - "version": "4.3.0", - "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I=" - }, - { - "pname": "runtime.any.System.Diagnostics.Tracing", - "version": "4.3.0", - "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=" - }, - { - "pname": "runtime.any.System.Globalization", - "version": "4.3.0", - "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" - }, - { - "pname": "runtime.any.System.Globalization.Calendars", - "version": "4.3.0", - "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=" - }, - { - "pname": "runtime.any.System.IO", - "version": "4.3.0", - "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" - }, - { - "pname": "runtime.any.System.Reflection", - "version": "4.3.0", - "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" - }, - { - "pname": "runtime.any.System.Reflection.Extensions", - "version": "4.3.0", - "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=" - }, - { - "pname": "runtime.any.System.Reflection.Primitives", - "version": "4.3.0", - "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" - }, - { - "pname": "runtime.any.System.Resources.ResourceManager", - "version": "4.3.0", - "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" - }, - { - "pname": "runtime.any.System.Runtime", - "version": "4.3.0", - "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" - }, - { - "pname": "runtime.any.System.Runtime.Handles", - "version": "4.3.0", - "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" - }, - { - "pname": "runtime.any.System.Runtime.InteropServices", - "version": "4.3.0", - "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" - }, - { - "pname": "runtime.any.System.Text.Encoding", - "version": "4.3.0", - "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" - }, - { - "pname": "runtime.any.System.Text.Encoding.Extensions", - "version": "4.3.0", - "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=" - }, - { - "pname": "runtime.any.System.Threading.Tasks", - "version": "4.3.0", - "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" - }, - { - "pname": "runtime.any.System.Threading.Timer", - "version": "4.3.0", - "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs=" - }, - { - "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=" - }, - { - "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=" - }, - { - "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" - }, - { - "pname": "runtime.native.System", - "version": "4.0.0", - "hash": "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894=" - }, - { - "pname": "runtime.native.System", - "version": "4.3.0", - "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" - }, - { - "pname": "runtime.native.System.IO.Compression", - "version": "4.1.0", - "hash": "sha256-085JrZxNEwIHdBWKKKFsh1JzpF0AblvrUsz5T8kH4jQ=" - }, - { - "pname": "runtime.native.System.IO.Compression", - "version": "4.3.0", - "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8=" - }, - { - "pname": "runtime.native.System.Net.Http", - "version": "4.0.1", - "hash": "sha256-5nWnTQrA1T6t9r8MqIiV4yTNu+IH0of2OX1qteoS+8E=" - }, - { - "pname": "runtime.native.System.Net.Security", - "version": "4.0.1", - "hash": "sha256-E64W+qCHZGYbhzQOEeToCob/4K8cTg3uOO7ltZG7ZNo=" - }, - { - "pname": "runtime.native.System.Security.Cryptography", - "version": "4.0.0", - "hash": "sha256-6Q8eYzC32BbGIiTHoQaE6B3cD81vYQcH5SCswYRSp0w=" - }, - { - "pname": "runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" - }, - { - "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=" - }, - { - "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" - }, - { - "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=" - }, - { - "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=" - }, - { - "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=" - }, - { - "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=" - }, - { - "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" - }, - { - "pname": "runtime.unix.Microsoft.Win32.Primitives", - "version": "4.3.0", - "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" - }, - { - "pname": "runtime.unix.System.Console", - "version": "4.3.0", - "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190=" - }, - { - "pname": "runtime.unix.System.Diagnostics.Debug", - "version": "4.3.0", - "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" - }, - { - "pname": "runtime.unix.System.IO.FileSystem", - "version": "4.3.0", - "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=" - }, - { - "pname": "runtime.unix.System.Net.Primitives", - "version": "4.3.0", - "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" - }, - { - "pname": "runtime.unix.System.Net.Sockets", - "version": "4.3.0", - "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=" - }, - { - "pname": "runtime.unix.System.Private.Uri", - "version": "4.3.0", - "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" - }, - { - "pname": "runtime.unix.System.Runtime.Extensions", - "version": "4.3.0", - "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" - }, - { - "pname": "System.AppContext", - "version": "4.1.0", - "hash": "sha256-v6YfyfrKmhww+EYHUq6cwYUMj00MQ6SOfJtcGVRlYzs=" - }, { "pname": "System.Buffers", - "version": "4.0.0", - "hash": "sha256-+YUymoyS0O+xVyF2+LiAdZlMww8nofPN4ja9ylYqRo8=" + "version": "4.5.1", + "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" }, { - "pname": "System.Buffers", - "version": "4.3.0", - "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" - }, - { - "pname": "System.Collections", - "version": "4.0.11", - "hash": "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0=" - }, - { - "pname": "System.Collections", - "version": "4.3.0", - "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" - }, - { - "pname": "System.Collections.Concurrent", - "version": "4.0.12", - "hash": "sha256-zIEM7AB4SyE9u6G8+o+gCLLwkgi6+3rHQVPdn/dEwB8=" - }, - { - "pname": "System.Collections.Immutable", - "version": "1.2.0", - "hash": "sha256-FQ3l+ulbLSPhQ0JcQCC4D4SzjTnHsRqcOj56Ywy7pMo=" - }, - { - "pname": "System.ComponentModel", - "version": "4.0.1", - "hash": "sha256-X5T36S49q1odsn6wAET6EGNlsxOyd66naMr5T3G9mGw=" - }, - { - "pname": "System.ComponentModel.Annotations", - "version": "4.1.0", - "hash": "sha256-jhvr6zS+iC4OXBkdXr+S8rPy/5nfhZtDVVJiAc0f1VA=" - }, - { - "pname": "System.Console", - "version": "4.0.0", - "hash": "sha256-jtZfT/TpJtLisV/y5Mk3IfCpE79zwhBYXtyGP9jC3Xo=" - }, - { - "pname": "System.Diagnostics.Debug", - "version": "4.0.11", - "hash": "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4=" - }, - { - "pname": "System.Diagnostics.Debug", - "version": "4.3.0", - "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" - }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "4.0.0", - "hash": "sha256-dYh9UoFesuGcHY+ewsI+z2WnNy+bwHPsHQ3t85cbzNg=" - }, - { - "pname": "System.Diagnostics.FileVersionInfo", - "version": "4.0.0", - "hash": "sha256-Yy94jPhDXF2QHOF7qTmqKkn1048K9xkKryuBeDzsu+g=" - }, - { - "pname": "System.Diagnostics.Process", - "version": "4.1.0", - "hash": "sha256-OgW6ogQ+oYADYS0PHmwXdhrOKQJpqXlwzSvmfjTLNBg=" - }, - { - "pname": "System.Diagnostics.StackTrace", - "version": "4.0.1", - "hash": "sha256-gqqCAwpDsca242nli+fejgqwPAuwROv3NoNeOnFXSWA=" - }, - { - "pname": "System.Diagnostics.Tools", - "version": "4.0.1", - "hash": "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U=" - }, - { - "pname": "System.Diagnostics.Tracing", - "version": "4.1.0", - "hash": "sha256-JA0jJcLbU3zh52ub3zweob2EVHvxOqiC6SCYHrY5WbQ=" - }, - { - "pname": "System.Diagnostics.Tracing", - "version": "4.3.0", - "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" - }, - { - "pname": "System.Dynamic.Runtime", - "version": "4.0.11", - "hash": "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4=" - }, - { - "pname": "System.Globalization", - "version": "4.0.11", - "hash": "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw=" - }, - { - "pname": "System.Globalization", - "version": "4.3.0", - "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" - }, - { - "pname": "System.Globalization.Calendars", - "version": "4.0.1", - "hash": "sha256-EJN3LbN+b0O9Dr2eg7kfThCYpne0iJ/H/GIyUTNVYC8=" - }, - { - "pname": "System.Globalization.Extensions", - "version": "4.0.1", - "hash": "sha256-zLtkPryJwqTGcJqMC6zoMMvMrT+aAL5GoumjmMtqUEI=" - }, - { - "pname": "System.IO", - "version": "4.1.0", - "hash": "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw=" - }, - { - "pname": "System.IO", - "version": "4.3.0", - "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" - }, - { - "pname": "System.IO.Compression", - "version": "4.1.0", - "hash": "sha256-UT4KEfJNZOk7b4X0AqLFUsqfHu6myVH/BhbRKYc+1Uc=" - }, - { - "pname": "System.IO.Compression", - "version": "4.3.0", - "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA=" - }, - { - "pname": "System.IO.Compression.ZipFile", - "version": "4.3.0", - "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=" - }, - { - "pname": "System.IO.FileSystem", - "version": "4.0.1", - "hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0=" - }, - { - "pname": "System.IO.FileSystem", - "version": "4.3.0", - "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" - }, - { - "pname": "System.IO.FileSystem.Primitives", - "version": "4.0.1", - "hash": "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg=" - }, - { - "pname": "System.IO.FileSystem.Primitives", - "version": "4.3.0", - "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=" - }, - { - "pname": "System.IO.FileSystem.Watcher", - "version": "4.0.0", - "hash": "sha256-OcLhbiHvn453sJsZBHe6RmtDlCaaarcqRB439HGU7mU=" - }, - { - "pname": "System.IO.MemoryMappedFiles", - "version": "4.0.0", - "hash": "sha256-1VQa8FoMUNAsja31OvOn7ungif+IPusAe9YcR+kRF6o=" - }, - { - "pname": "System.IO.UnmanagedMemoryStream", - "version": "4.0.1", - "hash": "sha256-Sx60QjHjvXQMAL7O4aN81321gu13LE0XzCRtt7hFTwQ=" - }, - { - "pname": "System.Linq", - "version": "4.1.0", - "hash": "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794=" - }, - { - "pname": "System.Linq.Expressions", - "version": "4.1.1", - "hash": "sha256-nwRmq03bvyYhohaDJtCYj4Z6hHsp0AlhjFJzuw7fsdk=" - }, - { - "pname": "System.Linq.Parallel", - "version": "4.0.1", - "hash": "sha256-TV1F3KYFipPmPnWFjX6hOZQNFsG2m729EdgPSFzqY0Q=" - }, - { - "pname": "System.Linq.Queryable", - "version": "4.0.1", - "hash": "sha256-XOFRO+lyoxsWtIUJfg5JCqv9Gx35ASOc94WIR8ZMVoY=" - }, - { - "pname": "System.Net.Http", - "version": "4.1.1", - "hash": "sha256-+JTAbEt2BicpnP3ooKXludoS5nClzBOnUyI9C/XxyyM=" - }, - { - "pname": "System.Net.NameResolution", - "version": "4.0.0", - "hash": "sha256-EAO67qEDqrtxEa+J3xccA5/lgCJ0PiRU9DYZsO++QzY=" - }, - { - "pname": "System.Net.Primitives", - "version": "4.0.11", - "hash": "sha256-2YSijNhCdw/ZU2yfH7vE+ReA8pgxRCXPnWr+ab36v4M=" - }, - { - "pname": "System.Net.Requests", - "version": "4.0.11", - "hash": "sha256-MLXxaUhHQC3pId/6r4q0EF37CIExt0+4Na8ZpUtRs44=" - }, - { - "pname": "System.Net.Security", - "version": "4.0.0", - "hash": "sha256-65Vqr/B5B336KEW69aM95+f7s5u2Q7/OiJmBarV2fnk=" - }, - { - "pname": "System.Net.Sockets", - "version": "4.1.0", - "hash": "sha256-muK7oXIX7ykqhXskuUt0KX6Hzg5VogJhUS0JiOB2BY0=" - }, - { - "pname": "System.Net.WebHeaderCollection", - "version": "4.0.1", - "hash": "sha256-uJSV6kmL+V/9/ot1LhHXGCd8Ndcu6zk+AJ8wgGS/fYE=" - }, - { - "pname": "System.Numerics.Vectors", - "version": "4.1.1", - "hash": "sha256-Kv4FrStml5+X7hGDCLhJJaIwJDvdJdYMBfcCcOjNf/Y=" - }, - { - "pname": "System.ObjectModel", - "version": "4.0.12", - "hash": "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s=" - }, - { - "pname": "System.Private.Uri", - "version": "4.3.0", - "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" - }, - { - "pname": "System.Reflection", - "version": "4.1.0", - "hash": "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs=" - }, - { - "pname": "System.Reflection", - "version": "4.3.0", - "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" - }, - { - "pname": "System.Reflection.DispatchProxy", - "version": "4.0.1", - "hash": "sha256-GdjA81UywW1yeAyNi+MR5agmOXl859GrWwiOui2jT9U=" - }, - { - "pname": "System.Reflection.Emit", - "version": "4.0.1", - "hash": "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk=" - }, - { - "pname": "System.Reflection.Emit.ILGeneration", - "version": "4.0.1", - "hash": "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0=" - }, - { - "pname": "System.Reflection.Emit.Lightweight", - "version": "4.0.1", - "hash": "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g=" - }, - { - "pname": "System.Reflection.Extensions", - "version": "4.0.1", - "hash": "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ=" - }, - { - "pname": "System.Reflection.Metadata", - "version": "1.3.0", - "hash": "sha256-a/RQr++mSsziWaOTknicfIQX/zJrwPFExfhK6PM0tfg=" - }, - { - "pname": "System.Reflection.Primitives", - "version": "4.0.1", - "hash": "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0=" - }, - { - "pname": "System.Reflection.Primitives", - "version": "4.3.0", - "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" - }, - { - "pname": "System.Reflection.TypeExtensions", - "version": "4.1.0", - "hash": "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4=" - }, - { - "pname": "System.Resources.Reader", - "version": "4.0.0", - "hash": "sha256-NOax26EYc/L4bfedL2a33fg4sFXVkBwzVTQ41saJTsk=" - }, - { - "pname": "System.Resources.ResourceManager", - "version": "4.0.1", - "hash": "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw=" - }, - { - "pname": "System.Resources.ResourceManager", - "version": "4.3.0", - "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" - }, - { - "pname": "System.Runtime", - "version": "4.1.0", - "hash": "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo=" - }, - { - "pname": "System.Runtime", - "version": "4.3.0", - "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" - }, - { - "pname": "System.Runtime.Extensions", - "version": "4.1.0", - "hash": "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc=" - }, - { - "pname": "System.Runtime.Extensions", - "version": "4.3.0", - "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" - }, - { - "pname": "System.Runtime.Handles", - "version": "4.0.1", - "hash": "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w=" - }, - { - "pname": "System.Runtime.Handles", - "version": "4.3.0", - "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" - }, - { - "pname": "System.Runtime.InteropServices", - "version": "4.1.0", - "hash": "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY=" - }, - { - "pname": "System.Runtime.InteropServices", - "version": "4.3.0", - "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" - }, - { - "pname": "System.Runtime.InteropServices.RuntimeInformation", - "version": "4.0.0", - "hash": "sha256-5j53amb76A3SPiE3B0llT2XPx058+CgE7OXL4bLalT4=" - }, - { - "pname": "System.Runtime.Loader", - "version": "4.0.0", - "hash": "sha256-gE5/ehU3Qq5phhSxGuPmSv1DFVQeiyl1/+YyrO+I7lI=" - }, - { - "pname": "System.Runtime.Numerics", - "version": "4.0.1", - "hash": "sha256-1pJt5ZGxLPTX1mjOi8qZPXyyOMkYV0NstoUCv91HYPg=" - }, - { - "pname": "System.Security.Claims", - "version": "4.0.1", - "hash": "sha256-xqI0HHahNAd9g3jqgnLKH4P/pIueef6cy3qvRDQFvA0=" - }, - { - "pname": "System.Security.Cryptography.Algorithms", - "version": "4.2.0", - "hash": "sha256-BelNIpEyToEp/VYKnje/q1P7KNEpQNtOzGPU18pLGpE=" - }, - { - "pname": "System.Security.Cryptography.Cng", - "version": "4.2.0", - "hash": "sha256-7F+m3HnmBsgE4xWF8FeCGlaEgQM3drqA6HEaQr6MEoU=" - }, - { - "pname": "System.Security.Cryptography.Csp", - "version": "4.0.0", - "hash": "sha256-WHyR6vVK3zaT4De7jgQFUar1P5fiX9ECwiVkJDFFm7M=" - }, - { - "pname": "System.Security.Cryptography.Encoding", - "version": "4.0.0", - "hash": "sha256-ZO7ha39J5uHkIF2RoEKv/bW/bLbVvYMO4+rWyYsKHik=" - }, - { - "pname": "System.Security.Cryptography.OpenSsl", - "version": "4.0.0", - "hash": "sha256-mLijAozynzjiOMyh2P5BHcfVq3Ovd0T/phG08SIbXZs=" - }, - { - "pname": "System.Security.Cryptography.Primitives", - "version": "4.0.0", - "hash": "sha256-sEdPftfTxQd/8DpdpqUZC2XWC0SjVCPqAkEleLl17EQ=" - }, - { - "pname": "System.Security.Cryptography.X509Certificates", - "version": "4.1.0", - "hash": "sha256-sBUUhJP+yYDXvcjNMKqNpn8yzGUpVABwK9vVUvYKjzI=" - }, - { - "pname": "System.Security.Principal", - "version": "4.0.1", - "hash": "sha256-9wBgPnJfFOtrhKZ7wDXZ4q12GklQ49Ka02/9v7Frf9k=" - }, - { - "pname": "System.Security.Principal.Windows", - "version": "4.0.0", - "hash": "sha256-38wEUCB889Mpm4WgRFEQBB+4HtE0X0wu+knrDyJie7Q=" - }, - { - "pname": "System.Text.Encoding", - "version": "4.0.11", - "hash": "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc=" - }, - { - "pname": "System.Text.Encoding", - "version": "4.3.0", - "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "4.5.0", + "hash": "sha256-g9jIdQtXSAhY+ezQtYNgHEUoQR3HzznHs3JMzD9bip4=" }, { "pname": "System.Text.Encoding.CodePages", - "version": "4.0.1", - "hash": "sha256-wxtwWQSTv5tuFP79KhUAhaL6bL4d8lSzSWkCn9aolwM=" - }, - { - "pname": "System.Text.Encoding.Extensions", - "version": "4.0.11", - "hash": "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI=" - }, - { - "pname": "System.Text.Encoding.Extensions", - "version": "4.3.0", - "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" - }, - { - "pname": "System.Text.RegularExpressions", - "version": "4.1.0", - "hash": "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c=" - }, - { - "pname": "System.Threading", - "version": "4.0.11", - "hash": "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac=" - }, - { - "pname": "System.Threading", - "version": "4.3.0", - "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" - }, - { - "pname": "System.Threading.Overlapped", - "version": "4.0.1", - "hash": "sha256-CAWZlavcuBQHs+kaSX9CmkpHF7wC8rFrug3XPb5KJzo=" - }, - { - "pname": "System.Threading.Tasks", - "version": "4.0.11", - "hash": "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs=" - }, - { - "pname": "System.Threading.Tasks", - "version": "4.3.0", - "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" - }, - { - "pname": "System.Threading.Tasks.Dataflow", - "version": "4.6.0", - "hash": "sha256-YYrT3GRzVBdendxt8FUDCnOBJi0nw/CJ9VrzcPJWLSg=" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.0.0", - "hash": "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE=" - }, - { - "pname": "System.Threading.Tasks.Parallel", - "version": "4.0.1", - "hash": "sha256-5VyRZ97Fug4reK/cQ6wsCrJ5jH53aGu1a4ZkKMZrnIQ=" - }, - { - "pname": "System.Threading.Thread", - "version": "4.0.0", - "hash": "sha256-7EtSJuKqcW107FYA5Ko9NFXEWUPIzNDtlfKaQV2pvb8=" - }, - { - "pname": "System.Threading.ThreadPool", - "version": "4.0.10", - "hash": "sha256-/fowWjM/0ZZFC1Rwu0i5N71iRxV2JOd3jQV2Jn0wuTk=" - }, - { - "pname": "System.Threading.Timer", - "version": "4.0.1", - "hash": "sha256-5lU6zt1O9JDSPr2KAHw4BYgysHnt0yyZrMNa5IIjxZY=" - }, - { - "pname": "System.Xml.ReaderWriter", - "version": "4.0.11", - "hash": "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA=" - }, - { - "pname": "System.Xml.XDocument", - "version": "4.0.11", - "hash": "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg=" - }, - { - "pname": "System.Xml.XmlDocument", - "version": "4.0.1", - "hash": "sha256-gdoFrPo54v1LjkBF79f8EvtltVVjHz9ZI9kc5ve0GkY=" - }, - { - "pname": "System.Xml.XPath", - "version": "4.0.1", - "hash": "sha256-lQCoK2M51SGRuGjfiuIW26Y2goABY2RLE6cZ4816WDo=" - }, - { - "pname": "System.Xml.XPath.XDocument", - "version": "4.0.1", - "hash": "sha256-H/zyMMB1YB8vd+StYJr99KLqWmSHhaP7RHDLRcFhzbo=" - }, - { - "pname": "UrlCombine", - "version": "2.0.0", - "hash": "sha256-yvBqXgZsqre+JIyxY/e8y+oBs2+K7PtJkITR3YEtHlU=" + "version": "4.5.0", + "hash": "sha256-Q+7R7EVSOtsXIzKjjfCnvfNul6AE1NxzJZirG0JCo6c=" } ] diff --git a/pkgs/by-name/pu/pupdate/package.nix b/pkgs/by-name/pu/pupdate/package.nix index 66ac56b52271..2bf3f5415414 100644 --- a/pkgs/by-name/pu/pupdate/package.nix +++ b/pkgs/by-name/pu/pupdate/package.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "pupdate"; - version = "3.20.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "mattpannella"; repo = "pupdate"; rev = "${version}"; - hash = "sha256-kdxqG1Vw6jRT/YyRLi60APpayYyLG73KqAFga8N9G2A="; + hash = "sha256-KodDuTVw06IFfwVOgbVwgNp74czjEcgu/T9rgYXlASQ="; }; buildInputs = [ @@ -30,7 +30,7 @@ buildDotnetModule rec { patches = [ ./add-runtime-identifier.patch ]; postPatch = '' substituteInPlace pupdate.csproj \ - --replace @RuntimeIdentifier@ "${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}" + --replace-fail @RuntimeIdentifier@ "${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}" ''; projectFile = "pupdate.csproj"; @@ -45,8 +45,8 @@ buildDotnetModule rec { "-p:PackageRuntime=${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system} -p:TrimMode=partial" ]; - dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnet-runtime = dotnetCorePackages.runtime_8_0; + dotnet-sdk = dotnetCorePackages.sdk_9_0; + dotnet-runtime = dotnetCorePackages.runtime_9_0; passthru = { updateScript = nix-update-script { }; From fdc4376846f7d4152d5fce8b879c162eaae26c9e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 06:24:19 +0000 Subject: [PATCH 207/429] atlauncher: 3.4.40.2 -> 3.4.40.3 --- pkgs/by-name/at/atlauncher/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix index 5e406a8ef485..118041f76ed9 100644 --- a/pkgs/by-name/at/atlauncher/package.nix +++ b/pkgs/by-name/at/atlauncher/package.nix @@ -27,13 +27,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "atlauncher"; - version = "3.4.40.2"; + version = "3.4.40.3"; src = fetchFromGitHub { owner = "ATLauncher"; repo = "ATLauncher"; rev = "v${finalAttrs.version}"; - hash = "sha256-sV6eWIgx/0e+uUCbbRwAPPqNcFWUQWyuHnzrwcYJkqA="; + hash = "sha256-QFPdEH3V9Krwy/cWCbY+IMtW0ydVCqKr/OZfttZGCss="; }; nativeBuildInputs = [ From ddde5c583ad101852854474c65badca996dd07c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 06:53:23 +0000 Subject: [PATCH 208/429] python3Packages.claude-agent-sdk: 0.1.44 -> 0.1.46 --- pkgs/development/python-modules/claude-agent-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claude-agent-sdk/default.nix b/pkgs/development/python-modules/claude-agent-sdk/default.nix index 3f7177a39da8..8fb968e2bee2 100644 --- a/pkgs/development/python-modules/claude-agent-sdk/default.nix +++ b/pkgs/development/python-modules/claude-agent-sdk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage (finalAttrs: { pname = "claude-agent-sdk"; - version = "0.1.44"; + version = "0.1.46"; pyproject = true; src = fetchFromGitHub { owner = "anthropics"; repo = "claude-agent-sdk-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-YRXSQsJYNhwV43x1iQbnwm23Hllr/SXl8Fv91/AWh8Y="; + hash = "sha256-Cxffdl8oQ9//lURbIVhhX9g1sin2BRj9hJ1/A6Tb++o="; }; build-system = [ hatchling ]; From b3365d9e43920800d08b801ae02b77d8be409356 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 07:42:12 +0000 Subject: [PATCH 209/429] cog: 0.0.60 -> 0.1.4 --- pkgs/by-name/co/cog/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/cog/package.nix b/pkgs/by-name/co/cog/package.nix index 77cfd7fc3c0f..a09614df34a8 100644 --- a/pkgs/by-name/co/cog/package.nix +++ b/pkgs/by-name/co/cog/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "cog"; - version = "0.0.60"; + version = "0.1.4"; src = fetchFromGitHub { owner = "grafana"; repo = "cog"; tag = "v${finalAttrs.version}"; - hash = "sha256-hqDqsngkFG8jhwLHxN1JhBOx7UMfArFyRD9CEEK/SMw="; + hash = "sha256-cx9ztZufX199jiVT4ZB5qNUR5W2bfN3jzYhUmdAi+80="; }; - vendorHash = "sha256-IQSb7SI+x+xRbfjBhbiROBTzlY2SI91cZIz0VfQn+n0="; + vendorHash = "sha256-rz/qL5kEryIV2SMQKoVav4C6scIKaxIFuwtTjqBaF4g="; subPackages = [ "cmd/cli" ]; From 9139860ea5ee032b9aede8a0e6d1f1a12a1f0b62 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 08:19:41 +0000 Subject: [PATCH 210/429] sif: 0-unstable-2026-02-23 -> 0-unstable-2026-03-01 --- pkgs/by-name/si/sif/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/si/sif/package.nix b/pkgs/by-name/si/sif/package.nix index 407b062fac86..06b5ffba7bb0 100644 --- a/pkgs/by-name/si/sif/package.nix +++ b/pkgs/by-name/si/sif/package.nix @@ -7,16 +7,16 @@ buildGoModule { pname = "sif"; - version = "0-unstable-2026-02-23"; + version = "0-unstable-2026-03-01"; src = fetchFromGitHub { owner = "vmfunc"; repo = "sif"; - rev = "fef7806ac22938a480cc35e429f6862b758928a5"; - hash = "sha256-mLz6CXpxbo7zQTgOxJJ7tvvCi/X2LWS+87iGDKhXeo4="; + rev = "237dfde4d1c10339efb62cc5e5ade18c0050f70c"; + hash = "sha256-XRK4qZWAU+7JO07Kuo9hF7cGWJ+ljjnG4SHQ05nS91M="; }; - vendorHash = "sha256-svuWF0mUfUBKpigY34A7Iio3d4LIR1wj2ks4KGUv0wE="; + vendorHash = "sha256-npwwYuAEMKm61T+s604kblrcHKBWMnMs4OHfOOqREkA="; subPackages = [ "cmd/sif" ]; From 91c129f12990d3b5406209081c5b65206dba61a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 08:35:57 +0000 Subject: [PATCH 211/429] stackit-cli: 0.54.1 -> 0.55.0 --- pkgs/by-name/st/stackit-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index 9222b9af5fb2..84feafaea4d4 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -12,16 +12,16 @@ buildGoModule (finalAttrs: { pname = "stackit-cli"; - version = "0.54.1"; + version = "0.55.0"; src = fetchFromGitHub { owner = "stackitcloud"; repo = "stackit-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-yXWwOQ+cOKxXW+Ez7lJSt/9gpqOR1+QX4IJprGhdXBk="; + hash = "sha256-dq6354WDaP3r9gE5llXQkgXPNqMXfchJyjeCuG/NGyA="; }; - vendorHash = "sha256-Hvwq6P7y5lNWX+uClrb5uk9d2ODs4Tavjf7m6A2DDrg="; + vendorHash = "sha256-KHixmVUCZIw2VJECI2LPC8vdmiasmZEQ69r7Z+D63RY="; subPackages = [ "." ]; From ae147f005a143b438b7f16192985e80c6d8add94 Mon Sep 17 00:00:00 2001 From: Aleksi Hannula Date: Thu, 5 Mar 2026 10:51:56 +0200 Subject: [PATCH 212/429] pkgsi686Linux.pkgsMusl.gzip: Fix build Set -no-pie for gzip on this specific platform. The ASM fast-path makes object references without going through PLT, which would need to be relocated. Then musl ldd tries to apply relocations to an R-X .text section and crashes. --- pkgs/tools/compression/gzip/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index 85b452f2260b..446e5fab0af8 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -48,6 +48,10 @@ stdenv.mkDerivation (finalAttrs: { "ZLESS_PROG=zless" ]; + env = lib.optionalAttrs (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_32) { + NIX_CFLAGS_LINK = "-no-pie"; + }; + nativeCheckInputs = [ less perl From d5295eb99e574ee1a94844d66c08870ba2e7e11b Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Thu, 5 Mar 2026 10:53:16 +0100 Subject: [PATCH 213/429] python3Packages.textstat: move env variable into env, use finalAttrs --- pkgs/development/python-modules/textstat/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/textstat/default.nix b/pkgs/development/python-modules/textstat/default.nix index ff1422a56320..eea22e506584 100644 --- a/pkgs/development/python-modules/textstat/default.nix +++ b/pkgs/development/python-modules/textstat/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "0.7.13"; pname = "textstat"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "textstat"; repo = "textstat"; - tag = version; + tag = finalAttrs.version; hash = "sha256-VMWwhwyGMFaKNLHoDG3gw1/jzSYCDBH3Yq4pE4JZTTo="; }; @@ -43,7 +43,7 @@ buildPythonPackage rec { "tests/" ]; - NLTK_DATA = nltk.data.cmudict; + env.NLTK_DATA = nltk.data.cmudict; meta = { description = "Python package to calculate readability statistics of a text object"; @@ -51,4 +51,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ aleksana ]; }; -} +}) From 1f93550e0a393e25487939e6e8e56da35144c627 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Thu, 5 Mar 2026 10:58:07 +0100 Subject: [PATCH 214/429] perlPackages.BioBigFile: move env variable into env for structuredAttrs --- pkgs/development/perl-modules/Bio-BigFile/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/perl-modules/Bio-BigFile/default.nix b/pkgs/development/perl-modules/Bio-BigFile/default.nix index 4210ee8f5d3b..8bf33fb12bc5 100644 --- a/pkgs/development/perl-modules/Bio-BigFile/default.nix +++ b/pkgs/development/perl-modules/Bio-BigFile/default.nix @@ -24,7 +24,7 @@ buildPerlModule rec { # - official documentation: https://www.ensembl.org/info/docs/tools/vep/script/vep_download.html#bigfile # - one of the developer's answer: https://github.com/Ensembl/ensembl-vep/issues/1412 # BioBigfile needs the environment variable KENT_SRC to find kent - KENT_SRC = kent.overrideAttrs (old: rec { + env.KENT_SRC = kent.overrideAttrs (old: rec { pname = "kent"; version = "335"; From 6dc088a89ae021a8a8023b2b00ff4ed6f8882bbd Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Thu, 5 Mar 2026 10:58:46 +0100 Subject: [PATCH 215/429] perlPackages.MozillaLdap: move env variables into env for structuredAttrs --- pkgs/development/perl-modules/Mozilla-LDAP/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/perl-modules/Mozilla-LDAP/default.nix b/pkgs/development/perl-modules/Mozilla-LDAP/default.nix index 39d7011d4cf5..dc73b61e2ac7 100644 --- a/pkgs/development/perl-modules/Mozilla-LDAP/default.nix +++ b/pkgs/development/perl-modules/Mozilla-LDAP/default.nix @@ -8,9 +8,13 @@ buildPerlPackage rec { pname = "Mozilla-Ldap"; version = "1.5.3"; - USE_OPENLDAP = 1; - LDAPSDKDIR = openldap.dev; - LDAPSDKLIBDIR = "${openldap.out}/lib"; + + env = { + USE_OPENLDAP = 1; + LDAPSDKDIR = openldap.dev; + LDAPSDKLIBDIR = "${openldap.out}/lib"; + }; + src = fetchurl { url = "https://ftp.mozilla.org/pub/directory/perldap/releases/${version}/src/perl-mozldap-${version}.tar.gz"; sha256 = "0s0albdw0zvg3w37s7is7gddr4mqwicjxxsy400n1p96l7ipnw4x"; From 4617d39c62ce9a8861905cbe8af81930bc7ae433 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 10:15:26 +0000 Subject: [PATCH 216/429] simple-http-server: 0.6.13 -> 0.6.14 --- pkgs/by-name/si/simple-http-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/simple-http-server/package.nix b/pkgs/by-name/si/simple-http-server/package.nix index 3b917c6ab1d5..d2452b28769b 100644 --- a/pkgs/by-name/si/simple-http-server/package.nix +++ b/pkgs/by-name/si/simple-http-server/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "simple-http-server"; - version = "0.6.13"; + version = "0.6.14"; src = fetchFromGitHub { owner = "TheWaWaR"; repo = "simple-http-server"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-uTzzQg1UJ+PG2poIKd+LO0T0y7z48ZK0f196zIgeZhs="; + sha256 = "sha256-Ka6PU2Mbu7wIyj5hbAhUa8ncK61wcM+huSKYh/kiH7M="; }; - cargoHash = "sha256-y+pNDg73fAHs9m0uZr6z0HTA/vB3fFM5qukJycuIxnY="; + cargoHash = "sha256-0dODUHXeIVltwMn4U9Y4/NCOTuxkfVxpRYzXIHSTfQQ="; nativeBuildInputs = [ pkg-config ]; From b410183b980c299b63e5f12f874bf27eb105c1aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 11:44:35 +0000 Subject: [PATCH 217/429] circleci-cli: 0.1.34592 -> 0.1.34770 --- pkgs/by-name/ci/circleci-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/circleci-cli/package.nix b/pkgs/by-name/ci/circleci-cli/package.nix index 5acaff20d3bf..bedd2f5016d1 100644 --- a/pkgs/by-name/ci/circleci-cli/package.nix +++ b/pkgs/by-name/ci/circleci-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "circleci-cli"; - version = "0.1.34592"; + version = "0.1.34770"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = "circleci-cli"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-yvR38Tyju26D0EdH7s1yioGr32l8d3VfHgC7lY2OmF4="; + sha256 = "sha256-UTlwpAraM7Q4pEtB3i8h0uDpGG64wYm+2a+47q7R7UA="; }; vendorHash = "sha256-GRWo9oq8M7zJoWCg6iNLbR+DPXvMXF3v+YRU2BBH5+8="; From 009bccbfbf97ed3090b6ed29679e69fb2e15dcd2 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 5 Mar 2026 14:15:06 +0100 Subject: [PATCH 218/429] tclPackages.yajl-tcl: fix for GCC 15 GCC 15 issue: https://github.com/NixOS/nixpkgs/issues/475479 Upstream issue: https://github.com/flightaware/yajl-tcl/pull/45 --- pkgs/development/tcl-modules/by-name/ya/yajl-tcl/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/tcl-modules/by-name/ya/yajl-tcl/package.nix b/pkgs/development/tcl-modules/by-name/ya/yajl-tcl/package.nix index 8230d16119d3..9b5f71c9cc97 100644 --- a/pkgs/development/tcl-modules/by-name/ya/yajl-tcl/package.nix +++ b/pkgs/development/tcl-modules/by-name/ya/yajl-tcl/package.nix @@ -29,6 +29,11 @@ mkTclDerivation rec { yajl ]; + buildFlags = [ + # https://github.com/flightaware/yajl-tcl/pull/45 + "CFLAGS=-std=gnu17" + ]; + meta = { description = "Tcl bindings for Yet Another JSON Library"; homepage = "https://github.com/flightaware/yajl-tcl"; From bf07146c9d0eb2cbd273fa99f43170badf883796 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 13:49:48 +0000 Subject: [PATCH 219/429] argon: 2.0.27 -> 2.0.28 --- pkgs/by-name/ar/argon/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ar/argon/package.nix b/pkgs/by-name/ar/argon/package.nix index 6554b9b1eeb9..8d237030f25c 100644 --- a/pkgs/by-name/ar/argon/package.nix +++ b/pkgs/by-name/ar/argon/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "argon"; - version = "2.0.27"; + version = "2.0.28"; src = fetchFromGitHub { owner = "argon-rbx"; repo = "argon"; tag = finalAttrs.version; - hash = "sha256-AcgaY7XmecqvWan81tVxV6UJ+A38tAYDlvUSLLKlYuU="; + hash = "sha256-QXGiDcn5BM1psCZf88gEyKqoK9EDFquLgyzJeZOhwMU="; }; - cargoHash = "sha256-0VIPAcCK7+te7TgH/+x0Y7pP0fYWuRT58/h9OIva0mQ="; + cargoHash = "sha256-okfQn/dgBN6s1aO1cnU/bY7BIqwM9iq1iPZ321ez4C4="; nativeBuildInputs = [ pkg-config ]; From 9416e6e658cc2b8da95da08aab9ecbc2b16f2e63 Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Thu, 5 Mar 2026 15:21:43 +0100 Subject: [PATCH 220/429] maintainers: remove p-rintz --- maintainers/maintainer-list.nix | 7 ------- pkgs/by-name/pu/pupdate/package.nix | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d6e278b5f87e..d865cfe4c466 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -20324,13 +20324,6 @@ githubId = 645664; name = "Philippe Hürlimann"; }; - p-rintz = { - email = "nix@rintz.net"; - github = "p-rintz"; - githubId = 13933258; - name = "Philipp Rintz"; - matrix = "@philipp:srv.icu"; - }; p0lyw0lf = { email = "p0lyw0lf@protonmail.com"; name = "PolyWolf"; diff --git a/pkgs/by-name/pu/pupdate/package.nix b/pkgs/by-name/pu/pupdate/package.nix index b33a17e6a5cf..b9d4d40e53f8 100644 --- a/pkgs/by-name/pu/pupdate/package.nix +++ b/pkgs/by-name/pu/pupdate/package.nix @@ -57,7 +57,7 @@ buildDotnetModule rec { description = "Update utility for the openFPGA cores, firmware, and other stuff on your Analogue Pocket"; license = lib.licenses.mit; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ p-rintz ]; + maintainers = [ ]; mainProgram = "pupdate"; }; } From 82370a37680f57825020b49dec4d02e2e86246a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 14:34:41 +0000 Subject: [PATCH 221/429] htmlhint: 1.9.1 -> 1.9.2 --- pkgs/by-name/ht/htmlhint/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ht/htmlhint/package.nix b/pkgs/by-name/ht/htmlhint/package.nix index da339ad49d0a..b10adad072e5 100644 --- a/pkgs/by-name/ht/htmlhint/package.nix +++ b/pkgs/by-name/ht/htmlhint/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "htmlhint"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "htmlhint"; repo = "HTMLHint"; rev = "v${version}"; - hash = "sha256-emQEdCKvmNUSZUKe/rMDpivALwt0au6y9x2xO21nCA4="; + hash = "sha256-jqlTtLC9tCGVU9w5xC3Lgr61SOo96yk2rIG0LjYGklw="; }; - npmDepsHash = "sha256-9gY3KfW3HZ+ZhVvdVB7BBOQU6Z4OYbCTnPUb0DRhOwU="; + npmDepsHash = "sha256-baMVZNwKwXVQCkIgaQizYe9vjYKJXggUXsGMZmSrwdY="; meta = { changelog = "https://github.com/htmlhint/HTMLHint/blob/${src.rev}/CHANGELOG.md"; From b42ada7d6a754c01cf93e7e672444a331a7bfd20 Mon Sep 17 00:00:00 2001 From: Arsenii Zorin Date: Thu, 5 Mar 2026 18:06:54 +0300 Subject: [PATCH 222/429] pulumi-bin: 3.224.0 -> 3.225.0 --- pkgs/by-name/pu/pulumi-bin/data.nix | 98 ++++++++++++++--------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/pkgs/by-name/pu/pulumi-bin/data.nix b/pkgs/by-name/pu/pulumi-bin/data.nix index c998d5e54206..151523a5febf 100644 --- a/pkgs/by-name/pu/pulumi-bin/data.nix +++ b/pkgs/by-name/pu/pulumi-bin/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.224.0"; + version = "3.225.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.224.0-linux-x64.tar.gz"; - sha256 = "11v0zgsqkclh5fa65ai6nylg3mnrvli9nvsh7yr6d687k6a6yz30"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.225.0-linux-x64.tar.gz"; + sha256 = "1ars3md5s4wkv4lvib80x2k8qly8kdsrfkykk31xghd6smpcpl33"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.50.0-linux-amd64.tar.gz"; @@ -17,8 +17,8 @@ sha256 = "1c8bd6m2kk6nzbmq3csb5babmbma83cxsvqxv7z0s59b2p6jc9r5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.95.0-linux-amd64.tar.gz"; - sha256 = "1xfzl4a8sgkdadix2m9kn7js4sy6rlhp96nl2lnh8hc130y4jafg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.96.0-linux-amd64.tar.gz"; + sha256 = "076frm1271k5ngdfyfq94qcaag4dz4079b23wadzlvaijw7r58a3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.3-linux-amd64.tar.gz"; @@ -29,8 +29,8 @@ sha256 = "13jsxvjzhhx7zrnx93drh7sych1sh173fl5wa05hxzc18vl29g81"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.20.0-linux-amd64.tar.gz"; - sha256 = "1qmcqb431cljxcnj7jdhly7zhkwm55v8y8h79k7pzbk1g2jys08a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.21.0-linux-amd64.tar.gz"; + sha256 = "128x7scca7lqqjbsk0rl3mlipc6mbl6q3kixrwm8vv4l0y5wp8pd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.8.1-linux-amd64.tar.gz"; @@ -73,8 +73,8 @@ sha256 = "09x25vfq2fbxcmkcjaj0yr2xhcplyj0w2z4c0lwcl368fnk9z9zy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.13.0-linux-amd64.tar.gz"; - sha256 = "0554ghycvy9r8zi7m770cdrjqmgpzz3ax4cvj5bv9sq9qqla4g7x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.14.0-linux-amd64.tar.gz"; + sha256 = "0kdb1a88z3mrlwm24m8935ck2fgb1vc2ygp38sq8fmndfzvrikvc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.1-linux-amd64.tar.gz"; @@ -93,8 +93,8 @@ sha256 = "19k79m8dhkiy4x4rs6dq4zkfczjsnmc0mvbh57b5l52imsv7ks7m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.26.0-linux-amd64.tar.gz"; - sha256 = "1961iwichi9zrxp9vjk4f4l9p35r0i99m0b47kyz14c1ban9s9ns"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.27.0-linux-amd64.tar.gz"; + sha256 = "1babmf4727g6xsp4z00qqqz6nb01wqa2w90c2g0nnx804gsy5rr0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.8.0-linux-amd64.tar.gz"; @@ -125,8 +125,8 @@ sha256 = "1m66bqlx14nnwkb8agrdi3x7968jr4k252j6068y2gqkc4kzkxfq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.128.3-linux-amd64.tar.gz"; - sha256 = "0jws5j1350vfi1bj9hl44d3j82573bls86w0v1p7k8bn9b1wqc3k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.128.4-linux-amd64.tar.gz"; + sha256 = "0bimhh8c20cpkrv0dfv1w7k54k4gzcmykayx6f9jahc1m0ff8bbr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.224.0-darwin-x64.tar.gz"; - sha256 = "0s2nfx4p6zwvi8yadhi2bk6lfpx15i2fy7k7f25lw1pqkqzvkjj7"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.225.0-darwin-x64.tar.gz"; + sha256 = "0yz4gdblgwwy0kw7xy47qba0s9x3691cyigys353f05bm0lpxzmf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.50.0-darwin-amd64.tar.gz"; @@ -175,8 +175,8 @@ sha256 = "08i28x0fp4pxb14klgjdqi05hyw4ilj0iz5ri53mpmviyl1mrmaq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.95.0-darwin-amd64.tar.gz"; - sha256 = "1ys8lfq6wcgni5xvvmsdj6h5bvs0cfzalra73n21ar0bag7r2f9d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.96.0-darwin-amd64.tar.gz"; + sha256 = "06jril67jal879fbxq7jh4qsaslb2vmvi8grh98ad0ark8yvlj48"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.3-darwin-amd64.tar.gz"; @@ -187,8 +187,8 @@ sha256 = "06yyr3zaj29mhvfsf4fgwip53mk28hrh73va32vkxvry6hn2hmjr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.20.0-darwin-amd64.tar.gz"; - sha256 = "05x8nc23i42yd86kid1fca6k6fd8nwiv9yh30wnmmia8xsvmvjdz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.21.0-darwin-amd64.tar.gz"; + sha256 = "1g4d85jqr7j66xjx92azw2hxzapj45rr9bwdin9fy6snjv1z9y52"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.8.1-darwin-amd64.tar.gz"; @@ -231,8 +231,8 @@ sha256 = "1jyi9mp8dc5hkb493kz4mkhcn9rvz1whj42vfbml5zdnywhq346f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.13.0-darwin-amd64.tar.gz"; - sha256 = "00an9xh2dgjrp9vlm57bj477f85azhzf1la0246011zl5aqfs4kn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.14.0-darwin-amd64.tar.gz"; + sha256 = "1n9lallx43g745889k2zck5wzpd8bf8wypwiy5xd3v2q77kbj8lv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.1-darwin-amd64.tar.gz"; @@ -251,8 +251,8 @@ sha256 = "04rmlydspvgbcgn7qd9sk0bd70axz2rmpiydfw383352bxrinlvs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.26.0-darwin-amd64.tar.gz"; - sha256 = "0vmk45isvikznm98w2hgnm3kzxb1a7zh1gbhgn4aia7afas7ksbf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.27.0-darwin-amd64.tar.gz"; + sha256 = "1d5ib18acs4iq85m55n4iznw3vxscass2a8l0ng9fyld95jyv7sd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.8.0-darwin-amd64.tar.gz"; @@ -283,8 +283,8 @@ sha256 = "1fxdbd76gx1yhix6856zi2bjx19450561v4kp4pqxgp4qxzv755f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.128.3-darwin-amd64.tar.gz"; - sha256 = "11hzykjfx3awps8mx123bzlbbvm33gagkqwnkzs1ym3g8m7n7b4w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.128.4-darwin-amd64.tar.gz"; + sha256 = "1jx7v93lnpiva60sc4yq6z8xwc3fg9f8f5y1v8jxcmiyska6r6sl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.224.0-linux-arm64.tar.gz"; - sha256 = "0q0k1kn0hr4s168i1lr2iskck3g8hab4s52dw9zksg0xbfwzv2qh"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.225.0-linux-arm64.tar.gz"; + sha256 = "0zivisqzsqjh9x9mcb6apishcbj7b56ds770kydiikpkh571fjpr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.50.0-linux-arm64.tar.gz"; @@ -333,8 +333,8 @@ sha256 = "0l3sgb5l0rjxj9msff6ywkvygn3pq96nbif3b85xssq7a0qsvh3c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.95.0-linux-arm64.tar.gz"; - sha256 = "1qxqj6cwyzldafj8al9dphbmmszcdmkyikw4dn8ipn15hwkk3skh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.96.0-linux-arm64.tar.gz"; + sha256 = "1v19fnkpb71jygfbw0602nayjkjvi7fjiz92crw4vqrfmpq7py0i"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.3-linux-arm64.tar.gz"; @@ -345,8 +345,8 @@ sha256 = "1qinsdjkiy80x8mssg5crlzz0vqgpyl3mr286048y8q0a2jifkkv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.20.0-linux-arm64.tar.gz"; - sha256 = "09f3p9gghp31idc1bcf0igbsp2rl6lpaqvsm7f6aiccbifbd8j7k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.21.0-linux-arm64.tar.gz"; + sha256 = "1pzb7vjcgqwwgbldsg12mbi0awz7fpqxi42f6ah4rr2wk24v93k1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.8.1-linux-arm64.tar.gz"; @@ -389,8 +389,8 @@ sha256 = "1a9fwnf15l3ld0a17v2p66jxqav4rawhixy6rgs5065nbrf29vys"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.13.0-linux-arm64.tar.gz"; - sha256 = "131r54c8xki769p56zqdks8xmw69w857via3yxn7wmn71vrcdkmy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.14.0-linux-arm64.tar.gz"; + sha256 = "020yyi3wjzsihk5g3lfmfsbyxswyl5gvrwnafpc87hjz3r16afmd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.1-linux-arm64.tar.gz"; @@ -409,8 +409,8 @@ sha256 = "094pmichc66fnd38vfn4hb2dl3v88vqfx00smk0b19fdbrafcp5j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.26.0-linux-arm64.tar.gz"; - sha256 = "0jvp5m8s91rh3z2y5k8mahs0jzg24zskl93k2bq24rfvw223afrk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.27.0-linux-arm64.tar.gz"; + sha256 = "0ralnb39m9zd7248kpz4xm7yq87paiqlx1xsw3xzk21cy67px1cm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.8.0-linux-arm64.tar.gz"; @@ -441,8 +441,8 @@ sha256 = "1x548iws1b8ahqlm4wj8qs1bhw8dqr2xbdjp0ckiv0nkws90wbbn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.128.3-linux-arm64.tar.gz"; - sha256 = "0xap4208w061jfpc6xn0jb5p30d56w1q2pvbvhj8xriz46pjac3c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.128.4-linux-arm64.tar.gz"; + sha256 = "1viimvll23ah7wgb9h7whlw0cmqd4azlxcrz3zvjj9ja2da8895n"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.224.0-darwin-arm64.tar.gz"; - sha256 = "1q51xl2k4zh23rbmw2wqlsv1lsd01lvfb1zzkbr5gf053r5pjhbc"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.225.0-darwin-arm64.tar.gz"; + sha256 = "02i42sa2j9p6q9igqci4v7paj9m6a20wi044rnwj9jqwa9rs31p6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.50.0-darwin-arm64.tar.gz"; @@ -491,8 +491,8 @@ sha256 = "0hbrmmgh3pbsqcm20lz3kimxwls4s10cqssp19m344f9jwp33chq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.95.0-darwin-arm64.tar.gz"; - sha256 = "08niw1syfd5622vn1q38q1gvd4hdjnzp7i7767jxdpccp014g06b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.96.0-darwin-arm64.tar.gz"; + sha256 = "1b74jf9wd2ljxl6krzjgy1ap3mnmhc76rrwxna1yz6v0pa0k58d9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.3-darwin-arm64.tar.gz"; @@ -503,8 +503,8 @@ sha256 = "0vgb5zvg5gpv3pfl6nz5wpzhiyy550s99qj80qs83gzlr5gl9xab"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.20.0-darwin-arm64.tar.gz"; - sha256 = "08jvdcwmb9vmqn642kalpk9paf7mym9dhqn12fc9jafzbvp4rjkd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.21.0-darwin-arm64.tar.gz"; + sha256 = "0nkkn8j7pi961jz4y0gjknaxj3fbgffmwj4dadnwqm2ipvqalp6n"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.8.1-darwin-arm64.tar.gz"; @@ -547,8 +547,8 @@ sha256 = "1msppdp4navjhkp7lzngmp056y6x3fqb30r6wq5a53kyvi43x0ik"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.13.0-darwin-arm64.tar.gz"; - sha256 = "1jx2p72x2rrxyg6cwswkbl9m6dq8b4sxl2c68sl1cmbm947islf4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.14.0-darwin-arm64.tar.gz"; + sha256 = "13qbccic5a0kqv9013j9yx94nbvx1937i1rz5bnbv3dhwlkkxjgm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.1-darwin-arm64.tar.gz"; @@ -567,8 +567,8 @@ sha256 = "150kg8brpsazpdd6laywwvbrjmzl4n3w7saf9vidiwsv01zpl90m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.26.0-darwin-arm64.tar.gz"; - sha256 = "0117fga7gdr4ls5wnlqdxd7p74cg24kj38gdb897gb3passg29kb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.27.0-darwin-arm64.tar.gz"; + sha256 = "0xhflraz9xk0ggqar91knh9bvzla0lll7q9ijrklcm5pfjbhf5zr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.8.0-darwin-arm64.tar.gz"; @@ -599,8 +599,8 @@ sha256 = "16cc35fpjc14lbdz0mn7hp8l0hj1645s01lv0w9cia5x1bxsdnd3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.128.3-darwin-arm64.tar.gz"; - sha256 = "0d4f811cizk42w884va89sm7pbkkibkg17bqfak4rf6l42xgcf2n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.128.4-darwin-arm64.tar.gz"; + sha256 = "1cjc8zdw57vhhm3fp489whk7sk2hcc0nv7p188w65zwmis5qrdkh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-arm64.tar.gz"; From 8e6e532b5ace1becd8113fc6f83814b5b6b7c2f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 15:16:23 +0000 Subject: [PATCH 223/429] eigenwallet: 3.6.7 -> 3.7.0 --- pkgs/by-name/ei/eigenwallet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ei/eigenwallet/package.nix b/pkgs/by-name/ei/eigenwallet/package.nix index 9fc7b7afc79c..6f583604ccd3 100644 --- a/pkgs/by-name/ei/eigenwallet/package.nix +++ b/pkgs/by-name/ei/eigenwallet/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "eigenwallet"; - version = "3.6.7"; + version = "3.7.0"; src = fetchurl { url = "https://github.com/eigenwallet/core/releases/download/${finalAttrs.version}/eigenwallet_${finalAttrs.version}_amd64.deb"; - hash = "sha256-kIu0TLFw5hxUnCItgSNB+XuxpC1gKXvu+k4vQH1UitA="; + hash = "sha256-0iLO9D2Xvgn2bkTbl6c/XGBRJm3t4AuoYRlCZaxHneo="; }; nativeBuildInputs = [ From 6c5f17d1e6b60aa2a64620207a133e3f2be82a0a Mon Sep 17 00:00:00 2001 From: Mynacol Date: Thu, 5 Mar 2026 14:01:00 +0000 Subject: [PATCH 224/429] zotero-beta: drop This package has seen no update in a year, is still stuck on a beta version of 7.0, while the main zotero package is now at version 8 and built from source. --- pkgs/by-name/zo/zotero-beta/package.nix | 139 ------------------------ pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 139 deletions(-) delete mode 100644 pkgs/by-name/zo/zotero-beta/package.nix diff --git a/pkgs/by-name/zo/zotero-beta/package.nix b/pkgs/by-name/zo/zotero-beta/package.nix deleted file mode 100644 index 72bbb8df0058..000000000000 --- a/pkgs/by-name/zo/zotero-beta/package.nix +++ /dev/null @@ -1,139 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - wrapGAppsHook3, - makeDesktopItem, - alsa-lib, - atk, - cairo, - dbus-glib, - gdk-pixbuf, - glib, - gtk3, - libGL, - libxtst, - libxrandr, - libxi, - libxfixes, - libxext, - libxdamage, - libxcursor, - libxcomposite, - libx11, - libxcb, - libgbm, - pango, - pciutils, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "zotero"; - version = "7.0.0-beta.111+b4f6c050e"; - - src = - let - escapedVersion = lib.replaceStrings [ "+" ] [ "%2B" ] finalAttrs.version; - in - fetchurl { - url = "https://download.zotero.org/client/beta/${escapedVersion}/Zotero-${escapedVersion}_linux-x86_64.tar.bz2"; - hash = "sha256-pZsmS4gKCT8UAjz9IJg5C7n4kk7bWT/7H5ONF20CzPM="; - }; - - dontPatchELF = true; - nativeBuildInputs = [ wrapGAppsHook3 ]; - - libPath = - lib.makeLibraryPath [ - alsa-lib - atk - cairo - dbus-glib - gdk-pixbuf - glib - gtk3 - libGL - libx11 - libxcomposite - libxcursor - libxdamage - libxext - libxfixes - libxi - libxrandr - libxtst - libxcb - libgbm - pango - pciutils - ] - + ":" - + lib.makeSearchPathOutput "lib" "lib" [ stdenv.cc.cc ]; - - desktopItem = makeDesktopItem { - name = "zotero"; - exec = "zotero -url %U"; - icon = "zotero"; - comment = finalAttrs.meta.description; - desktopName = "Zotero"; - genericName = "Reference Management"; - categories = [ - "Office" - "Database" - ]; - startupNotify = true; - mimeTypes = [ - "x-scheme-handler/zotero" - "text/plain" - ]; - }; - - installPhase = '' - runHook preInstall - - # Copy package contents to the output directory - mkdir -p "$prefix/usr/lib/zotero-bin-${finalAttrs.version}" - cp -r * "$prefix/usr/lib/zotero-bin-${finalAttrs.version}" - mkdir -p "$out/bin" - ln -s "$prefix/usr/lib/zotero-bin-${finalAttrs.version}/zotero" "$out/bin/" - - # Install desktop file and icons - mkdir -p $out/share/applications - cp ${finalAttrs.desktopItem}/share/applications/* $out/share/applications/ - for size in 32 64 128; do - install -Dm444 icons/icon''${size}.png \ - $out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png - done - install -Dm444 icons/symbolic.svg \ - $out/share/icons/hicolor/symbolic/apps/zotero-symbolic.svg - - runHook postInstall - ''; - - postFixup = '' - for executable in \ - zotero-bin plugin-container updater vaapitest \ - minidump-analyzer glxtest - do - if [ -e "$out/usr/lib/zotero-bin-${finalAttrs.version}/$executable" ]; then - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - "$out/usr/lib/zotero-bin-${finalAttrs.version}/$executable" - fi - done - find . -executable -type f -exec \ - patchelf --set-rpath "$libPath" \ - "$out/usr/lib/zotero-bin-${finalAttrs.version}/{}" \; - ''; - - meta = { - homepage = "https://www.zotero.org"; - description = "Collect, organize, cite, and share your research sources"; - mainProgram = "zotero"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.agpl3Only; - platforms = [ "x86_64-linux" ]; - maintainers = with lib.maintainers; [ - justanotherariel - ]; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 20a0ad07b900..b1b451f6781e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2438,6 +2438,7 @@ mapAliases { zint = throw "'zint' has been renamed to/replaced by 'zint-qt'"; # Converted to throw 2025-10-27 zmkBATx = warnAlias "'zmkBATx' has been renamed to 'zmkbatx'" zmkbatx; # Added 2026-02-18 zombietrackergps = throw "'zombietrackergps' has been dropped, as it depends on KDE Gear 5 and is unmaintained"; # Added 2025-08-20 + zotero-beta = throw "'zotero-beta' has been removed. Use 'zotero' instead."; # Added 2026-03-05 zotero_7 = throw "'zotero_7' has been renamed to/replaced by 'zotero'"; # Added 2025-12-09 zotify = throw "zotify has been removed due to lack of upstream maintenance"; # Added 2025-09-26 zq = throw "zq has been replaced by zed"; # Converted to throw 2025-10-26 From 1659751ae22bac8b002e5b0a3d9c677b72881486 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 15:41:53 +0000 Subject: [PATCH 225/429] hamrs-pro: 2.47.0 -> 2.47.1 --- pkgs/by-name/ha/hamrs-pro/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ha/hamrs-pro/package.nix b/pkgs/by-name/ha/hamrs-pro/package.nix index 7511c63418ae..d13f584425ce 100644 --- a/pkgs/by-name/ha/hamrs-pro/package.nix +++ b/pkgs/by-name/ha/hamrs-pro/package.nix @@ -8,29 +8,29 @@ let pname = "hamrs-pro"; - version = "2.47.0"; + version = "2.47.1"; throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"; srcs = { x86_64-linux = fetchurl { url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-linux-x86_64.AppImage"; - hash = "sha256-TFiU3bbDm3NpjfOJcbzp9Rpyn2YkvZYTf25vgOwlCvE="; + hash = "sha256-JcckonAYM4HE8yTvzJHJ3pX+H4jOPaUQXaYmWUAg8AY="; }; aarch64-linux = fetchurl { url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-linux-arm64.AppImage"; - hash = "sha256-AH93E5WCIffEshtPiy6Yq9f1DLc2w9o9f6KcnYP5EI0="; + hash = "sha256-5WUQBFyvMHZyyIH2aImCRUYdzou8BadaH/M4+5DeQdo="; }; x86_64-darwin = fetchurl { url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-mac-x64.dmg"; - hash = "sha256-/tEaRfviWGxvSP/TsR3ZOa3FFOqxdV2uwhg1TNSsTxU="; + hash = "sha256-BboXYdKT10+SBGhlxW5t1zPZ+0BMC1gUjwTlkQU+/Bk="; }; aarch64-darwin = fetchurl { url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-mac-arm64.dmg"; - hash = "sha256-MXz5d1GeXeoOG29FxecXGunSFwRSVbFf1dozsAhTzE0="; + hash = "sha256-/9UamFxEJ9NkswgsI8mcfher9nFpVt5Vk0QYFpRXRB4="; }; }; From 5c9cee17c8b7fe3c1c8ab3fc8a8bfa1356e929bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 15:42:01 +0000 Subject: [PATCH 226/429] myks: 5.9.2 -> 5.9.3 --- pkgs/by-name/my/myks/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index 2de933e8f274..3a742a500f17 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "myks"; - version = "5.9.2"; + version = "5.9.3"; src = fetchFromGitHub { owner = "mykso"; repo = "myks"; tag = "v${finalAttrs.version}"; - hash = "sha256-xDggxh9IkfFwKFS5U3SmL4HCbMw3J+N+vYNKfmh0E44="; + hash = "sha256-D1JLpDueIFMZS2RebFvlNI9eNDd1nWohzmPR8sUDXMc="; }; - vendorHash = "sha256-b1uLNz8dSJnJ0tevdm79x9YVas+Wh9//4o+k6fEckZA="; + vendorHash = "sha256-XMGcLYMZiCB98U5+aB/O4f5knAp46UkrH4teCPZk/bM="; subPackages = "."; From 5c501951d553acd041de076f49d3f2dd979e93ac Mon Sep 17 00:00:00 2001 From: Dom Rodriguez Date: Mon, 23 Feb 2026 23:47:48 +0000 Subject: [PATCH 227/429] buildstream: ignore Git tags containing `*dev*` Tags containing `*dev*` on official BuildStream projects are for pre-releases, and should not be included in the passthru updateScript. This is needed after https://github.com/NixOS/nixpkgs/pull/493236 showed a issue with the updateScript. --- pkgs/by-name/bu/buildstream/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bu/buildstream/package.nix b/pkgs/by-name/bu/buildstream/package.nix index 116e151c3b9b..134d77e4c660 100644 --- a/pkgs/by-name/bu/buildstream/package.nix +++ b/pkgs/by-name/bu/buildstream/package.nix @@ -2,7 +2,7 @@ lib, python3Packages, fetchFromGitHub, - nix-update-script, + gitUpdater, # buildInputs buildbox, @@ -119,7 +119,9 @@ python3Packages.buildPythonApplication (finalAttrs: { versionCheckProgram = "${placeholder "out"}/bin/bst"; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = gitUpdater { + ignoredVersions = "dev"; + }; meta = { description = "Powerful software integration tool"; From f8a58eb351b3ffae4721896cd7f0113c7bda529d Mon Sep 17 00:00:00 2001 From: Dom Rodriguez Date: Fri, 27 Feb 2026 17:17:10 +0000 Subject: [PATCH 228/429] buildstream-plugins: ignore Git tags containing `*dev*` Tags containing `*dev*` on official BuildStream projects are for pre-releases, and should not be included in the passthru updateScript. This is needed after https://github.com/NixOS/nixpkgs/pull/493236 showed a issue with the updateScript. --- .../python-modules/buildstream-plugins/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/buildstream-plugins/default.nix b/pkgs/development/python-modules/buildstream-plugins/default.nix index 201db0932bab..1159c4cafab5 100644 --- a/pkgs/development/python-modules/buildstream-plugins/default.nix +++ b/pkgs/development/python-modules/buildstream-plugins/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + gitUpdater, setuptools, cython, }: @@ -29,6 +30,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "buildstream_plugins" ]; + passthru.updateScript = gitUpdater { + ignoredVersions = "dev"; + }; + meta = { description = "BuildStream plugins"; homepage = "https://github.com/apache/buildstream-plugins"; From 873f21e2a241d644e055ba97f52b997a71ac8af7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 15:54:27 +0000 Subject: [PATCH 229/429] cirrus-cli: 0.164.3 -> 0.165.0 --- pkgs/by-name/ci/cirrus-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ci/cirrus-cli/package.nix b/pkgs/by-name/ci/cirrus-cli/package.nix index bb22bd559d0d..79f51c512591 100644 --- a/pkgs/by-name/ci/cirrus-cli/package.nix +++ b/pkgs/by-name/ci/cirrus-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "cirrus-cli"; - version = "0.164.3"; + version = "0.165.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = "cirrus-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-uNPrVdAo9FAAMUXU31qfLpIq7JvOT30a8L534NKedZk="; + hash = "sha256-JgbUOMG3pjrJ5lKfK23gLOqA/mgagnm5XrdlFntpnpI="; }; - vendorHash = "sha256-G/UlmNDzYuF9gkAaGO6O/SziNZ9obs01sD2Cmu+r8Dc="; + vendorHash = "sha256-3N2+FMJ4eLv37D6qqgDqG7NMPpm1Dx+Krq8zB05c8dw="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${finalAttrs.version}" From 9fb288de741ee101bda204e54799148cd581798f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 16:09:22 +0000 Subject: [PATCH 230/429] c2patool: 0.26.29 -> 0.26.33 --- pkgs/by-name/c2/c2patool/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix index d44a83b43bdb..26f2378f9f30 100644 --- a/pkgs/by-name/c2/c2patool/package.nix +++ b/pkgs/by-name/c2/c2patool/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "c2patool"; - version = "0.26.29"; + version = "0.26.33"; src = fetchFromGitHub { owner = "contentauth"; repo = "c2pa-rs"; tag = "c2patool-v${finalAttrs.version}"; - hash = "sha256-NaTLMko3JcjAGe4ow66jjJwWOP4+P2G1SnpgCPcQNBc="; + hash = "sha256-e016wNfAVhDFwCYvBb/I+nci1FVSG/knsPZFhsR4074="; }; - cargoHash = "sha256-AHgqmc5rAiUBScJ6eBSV6xHG2HJWspEwI5Ka/iyACqY="; + cargoHash = "sha256-KCL3GhNb1ilKXXjj6DSnLTbSNfevAYDUuJt01y4bDVE="; # use the non-vendored openssl env.OPENSSL_NO_VENDOR = 1; From 155bc8f73bf94b6108be517427564c21a85e3548 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 17:08:49 +0000 Subject: [PATCH 231/429] honeycomb-refinery: 3.1.0 -> 3.1.1 --- pkgs/by-name/ho/honeycomb-refinery/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ho/honeycomb-refinery/package.nix b/pkgs/by-name/ho/honeycomb-refinery/package.nix index 142581a155cf..d07b359aa467 100644 --- a/pkgs/by-name/ho/honeycomb-refinery/package.nix +++ b/pkgs/by-name/ho/honeycomb-refinery/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "honeycomb-refinery"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "honeycombio"; repo = "refinery"; rev = "v${finalAttrs.version}"; - hash = "sha256-JHjjaK5WFRzDYuVkenfYowFsPnrF+Wjo85gQAbaVxO8="; + hash = "sha256-xO+8eiIoFw9CMjtjs9jjfQ8ENrhHVlkv3VVd/kXBwFs="; }; env.NO_REDIS_TEST = true; @@ -37,7 +37,7 @@ buildGoModule (finalAttrs: { "-X main.BuildID=${finalAttrs.version}" ]; - vendorHash = "sha256-PvkOvMADUjHc1/T/1bR5YDFM902q8CvGeWxj/uhu3+8="; + vendorHash = "sha256-eyq4pDZKE6Wmkuo/2PtiQJoYumbLelvcL4Dyb18OnaY="; doCheck = true; From ec0a282f18c1f156cd4fccb82ad517d9a959cda5 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Thu, 5 Mar 2026 18:25:22 +0100 Subject: [PATCH 232/429] linuxPackages.nvidiaPackages.beta: 590.44.01 -> 595.45.04 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index d64fb8c6845c..186127d7b298 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -90,12 +90,12 @@ rec { }); beta = selectHighestVersion latest (generic { - version = "590.44.01"; - sha256_64bit = "sha256-VbkVaKwElaazojfxkHnz/nN/5olk13ezkw/EQjhKPms="; - sha256_aarch64 = "sha256-gpqz07aFx+lBBOGPMCkbl5X8KBMPwDqsS+knPHpL/5g="; - openSha256 = "sha256-ft8FEnBotC9Bl+o4vQA1rWFuRe7gviD/j1B8t0MRL/o="; - settingsSha256 = "sha256-wVf1hku1l5OACiBeIePUMeZTWDQ4ueNvIk6BsW/RmF4="; - persistencedSha256 = "sha256-nHzD32EN77PG75hH9W8ArjKNY/7KY6kPKSAhxAWcuS4="; + version = "595.45.04"; + sha256_64bit = "sha256-zUllSSRsuio7dSkcbBTuxF+dN12d6jEPE0WgGvVOj14="; + sha256_aarch64 = "sha256-jl6lQWsgF6ya22sAhYPpERJ9r+wjnWzbGnINDpUMzsk="; + openSha256 = "sha256-uqNfImwTKhK8gncUdP1TPp0D6Gog4MSeIJMZQiJWDoE="; + settingsSha256 = "sha256-Y45pryyM+6ZTJyRaRF3LMKaiIWxB5gF5gGEEcQVr9nA="; + persistencedSha256 = "sha256-5FoeUaRRMBIPEWGy4Uo0Aho39KXmjzQsuAD9m/XkNpA="; }); # Vulkan developer beta driver From ef0adc33fa96be8da79459d2319fa026e565f666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 5 Mar 2026 18:44:08 +0100 Subject: [PATCH 233/429] azure-cli-extensions.confcom: 1.2.6 -> 1.8.0, fix build --- pkgs/by-name/az/azure-cli/extensions-manual.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index 5176abb9c1bf..e8c083fb45c1 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -10,7 +10,7 @@ python3Packages, autoPatchelfHook, python3, - openssl_1_1, + openssl, }: { @@ -173,16 +173,18 @@ confcom = mkAzExtension rec { pname = "confcom"; - version = "1.2.6"; + version = "1.8.0"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/confcom-${version}-py3-none-any.whl"; - hash = "sha256-kyJ4AkPcpP/10nf4whJiuraC7hn0E6iBkhRIn43E9J0="; + hash = "sha256-rKEECrGR4VIKTgPzInGhFrbrXDtYqayAzYWLKclE1tg="; description = "Microsoft Azure Command-Line Tools Confidential Container Security Policy Generator Extension"; nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ openssl_1_1 ]; + buildInputs = [ openssl ]; + pythonRelaxDeps = [ "tqdm" ]; propagatedBuildInputs = with python3Packages; [ - pyyaml deepdiff docker + pydantic + pyyaml tqdm ]; postInstall = '' From 67fbbc44a67b62f8504fdbfeeda41e658d2cca00 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 5 Mar 2026 21:43:36 +0400 Subject: [PATCH 234/429] =?UTF-8?q?nanomq:=200.24.5=20=E2=86=92=200.24.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/na/nanomq/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/na/nanomq/package.nix b/pkgs/by-name/na/nanomq/package.nix index ef1f0e3db184..18ab5746dbd1 100644 --- a/pkgs/by-name/na/nanomq/package.nix +++ b/pkgs/by-name/na/nanomq/package.nix @@ -49,13 +49,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nanomq"; - version = "0.24.5"; + version = "0.24.10"; src = fetchFromGitHub { owner = "emqx"; repo = "nanomq"; tag = finalAttrs.version; - hash = "sha256-tyhAEYdYCO0Tur7HDXXbBSQ8tzTHCbW9B8aBu0sMEEI="; + hash = "sha256-2laH4qJo4sQtjsUDEljUoipAXs+LRH+xmOP4a0zz1Y8="; fetchSubmodules = true; }; @@ -132,5 +132,9 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ sikmir ]; platforms = lib.platforms.unix; + knownVulnerabilities = [ + "CVE-2026-22040" + "CVE-2025-68699" + ]; }; }) From dd18321b8fd031bac30b52f1d317795b4bac9149 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 5 Mar 2026 10:43:33 -0800 Subject: [PATCH 235/429] nixVersions.git: 2.34pre20260217 -> 2.35pre20260305 Hello from PlanetNix! --- pkgs/tools/package-management/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 2db1321747df..3d4680048dd5 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -222,14 +222,14 @@ lib.makeExtensible ( nixComponents_git = (nixDependencies.callPackage ./modular/packages.nix rec { - version = "2.34pre20260217_${lib.substring 0 8 src.rev}"; + version = "2.35pre20260305_${lib.substring 0 8 src.rev}"; inherit teams; otherSplices = generateSplicesForNixComponents "nixComponents_git"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "6e725093e6d4dda4f6bdbab20ea3e9e9687225ec"; - hash = "sha256-dhPINhGyN3N+3zMSdM51DRTEKCPGCNO3+QsbhD0/nFc="; + rev = "124b277764bba830a35fea1dff7ced6db4b3f290"; + hash = "sha256-qTdRLFF1TgUj+EM34XO4nLyunSxKzbaSvKeuLdOmv2w="; }; }).appendPatches patches_common; From e624b2f653b97ddbe7e797860aa06e1640a24dc4 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Thu, 5 Mar 2026 10:56:39 -0800 Subject: [PATCH 236/429] python3Packages.opentelemetry-resourcedetector-gcp: init at 1.11.0a0 --- .../default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/opentelemetry-resourcedetector-gcp/default.nix diff --git a/pkgs/development/python-modules/opentelemetry-resourcedetector-gcp/default.nix b/pkgs/development/python-modules/opentelemetry-resourcedetector-gcp/default.nix new file mode 100644 index 000000000000..02b3917a0cfa --- /dev/null +++ b/pkgs/development/python-modules/opentelemetry-resourcedetector-gcp/default.nix @@ -0,0 +1,55 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + opentelemetry-api, + opentelemetry-sdk, + requests, + typing-extensions, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "opentelemetry-resourcedetector-gcp"; + version = "1.11.0a0"; + pyproject = true; + + # Use PyPi instead of GitHub because the GitHub tags are inaccurate + # (GitHub tags lack the alpha suffix) + src = fetchPypi { + pname = "opentelemetry_resourcedetector_gcp"; + inherit (finalAttrs) version; + hash = "sha256-kVodb9FdrKnu3T/FKw9wU3UFTy7xQOLnprTMqVpHzbE="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + opentelemetry-api + opentelemetry-sdk + requests + typing-extensions + ]; + + pythonImportsCheck = [ + "opentelemetry.resourcedetector.gcp_resource_detector" + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTestPaths = [ + # These require a 4-year-old syrupy version + "tests/test_mapping.py" + "tests/test_gcp_resource_detector.py" + ]; + + meta = { + description = "Google Cloud resource detector for OpenTelemetry"; + homepage = "https://pypi.org/project/opentelemetry-resourcedetector-gcp"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + sarahec + ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2582a02d0743..2fbe8311b730 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11676,6 +11676,10 @@ self: super: with self; { opentelemetry-proto = callPackage ../development/python-modules/opentelemetry-proto { }; + opentelemetry-resourcedetector-gcp = + callPackage ../development/python-modules/opentelemetry-resourcedetector-gcp + { }; + opentelemetry-sdk = callPackage ../development/python-modules/opentelemetry-sdk { }; opentelemetry-semantic-conventions = From c7030f2d6e0c6ab25df330548faeb069d6a077fd Mon Sep 17 00:00:00 2001 From: BatteredBunny Date: Mon, 9 Feb 2026 23:45:50 +0200 Subject: [PATCH 237/429] python3Packages.exllamav3: 0.0.20 -> 0.0.23 --- pkgs/development/python-modules/exllamav3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/exllamav3/default.nix b/pkgs/development/python-modules/exllamav3/default.nix index 51caa30ecf13..d11a44c9f0a3 100644 --- a/pkgs/development/python-modules/exllamav3/default.nix +++ b/pkgs/development/python-modules/exllamav3/default.nix @@ -27,14 +27,14 @@ let in buildPythonPackage (finalAttrs: { pname = "exllamav3"; - version = "0.0.20"; + version = "0.0.23"; pyproject = true; src = fetchFromGitHub { owner = "turboderp-org"; repo = "exllamav3"; tag = "v${finalAttrs.version}"; - hash = "sha256-G3PtxKU/J4JEQQOwFmrSWuSr/hA4uyxRci3khXCwEqE="; + hash = "sha256-wAT+zntPxjIjrXaa2ZJpjImRt1V8vFqWfSNjgZYGGJk="; }; pythonRelaxDeps = [ From db2d5cec4c39ab575a3818d87895c3ee6f19da17 Mon Sep 17 00:00:00 2001 From: whispers Date: Thu, 5 Mar 2026 14:19:47 -0500 Subject: [PATCH 238/429] vicinae: 0.20.2 -> 0.20.3 Release announcement: https://github.com/vicinaehq/vicinae/releases/tag/v0.20.3 Diff: https://github.com/vicinaehq/vicinae/compare/v0.20.2...v0.20.3 --- pkgs/by-name/vi/vicinae/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/vicinae/package.nix b/pkgs/by-name/vi/vicinae/package.nix index 9e5e9f22a94e..a333943060ac 100644 --- a/pkgs/by-name/vi/vicinae/package.nix +++ b/pkgs/by-name/vi/vicinae/package.nix @@ -19,16 +19,17 @@ stdenv, wayland, libxml2, + udevCheckHook, }: stdenv.mkDerivation (finalAttrs: { pname = "vicinae"; - version = "0.20.2"; + version = "0.20.3"; src = fetchFromGitHub { owner = "vicinaehq"; repo = "vicinae"; tag = "v${finalAttrs.version}"; - hash = "sha256-mUHV5wFbtNt00XnghklltvJ/LRi+17fluGuFebQ0HEw="; + hash = "sha256-9xE2izQakApB+cgibErwyY3KAlc6F26UhgCw/Tak43c="; }; apiDeps = fetchNpmDeps { @@ -104,6 +105,9 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "ExecStart=vicinae" "ExecStart=$out/bin/vicinae" ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ udevCheckHook ]; + passthru.updateScript = ./update.sh; meta = { From 12fc8f53c7f2afe5a1d2304f4715d8c1463e8bb7 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 5 Mar 2026 11:03:45 -0800 Subject: [PATCH 239/429] python3Packages.google-cloud-spanner: 3.58.0 -> 3.63.0 --- .../google-cloud-spanner/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index b8ada5017686..3981cb83c107 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -13,6 +13,7 @@ google-cloud-testutils, grpc-google-iam-v1, grpc-interceptor, + opentelemetry-resourcedetector-gcp, proto-plus, protobuf, sqlparse, @@ -31,16 +32,16 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-spanner"; - version = "3.58.0"; + version = "3.63.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "python-spanner"; - tag = "v${version}"; - hash = "sha256-bIagQjQv+oatIo8mkA8t5wP9igMnorkiudgyWkVnJcg="; + tag = "v${finalAttrs.version}"; + hash = "sha256-QWBl7X/cKGds617IrHKaIteOnqgwB83jgfi8j/ESUws="; }; build-system = [ setuptools ]; @@ -51,6 +52,7 @@ buildPythonPackage rec { google-cloud-core grpc-google-iam-v1 grpc-interceptor + opentelemetry-resourcedetector-gcp proto-plus protobuf sqlparse @@ -79,7 +81,7 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; preCheck = '' # prevent google directory from shadowing google imports @@ -97,6 +99,9 @@ buildPythonPackage rec { "test_snapshot_read_concurrent" # Flaky, can retry too quickly and fail "test_retry_helper" + # Flaky, system speed sensitive + "test_transaction_for_concurrent_statement_should_begin_one_transaction_with_query" + "test_transaction_for_concurrent_statement_should_begin_one_transaction_with_read" ]; disabledTestPaths = [ @@ -130,8 +135,8 @@ buildPythonPackage rec { meta = { description = "Cloud Spanner API client library"; homepage = "https://github.com/googleapis/python-spanner"; - changelog = "https://github.com/googleapis/python-spanner/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/googleapis/python-spanner/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.sarahec ]; }; -} +}) From 200ee9d647701bd36059f9fe4432619d65f36af3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 20:24:46 +0000 Subject: [PATCH 240/429] patch2pr: 0.42.0 -> 0.43.0 --- pkgs/by-name/pa/patch2pr/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/patch2pr/package.nix b/pkgs/by-name/pa/patch2pr/package.nix index 1078ab396b75..ee8306caba0a 100644 --- a/pkgs/by-name/pa/patch2pr/package.nix +++ b/pkgs/by-name/pa/patch2pr/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "patch2pr"; - version = "0.42.0"; + version = "0.43.0"; src = fetchFromGitHub { owner = "bluekeyes"; repo = "patch2pr"; rev = "v${finalAttrs.version}"; - hash = "sha256-3VrUp9JmZLHIknXneMa5IixRkjWFzTLanVGhSagSams="; + hash = "sha256-Jv2tGdziPLKy5vNUgwnB8ern3IYS+D+N5LMrsGIqTMI="; }; - vendorHash = "sha256-zpyyz0C+lJKFjKgaUnO3R5kmujIXCzM16UvcXcNQnVw="; + vendorHash = "sha256-tM4Y/dPn5ZCP5NJl+nOPulY3hKWzI/l8c+Ku+dxtWwI="; ldflags = [ "-X main.version=${finalAttrs.version}" From 05ebca800717117e4037bd38b45b9da9846c426b Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Wed, 4 Mar 2026 13:20:31 -0800 Subject: [PATCH 241/429] reaper: fix xdg-open We shouldn't rely on xdg-utils already existing on PATH --- pkgs/applications/audio/reaper/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index c1f1ae485654..793ecb7a443a 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -17,6 +17,7 @@ xdg-utils, xdotool, which, + openssl, jackSupport ? stdenv.hostPlatform.isLinux, jackLibrary, @@ -59,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ which autoPatchelfHook - xdg-utils # Required for desktop integration + xdg-utils # Required for install script ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ undmg @@ -112,6 +113,7 @@ stdenv.mkDerivation (finalAttrs: { # We opt for wrapping the executable with LD_LIBRARY_PATH prefix. # Note that libcurl and libxml2_13 are needed for ReaPack to run. wrapProgram $out/opt/REAPER/reaper \ + --prefix PATH : "${lib.makeBinPath [ xdg-utils ]}" \ --prefix LD_LIBRARY_PATH : "${ lib.makeLibraryPath [ curl @@ -121,6 +123,7 @@ stdenv.mkDerivation (finalAttrs: { vlc xdotool stdenv.cc.cc + openssl ] }" From a33732b6678c9a823ed6506bf3aa540823c65830 Mon Sep 17 00:00:00 2001 From: Luna Heyman Date: Thu, 5 Mar 2026 20:33:09 +0100 Subject: [PATCH 242/429] azure-functions-core-tools: 4.0.7030 -> 4.7.0 --- .../az/azure-functions-core-tools/deps.json | 1154 ++++++++++------- .../az/azure-functions-core-tools/package.nix | 46 +- 2 files changed, 704 insertions(+), 496 deletions(-) diff --git a/pkgs/by-name/az/azure-functions-core-tools/deps.json b/pkgs/by-name/az/azure-functions-core-tools/deps.json index 1b0b351c562e..4037b5b48b65 100644 --- a/pkgs/by-name/az/azure-functions-core-tools/deps.json +++ b/pkgs/by-name/az/azure-functions-core-tools/deps.json @@ -4,31 +4,21 @@ "version": "2.0.0", "hash": "sha256-W4Zig87k4tiPcdaEykpnE1znfCFAZ5ebFHo5l0gsQWg=" }, + { + "pname": "AspNetCore.HealthChecks.UI.Client", + "version": "9.0.0", + "hash": "sha256-ghXhPV6oGCxVogZMW+dnzsHkl8fKxWHcdLdiS6xmdqM=" + }, + { + "pname": "AspNetCore.HealthChecks.UI.Core", + "version": "9.0.0", + "hash": "sha256-FEa3Lv6dfX/ADomevS8peHrmSWiPa5yl5IsiP2iXBgM=" + }, { "pname": "Autofac", "version": "4.6.2", "hash": "sha256-eE/ye5ELqliiZXlsbvt9ridrJPYusjzNhJJi9Dw2BAA=" }, - { - "pname": "Azure.Core", - "version": "1.35.0", - "hash": "sha256-kKKNZRAJJO9CeedtA0YqHOrlUTIMr5HFKOPWadhs0Rg=" - }, - { - "pname": "Azure.Core", - "version": "1.36.0", - "hash": "sha256-lokfjW2wvgFu6bALLzNmDhXIz3HXoPuGX0WfGb9hmpI=" - }, - { - "pname": "Azure.Core", - "version": "1.37.0", - "hash": "sha256-ETDRf0+cNgVa1udMkhjYkOLP5Hd0NtiSQqAZHCjevds=" - }, - { - "pname": "Azure.Core", - "version": "1.38.0", - "hash": "sha256-gzWMtIZJgwtE51dTMzLCbN4KxmE4/bzdjb/NU86N1uY=" - }, { "pname": "Azure.Core", "version": "1.41.0", @@ -40,9 +30,24 @@ "hash": "sha256-0su/ylZ68+FDZ6mgfp3qsm7qpfPtD5SW75HXbVhs5qk=" }, { - "pname": "Azure.Data.Tables", - "version": "12.8.3", - "hash": "sha256-0mMBh5fZ4nS1H5I5GwjntQuWiMANcA4ymU5VXA8Ttr0=" + "pname": "Azure.Core", + "version": "1.46.0", + "hash": "sha256-JWnPjVgqFnVmC15Lctc4OYyfQJk5kZTQ431dH/OyxT0=" + }, + { + "pname": "Azure.Core", + "version": "1.46.1", + "hash": "sha256-xpb9A2pFHEQ07yVrzq0gpeFBTN9LTqk7iHhg707a5Mg=" + }, + { + "pname": "Azure.Core", + "version": "1.46.2", + "hash": "sha256-vgSB95UVbZm+7a5h6WT82RysuWhBIhicM47b73DOjS4=" + }, + { + "pname": "Azure.Core", + "version": "1.47.1", + "hash": "sha256-YJR1bDI9H9lr6p/9QcOWEhnpMD8ePyxxO39S32VAOak=" }, { "pname": "Azure.Data.Tables", @@ -51,44 +56,24 @@ }, { "pname": "Azure.Identity", - "version": "1.11.4", - "hash": "sha256-J3nI80CQwS7fwRLnqBxqZNemxqP05rcn3x44YpIf2no=" - }, - { - "pname": "Azure.Monitor.OpenTelemetry.AspNetCore", - "version": "1.2.0-beta.2", - "hash": "sha256-8WrJBCiUTFYhJNHv8ZsTdiE91YchgwGmYzzNwwF5d+Q=" + "version": "1.14.2", + "hash": "sha256-PpGcGQrzcEzDtTm65gLmjWrt8yavst4VOKDlr+NuLQo=" }, { "pname": "Azure.Monitor.OpenTelemetry.Exporter", - "version": "1.3.0-beta.1", - "hash": "sha256-R4cPuP2AaWJITH6MDJdUNTMeAvqLaQK3p0aRdX6EZ00=" - }, - { - "pname": "Azure.Monitor.OpenTelemetry.LiveMetrics", - "version": "1.0.0-beta.3", - "hash": "sha256-Cs5Xax3DhEocVGlbId9ziwnxcTfBZiH8pt30dzMWx2Q=" + "version": "1.4.0", + "hash": "sha256-H2gbtQrHxXsHQT+vz94OswgLxAQfoS/yzgpgaRr66ik=" }, { "pname": "Azure.Security.KeyVault.Secrets", "version": "4.7.0", "hash": "sha256-SNW1F7WLG+3h6fSXvWLI5sQhSFDXonVwI2qKlx6jsz0=" }, - { - "pname": "Azure.Storage.Blobs", - "version": "12.19.1", - "hash": "sha256-E7QHJrhQjQjGhFq4GoQpyVGR6uKfA91NGcyziRfdr2U=" - }, { "pname": "Azure.Storage.Blobs", "version": "12.21.2", "hash": "sha256-DvdMGuophEbvvVtbRU3vsNwla0zTn5dn7HbW0Mr4P/o=" }, - { - "pname": "Azure.Storage.Common", - "version": "12.18.1", - "hash": "sha256-M10Ov1bBV1/U8R3Sp05apS3qFHONQRmAQakQsd17X8I=" - }, { "pname": "Azure.Storage.Common", "version": "12.20.1", @@ -129,11 +114,6 @@ "version": "3.1.2.5", "hash": "sha256-MMIyGbKBNZFOgr4z8dC8jhICWtRPBCNzWc7ll2uU210=" }, - { - "pname": "Google.Protobuf", - "version": "3.22.5", - "hash": "sha256-KuPCqobX6vE9RYElAN9vw+FPonFipms7kE/cRDCLmSQ=" - }, { "pname": "Google.Protobuf", "version": "3.23.1", @@ -154,21 +134,11 @@ "version": "2.55.0", "hash": "sha256-HxNY6an4tQpjKxUNstyW2LOy+yovwWHdYxRgWeZxRFs=" }, - { - "pname": "Grpc.Core.Api", - "version": "2.52.0", - "hash": "sha256-ISgN3zWwvV8qD7JFkaYveLbke09+UtUBy3Tux+ZHLNc=" - }, { "pname": "Grpc.Core.Api", "version": "2.55.0", "hash": "sha256-cVHZhIokR5Yb1zGs6WAIytpKbKPmuaPzwS4NCjT6Yg4=" }, - { - "pname": "Grpc.Net.Client", - "version": "2.52.0", - "hash": "sha256-4Rhb8PIoV2BiohfRwzx1GYDPbcfqxGAmL2uB0atFFTk=" - }, { "pname": "Grpc.Net.Client", "version": "2.55.0", @@ -179,11 +149,6 @@ "version": "2.55.0", "hash": "sha256-xwOnTs14pAFNeNGXxOtRzyXtbj1ApNsPPWQTEljS+C4=" }, - { - "pname": "Grpc.Net.Common", - "version": "2.52.0", - "hash": "sha256-XoY+jt+JIt6SzvCjUSXKKa9Q8Bu5UrNJv2z1hCBKDrY=" - }, { "pname": "Grpc.Net.Common", "version": "2.55.0", @@ -204,11 +169,21 @@ "version": "2.22.0", "hash": "sha256-mUQ63atpT00r49ca50uZu2YCiLg3yd6r3HzTryqcuEA=" }, + { + "pname": "Microsoft.ApplicationInsights.AspNetCore", + "version": "2.21.0", + "hash": "sha256-IZgibkpHp6rK3X3tlrH4aNlIel5j2cnzNbd9KsOM7DY=" + }, { "pname": "Microsoft.ApplicationInsights.AspNetCore", "version": "2.22.0", "hash": "sha256-BIa8rILgulQ+ZztaP3P5cD467x7Jpd+uSUBZZu2eeGc=" }, + { + "pname": "Microsoft.ApplicationInsights.DependencyCollector", + "version": "2.21.0", + "hash": "sha256-xjwB4HANWbKaHCCWgyPGd3gB0wyb+sZN58UFXl76TLU=" + }, { "pname": "Microsoft.ApplicationInsights.DependencyCollector", "version": "2.22.0", @@ -234,16 +209,31 @@ "version": "1.4.4", "hash": "sha256-oaxpiMbuHfDBIRjheo83iS7i+aAtqrlAvdnTXGHK4nk=" }, + { + "pname": "Microsoft.ApplicationInsights.WindowsServer", + "version": "2.21.0", + "hash": "sha256-jGPJtk1hhK7bNXpLgqUK6wvoPWhEQUZLkobJyOZtIwE=" + }, { "pname": "Microsoft.ApplicationInsights.WindowsServer", "version": "2.22.0", "hash": "sha256-oaWcrMK/TCtExq9BrTRvVs98a0YnlnMEbntsMYZhrCI=" }, + { + "pname": "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel", + "version": "2.21.0", + "hash": "sha256-mdFIPBX7xKID6Xq/fpTRTLomc2hzxH/+N52iKhUV/Jc=" + }, { "pname": "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel", "version": "2.22.0", "hash": "sha256-JkqPzRI+wdtefP1UulOenrA5kkGB0cWzZqa3SLP3p8w=" }, + { + "pname": "Microsoft.AspNet.WebApi.Client", + "version": "5.2.6", + "hash": "sha256-jB/56a4VaBS6N7fAIrNuJ5fICGq1nFwSuIU8NBjiybU=" + }, { "pname": "Microsoft.AspNet.WebApi.Client", "version": "5.2.8", @@ -254,6 +244,56 @@ "version": "2.2.0", "hash": "sha256-NBUF/oT5TYVvuUW4/lws//1OfX8ldrAxY4+CLnmT3Ag=" }, + { + "pname": "Microsoft.AspNetCore.App.Ref", + "version": "8.0.24", + "hash": "sha256-S8WKO+yB9fF56M2DOaqEOUzKL0/iXtCZQWcXeAV7zWE=" + }, + { + "pname": "Microsoft.AspNetCore.App.Ref", + "version": "9.0.13", + "hash": "sha256-uhcJ9ll5PEg4bX2PhIrxPZ270j2W2bYREarQCihyW7w=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64", + "version": "8.0.24", + "hash": "sha256-K+AQgKYpIKFYxPSOKNm2hYyDlEhQCj8KN5FV9xdV8nY=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64", + "version": "9.0.13", + "hash": "sha256-zPiQ1KhNkdc9w9B5bq9EWBrjBXJMBmdn5qUqubp+Xyo=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", + "version": "8.0.24", + "hash": "sha256-qNw/gjM/JGjL3K6bxr0xhF4tLcGVScMOnk4M6O8eezU=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", + "version": "9.0.13", + "hash": "sha256-RMGZEBbjAgzoZIf878drIgb33Q0+NYX6euOIV34BjQk=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64", + "version": "8.0.24", + "hash": "sha256-bS8XRDQ7cGOzqb5i43S4LjanOAfZXbsWOI4n/tnrBi0=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64", + "version": "9.0.13", + "hash": "sha256-NkAx5OX1eGgd+jr5a0z4Uys/l9AkI4CyqXQfGi7GNKs=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.osx-x64", + "version": "8.0.24", + "hash": "sha256-Ek789mAUCy/sYZY9ZhBYrVitFk/QCLHPp9+2WHZ9Wvc=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.osx-x64", + "version": "9.0.13", + "hash": "sha256-blbl3C1tBmx+u9paJVHhgX3y8IaHZI2RwZEidgIZVtU=" + }, { "pname": "Microsoft.AspNetCore.Authentication.Abstractions", "version": "2.2.0", @@ -319,11 +359,6 @@ "version": "2.2.0", "hash": "sha256-GzqYrTqCCVy41AOfmgIRY1kkqxekn5T0gFC7tUMxcxA=" }, - { - "pname": "Microsoft.AspNetCore.Hosting.Server.Abstractions", - "version": "2.1.1", - "hash": "sha256-13BN1yOL4y2/emMObr3Wb9Q21LbqkPeGvir3A+H+jX4=" - }, { "pname": "Microsoft.AspNetCore.Hosting.Server.Abstractions", "version": "2.2.0", @@ -334,6 +369,11 @@ "version": "2.2.0", "hash": "sha256-O3j05VLAwWTOX0QywPWK6nq5jnSES9/9zpcnmNaftPw=" }, + { + "pname": "Microsoft.AspNetCore.Http", + "version": "2.1.1", + "hash": "sha256-Sgj8t/JyzDjESkqxcBXY6qJKuyl91JDSPLxZROPXaRE=" + }, { "pname": "Microsoft.AspNetCore.Http", "version": "2.1.22", @@ -369,11 +409,6 @@ "version": "2.2.0", "hash": "sha256-1rXxGQnkNR+SiNMtDShYoQVGOZbvu4P4ZtWj5Wq4D4U=" }, - { - "pname": "Microsoft.AspNetCore.Http.Features", - "version": "2.1.1", - "hash": "sha256-bXB9eARdVnjptjj02ubs81ljH8Ortj3Je9d6x4uCLm4=" - }, { "pname": "Microsoft.AspNetCore.Http.Features", "version": "2.2.0", @@ -526,27 +561,27 @@ }, { "pname": "Microsoft.Azure.AppService.Middleware", - "version": "1.5.5", - "hash": "sha256-bzmxhapBp4CbEvdcz4l0M7XpT2fVYJY+7MA2Y7vRFs0=", - "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/21e57804-e42a-44f4-a801-493faaf56251/nuget/v3/flat2/microsoft.azure.appservice.middleware/1.5.5/microsoft.azure.appservice.middleware.1.5.5.nupkg" + "version": "1.5.8", + "hash": "sha256-WHjXeEWsDM4geDY2M7Rm1vNE/rHSf1fzNNpTVIjrUuU=", + "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/21e57804-e42a-44f4-a801-493faaf56251/nuget/v3/flat2/microsoft.azure.appservice.middleware/1.5.8/microsoft.azure.appservice.middleware.1.5.8.nupkg" }, { "pname": "Microsoft.Azure.AppService.Middleware.Functions", - "version": "1.5.5", - "hash": "sha256-cXpg7Z2ZpKd/mKjKLtchap2xWJHlAlL+5Oa5xtI5bIo=", - "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/21e57804-e42a-44f4-a801-493faaf56251/nuget/v3/flat2/microsoft.azure.appservice.middleware.functions/1.5.5/microsoft.azure.appservice.middleware.functions.1.5.5.nupkg" + "version": "1.5.8", + "hash": "sha256-TrmPqYNpBbWlsdd1wvYZ9OkgVLsril57uWyVtD0YgIs=", + "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/21e57804-e42a-44f4-a801-493faaf56251/nuget/v3/flat2/microsoft.azure.appservice.middleware.functions/1.5.8/microsoft.azure.appservice.middleware.functions.1.5.8.nupkg" }, { "pname": "Microsoft.Azure.AppService.Middleware.Modules", - "version": "1.5.5", - "hash": "sha256-qswmhpHYanxIC/1Ox5NeZUqyKR9hkEPY77XN1M4ar7o=", - "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/21e57804-e42a-44f4-a801-493faaf56251/nuget/v3/flat2/microsoft.azure.appservice.middleware.modules/1.5.5/microsoft.azure.appservice.middleware.modules.1.5.5.nupkg" + "version": "1.5.8", + "hash": "sha256-UR8CB73kCXO1KjyufNjdxM1UHbq8kfd7ZCA48t5xZOg=", + "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/21e57804-e42a-44f4-a801-493faaf56251/nuget/v3/flat2/microsoft.azure.appservice.middleware.modules/1.5.8/microsoft.azure.appservice.middleware.modules.1.5.8.nupkg" }, { "pname": "Microsoft.Azure.AppService.Middleware.NetCore", - "version": "1.5.5", - "hash": "sha256-B6W76F4cw5mSHQmn6/+6Q3OSu7ehvA1CyARPEjkn8/w=", - "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/21e57804-e42a-44f4-a801-493faaf56251/nuget/v3/flat2/microsoft.azure.appservice.middleware.netcore/1.5.5/microsoft.azure.appservice.middleware.netcore.1.5.5.nupkg" + "version": "1.5.8", + "hash": "sha256-qbqhjiYbQmHTxN8g4ioR6EVsOnyjq8BnmCJvctK9UGM=", + "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/21e57804-e42a-44f4-a801-493faaf56251/nuget/v3/flat2/microsoft.azure.appservice.middleware.netcore/1.5.8/microsoft.azure.appservice.middleware.netcore.1.5.8.nupkg" }, { "pname": "Microsoft.Azure.AppService.Proxy.Client", @@ -580,21 +615,27 @@ }, { "pname": "Microsoft.Azure.Functions.DotNetIsolatedNativeHost", - "version": "1.0.11", - "hash": "sha256-aF0DGmMquKKg4cLV7SrDOC8O4PQa8YwDe4EmFyoJhgI=", - "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.functions.dotnetisolatednativehost/1.0.11/microsoft.azure.functions.dotnetisolatednativehost.1.0.11.nupkg" + "version": "1.0.13", + "hash": "sha256-sTpQTQ5K3uGezCU93YWiY2Vxnar7DTklYBT1JTkRzdY=", + "url": "https://pkgs.dev.azure.com/azfunc/ae7e3bf3-d41a-4480-9ac0-b6cf9df9ac24/_packaging/e85c0a6e-40b3-4b4f-b367-230750993eea/nuget/v3/flat2/microsoft.azure.functions.dotnetisolatednativehost/1.0.13/microsoft.azure.functions.dotnetisolatednativehost.1.0.13.nupkg" }, { "pname": "Microsoft.Azure.Functions.JavaWorker", - "version": "2.17.0", - "hash": "sha256-O+3f7Tbv+uGQB328wG6jeTDSnCs0m7z4T9qV9hCT1mI=", - "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.functions.javaworker/2.17.0/microsoft.azure.functions.javaworker.2.17.0.nupkg" + "version": "2.19.2", + "hash": "sha256-V5c629vBu2UMOBMjmQfUGM338bym3dgcWWHUI3lw6A4=", + "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.functions.javaworker/2.19.2/microsoft.azure.functions.javaworker.2.19.2.nupkg" }, { "pname": "Microsoft.Azure.Functions.NodeJsWorker", - "version": "3.10.1", - "hash": "sha256-/+Yu4T38FyHl1j0KFjG79w8jIrTlUJR9qOQ1FMxifuc=", - "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.functions.nodejsworker/3.10.1/microsoft.azure.functions.nodejsworker.3.10.1.nupkg" + "version": "3.12.0", + "hash": "sha256-WQpISoEiZVOTruhfHHvF6i9xdXQm8lrQIZurZeGdMMk=", + "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.functions.nodejsworker/3.12.0/microsoft.azure.functions.nodejsworker.3.12.0.nupkg" + }, + { + "pname": "Microsoft.Azure.Functions.Platform.Metrics.LinuxConsumption", + "version": "1.0.5", + "hash": "sha256-wePGXzxz+WsdUOu6935n+eRYW+GV2wnRjIm+2kXM7uA=", + "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/1e0b47db-42dd-4931-a098-8cb031234dcc/nuget/v3/flat2/microsoft.azure.functions.platform.metrics.linuxconsumption/1.0.5/microsoft.azure.functions.platform.metrics.linuxconsumption.1.0.5.nupkg" }, { "pname": "Microsoft.Azure.Functions.PowerShellWorker.PS7.0", @@ -610,15 +651,25 @@ }, { "pname": "Microsoft.Azure.Functions.PowerShellWorker.PS7.4", - "version": "4.0.4026", - "hash": "sha256-57lIzJjvaeWk2XQe3tcW2oN9jk5kNyc4Ad6zsdqyx2k=", - "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/c0493cce-bc63-4e11-9fc9-e7c45291f151/nuget/v3/flat2/microsoft.azure.functions.powershellworker.ps7.4/4.0.4026/microsoft.azure.functions.powershellworker.ps7.4.4.0.4026.nupkg" + "version": "4.0.4581", + "hash": "sha256-KRe1rZ1lwr1Qk2d1X37D9s90K0QCWt8KlrCZoSliZyI=", + "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/c0493cce-bc63-4e11-9fc9-e7c45291f151/nuget/v3/flat2/microsoft.azure.functions.powershellworker.ps7.4/4.0.4581/microsoft.azure.functions.powershellworker.ps7.4.4.0.4581.nupkg" }, { "pname": "Microsoft.Azure.Functions.PythonWorker", - "version": "4.34.0", - "hash": "sha256-cYtmcb5HJVy5PAmPMFUMginufoSqrtOZp1jvvkLfno0=", - "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.functions.pythonworker/4.34.0/microsoft.azure.functions.pythonworker.4.34.0.nupkg" + "version": "4.40.2", + "hash": "sha256-XRH3J+iUr5Ox3jWb1dVwOeHEj4mQZC4RzNjfkj0zkhI=", + "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.functions.pythonworker/4.40.2/microsoft.azure.functions.pythonworker.4.40.2.nupkg" + }, + { + "pname": "Microsoft.Azure.Functions.Worker.ItemTemplates", + "version": "4.0.5337", + "hash": "sha256-QjNLFUsekQRJ80rOMOQZR9n0LAc7yxBU1lwyd3JmsJc=" + }, + { + "pname": "Microsoft.Azure.Functions.Worker.ProjectTemplates", + "version": "4.0.5337", + "hash": "sha256-O6FzMLbJA7oVlRAzf6UJQr1Caq8TL12se5SbeK6Lgpk=" }, { "pname": "Microsoft.Azure.KeyVault.Core", @@ -635,21 +686,45 @@ "version": "11.1.7", "hash": "sha256-pC9oUUWMNr9mbAW2p19VFRHD1TP5M6Sc+8ytLXbsloY=" }, + { + "pname": "Microsoft.Azure.WebJobs", + "version": "3.0.32", + "hash": "sha256-u8xcdtQYUu8X52WNmpyNw4TRjmSlZulA6RmR08fV28w=" + }, + { + "pname": "Microsoft.Azure.WebJobs", + "version": "3.0.37", + "hash": "sha256-C6ztW9QdUgxNTsYewOZDQGrl3Pxy99X7J8kQxUpivMk=" + }, + { + "pname": "Microsoft.Azure.WebJobs", + "version": "3.0.39", + "hash": "sha256-Ndym81F4BFIHsH4NF/weySuRdWgzQQM8hHsjTW8c1vs=" + }, { "pname": "Microsoft.Azure.WebJobs", "version": "3.0.41", "hash": "sha256-w5ojyAOq2qewkpP8NC1r7YV/GiC9eFbRrRC+keB4CDA=" }, + { + "pname": "Microsoft.Azure.WebJobs", + "version": "3.0.42", + "hash": "sha256-pAAq5ZcRZVgX2v/SSoK84cAiBbUCn4R2KK0ME3FIqtg=" + }, { "pname": "Microsoft.Azure.WebJobs.Core", - "version": "3.0.41", - "hash": "sha256-Vt5A6B0rZ5pwK43DSVbSsQz4p8qIcY8QmTazoGIztyo=" + "version": "3.0.42", + "hash": "sha256-kIaV8zb9TO1M/Dac4P3Csa34CBDMaPRza534ll4FW7A=" }, { "pname": "Microsoft.Azure.WebJobs.Extensions", - "version": "5.1.0-12067", - "hash": "sha256-SHWuNbS286bi5KHBCHTNkfr6VHDJVxVZxswvy+bUudo=", - "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/f37f760c-aebd-443e-9714-ce725cd427df/nuget/v3/flat2/microsoft.azure.webjobs.extensions/5.1.0-12067/microsoft.azure.webjobs.extensions.5.1.0-12067.nupkg" + "version": "5.0.0-beta.1", + "hash": "sha256-KWpUGPgtkdhP3XKnlEWDEjm9mFlGeH42HEmMUNAq83o=" + }, + { + "pname": "Microsoft.Azure.WebJobs.Extensions", + "version": "5.2.1", + "hash": "sha256-WSvYA+JJqbVSQr8uawjrdki43cPf3+K1feuuKcz80bg=" }, { "pname": "Microsoft.Azure.WebJobs.Extensions.Http", @@ -661,17 +736,32 @@ "version": "1.0.0-beta.1", "hash": "sha256-92Oz6qPEgW8YYOHjEf+VzHjywu74qxUh5pCZGM1M2w8=" }, + { + "pname": "Microsoft.Azure.WebJobs.Host.Storage", + "version": "5.0.0-beta.1", + "hash": "sha256-emTiSL+NTitYUPbDuqo3j22gKfGAk/1AC8V0LNziybo=" + }, { "pname": "Microsoft.Azure.WebJobs.Host.Storage", "version": "5.0.1", "hash": "sha256-ZbjinILfgrME2Z+9LkdHD4fGoIwy44im9WJfDnANWng=" }, + { + "pname": "Microsoft.Azure.WebJobs.ItemTemplates", + "version": "4.0.5337", + "hash": "sha256-ZNr3TbjWliegpDkHEp01eu9rgG62/FoshBHTQUx3JGU=" + }, { "pname": "Microsoft.Azure.WebJobs.Logging.ApplicationInsights", "version": "3.0.42-12121", "hash": "sha256-LHQL+cdP95W4l3jkPNIAIIqfWIDk9rEtvh71ZrosToc=", "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/1e0b47db-42dd-4931-a098-8cb031234dcc/nuget/v3/flat2/microsoft.azure.webjobs.logging.applicationinsights/3.0.42-12121/microsoft.azure.webjobs.logging.applicationinsights.3.0.42-12121.nupkg" }, + { + "pname": "Microsoft.Azure.WebJobs.ProjectTemplates", + "version": "4.0.5337", + "hash": "sha256-vsm33WkI7ZXM64mP5S79rs8e+NlKyfQlFNQRCB6BpJo=" + }, { "pname": "Microsoft.Azure.WebJobs.Rpc.Core", "version": "3.0.37", @@ -679,9 +769,9 @@ }, { "pname": "Microsoft.Azure.WebJobs.Script", - "version": "4.1037.0", - "hash": "sha256-HNKDU6O4INgifgN/MokvxlsuNLJAebASr61RjFFE4W8=", - "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.webjobs.script/4.1037.0/microsoft.azure.webjobs.script.4.1037.0.nupkg" + "version": "4.1045.200", + "hash": "sha256-OQJgJABMEtK+UMFNkQOyMuiYOe0CtiBVG1A5DA4MaIY=", + "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.webjobs.script/4.1045.200/microsoft.azure.webjobs.script.4.1045.200.nupkg" }, { "pname": "Microsoft.Azure.WebJobs.Script.Abstractions", @@ -690,15 +780,15 @@ }, { "pname": "Microsoft.Azure.WebJobs.Script.Grpc", - "version": "4.1037.0", - "hash": "sha256-henND212VH9Pdd0vOtWBpOhGj0IAMqMsvp10k8VcwC4=", - "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.webjobs.script.grpc/4.1037.0/microsoft.azure.webjobs.script.grpc.4.1037.0.nupkg" + "version": "4.1045.200", + "hash": "sha256-JA/mDxn6DR/PWED4Gieh9Gh0tGChIHNGIqINyZDL2P0=", + "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.webjobs.script.grpc/4.1045.200/microsoft.azure.webjobs.script.grpc.4.1045.200.nupkg" }, { "pname": "Microsoft.Azure.WebJobs.Script.WebHost", - "version": "4.1037.0", - "hash": "sha256-sGMbBMtYZiaWfa7CUin9ljMMHrwFp7BxrygcAqJ6RrE=", - "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.webjobs.script.webhost/4.1037.0/microsoft.azure.webjobs.script.webhost.4.1037.0.nupkg" + "version": "4.1045.200", + "hash": "sha256-jaf7HzuWFYYU1zqPnx7b/c2D9ASCzNvohpA/JBwPL94=", + "url": "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.webjobs.script.webhost/4.1045.200/microsoft.azure.webjobs.script.webhost.4.1045.200.nupkg" }, { "pname": "Microsoft.Azure.WebSites.DataProtection", @@ -716,6 +806,11 @@ "version": "6.0.0", "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" }, + { + "pname": "Microsoft.Bcl.AsyncInterfaces", + "version": "8.0.0", + "hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw=" + }, { "pname": "Microsoft.Build", "version": "17.0.0", @@ -727,9 +822,9 @@ "hash": "sha256-2B+t+YBL/wNPRyYE7zDlS6IIJxmrO4JpINYoV9spgiE=" }, { - "pname": "Microsoft.CodeAnalysis.Analyzers", - "version": "1.1.0", - "hash": "sha256-7KrZfK3kUbmeT82eVadvHurZcaFq3FDj4qkIIeExJiM=" + "pname": "Microsoft.Build.NoTargets", + "version": "3.7.56", + "hash": "sha256-eL1PHJ2+sAdV7nKeXt02w8xc0s6sVv29pFpDok8JZjE=" }, { "pname": "Microsoft.CodeAnalysis.Analyzers", @@ -796,6 +891,11 @@ "version": "4.7.0", "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0=" }, + { + "pname": "Microsoft.DotNet.ILCompiler", + "version": "9.0.13", + "hash": "sha256-yB24drjo/WDEU/nIgePA1UPgtFSb0oNBQrU6iXs1NRM=" + }, { "pname": "Microsoft.DotNet.PlatformAbstractions", "version": "1.0.3", @@ -806,6 +906,11 @@ "version": "2.1.0", "hash": "sha256-vrZhYp94SjycUMGaVYCFWJ4p7KBKfqVyLWtIG73fzeM=" }, + { + "pname": "Microsoft.Extensions.Azure", + "version": "1.12.0", + "hash": "sha256-yKGzS6jHIjRWRIGFLbzexCEzITZQ4qYzy3nd7L9EcFc=" + }, { "pname": "Microsoft.Extensions.Azure", "version": "1.7.1", @@ -816,11 +921,6 @@ "version": "1.0.0", "hash": "sha256-TSbJFK4eRIe1AKnzJNTTon30Tg+IECwZ2zTKy+qTXEg=" }, - { - "pname": "Microsoft.Extensions.Caching.Abstractions", - "version": "2.2.0", - "hash": "sha256-osgeoVggP5UqGBG7GbrZmsVvBJmA47aCgsqJclthHUI=" - }, { "pname": "Microsoft.Extensions.Caching.Abstractions", "version": "5.0.0", @@ -841,6 +941,11 @@ "version": "5.0.0", "hash": "sha256-itGTsmSLi+SbXq2lCF6Mxccwqq4CCK+oZGzPQZu9GlE=" }, + { + "pname": "Microsoft.Extensions.Compliance.Abstractions", + "version": "9.8.0", + "hash": "sha256-LYrL4TF7BRFGCzFvHivDevqAFlZxsnSrI/+n28fKMmU=" + }, { "pname": "Microsoft.Extensions.Configuration", "version": "2.0.0", @@ -856,11 +961,6 @@ "version": "2.1.1", "hash": "sha256-pnO6GdmnPJ8D4pmMpkxwgM4GggwGd2Uk+5s6OfJnhAg=" }, - { - "pname": "Microsoft.Extensions.Configuration", - "version": "3.0.3", - "hash": "sha256-qH+jM/3tJoWGgkjHkSG3EDBiKZIMr9vjnT8jYcrYPDo=" - }, { "pname": "Microsoft.Extensions.Configuration", "version": "3.1.0", @@ -877,14 +977,9 @@ "hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA=" }, { - "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "2.0.0", - "hash": "sha256-jveXZPNvx30uWT3q80OA1YaSb4K/KGOhlyun97IXn8Y=" - }, - { - "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "2.1.0", - "hash": "sha256-rd8zK6YWSxSP5HLrP+IR8o5/+/sheTNDtj3I9Eem/w0=" + "pname": "Microsoft.Extensions.Configuration", + "version": "9.0.0", + "hash": "sha256-uBLeb4z60y8z7NelHs9uT3cLD6wODkdwyfJm6/YZLDM=" }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", @@ -896,30 +991,20 @@ "version": "2.2.0", "hash": "sha256-5Jjn+0WZQ6OiN8AkNlGV0XIaw8L+a/wAq9hBD88RZbs=" }, - { - "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "3.0.3", - "hash": "sha256-NRAsb0aEwFrZSGM4mNYu87mGAmjgDXWL2wfI8432hqI=" - }, - { - "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "3.1.0", - "hash": "sha256-GMxvf0iAiWUWo0awlDczzcxNo8+MITBLp0/SqqYo8Lg=" - }, - { - "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "5.0.0", - "hash": "sha256-0+ywPdqMkx32+HcMHqAp00cWBE7aCNc09Xh2eRObHTs=" - }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", "version": "8.0.0", "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o=" }, { - "pname": "Microsoft.Extensions.Configuration.Binder", - "version": "2.1.0", - "hash": "sha256-FNOrXx7bJbc6qrscne8RhRj28kxK3uq+3ltdXzhCKHQ=" + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "9.0.0", + "hash": "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "9.0.6", + "hash": "sha256-11bIIn40Qadrlp1MZpQmAlpBHXPcbxB4Gjcp12EUQ1M=" }, { "pname": "Microsoft.Extensions.Configuration.Binder", @@ -928,13 +1013,18 @@ }, { "pname": "Microsoft.Extensions.Configuration.Binder", - "version": "3.0.3", - "hash": "sha256-eYFauGnI8zIl86tlFrJ6SBlwqwySMzQ+5jb2TfcEyX8=" + "version": "8.0.0", + "hash": "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q=" }, { "pname": "Microsoft.Extensions.Configuration.Binder", - "version": "8.0.0", - "hash": "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q=" + "version": "8.0.2", + "hash": "sha256-aGB0VuoC34YadAEqrwoaXLc5qla55pswDV2xLSmR7SE=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Binder", + "version": "9.0.0", + "hash": "sha256-6ajYWcNOQX2WqftgnoUmVtyvC1kkPOtTCif4AiKEffU=" }, { "pname": "Microsoft.Extensions.Configuration.EnvironmentVariables", @@ -946,11 +1036,6 @@ "version": "2.1.1", "hash": "sha256-KGqjU70qCxZw+RY/W3GCDu2VCRnVL4s/PrU526Qb7iw=" }, - { - "pname": "Microsoft.Extensions.Configuration.FileExtensions", - "version": "2.1.0", - "hash": "sha256-gNBnMT2wNFybQBtGWSDPupHLNl7PV+hagouyYSrv4tM=" - }, { "pname": "Microsoft.Extensions.Configuration.FileExtensions", "version": "2.1.1", @@ -973,54 +1058,14 @@ }, { "pname": "Microsoft.Extensions.DependencyInjection", - "version": "2.0.0", - "hash": "sha256-+KqiuV8ncy9b1xhtDExh4s4U57tKxqx4pAyr6d//EQU=" - }, - { - "pname": "Microsoft.Extensions.DependencyInjection", - "version": "2.1.0", - "hash": "sha256-lj6TupnD30dlTU5JrcIrLmgrhwtJ2LKkIGvK5QD3YMA=" - }, - { - "pname": "Microsoft.Extensions.DependencyInjection", - "version": "2.1.1", - "hash": "sha256-l/UvDZRXk1Z+YiFAXNV+mnARKdsA9q+O8M9qhm6dh9I=" - }, - { - "pname": "Microsoft.Extensions.DependencyInjection", - "version": "2.2.0", - "hash": "sha256-k/3UKceE1hbgv1sfV9H85hzWvMwooE8PcasHvHMhe1M=" - }, - { - "pname": "Microsoft.Extensions.DependencyInjection", - "version": "3.0.3", - "hash": "sha256-8o1Ljk5me83HfDxwlQinpwOuqhZ6UUk4oWVj94E1o1k=" - }, - { - "pname": "Microsoft.Extensions.DependencyInjection", - "version": "5.0.0", - "hash": "sha256-RN478YJQE0YM0g+JztXp00w57CIF4bb48hSD/z3jTZc=" - }, - { - "pname": "Microsoft.Extensions.DependencyInjection", - "version": "8.0.0", - "hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ=" + "version": "9.0.2", + "hash": "sha256-jNQVj2Xo7wzVdNDu27bLbYCVUOF8yDVrFtC3cZ9OsXo=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "version": "1.0.0", "hash": "sha256-EW99BPB7ztVVd5nONd4Qjn9Ji+a1FX+nAe3Z/a+UnzA=" }, - { - "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "2.0.0", - "hash": "sha256-H1rEnq/veRWvmp8qmUsrQkQIcVlKilUNzmmKsxJ0md8=" - }, - { - "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "2.1.0", - "hash": "sha256-WgS/QtxbITCpVjs1JPCWuJRrZSoplOtY7VfOXjLqDDA=" - }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "version": "2.1.1", @@ -1031,21 +1076,41 @@ "version": "2.2.0", "hash": "sha256-pf+UQToJnhAe8VuGjxyCTvua1nIX8n5NHzAUk3Jz38s=" }, - { - "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "3.0.3", - "hash": "sha256-r1R9rsAQb45dxuDPpItdWE93JYImK8/++T2F/Mql0cM=" - }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "version": "5.0.0", "hash": "sha256-0sfuxZ07HsMZJpKatDrW6I671uJBYWsUgAyoDZA2n50=" }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "6.0.0", + "hash": "sha256-SZke0jNKIqJvvukdta+MgIlGsrP2EdPkkS8lfLg7Ju4=" + }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "version": "8.0.0", "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8=" }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "8.0.2", + "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "9.0.0", + "hash": "sha256-CncVwkKZ5CsIG2O0+OM9qXuYXh3p6UGyueTHSLDVL+c=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "9.0.2", + "hash": "sha256-WoTLgw/OlXhgN54Szip0Zpne7i/YTXwZ1ZLCPcHV6QM=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "9.0.6", + "hash": "sha256-40rY38OwSqueIWr/KMvJX9u+vipN+AaRQ6eNCZLqrog=" + }, { "pname": "Microsoft.Extensions.DependencyModel", "version": "1.0.3", @@ -1056,11 +1121,36 @@ "version": "2.1.0", "hash": "sha256-7dFo5itkB2OgSgS7dN87h0Xf2p5/f6fl2Ka6+CTEhDY=" }, + { + "pname": "Microsoft.Extensions.Diagnostics", + "version": "8.0.0", + "hash": "sha256-fBLlb9xAfTgZb1cpBxFs/9eA+BlBvF8Xg0DMkBqdHD4=" + }, { "pname": "Microsoft.Extensions.Diagnostics.Abstractions", "version": "8.0.0", "hash": "sha256-USD5uZOaahMqi6u7owNWx/LR4EDrOwqPrAAim7iRpJY=" }, + { + "pname": "Microsoft.Extensions.Diagnostics.Abstractions", + "version": "9.0.0", + "hash": "sha256-wG1LcET+MPRjUdz3HIOTHVEnbG/INFJUqzPErCM79eY=" + }, + { + "pname": "Microsoft.Extensions.Diagnostics.Abstractions", + "version": "9.0.6", + "hash": "sha256-3Bl1nIg0NoTbHaIXWmaRxutoxV1PSy6jlmKwPLdc5r4=" + }, + { + "pname": "Microsoft.Extensions.Diagnostics.HealthChecks", + "version": "8.0.11", + "hash": "sha256-wS+5kN0lREre+gv7//VuVb9oVkEzWHxKGiZJukj4Z30=" + }, + { + "pname": "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions", + "version": "8.0.11", + "hash": "sha256-JjWYaK5c+w8GUkNudYQKf2m3NwOQLYEeSFwL8kgTWC0=" + }, { "pname": "Microsoft.Extensions.FileProviders.Abstractions", "version": "2.1.0", @@ -1083,8 +1173,8 @@ }, { "pname": "Microsoft.Extensions.FileProviders.Abstractions", - "version": "8.0.0", - "hash": "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU=" + "version": "9.0.6", + "hash": "sha256-/1jaqN44SNaRkyfwhH3KGDq/St1M1izCGUaPgkC9dIU=" }, { "pname": "Microsoft.Extensions.FileProviders.Composite", @@ -1148,14 +1238,34 @@ }, { "pname": "Microsoft.Extensions.Hosting.Abstractions", - "version": "8.0.0", - "hash": "sha256-0JBx+wwt5p1SPfO4m49KxNOXPAzAU0A+8tEc/itvpQE=" + "version": "8.0.1", + "hash": "sha256-/bIVL9uvBQhV/KQmjA1ZjR74sMfaAlBb15sVXsGDEVA=" + }, + { + "pname": "Microsoft.Extensions.Hosting.Abstractions", + "version": "9.0.0", + "hash": "sha256-NhEDqZGnwCDFyK/NKn1dwLQExYE82j1YVFcrhXVczqY=" + }, + { + "pname": "Microsoft.Extensions.Hosting.Abstractions", + "version": "9.0.6", + "hash": "sha256-1Mzyk2Y5WZX0hCxpYpNumCdCTOsZsA+CUMqHOB07JrE=" }, { "pname": "Microsoft.Extensions.Http", "version": "3.0.3", "hash": "sha256-IRjQMptb5Use3H4YcjVCmxsMt8lK4ItlryRXJVCLjj4=" }, + { + "pname": "Microsoft.Extensions.Http", + "version": "8.0.0", + "hash": "sha256-UgljypOLld1lL7k7h1noazNzvyEHIJw+r+6uGzucFSY=" + }, + { + "pname": "Microsoft.Extensions.Http.Polly", + "version": "8.0.7", + "hash": "sha256-kRbWcrk9v2/pz5MLq4zKYpwF6LnQQ3TnHAgMzgO3pxI=" + }, { "pname": "Microsoft.Extensions.Localization", "version": "2.2.0", @@ -1168,8 +1278,8 @@ }, { "pname": "Microsoft.Extensions.Logging", - "version": "2.0.0", - "hash": "sha256-Bg3bFJPjQRJnPvlEc5v7lzwRaUTzKwXDtz81GjCTfMo=" + "version": "2.1.0", + "hash": "sha256-BtRVc8o7NruFCblOITHPZD3llUmri3+1dStSo09EMTY=" }, { "pname": "Microsoft.Extensions.Logging", @@ -1178,13 +1288,13 @@ }, { "pname": "Microsoft.Extensions.Logging", - "version": "3.0.3", - "hash": "sha256-wcCcrtHdKoNQvy4jdjwqT1XuwDmh/iTsbov7mOYy0E8=" + "version": "5.0.0", + "hash": "sha256-IyJiQk0xhESWjr231L7MsbFvFbphP6T8VwlKgVGgQeE=" }, { "pname": "Microsoft.Extensions.Logging", - "version": "5.0.0", - "hash": "sha256-IyJiQk0xhESWjr231L7MsbFvFbphP6T8VwlKgVGgQeE=" + "version": "6.0.0", + "hash": "sha256-8WsZKRGfXW5MsXkMmNVf6slrkw+cR005czkOP2KUqTk=" }, { "pname": "Microsoft.Extensions.Logging", @@ -1192,14 +1302,14 @@ "hash": "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o=" }, { - "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "2.0.0", - "hash": "sha256-cBBNcoREIdCDnwZtnTG+BoAFmVb71P1nhFOAH07UsfQ=" + "pname": "Microsoft.Extensions.Logging", + "version": "8.0.1", + "hash": "sha256-vkfVw4tQEg86Xg18v6QO0Qb4Ysz0Njx57d1XcNuj6IU=" }, { - "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "2.1.0", - "hash": "sha256-0i4YUnMQ4DE0KDp47pssJLUIw8YAsHf2NZN0xoOLb78=" + "pname": "Microsoft.Extensions.Logging", + "version": "9.0.0", + "hash": "sha256-kR16c+N8nQrWeYLajqnXPg7RiXjZMSFLnKLEs4VfjcM=" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", @@ -1221,11 +1331,36 @@ "version": "5.0.0", "hash": "sha256-jJtcchUS8Spt/GddcDtWa4lN1RAVQ2sxDnu1cgwa6vs=" }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "6.0.0", + "hash": "sha256-QNqcQ3x+MOK7lXbWkCzSOWa/2QyYNbdM/OEEbWN15Sw=" + }, { "pname": "Microsoft.Extensions.Logging.Abstractions", "version": "8.0.0", "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4=" }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "8.0.2", + "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc=" + }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "8.0.3", + "hash": "sha256-5MSY1aEwUbRXehSPHYw0cBZyFcUH4jkgabddxhMiu3Q=" + }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "9.0.0", + "hash": "sha256-iBTs9twjWXFeERt4CErkIIcoJZU1jrd1RWCI8V5j7KU=" + }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "9.0.6", + "hash": "sha256-lhOMYT4+hua7SlgASGFBDhOkrNOsy35WyIxU3nVsD08=" + }, { "pname": "Microsoft.Extensions.Logging.ApplicationInsights", "version": "2.22.0", @@ -1241,6 +1376,11 @@ "version": "8.0.0", "hash": "sha256-mzmstNsVjKT0EtQcdAukGRifD30T82BMGYlSu8k4K7U=" }, + { + "pname": "Microsoft.Extensions.Logging.Configuration", + "version": "9.0.0", + "hash": "sha256-ysPjBq64p6JM4EmeVndryXnhLWHYYszzlVpPxRWkUkw=" + }, { "pname": "Microsoft.Extensions.Logging.Console", "version": "2.0.0", @@ -1261,21 +1401,16 @@ "version": "2.2.0", "hash": "sha256-P+QUM50j/V8f45zrRqat8fz6Gu3lFP+hDjESwTZNOFg=" }, + { + "pname": "Microsoft.Extensions.ObjectPool", + "version": "8.0.19", + "hash": "sha256-g3WLX77UQ7eELSSSc5QTMNfiR6CtBas6XC5etRqtuQE=" + }, { "pname": "Microsoft.Extensions.Options", "version": "1.0.0", "hash": "sha256-vU5mAhwBnf0EXQw1QMNwkt1aiEA0xjUMZmXOBo/MIz4=" }, - { - "pname": "Microsoft.Extensions.Options", - "version": "2.0.0", - "hash": "sha256-EMvaXxGzueI8lT97bYJQr0kAj1IK0pjnAcWN82hTnzw=" - }, - { - "pname": "Microsoft.Extensions.Options", - "version": "2.1.0", - "hash": "sha256-ol0tKlHOyX1qAQqNWuag0thb2mMCU2JHNiw0nzUhJnE=" - }, { "pname": "Microsoft.Extensions.Options", "version": "2.1.1", @@ -1286,21 +1421,36 @@ "version": "2.2.0", "hash": "sha256-YBtPoWBEs+dlHPQ7qOmss+U9gnvG0T1irZY8NwD0QKw=" }, - { - "pname": "Microsoft.Extensions.Options", - "version": "3.0.3", - "hash": "sha256-wJ//lnf+dFchHopqxavJuptYFbY9bxA4cbCNP/oYBFM=" - }, { "pname": "Microsoft.Extensions.Options", "version": "5.0.0", "hash": "sha256-Xq2JIa2Rg9vnLnZ75k4ydyT4j2A+G6UUx6iDc959teU=" }, + { + "pname": "Microsoft.Extensions.Options", + "version": "6.0.0", + "hash": "sha256-DxnEgGiCXpkrxFkxXtOXqwaiAtoIjA8VSSWCcsW0FwE=" + }, { "pname": "Microsoft.Extensions.Options", "version": "8.0.0", "hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw=" }, + { + "pname": "Microsoft.Extensions.Options", + "version": "8.0.2", + "hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys=" + }, + { + "pname": "Microsoft.Extensions.Options", + "version": "9.0.0", + "hash": "sha256-DT5euAQY/ItB5LPI8WIp6Dnd0lSvBRP35vFkOXC68ck=" + }, + { + "pname": "Microsoft.Extensions.Options", + "version": "9.0.6", + "hash": "sha256-QXLt+WeCjH3pnbs0UVNXmskuWJtBrbNHOV8Of8w3teg=" + }, { "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", "version": "2.1.0", @@ -1312,19 +1462,9 @@ "hash": "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI=" }, { - "pname": "Microsoft.Extensions.Primitives", - "version": "1.0.0", - "hash": "sha256-Qeu+WKRCM/S0QaoohtNrqxiLy3lasmiALK4DJGncrD4=" - }, - { - "pname": "Microsoft.Extensions.Primitives", - "version": "2.0.0", - "hash": "sha256-q44LtMvyNEKSvgERvA+BrasKapP92Sc91QR4u2TJ9/Y=" - }, - { - "pname": "Microsoft.Extensions.Primitives", - "version": "2.1.0", - "hash": "sha256-q1oDnqfQiiKgzlv/WDHgNGTlWfm+fkuY1R6t6hr/L+U=" + "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", + "version": "9.0.0", + "hash": "sha256-r1Z3sEVSIjeH2UKj+KMj86har68g/zybSqoSjESBcoA=" }, { "pname": "Microsoft.Extensions.Primitives", @@ -1336,16 +1476,6 @@ "version": "2.2.0", "hash": "sha256-DMCTC3HW+sHaRlh/9F1sDwof+XgvVp9IzAqzlZWByn4=" }, - { - "pname": "Microsoft.Extensions.Primitives", - "version": "3.0.3", - "hash": "sha256-7o4F+2Fkgb0Yu2h2y+fqFiVtuNQ8aCZ2kvaLRKfJ9CM=" - }, - { - "pname": "Microsoft.Extensions.Primitives", - "version": "3.1.0", - "hash": "sha256-K/cDq+LMfK4cBCvKWkmWAC+IB6pEWolR1J5zL60QPvA=" - }, { "pname": "Microsoft.Extensions.Primitives", "version": "5.0.0", @@ -1356,6 +1486,21 @@ "version": "8.0.0", "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo=" }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "9.0.0", + "hash": "sha256-ZNLusK1CRuq5BZYZMDqaz04PIKScE2Z7sS2tehU7EJs=" + }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "9.0.6", + "hash": "sha256-hO2BmhEhL5sJUv0cf37jhsjr+gRCAJnQKOj38RKxJvo=" + }, + { + "pname": "Microsoft.Extensions.Telemetry.Abstractions", + "version": "9.8.0", + "hash": "sha256-/m0QanS9S/WSFBT5MZFqs+y48tmQvuY1c+pP3vLjwtY=" + }, { "pname": "Microsoft.Extensions.WebEncoders", "version": "2.2.0", @@ -1363,18 +1508,13 @@ }, { "pname": "Microsoft.Identity.Client", - "version": "4.61.3", - "hash": "sha256-1cccC8EWlIQlJ3SSOB7CNImOYSaxsJpRHvlCgv2yOtA=" + "version": "4.73.1", + "hash": "sha256-cd5ArtDvQK4gdX8M0GHQEsCFWlqpdm6lxvaM2yMHkhc=" }, { "pname": "Microsoft.Identity.Client.Extensions.Msal", - "version": "4.61.3", - "hash": "sha256-nFQ2C7S4BQ4nvQmGAc5Ar7/ynKyztvK7fPKrpJXaQFE=" - }, - { - "pname": "Microsoft.IdentityModel.Abstractions", - "version": "6.32.0", - "hash": "sha256-xBmawStwUQIerg7L/C4EkWDiolK0TuuT9mFPNKGfZgU=" + "version": "4.73.1", + "hash": "sha256-wc4oHBGKCJhAqNIyD4LlugCFvmyiW5iVzGYP88bnWqs=" }, { "pname": "Microsoft.IdentityModel.Abstractions", @@ -1386,11 +1526,6 @@ "version": "6.35.0", "hash": "sha256-yqouDt+bjNFhAA4bPXLoRRSXAZ07idIZ8xvThJDeDxE=" }, - { - "pname": "Microsoft.IdentityModel.Logging", - "version": "6.32.0", - "hash": "sha256-trQQoVDN0GAffMV7zMJILiRm8gEnVpSlJn8/xajPxvI=" - }, { "pname": "Microsoft.IdentityModel.Logging", "version": "6.35.0", @@ -1406,11 +1541,26 @@ "version": "6.35.0", "hash": "sha256-qcS6GPdbMrjq5e/pKFKBSc+1CafU8TsINaVvK2QYvwQ=" }, + { + "pname": "Microsoft.IdentityModel.Protocols.OpenIdConnect", + "version": "6.10.0", + "hash": "sha256-o9bG81VpdFMMMR+as39wdnI6vFau+xwBk2Vv7nFpyaI=" + }, + { + "pname": "Microsoft.IdentityModel.Protocols.OpenIdConnect", + "version": "6.32.0", + "hash": "sha256-i57ARHnBpNGtzVsKu6DGIL/Cn2Xj/LDBen5/mnxQZbA=" + }, { "pname": "Microsoft.IdentityModel.Protocols.OpenIdConnect", "version": "6.35.0", "hash": "sha256-G9a7NBa88COg437cWoasqFv+j+doJ7033ytvb9lCfc4=" }, + { + "pname": "Microsoft.IdentityModel.Tokens", + "version": "6.32.0", + "hash": "sha256-OV8wssdJzwesaKAaTmWGzHRbgz2qZEB8XSvbOXNDrIg=" + }, { "pname": "Microsoft.IdentityModel.Tokens", "version": "6.35.0", @@ -1431,6 +1581,11 @@ "version": "2.2.0", "hash": "sha256-pb8AoacSvy8hGNGodU6Lhv1ooWtUSCZwjmwd89PM1HA=" }, + { + "pname": "Microsoft.NET.ILLink.Tasks", + "version": "9.0.13", + "hash": "sha256-1fx7XZRRB//5B4GZlJuNsVKBin1UuTlijn49truBxn0=" + }, { "pname": "Microsoft.NET.StringTools", "version": "1.0.0", @@ -1441,6 +1596,101 @@ "version": "15.6.2", "hash": "sha256-YlhxcIvjI3MZ8EidG8chXhlTsHE59U0nkbMUVDsQMYI=" }, + { + "pname": "Microsoft.NETCore.App.Host.linux-arm64", + "version": "8.0.24", + "hash": "sha256-/dAJ/5dleJlkxMWd3kJSiME7Yq/QdlE73DZwM1C9KGQ=" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-arm64", + "version": "9.0.13", + "hash": "sha256-hyLmW3K44AcouG0o5iH7dF06+pgqcs29DoplRYFxeqI=" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-x64", + "version": "8.0.24", + "hash": "sha256-REGiuRAPAOZl0arcP/QCYH9gdiCBDGu0Vnp5LD5qPmE=" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-x64", + "version": "9.0.13", + "hash": "sha256-OQenvUHKKS0h1c2EirYATJIEgGpVCJvxHIykIV6NCaE=" + }, + { + "pname": "Microsoft.NETCore.App.Host.osx-arm64", + "version": "8.0.24", + "hash": "sha256-C3F39k9qyKPAASiaacsvER4GN2Ryw2dxKKpRECaylto=" + }, + { + "pname": "Microsoft.NETCore.App.Host.osx-arm64", + "version": "9.0.13", + "hash": "sha256-JAFf+vSH7jUnjhKPGPBzgsauq29Ux+aIYi/k8W2kzBs=" + }, + { + "pname": "Microsoft.NETCore.App.Host.osx-x64", + "version": "8.0.24", + "hash": "sha256-FHorC+fd57T98l+8CrcBCeuGye11IJdGBKeY2rM1fNM=" + }, + { + "pname": "Microsoft.NETCore.App.Host.osx-x64", + "version": "9.0.13", + "hash": "sha256-yFizMrUqfMUGV1uxUoAOJP4f5m2jAVAS+mt9SFSRhf4=" + }, + { + "pname": "Microsoft.NETCore.App.Ref", + "version": "8.0.24", + "hash": "sha256-1dP3uWhHcbXPI3kA4b14ZulF9m1lU9OPZ+hQ8TnZveY=" + }, + { + "pname": "Microsoft.NETCore.App.Ref", + "version": "9.0.13", + "hash": "sha256-igu/tb7UIgqgP8+hGThU0N+nowgeKBOGdRxam+zrJvM=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-arm64", + "version": "8.0.24", + "hash": "sha256-oe/yKNEiAJwio7fZs0Hf+AfIkIuKsB+rpbyr1DGEx9I=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-arm64", + "version": "9.0.13", + "hash": "sha256-8yfXrHaOJZdC6oOrHvLEwhx2YWhQZRlfMAzI2KG0R9E=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-x64", + "version": "8.0.24", + "hash": "sha256-tliAyrTeTUdQIe5CkwQLvQMNKIesn303oS3EYzV9IjE=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-x64", + "version": "9.0.13", + "hash": "sha256-yoB2mCxdhsE/grReVIyeH4Q2WpUA9hHxUyZemCC2Cuc=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.osx-arm64", + "version": "8.0.24", + "hash": "sha256-v20On/+Xs3U0EHlxmx0BqJXEhBLErOCb2ynmi7VGIa0=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.osx-arm64", + "version": "9.0.13", + "hash": "sha256-yWhIeOq7w5UTbxM27N6/pg/zqyj31ZcpaHUi4Ca2QD4=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.osx-x64", + "version": "8.0.24", + "hash": "sha256-JG1fpGbqOXqs6fYkeABAsZpdLUuOaeJVvk648DeGyew=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.osx-x64", + "version": "9.0.13", + "hash": "sha256-+LIth4iOI4rQwZTRvR+Y0bA3qxM4TUuZg72cqY5I0LA=" + }, + { + "pname": "Microsoft.NETCore.DotNetAppHost", + "version": "8.0.8", + "hash": "sha256-2KBKkVUlpiO1bOY+Ia2PKjurY2taV7CHnzU7Jr5HYUs=" + }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.0.1", @@ -1466,11 +1716,6 @@ "version": "2.1.2", "hash": "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q=" }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "3.1.0", - "hash": "sha256-cnygditsEaU86bnYtIthNMymAHqaT/sf9Gjykhzqgb0=" - }, { "pname": "Microsoft.NETCore.Platforms", "version": "5.0.0", @@ -1531,21 +1776,6 @@ "version": "4.5.0", "hash": "sha256-WMBXsIb0DgPFPaFkNVxY9b9vcMxPqtgFgijKYMJfV/0=" }, - { - "pname": "Microsoft.Win32.Registry", - "version": "4.7.0", - "hash": "sha256-+jWCwRqU/J/jLdQKDFm93WfIDrDMXMJ984UevaQMoi8=" - }, - { - "pname": "Microsoft.Win32.SystemEvents", - "version": "4.7.0", - "hash": "sha256-GHxnD1Plb32GJWVWSv0Y51Kgtlb+cdKgOYVBYZSgVF4=" - }, - { - "pname": "Microsoft.Win32.SystemEvents", - "version": "6.0.0", - "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA=" - }, { "pname": "Microsoft.Win32.SystemEvents", "version": "8.0.0", @@ -1646,75 +1876,80 @@ "version": "5.11.6", "hash": "sha256-YrFf7+ZDJlsScZTcI3dUQWe6oCZhdE72cLl4JOZoPRo=" }, - { - "pname": "Octokit", - "version": "0.29.0", - "hash": "sha256-S5Jk6iOSrJwv8bIaleDuQ97XopKMJhqBc7MkyUriwuA=" - }, { "pname": "OpenTelemetry", - "version": "1.7.0", - "hash": "sha256-DnDadaHEfbrLtBmkOsyuhW/SnPVQ6zBmJSeh/qzTQw0=" - }, - { - "pname": "OpenTelemetry", - "version": "1.8.0", - "hash": "sha256-LElV8bMjnRtUVM1axFiJgMbBZYs2OxOqr2vPwe5jks4=" + "version": "1.12.0", + "hash": "sha256-WqUAXbwHyoksigzEgYnHNONl2TLd0ZM5MJ6jDsbYxas=" }, { "pname": "OpenTelemetry.Api", - "version": "1.7.0", - "hash": "sha256-CrYdLH0A3VAyBR4eO6YtLJyMhtO6+W4OQAcU+dWOPiU=" + "version": "1.12.0", + "hash": "sha256-nw7Y84b98RFoL9eHip2Moz5sLHt3cDUDznYZLu3OCXU=" }, { "pname": "OpenTelemetry.Api", - "version": "1.8.0", - "hash": "sha256-aVGjIjOdo+ED0K29YinR1cTLFVephCQehSz8R34VgGg=" + "version": "1.9.0", + "hash": "sha256-raXpHi2DZ3mSLn9dnJYF64XaP23epdfu8zgagSpm8+4=" }, { "pname": "OpenTelemetry.Api.ProviderBuilderExtensions", - "version": "1.7.0", - "hash": "sha256-p0fQAds/9cJjr/ShO8meUasr5VaV6FMVyTKzyy/s68g=" - }, - { - "pname": "OpenTelemetry.Api.ProviderBuilderExtensions", - "version": "1.8.0", - "hash": "sha256-Hx5Or40wMzv5ZLrScWqiOtpcu7DSXzDVhdYjA7gAFO4=" - }, - { - "pname": "OpenTelemetry.Exporter.Console", - "version": "1.6.0", - "hash": "sha256-clSjHEc5JeSTSVedVhzWBDjjZDrTlWwyax1zs8wdvwY=" + "version": "1.12.0", + "hash": "sha256-HW5lCuHZgkh0SO94cJLcjfX3M0dJDV0xJIRV2pY0jXc=" }, { "pname": "OpenTelemetry.Exporter.OpenTelemetryProtocol", - "version": "1.8.0", - "hash": "sha256-KK4KHOTfcWCXUhbHt2FEpYY+Rb0SV+iGQ0QZrAqcXU8=" + "version": "1.12.0", + "hash": "sha256-DapxmIJEc0m43r4CEsGmIOqIeH5U9Xerie1X/VpcmaE=" }, { "pname": "OpenTelemetry.Extensions.Hosting", - "version": "1.8.0", - "hash": "sha256-tGKCllp9WN0+UIeSFPPoXpA4BybSf0P4RYmcYe6D+rU=" + "version": "1.12.0", + "hash": "sha256-TbZ0XXPWa84m9810x7XQmxccWZmGnE8PM4rwG+88dmg=" }, { "pname": "OpenTelemetry.Instrumentation.AspNetCore", - "version": "1.8.1", - "hash": "sha256-EDA/EVmIgwkRfvaABbJHC9tZ91a6Vrq0uKLyCiXus2g=" + "version": "1.12.0", + "hash": "sha256-38FaYhE33hu053RJq0pdlsCQScDU6cwONWX2UAFJeWM=" }, { "pname": "OpenTelemetry.Instrumentation.Http", - "version": "1.8.1", - "hash": "sha256-JSk2gtey1TScTshilMLCmAHpYFjIpiEMcJKmuBHgdVw=" + "version": "1.12.0", + "hash": "sha256-3OVK3iC4k1KXwEZ4OsVJYwldQqzq6YuxL61oY7aaenE=" + }, + { + "pname": "OpenTelemetry.Instrumentation.Process", + "version": "0.5.0-beta.7", + "hash": "sha256-JYq4X/MhuR/o76F+UUzm6AT+IZK2uWEkrCoqnFwLO+M=" + }, + { + "pname": "OpenTelemetry.Instrumentation.Runtime", + "version": "1.12.0", + "hash": "sha256-aGKGcW6Cb2MS64oLG+aZVNRle3YUtAcopSbYQ2Z51PE=" }, { "pname": "OpenTelemetry.PersistentStorage.Abstractions", - "version": "1.0.0", - "hash": "sha256-V4uOfNhuFptyk/f8qXiTQU5X0RTTcJ5Y3eu1+lmBT6c=" + "version": "1.0.1", + "hash": "sha256-hPt/V/Z6eLdUDZaT2sq+eFV3SUYiJNeVt48EW9x5BKE=" }, { "pname": "OpenTelemetry.PersistentStorage.FileSystem", - "version": "1.0.0", - "hash": "sha256-JRi8xWsYXvJooeSFkfFim5/imzXHBw1kU7L5bH3c+94=" + "version": "1.0.1", + "hash": "sha256-0ChZBade7n+vxfVgnxAWIiYvbDultXb9VctiHaUBvwE=" + }, + { + "pname": "Polly", + "version": "7.1.0", + "hash": "sha256-rnp9GSJsm0BScqBlECaJCmtY1ThhrL1pKVHm3ix+p5c=" + }, + { + "pname": "Polly", + "version": "7.2.4", + "hash": "sha256-wQvK3XmQlplyI/duVkhM+iRhikGBLwrQ8cpcFJSIcFM=" + }, + { + "pname": "Polly.Extensions.Http", + "version": "3.0.0", + "hash": "sha256-m/DfApduj4LIW9cNjUGit703sMzMLz0MdG0VXQGdJoA=" }, { "pname": "protobuf-net", @@ -1841,6 +2076,26 @@ "version": "4.3.2", "hash": "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA=" }, + { + "pname": "runtime.linux-arm64.Microsoft.DotNet.ILCompiler", + "version": "9.0.13", + "hash": "sha256-vwIqC7MmdxuwprvPg5kxpl12HASsUSQdOsbC+UrrSxA=" + }, + { + "pname": "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost", + "version": "8.0.8", + "hash": "sha256-GRldzHE2XXJdR6qAdcxgLcXZM1gNoiGsfJg0M5qnlR4=" + }, + { + "pname": "runtime.linux-x64.Microsoft.DotNet.ILCompiler", + "version": "9.0.13", + "hash": "sha256-0jqd1+Q/0/JgekLDBdsGchsg/5BN5x88JzJS1iqVodE=" + }, + { + "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost", + "version": "8.0.8", + "hash": "sha256-Ls2+jcDC4FW9zO81O2JP6BtKeazhydWEiXBPg/GJsfw=" + }, { "pname": "runtime.native.System", "version": "4.0.0", @@ -1911,6 +2166,26 @@ "version": "4.3.2", "hash": "sha256-Mpt7KN2Kq51QYOEVesEjhWcCGTqWckuPf8HlQ110qLY=" }, + { + "pname": "runtime.osx-arm64.Microsoft.DotNet.ILCompiler", + "version": "9.0.13", + "hash": "sha256-imtP20skhTnzSGXqCzVt57SqkM0btTet9g1OHm7QGV8=" + }, + { + "pname": "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost", + "version": "8.0.8", + "hash": "sha256-O59V6pzicz7KWwUy+5qB3nAwSxhRsM9HoCq2uInaaHY=" + }, + { + "pname": "runtime.osx-x64.Microsoft.DotNet.ILCompiler", + "version": "9.0.13", + "hash": "sha256-Mds6EWafCVVuMp1mKQcreRGajlIMVJSU5qO5zZ4hrTw=" + }, + { + "pname": "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost", + "version": "8.0.8", + "hash": "sha256-bG/yxRP8uNHjCcZkSOlqSqgWIesuww8irvtSsC8jIfE=" + }, { "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", "version": "4.3.0", @@ -2006,6 +2281,16 @@ "version": "4.3.0", "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" }, + { + "pname": "StyleCop.Analyzers", + "version": "1.2.0-beta.556", + "hash": "sha256-97YYQcr5vZxTvi36608eUkA1wb6xllZQ7UcXbjrYIfU=" + }, + { + "pname": "StyleCop.Analyzers.Unstable", + "version": "1.2.0.556", + "hash": "sha256-aVop7a9r+X2RsZETgngBm3qQPEIiPBWgHzicGSTEymc=" + }, { "pname": "Suave", "version": "1.1.3", @@ -2051,6 +2336,16 @@ "version": "1.1.0", "hash": "sha256-FiueWJawZGar++OztDFWxU2nQE5Vih9iYsc3uEx0thM=" }, + { + "pname": "System.ClientModel", + "version": "1.4.1", + "hash": "sha256-BG5ObHp2Kfmg7MT3ikaAKTGpJPEkpWOtQmkiqf14BWc=" + }, + { + "pname": "System.ClientModel", + "version": "1.5.1", + "hash": "sha256-n4PHKtjmFXo37s5yhfUQ9UbfnWplqHpC+wsvlHxctow=" + }, { "pname": "System.Collections", "version": "4.0.11", @@ -2071,16 +2366,6 @@ "version": "4.3.0", "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" }, - { - "pname": "System.Collections.Immutable", - "version": "1.2.0", - "hash": "sha256-FQ3l+ulbLSPhQ0JcQCC4D4SzjTnHsRqcOj56Ywy7pMo=" - }, - { - "pname": "System.Collections.Immutable", - "version": "1.3.1", - "hash": "sha256-areGRq/dO08KhxiWuAK+cWAjOWYtuB1R9zGXLvIqwZw=" - }, { "pname": "System.Collections.Immutable", "version": "1.5.0", @@ -2091,26 +2376,22 @@ "version": "5.0.0", "hash": "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8=" }, - { - "pname": "System.Collections.NonGeneric", - "version": "4.0.1", - "hash": "sha256-jdCVXmGOsJ+2F0xAagCkiMZ91SGAm9iOhO2u4ksmKaU=" - }, { "pname": "System.Collections.NonGeneric", "version": "4.3.0", "hash": "sha256-8/yZmD4jjvq7m68SPkJZLBQ79jOTOyT5lyzX4SCYAx8=" }, - { - "pname": "System.Collections.Specialized", - "version": "4.0.1", - "hash": "sha256-qao6hk9XKdRtpsqdks2uOx5jqT41KpuTCb1cg4w/e/E=" - }, { "pname": "System.Collections.Specialized", "version": "4.3.0", "hash": "sha256-QNg0JJNx+zXMQ26MJRPzH7THdtqjrNtGLUgaR1SdvOk=" }, + { + "pname": "System.CommandLine", + "version": "2.0.0-beta5.25306.101", + "hash": "sha256-Gn1MRpeHkduwDPtoZmQoIItMWwRKFDkFtFGyH2+AtpE=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/2.0.0-beta5.25306.101/system.commandline.2.0.0-beta5.25306.101.nupkg" + }, { "pname": "System.ComponentModel", "version": "4.0.1", @@ -2136,11 +2417,6 @@ "version": "4.0.11", "hash": "sha256-kAOQ9dEg+yDh5h56qSf36OTLJYRIcKftIcOqxfuJJR8=" }, - { - "pname": "System.ComponentModel.Primitives", - "version": "4.1.0", - "hash": "sha256-AIcFeZDeYbaI4V9lY8TtUG+xkUyhA8K8dYSDp5StZXE=" - }, { "pname": "System.ComponentModel.Primitives", "version": "4.3.0", @@ -2186,11 +2462,6 @@ "version": "4.3.0", "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo=" }, - { - "pname": "System.Diagnostics.Contracts", - "version": "4.0.1", - "hash": "sha256-Mq2MU+80m+zqhe92JazEIDi4rsgk8MHg3yjNYlObzXg=" - }, { "pname": "System.Diagnostics.Debug", "version": "4.0.11", @@ -2221,6 +2492,11 @@ "version": "5.0.0", "hash": "sha256-6mW3N6FvcdNH/pB58pl+pFSCGWgyaP4hfVtC/SMWDV4=" }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "6.0.0", + "hash": "sha256-RY9uWSPdK2fgSwlj1OHBGBVo3ZvGQgBJNzAsS5OGMWc=" + }, { "pname": "System.Diagnostics.DiagnosticSource", "version": "6.0.1", @@ -2232,20 +2508,20 @@ "hash": "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs=" }, { - "pname": "System.Diagnostics.FileVersionInfo", - "version": "4.3.0", - "hash": "sha256-JyqOf5/lsUNLMpIqK8XffcFTxB6vHWzGWHssmojokCQ=" + "pname": "System.Diagnostics.DiagnosticSource", + "version": "9.0.0", + "hash": "sha256-1VzO9i8Uq2KlTw1wnCCrEdABPZuB2JBD5gBsMTFTSvE=" + }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "9.0.6", + "hash": "sha256-pwZzxd7JfzP3ych3GjvE8KjXJF/8IfQ244+IXjBE1TA=" }, { "pname": "System.Diagnostics.PerformanceCounter", "version": "4.5.0", "hash": "sha256-yx6XIFNdItNiADC+vVbTfUBg+Y9njkcmJnhtuWQM8J0=" }, - { - "pname": "System.Diagnostics.PerformanceCounter", - "version": "4.7.0", - "hash": "sha256-gcanKBgh7EWUJxfa7h9f/HkfTtGRp0BLg9fVDIhjANQ=" - }, { "pname": "System.Diagnostics.PerformanceCounter", "version": "6.0.0", @@ -2256,11 +2532,6 @@ "version": "4.1.0", "hash": "sha256-OgW6ogQ+oYADYS0PHmwXdhrOKQJpqXlwzSvmfjTLNBg=" }, - { - "pname": "System.Diagnostics.StackTrace", - "version": "4.3.0", - "hash": "sha256-Tfq7F61N0VfujVyI5A9MZvyWewQ5HepB1f1UMBMkUCs=" - }, { "pname": "System.Diagnostics.TextWriterTraceListener", "version": "4.0.0", @@ -2356,6 +2627,16 @@ "version": "4.3.0", "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=" }, + { + "pname": "System.IdentityModel.Tokens.Jwt", + "version": "5.1.4", + "hash": "sha256-xTld9bWguphBzt9mEEzu4lrbrtcCP2LZuuABwofZFRg=" + }, + { + "pname": "System.IdentityModel.Tokens.Jwt", + "version": "6.32.0", + "hash": "sha256-LHCrHdaWdNL6b9Q2ufr/QKz57uE3+dnWkMOm228safc=" + }, { "pname": "System.IdentityModel.Tokens.Jwt", "version": "6.35.0", @@ -2406,6 +2687,16 @@ "version": "4.3.0", "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" }, + { + "pname": "System.IO.FileSystem.AccessControl", + "version": "4.5.0", + "hash": "sha256-ck44YBQ0M+2Im5dw0VjBgFD1s0XuY54cujrodjjSBL8=" + }, + { + "pname": "System.IO.FileSystem.AccessControl", + "version": "4.7.0", + "hash": "sha256-8St5apXnq9UofZQu/ysvEGCC16Mjy8SfpNfWVib0FEw=" + }, { "pname": "System.IO.FileSystem.AccessControl", "version": "5.0.0", @@ -2456,11 +2747,6 @@ "version": "4.3.0", "hash": "sha256-EioRexhnpSoIa96Un0syFO9CP6l1jNaXYhp5LlnaLW4=" }, - { - "pname": "System.Memory", - "version": "4.5.0", - "hash": "sha256-YOz1pCR4RpP1ywYoJsgXnVlzsWtC2uYKQJTg0NnFXtE=" - }, { "pname": "System.Memory", "version": "4.5.1", @@ -2491,6 +2777,11 @@ "version": "6.0.0", "hash": "sha256-83/bxn3vyv17dQDDqH1L3yDpluhOxIS5XR27f4OnCEo=" }, + { + "pname": "System.Memory.Data", + "version": "6.0.1", + "hash": "sha256-RXS82gmLtIOAUaGqTc8J3bVbHTL5pnW3QFE3G+Xb5Jk=" + }, { "pname": "System.Memory.Data", "version": "8.0.1", @@ -2571,21 +2862,11 @@ "version": "5.0.0", "hash": "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE=" }, - { - "pname": "System.Reactive.Core", - "version": "3.1.1", - "hash": "sha256-yc7PgNpKxv2Wo3vVhTPZ8FZBpQuZTphhLFA5xvT31JY=" - }, { "pname": "System.Reactive.Core", "version": "5.0.0", "hash": "sha256-54EnrbM7HTuxedV2aY4dnIv6Jg5JJn4f54qIa9UoqLc=" }, - { - "pname": "System.Reactive.Interfaces", - "version": "3.1.1", - "hash": "sha256-U5FmDalEXgnw8mxf2j0i4z1Qs3pDt7lXaWNazkjCn8Q=" - }, { "pname": "System.Reactive.Linq", "version": "3.1.1", @@ -2651,11 +2932,6 @@ "version": "1.3.0", "hash": "sha256-a/RQr++mSsziWaOTknicfIQX/zJrwPFExfhK6PM0tfg=" }, - { - "pname": "System.Reflection.Metadata", - "version": "1.4.2", - "hash": "sha256-cYd2SWmnacNq14fTpyW9vGcnbZSD4DPRjpR+tgdZZyE=" - }, { "pname": "System.Reflection.Metadata", "version": "1.6.0", @@ -2706,16 +2982,6 @@ "version": "4.3.1", "hash": "sha256-R9T68AzS1PJJ7v6ARz9vo88pKL1dWqLOANg4pkQjkA0=" }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.4.0", - "hash": "sha256-SeTI4+yVRO2SmAKgOrMni4070OD+Oo8L1YiEVeKDyig=" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.5.0", - "hash": "sha256-g9jIdQtXSAhY+ezQtYNgHEUoQR3HzznHs3JMzD9bip4=" - }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "4.5.1", @@ -2776,11 +3042,6 @@ "version": "4.3.0", "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA=" }, - { - "pname": "System.Runtime.InteropServices.WindowsRuntime", - "version": "4.0.1", - "hash": "sha256-RtiWiXOjLM78WD9kdAaQPREezXaPGKrUXqD596Rgg2Q=" - }, { "pname": "System.Runtime.Loader", "version": "4.0.0", @@ -2836,11 +3097,6 @@ "version": "6.0.0", "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg=" }, - { - "pname": "System.Security.Claims", - "version": "4.3.0", - "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks=" - }, { "pname": "System.Security.Cryptography.Algorithms", "version": "4.2.0", @@ -2866,11 +3122,6 @@ "version": "4.5.0", "hash": "sha256-9llRbEcY1fHYuTn3vGZaCxsFxSAqXl4bDA6Rz9b0pN4=" }, - { - "pname": "System.Security.Cryptography.Cng", - "version": "4.7.0", - "hash": "sha256-MvVSJhAojDIvrpuyFmcSVRSZPl3dRYOI9hSptbA+6QA=" - }, { "pname": "System.Security.Cryptography.Cng", "version": "5.0.0", @@ -2991,11 +3242,6 @@ "version": "6.0.0", "hash": "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs=" }, - { - "pname": "System.Security.Principal", - "version": "4.3.0", - "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk=" - }, { "pname": "System.Security.Principal.Windows", "version": "4.3.0", @@ -3031,11 +3277,6 @@ "version": "4.0.1", "hash": "sha256-wxtwWQSTv5tuFP79KhUAhaL6bL4d8lSzSWkCn9aolwM=" }, - { - "pname": "System.Text.Encoding.CodePages", - "version": "4.3.0", - "hash": "sha256-ezYVwe9atRkREc8O/HT/VfGDE2vuCpIckOfdY194/VE=" - }, { "pname": "System.Text.Encoding.CodePages", "version": "4.5.1", @@ -3071,11 +3312,6 @@ "version": "8.0.0", "hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE=" }, - { - "pname": "System.Text.Json", - "version": "4.7.2", - "hash": "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM=" - }, { "pname": "System.Text.Json", "version": "8.0.5", @@ -3131,11 +3367,6 @@ "version": "4.9.0", "hash": "sha256-ZTZBJTrP5kzO38ec9lPxuNUYgEoeGNdQ8hF98uRN2rw=" }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.0.0", - "hash": "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE=" - }, { "pname": "System.Threading.Tasks.Extensions", "version": "4.3.0", @@ -3156,11 +3387,6 @@ "version": "4.5.4", "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" }, - { - "pname": "System.Threading.Tasks.Parallel", - "version": "4.3.0", - "hash": "sha256-8H2vRmsn29MNfMmCeIL5vHfbM19jWaLDKNLzDonCI+c=" - }, { "pname": "System.Threading.Thread", "version": "4.0.0", @@ -3191,11 +3417,6 @@ "version": "4.3.0", "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s=" }, - { - "pname": "System.ValueTuple", - "version": "4.3.0", - "hash": "sha256-tkMwiobmGQn/t8LDqpkM+Q7XJOebEl3bwVf11d2ZR4g=" - }, { "pname": "System.ValueTuple", "version": "4.4.0", @@ -3256,16 +3477,6 @@ "version": "4.0.1", "hash": "sha256-lQCoK2M51SGRuGjfiuIW26Y2goABY2RLE6cZ4816WDo=" }, - { - "pname": "System.Xml.XPath", - "version": "4.3.0", - "hash": "sha256-kd1JMqj6obhxzEPRJeYvcUyJqkOs/9A0UOQccC6oYrM=" - }, - { - "pname": "System.Xml.XPath.XDocument", - "version": "4.3.0", - "hash": "sha256-dqk4CWuwocj5qsUAYlS+XAe6GGcY/N/HIPEGe5afrPM=" - }, { "pname": "System.Xml.XPath.XmlDocument", "version": "4.0.1", @@ -3286,11 +3497,6 @@ "version": "2.4.0", "hash": "sha256-xRxQfuu87qJYTIeRZf4OdAUTwf8dL8Am6cQgk6tRHrs=" }, - { - "pname": "xunit.abstractions", - "version": "2.0.1", - "hash": "sha256-v5iPVeoUFsZp9zQMt3rg6xgw6UwF4VMIgzVYFIeb/zA=" - }, { "pname": "xunit.abstractions", "version": "2.0.2", diff --git a/pkgs/by-name/az/azure-functions-core-tools/package.nix b/pkgs/by-name/az/azure-functions-core-tools/package.nix index e9d7dff1a843..fad1ce9d4e26 100644 --- a/pkgs/by-name/az/azure-functions-core-tools/package.nix +++ b/pkgs/by-name/az/azure-functions-core-tools/package.nix @@ -1,46 +1,48 @@ { lib, stdenv, + fetchurl, fetchFromGitHub, buildDotnetModule, - buildGoModule, dotnetCorePackages, - versionCheckHook, + go, }: let - version = "4.0.7030"; + version = "4.7.0"; + templatesVersion = "3.1.1648"; + src = fetchFromGitHub { owner = "Azure"; repo = "azure-functions-core-tools"; tag = version; - hash = "sha256-ibbXUg2VHN2yJk6qwLwDbxcO0XArFFb7XMUCfKH0Tkw="; + hash = "sha256-2Bs1jxJmZzzShSrUK3XP+cNdXlczPEr6UCnh4oQRaoA="; }; - gozip = buildGoModule { - pname = "gozip"; - inherit version; - src = src + "/tools/go/gozip"; - vendorHash = null; + + templates = fetchurl { + url = "https://cdn.functions.azure.com/public/TemplatesApi/${templatesVersion}.zip"; + hash = "sha256-YYKBwd69TIHQKF1r8BzlzIyDLJBcCqtAbK3FhNvA+5s="; }; in buildDotnetModule { pname = "azure-functions-core-tools"; inherit src version; - - dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnet-runtime = dotnetCorePackages.sdk_8_0; - dotnetFlags = [ "-p:TargetFramework=net8.0" ]; - nugetDeps = ./deps.json; - useDotnetFromEnv = true; + projectFile = "src/Cli/func/Azure.Functions.Cli.csproj"; executables = [ "func" ]; - postPatch = '' - substituteInPlace src/Azure.Functions.Cli/Common/CommandChecker.cs \ - --replace-fail "CheckExitCode(\"/bin/bash" "CheckExitCode(\"${stdenv.shell}" - ''; + nugetDeps = ./deps.json; + dotnet-sdk = dotnetCorePackages.sdk_10_0; + nativeBuildInputs = [ go ]; - postInstall = '' - mkdir -p $out/bin - ln -s ${gozip}/bin/gozip $out/bin/gozip + linkNuGetPackagesAndSources = true; + useDotnetFromEnv = true; + + postPatch = '' + templates_path="./out/obj/Azure.Functions.Cli/templates-staging" + mkdir -p "$templates_path" + cp "${templates}" "$templates_path/templates.zip" + + substituteInPlace src/Cli/func/Common/CommandChecker.cs \ + --replace-fail "CheckExitCode(\"/bin/bash" "CheckExitCode(\"${stdenv.shell}" ''; meta = { From f6d585aa20c5304535d147117058412ffc33c1e8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 Mar 2026 21:42:05 +0100 Subject: [PATCH 243/429] evcc: 0.301.2 -> 0.302.0 https://github.com/evcc-io/evcc/releases/tag/0.302.0 --- pkgs/by-name/ev/evcc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index 15d503b9e69d..c55c80dd44bd 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -17,13 +17,13 @@ }: let - version = "0.301.2"; + version = "0.302.0"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; tag = version; - hash = "sha256-14qIWgHLQCz+d0PlIavw4F7XEWpx9jJL43XbCpZb4XA="; + hash = "sha256-NW18HD6d7RD6a5DhyvI+eZIVmjBr3Q5g+F+O4N508Go="; }; vendorHash = "sha256-t70o3VWfypvWOLMCqC4I8GXywzrDgNKUi5yAaB0NdZw="; From 3304a302e007002ba6775e3f75aa4634ab9e44ac Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 5 Mar 2026 14:52:17 -0600 Subject: [PATCH 244/429] mangohud: migrate to by-name --- .../ma}/mangohud/hardcode-dependencies.patch | 0 .../default.nix => by-name/ma/mangohud/package.nix} | 9 ++++++--- .../ma}/mangohud/preload-nix-workaround.patch | 0 pkgs/top-level/all-packages.nix | 5 ----- 4 files changed, 6 insertions(+), 8 deletions(-) rename pkgs/{tools/graphics => by-name/ma}/mangohud/hardcode-dependencies.patch (100%) rename pkgs/{tools/graphics/mangohud/default.nix => by-name/ma/mangohud/package.nix} (96%) rename pkgs/{tools/graphics => by-name/ma}/mangohud/preload-nix-workaround.patch (100%) diff --git a/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch b/pkgs/by-name/ma/mangohud/hardcode-dependencies.patch similarity index 100% rename from pkgs/tools/graphics/mangohud/hardcode-dependencies.patch rename to pkgs/by-name/ma/mangohud/hardcode-dependencies.patch diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/by-name/ma/mangohud/package.nix similarity index 96% rename from pkgs/tools/graphics/mangohud/default.nix rename to pkgs/by-name/ma/mangohud/package.nix index aab550797ac2..36d24d92a496 100644 --- a/pkgs/tools/graphics/mangohud/default.nix +++ b/pkgs/by-name/ma/mangohud/package.nix @@ -13,7 +13,7 @@ libGL, libx11, hwdata, - mangohud32, + pkgsi686Linux, addDriverRunpath, appstream, glslang, @@ -23,14 +23,14 @@ pkg-config, unzip, wayland, - libXNVCtrl, + linuxPackages, spdlog, libxkbcommon, glfw, libxrandr, x11Support ? true, waylandSupport ? true, - nvidiaSupport ? lib.meta.availableOn stdenv.hostPlatform libXNVCtrl, + nvidiaSupport ? lib.meta.availableOn stdenv.hostPlatform linuxPackages.nvidia_x11.settings.libXNVCtrl, gamescopeSupport ? true, mangoappSupport ? gamescopeSupport, mangohudctlSupport ? gamescopeSupport, @@ -90,6 +90,9 @@ let hash = "sha256-hgNYz15z9FjNHoj4w4EW0SOrQh1c4uQSnsOOrt2CDhc="; }; }; + libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; + mangohud32 = pkgsi686Linux.mangohud; + in stdenv.mkDerivation (finalAttrs: { pname = "mangohud"; diff --git a/pkgs/tools/graphics/mangohud/preload-nix-workaround.patch b/pkgs/by-name/ma/mangohud/preload-nix-workaround.patch similarity index 100% rename from pkgs/tools/graphics/mangohud/preload-nix-workaround.patch rename to pkgs/by-name/ma/mangohud/preload-nix-workaround.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a74ca9d7fd5c..9886ef78b806 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2939,11 +2939,6 @@ with pkgs; man = man-db; - mangohud = callPackage ../tools/graphics/mangohud { - libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; - mangohud32 = pkgsi686Linux.mangohud; - }; - marimo = with python3Packages; toPythonApplication marimo; mcstatus = with python3Packages; toPythonApplication mcstatus; From f4c3f7605ab2ca386b189de431baa2824d28ba0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 20:55:23 +0000 Subject: [PATCH 245/429] keycloak: 26.5.4 -> 26.5.5 --- pkgs/by-name/ke/keycloak/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix index 20b56e9e0eff..19965cf9a5d2 100644 --- a/pkgs/by-name/ke/keycloak/package.nix +++ b/pkgs/by-name/ke/keycloak/package.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "keycloak"; - version = "26.5.4"; + version = "26.5.5"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${finalAttrs.version}/keycloak-${finalAttrs.version}.zip"; - hash = "sha256-jRINK5PdsRTbWbDMYzatkEpfXcN6o3hwsul/U4ZuXjg="; + hash = "sha256-k6keuENMQ1S+4YN67E6vc48W8x4Le0Bw9E1+UBLyxh0="; }; nativeBuildInputs = [ From f73ca04ed4e4ec846fee1bcb85b33fd77be86b30 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 5 Mar 2026 15:13:18 -0600 Subject: [PATCH 246/429] nvfancontrol: migrate to by-name --- .../default.nix => by-name/nv/nvfancontrol/package.nix} | 6 ++++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 4 insertions(+), 6 deletions(-) rename pkgs/{tools/misc/nvfancontrol/default.nix => by-name/nv/nvfancontrol/package.nix} (91%) diff --git a/pkgs/tools/misc/nvfancontrol/default.nix b/pkgs/by-name/nv/nvfancontrol/package.nix similarity index 91% rename from pkgs/tools/misc/nvfancontrol/default.nix rename to pkgs/by-name/nv/nvfancontrol/package.nix index 48b7872c9c84..7fa9d965320d 100644 --- a/pkgs/tools/misc/nvfancontrol/default.nix +++ b/pkgs/by-name/nv/nvfancontrol/package.nix @@ -2,11 +2,13 @@ lib, rustPlatform, fetchFromGitHub, - libXNVCtrl, + linuxPackages, libx11, libxext, }: - +let + libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; +in rustPlatform.buildRustPackage rec { pname = "nvfancontrol"; version = "0.5.1"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a74ca9d7fd5c..116195a47354 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3082,10 +3082,6 @@ with pkgs; # ntfsprogs are merged into ntfs-3g ntfsprogs = pkgs.ntfs3g; - nvfancontrol = callPackage ../tools/misc/nvfancontrol { - libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; - }; - nwdiag = with python3Packages; toPythonApplication nwdiag; ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim { }; From 1431d9e4424338e67f94412c36883f4e5db45747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 Mar 2026 13:17:55 -0800 Subject: [PATCH 247/429] nfs-utils: add meta.changelog --- pkgs/by-name/nf/nfs-utils/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/nf/nfs-utils/package.nix b/pkgs/by-name/nf/nfs-utils/package.nix index 642cca819f63..4eb4c0f2643a 100644 --- a/pkgs/by-name/nf/nfs-utils/package.nix +++ b/pkgs/by-name/nf/nfs-utils/package.nix @@ -192,6 +192,7 @@ stdenv.mkDerivation (finalAttrs: { daemons. ''; + changelog = "https://www.kernel.org/pub/linux/utils/nfs-utils/${finalAttrs.version}/${finalAttrs.version}-Changelog"; homepage = "https://linux-nfs.org/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; From 0d842d99b0d1f62e626480b15e193441c508b78e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 21:29:49 +0000 Subject: [PATCH 248/429] vscode-extensions.leanprover.lean4: 0.0.223 -> 0.0.225 --- .../editors/vscode/extensions/leanprover.lean4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/leanprover.lean4/default.nix b/pkgs/applications/editors/vscode/extensions/leanprover.lean4/default.nix index ed43b2c75db0..7f124b280b8a 100644 --- a/pkgs/applications/editors/vscode/extensions/leanprover.lean4/default.nix +++ b/pkgs/applications/editors/vscode/extensions/leanprover.lean4/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "lean4"; publisher = "leanprover"; - version = "0.0.223"; - hash = "sha256-afdbAEQSWt4WeCISdtsuGN8GMjSSSpCuED6L/Oluso0="; + version = "0.0.225"; + hash = "sha256-JVsOHO2r7YHC4QxvpjoIgT5rZhW2SS24xu3TMnoRQi8="; }; meta = { From 9fc8a3051cf737bb65b7d92ae8c32512866126e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 21:48:56 +0000 Subject: [PATCH 249/429] prow: 0-unstable-2026-02-24 -> 0-unstable-2026-03-04 --- pkgs/by-name/pr/prow/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/prow/package.nix b/pkgs/by-name/pr/prow/package.nix index 0913d3c0ef26..219853b211b4 100644 --- a/pkgs/by-name/pr/prow/package.nix +++ b/pkgs/by-name/pr/prow/package.nix @@ -8,15 +8,15 @@ buildGoModule rec { pname = "prow"; - version = "0-unstable-2026-02-24"; - rev = "cd980a6645683fa534e2a2f3ab74d934b352dfe9"; + version = "0-unstable-2026-03-04"; + rev = "f92e22b4dc861f76dc2b686855274fb91ed55537"; src = fetchFromGitHub { inherit rev; owner = "kubernetes-sigs"; repo = "prow"; - hash = "sha256-4zgHgneZXTsrz5G12U+499QYZkns8IZW0aNYj7MvuwM="; + hash = "sha256-zZgb6gQdj+5vLDRkveKzWrGiwQ2tdMfr3kJSvbTBLyw="; }; vendorHash = "sha256-Pv9LznRh7Nzm74gMKT2Q/VLIMIIc93en0qX6YA6TwK4="; From 705b9878a385c8b9328076f7ec47a7dbe995a811 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 22:12:33 +0000 Subject: [PATCH 250/429] python3Packages.scikit-hep-testdata: 0.6.2 -> 0.6.3 --- .../python-modules/scikit-hep-testdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index f85f92abc28b..c62b7a9474c4 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.6.2"; + version = "0.6.3"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "scikit-hep-testdata"; tag = "v${version}"; - hash = "sha256-RA/A8av/KXVimktrjU4lHHMw+SokS7niB6zWhgZ4+IQ="; + hash = "sha256-Qo0Mh2e8lr18hY9+6qWRh8XGgiSNIOTlFlucQ6Frztw="; }; build-system = [ setuptools-scm ]; From 2f43ec99e2366b64aefb8e30c5af16ac58febefb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 5 Mar 2026 14:03:23 -0800 Subject: [PATCH 251/429] devenv: 2.0.1 -> 2.0.2 --- pkgs/by-name/de/devenv/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix index a899402de21c..208cdc7e6988 100644 --- a/pkgs/by-name/de/devenv/package.nix +++ b/pkgs/by-name/de/devenv/package.nix @@ -23,7 +23,7 @@ }: let - version = "2.0.1"; + version = "2.0.2"; devenvNixVersion = "2.32"; devenvNixRev = "7eb6c427c7a86fdc3ebf9e6cbf2a84e80e8974fd"; @@ -48,15 +48,16 @@ rustPlatform.buildRustPackage { owner = "cachix"; repo = "devenv"; tag = "v${version}"; - hash = "sha256-cZRSu+XbZ2P91cKsjHBAc5uu6fblUyBVE1Cvk3ywPaM="; + hash = "sha256-38crLoAfEOdnEDDZD2NyAEDVlBSFn+MlZyLwztAsC8Q="; }; - cargoHash = "sha256-dzho5gZmfji4n+zHwr2uCqOijCFpVj9loYr8VQNil3g="; + cargoHash = "sha256-e56HmkS+p8P/X7vS+hTT78lfQ2YDCuONM+6yW0RIfSE="; env = { RUSTFLAGS = "--cfg tracing_unstable"; LIBSQLITE3_SYS_USE_PKG_CONFIG = "1"; VERGEN_IDEMPOTENT = "1"; + DEVENV_ON_RELEASE_TAG = true; }; cargoBuildFlags = [ From fb5b3c5c30f3d3adb0b8d0e59d79ddf5198770a5 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Thu, 5 Mar 2026 02:58:30 -0700 Subject: [PATCH 252/429] libvirt: fix virt-secret-init-encryption --- pkgs/by-name/li/libvirt/package.nix | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libvirt/package.nix b/pkgs/by-name/li/libvirt/package.nix index e8544e5204b6..b1b7ef54b02b 100644 --- a/pkgs/by-name/li/libvirt/package.nix +++ b/pkgs/by-name/li/libvirt/package.nix @@ -33,11 +33,13 @@ python3, readline, rpcsvc-proto, + runtimeShell, stdenv, replaceVars, xhtml1, json_c, writeScript, + writeShellApplication, nixosTests, # Linux @@ -179,7 +181,23 @@ stdenv.mkDerivation rec { sed -i '/libxlxml2domconfigtest/d' tests/meson.build substituteInPlace src/libxl/libxl_capabilities.h \ --replace-fail /usr/lib/xen ${xen}/libexec/xen - ''; + '' + + lib.optionalString isLinux ( + let + script = writeShellApplication { + name = "virt-secret-init-encryption-sh"; + runtimeInputs = [ + coreutils + systemd + ]; + text = ''exec ${runtimeShell} "$@"''; + }; + in + '' + substituteInPlace src/secret/virt-secret-init-encryption.service.in \ + --replace-fail /usr/bin/sh ${lib.getExe script} + '' + ); strictDeps = true; From d699415ebe3add131044bcfd355ed1aa849bb646 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Thu, 5 Mar 2026 16:33:04 -0700 Subject: [PATCH 253/429] nixos/libvirtd: add secrets to StateDirectory --- nixos/modules/virtualisation/libvirtd.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 7bca79260362..d7313a0bcc57 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -530,7 +530,10 @@ in "nix-helpers" "nix-ovmf" ]; - StateDirectory = subDirs [ "dnsmasq" ]; + StateDirectory = subDirs [ + "dnsmasq" + "secrets" + ]; }; }; From 4f4109fff12a2d9db9eb3a2289bbed778492b925 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 23:34:34 +0000 Subject: [PATCH 254/429] python3Packages.alexapy: 1.29.17 -> 1.29.19 --- pkgs/development/python-modules/alexapy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/alexapy/default.nix b/pkgs/development/python-modules/alexapy/default.nix index 4d83bf085028..658b6408cded 100644 --- a/pkgs/development/python-modules/alexapy/default.nix +++ b/pkgs/development/python-modules/alexapy/default.nix @@ -18,14 +18,14 @@ buildPythonPackage (finalAttrs: { pname = "alexapy"; - version = "1.29.17"; + version = "1.29.19"; pyproject = true; src = fetchFromGitLab { owner = "keatontaylor"; repo = "alexapy"; tag = "v${finalAttrs.version}"; - hash = "sha256-5iH7nk8TwlwM56rXxaHKcpvOJ1pLge7PZ1C1f9NALlM="; + hash = "sha256-1PFHIVtFaaYRyOgzqxMCbvbSECK+9T7EuRlQ9CWuv5Y="; }; pythonRelaxDeps = [ "aiofiles" ]; From 0b55402fbfd46baa7b343966aa4d672cdd48f178 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 23:47:18 +0000 Subject: [PATCH 255/429] just-lsp: 0.3.3 -> 0.3.4 --- pkgs/by-name/ju/just-lsp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ju/just-lsp/package.nix b/pkgs/by-name/ju/just-lsp/package.nix index 73b7e28b3614..a2d68e8400e5 100644 --- a/pkgs/by-name/ju/just-lsp/package.nix +++ b/pkgs/by-name/ju/just-lsp/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "just-lsp"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "terror"; repo = "just-lsp"; tag = finalAttrs.version; - hash = "sha256-gY7SJmRv9KmJ+2OhHbQLqjXs6Zcelm9eW6kxGshQ+Ks="; + hash = "sha256-5tjyn27PhxVmWPesoFJXoF5yq1j4LUqaF8+XyR1PWfY="; }; - cargoHash = "sha256-RMUKW1jT+g9xEFa3WrSLQgXM73yFvT58nH++hWOJ9v4="; + cargoHash = "sha256-8Jz7neEcmTDag2GaJqWHsZ8IPF/zIwU47vQ+0sPI9w8="; passthru = { updateScript = nix-update-script { }; From 21e3baa3c19abacd7a4db5e9d7f88022fcde77a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 01:12:05 +0000 Subject: [PATCH 256/429] python3Packages.pyhik: 0.4.2 -> 0.4.3 --- pkgs/development/python-modules/pyhik/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyhik/default.nix b/pkgs/development/python-modules/pyhik/default.nix index f6ec9e71cd51..b374bdb2afae 100644 --- a/pkgs/development/python-modules/pyhik/default.nix +++ b/pkgs/development/python-modules/pyhik/default.nix @@ -9,14 +9,14 @@ buildPythonPackage (finalAttrs: { pname = "pyhik"; - version = "0.4.2"; + version = "0.4.3"; pyproject = true; src = fetchFromGitHub { owner = "mezz64"; repo = "pyHik"; tag = finalAttrs.version; - hash = "sha256-ree2UbGfmz4Xs0aRiAWcOnCEpnrjR11PBmo/hMnbnlI="; + hash = "sha256-3q1dCu/VY+4WnsLOZk+O2NLW2Ibun7IuNtXEHJ0GEms="; }; build-system = [ From ac188eebf80a9e34993ca639444ca4b85a451bec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 Mar 2026 17:38:09 -0800 Subject: [PATCH 257/429] Revert "python3Packages.pyqwikswitch: 0.94 -> 1.0.2" This reverts commit e0a4952d2c11c31c0472e3d511fc69827ee31c6e because it broke home-assistant.tests.components.qwikswitch. --- .../python-modules/pyqwikswitch/default.nix | 50 ++++++++----------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/pkgs/development/python-modules/pyqwikswitch/default.nix b/pkgs/development/python-modules/pyqwikswitch/default.nix index 5f7ceb36511c..0a22ec145f06 100644 --- a/pkgs/development/python-modules/pyqwikswitch/default.nix +++ b/pkgs/development/python-modules/pyqwikswitch/default.nix @@ -1,56 +1,50 @@ { lib, buildPythonPackage, - fetchFromGitHub, + fetchpatch, + fetchPypi, attrs, - aiohttp, - uv-build, - aioresponses, - pytest-asyncio, - pytest-cov-stub, - pytestCheckHook, + requests, + setuptools, }: -buildPythonPackage (finalAttrs: { +buildPythonPackage rec { pname = "pyqwikswitch"; - version = "1.0.2"; + version = "0.94"; pyproject = true; - src = fetchFromGitHub { - owner = "kellerza"; - repo = "pyqwikswitch"; - tag = "v${finalAttrs.version}"; - hash = "sha256-yx3rCPVuhsemAtFuEhPvFPHOFm2UWrXmWF3d/ZtPGo8="; + src = fetchPypi { + inherit pname version; + hash = "sha256-IpyWz+3EMr0I+xULBJJhBgdnQHNPJIM1SqKFLpszhQc="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "uv-build>=0.8.20,<0.9" uv-build - ''; + patches = [ + # https://github.com/kellerza/pyqwikswitch/pull/7 + (fetchpatch { + name = "replace-async-timeout-with-asyncio.timeout.patch"; + url = "https://github.com/kellerza/pyqwikswitch/commit/7b3f2211962b30bb6beea9a4fe17cd04cdf8e27f.patch"; + hash = "sha256-sdO5jzIgKdneNY5dTngIzUFtyRg7HBGaZA1BBeAJxu4="; + }) + ]; - build-system = [ uv-build ]; + build-system = [ setuptools ]; dependencies = [ - aiohttp attrs + requests ]; pythonImportsCheck = [ "pyqwikswitch" + "pyqwikswitch.threaded" ]; - nativeCheckInputs = [ - aioresponses - pytest-asyncio - pytest-cov-stub - pytestCheckHook - ]; + doCheck = false; # no tests in sdist meta = { - changelog = "https://github.com/kellerza/pyqwikswitch/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "QwikSwitch USB Modem API binding for Python"; homepage = "https://github.com/kellerza/pyqwikswitch"; license = lib.licenses.mit; teams = [ lib.teams.home-assistant ]; }; -}) +} From 92c5d6e336d3736eddf98e29882084e5763f0366 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 01:46:25 +0000 Subject: [PATCH 258/429] vscode-extensions.pkief.material-icon-theme: 5.31.0 -> 5.32.0 --- .../vscode/extensions/pkief.material-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix b/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix index 05a9d2ef0145..58bde2234e71 100644 --- a/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix +++ b/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix @@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "material-icon-theme"; publisher = "PKief"; - version = "5.31.0"; - hash = "sha256-B2+yaKX/nhBLdeFDffwt4CmeWo+Jr4oMxcWBEaAhRtg="; + version = "5.32.0"; + hash = "sha256-0YR3IeVxD7OuYfybDHBdgjQXH0bxz3U9Q8/gQZZB7sM="; }; meta = { description = "Material Design Icons for Visual Studio Code"; From 198bc4bb9f26f4f96fed5f0e1f9eaeccffb86ef8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 01:48:02 +0000 Subject: [PATCH 259/429] beam26Packages.elvis-erlang: 4.2.1 -> 4.2.3 --- pkgs/development/beam-modules/elvis-erlang/default.nix | 4 ++-- pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/beam-modules/elvis-erlang/default.nix b/pkgs/development/beam-modules/elvis-erlang/default.nix index 9de2d3cd2c2b..cb80d7e3b3ca 100644 --- a/pkgs/development/beam-modules/elvis-erlang/default.nix +++ b/pkgs/development/beam-modules/elvis-erlang/default.nix @@ -11,12 +11,12 @@ rebar3Relx rec { releaseType = "escript"; pname = "elvis-erlang"; - version = "4.2.1"; + version = "4.2.3"; src = fetchFromGitHub { owner = "inaka"; repo = "elvis"; - hash = "sha256-/a7wcST0CYVebX7XVZLaDXNJX6fsFCCoidhSqcs+mNI="; + hash = "sha256-4hStLm76HZmO3vk/RdeRGJPJ3gevUkjVO2jGpVff32Q="; tag = version; }; diff --git a/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix b/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix index 715e6ff43a51..43985a064e84 100644 --- a/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix +++ b/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix @@ -44,11 +44,11 @@ let }; elvis_core = builder { name = "elvis_core"; - version = "4.2.1"; + version = "4.2.3"; src = fetchHex { pkg = "elvis_core"; - version = "4.2.1"; - sha256 = "sha256-D3dLiR5kqMuZSf9PVUhclgjBFEFIEDqDOhAUk7l8J7I="; + version = "4.2.3"; + sha256 = "sha256-xy4xinPab51p3uDxh/h5dHH57kbPTdrO36LJ+byxjqA="; }; beamDeps = [ katana_code From c1e341f4eeeb356539b0de5eaed379794d5d1e12 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 01:49:51 +0000 Subject: [PATCH 260/429] python3Packages.appium-python-client: 5.2.6 -> 5.2.7 --- .../python-modules/appium-python-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/appium-python-client/default.nix b/pkgs/development/python-modules/appium-python-client/default.nix index 0fdb4cfb2f2c..c3f2a0321699 100644 --- a/pkgs/development/python-modules/appium-python-client/default.nix +++ b/pkgs/development/python-modules/appium-python-client/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "appium-python-client"; - version = "5.2.6"; + version = "5.2.7"; pyproject = true; src = fetchFromGitHub { owner = "appium"; repo = "python-client"; tag = "v${finalAttrs.version}"; - hash = "sha256-BTbz2ncCl6C2QBCLMaIZn4fv/ib/IvkWoRSrlxuFauM="; + hash = "sha256-H8WBByS/8P8xIM8RmWJFgvrVbEDc5LrFj1rQzxL3174="; }; build-system = [ hatchling ]; From afe24a56f50ce0972c1eb67a822831e6cd129a1b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 01:57:16 +0000 Subject: [PATCH 261/429] prometheus-collectd-exporter: 0.7.0 -> 0.7.1 --- pkgs/by-name/pr/prometheus-collectd-exporter/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/prometheus-collectd-exporter/package.nix b/pkgs/by-name/pr/prometheus-collectd-exporter/package.nix index 8b8f5723344f..655f5adfa369 100644 --- a/pkgs/by-name/pr/prometheus-collectd-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-collectd-exporter/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "collectd-exporter"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "prometheus"; repo = "collectd_exporter"; rev = "v${version}"; - sha256 = "sha256-MxgHJ9+e94ReY/8ISPfGEX9Z9ZHDyNsV0AqlPfsjXvc="; + sha256 = "sha256-cKwyEWtnyXah5pKSY16Omba0MkkP/76xpfe43KAYrbc="; }; - vendorHash = "sha256-kr8mHprIfXc/Yj/w2UKBkqIYZHmWtBLjqYDvKSXlozQ="; + vendorHash = "sha256-QGN8Ke761fTi2GzwdicMPWUIJNgBrEje2ifdJ5FymF4="; ldflags = [ "-s" From 4c1ab8020ac9ef8d6d669c94b9dac2d494d69795 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 02:01:24 +0000 Subject: [PATCH 262/429] pgdog: 0.1.30 -> 0.1.31 --- pkgs/by-name/pg/pgdog/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pg/pgdog/package.nix b/pkgs/by-name/pg/pgdog/package.nix index c3e61ebf5450..897d5d3af529 100644 --- a/pkgs/by-name/pg/pgdog/package.nix +++ b/pkgs/by-name/pg/pgdog/package.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: { pname = "pgdog"; - version = "0.1.30"; + version = "0.1.31"; src = fetchFromGitHub { owner = "pgdogdev"; repo = "pgdog"; tag = "v${finalAttrs.version}"; - hash = "sha256-oobSNeafVWwYmvYs4REV7RuqVMIob3JruMjgN/wzNFA="; + hash = "sha256-BO1EhlGAdGks5zGQddljFy8DXHISv4cMCeuC3UAw8jw="; }; - cargoHash = "sha256-Cm/wJtNwHuJklk8b39Fk+SzxWjGE2qGcJD/ekydcBxE="; + cargoHash = "sha256-Fkj2cyPTBTudKSh4c3dzfAz2B4ZryFiCu5y3WMXZ7Dg="; # Hardcoded paths for C compiler and linker postPatch = '' From bace983e92179ea9ffde2450f8efcf0ba3e36906 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Feb 2026 14:10:48 +0000 Subject: [PATCH 263/429] python3Packages.oslo-utils: 9.2.0 -> 10.0.0 --- pkgs/development/python-modules/oslo-utils/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix index 167fa70622d9..95c299a205b6 100644 --- a/pkgs/development/python-modules/oslo-utils/default.nix +++ b/pkgs/development/python-modules/oslo-utils/default.nix @@ -16,7 +16,6 @@ psutil, pyparsing, pytz, - tzdata, # tests ddt, @@ -31,17 +30,18 @@ stdenv, stestr, testscenarios, + tzdata, }: buildPythonPackage rec { pname = "oslo-utils"; - version = "9.2.0"; + version = "10.0.0"; pyproject = true; src = fetchPypi { pname = "oslo_utils"; inherit version; - hash = "sha256-H0IAbea5KRoDBQJfXM24kHEg2I7X68N4ShRyozKASKs="; + hash = "sha256-u0ZxPnYNlERqCE9elMHPJzk1NpMIrYjuW1OReSPZw5M="; }; postPatch = @@ -71,7 +71,6 @@ buildPythonPackage rec { psutil pyparsing pytz - tzdata ]; nativeCheckInputs = [ @@ -84,6 +83,7 @@ buildPythonPackage rec { qemu-utils stestr testscenarios + tzdata ]; # disabled tests: From 48029ea577290e99778b1ecc991d32baad8e9530 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Mar 2026 03:07:58 +0100 Subject: [PATCH 264/429] python3Packages.heretic-llm: init at 1.2.0 Tool to remove censorship removal for language models https://github.com/p-e-w/heretic --- pkgs/by-name/he/heretic/package.nix | 1 + .../python-modules/heretic-llm/default.nix | 90 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 93 insertions(+) create mode 100644 pkgs/by-name/he/heretic/package.nix create mode 100644 pkgs/development/python-modules/heretic-llm/default.nix diff --git a/pkgs/by-name/he/heretic/package.nix b/pkgs/by-name/he/heretic/package.nix new file mode 100644 index 000000000000..5b5529712aa0 --- /dev/null +++ b/pkgs/by-name/he/heretic/package.nix @@ -0,0 +1 @@ +{ python3Packages }: with python3Packages; toPythonApplication heretic-llm diff --git a/pkgs/development/python-modules/heretic-llm/default.nix b/pkgs/development/python-modules/heretic-llm/default.nix new file mode 100644 index 000000000000..749d46b9fad9 --- /dev/null +++ b/pkgs/development/python-modules/heretic-llm/default.nix @@ -0,0 +1,90 @@ +{ + lib, + accelerate, + bitsandbytes, + buildPythonPackage, + datasets, + fetchFromGitHub, + # geom-median, + hf-transfer, + huggingface-hub, + imageio, + kernels, + matplotlib, + numpy, + optuna, + # pacmap, + peft, + psutil, + pydantic-settings, + questionary, + rich, + scikit-learn, + transformers, + uv-build, +}: + +buildPythonPackage (finalAttrs: { + pname = "heretic-llm"; + version = "1.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "p-e-w"; + repo = "heretic"; + tag = "v${finalAttrs.version}"; + hash = "sha256-KmqbOAOII1SP7wpdvGxtzQJt5NmlnF/o99NuZ21vO0s="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.8.11,<0.9.0" "uv_build" + ''; + + pythonRelaxDeps = [ + "huggingface-hub" + "transformers" + ]; + + build-system = [ uv-build ]; + + dependencies = [ + accelerate + bitsandbytes + datasets + hf-transfer + huggingface-hub + kernels + optuna + peft + psutil + pydantic-settings + questionary + rich + transformers + ]; + + optional-dependencies = { + research = [ + # geom-median + imageio + matplotlib + numpy + # pacmap + scikit-learn + ]; + }; + + pythonImportsCheck = [ "heretic" ]; + + meta = { + description = "Tool to remove censorship removal for language models"; + homepage = "https://github.com/p-e-w/heretic"; + changelog = "https://github.com/p-e-w/heretic/releases/tag/v${finalAttrs.src.tag}"; + license = with lib.licenses; [ + agpl3Only + agpl3Plus + ]; + maintainers = with lib.maintainers; [ fab ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8e27fb27d8d6..28daecc9aab2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6970,6 +6970,8 @@ self: super: with self; { herepy = callPackage ../development/python-modules/herepy { }; + heretic-llm = callPackage ../development/python-modules/heretic-llm { }; + hetzner = callPackage ../development/python-modules/hetzner { }; heudiconv = callPackage ../development/python-modules/heudiconv { }; From eb56004ed7bb47113919e64fbe2dbf8d9fa0f259 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 02:11:28 +0000 Subject: [PATCH 265/429] soft-serve: 0.11.3 -> 0.11.5 --- pkgs/by-name/so/soft-serve/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/so/soft-serve/package.nix b/pkgs/by-name/so/soft-serve/package.nix index dc793d78db38..f3d7181f546f 100644 --- a/pkgs/by-name/so/soft-serve/package.nix +++ b/pkgs/by-name/so/soft-serve/package.nix @@ -9,7 +9,7 @@ }: let - version = "0.11.3"; + version = "0.11.5"; in buildGoModule { pname = "soft-serve"; @@ -19,10 +19,10 @@ buildGoModule { owner = "charmbracelet"; repo = "soft-serve"; rev = "v${version}"; - hash = "sha256-WugaUfu4X3eEMNKEjIo/um91iI5WeaZmkG/eJ1TPogA="; + hash = "sha256-6ZPb8qL6E2lJp5uNRWNTcTWcVecGfsoXxshfvTP1UBk="; }; - vendorHash = "sha256-qyOBwDSP+roKqi5Khn0ApmtVIgRc/0wB6FVmjzqaZOY="; + vendorHash = "sha256-BiusDvmXyS0HYx1mTLF1iECmIKPVlkI6B76NVnANEy4="; doCheck = false; From f8ac75058d2ab7ea379ea34ecc81b51f27f61190 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 02:11:37 +0000 Subject: [PATCH 266/429] signalbackup-tools: 20260302 -> 20260306 --- pkgs/by-name/si/signalbackup-tools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index 31e1dab38703..8d6c7f4e0f37 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "signalbackup-tools"; - version = "20260302"; + version = "20260306"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; tag = finalAttrs.version; - hash = "sha256-nDe7TSD37K7nEwQ3GVjFiuBff/IwxQNtu5YCfSIrk/k="; + hash = "sha256-mGJkkE+sT+FKd2tSAXcmDAmKbsE9H9k5IyQbzxJcvjY="; }; nativeBuildInputs = [ From edc7876daad048a83a4bed823ff84e75a48a70a5 Mon Sep 17 00:00:00 2001 From: Haylin Moore Date: Thu, 11 Sep 2025 21:19:25 -0700 Subject: [PATCH 267/429] uhttpd: init at 0-unstable-2025-12-24 --- pkgs/by-name/uh/uhttpd/package.nix | 66 ++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 pkgs/by-name/uh/uhttpd/package.nix diff --git a/pkgs/by-name/uh/uhttpd/package.nix b/pkgs/by-name/uh/uhttpd/package.nix new file mode 100644 index 000000000000..1326eb93aabf --- /dev/null +++ b/pkgs/by-name/uh/uhttpd/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + fetchgit, + cmake, + pkg-config, + lua5_1, + json_c, + libubox-wolfssl, + ubus, + libxcrypt, + unstableGitUpdater, + makeWrapper, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "uhttpd"; + version = "0-unstable-2025-12-24"; + + src = fetchgit { + url = "https://git.openwrt.org/project/uhttpd.git"; + rev = "506e24987b97fbc866005bfb71316bd63601a1ef"; + hash = "sha256-x5hbbEcyxWhCjjqiHvAxvI1eHewqRlXuAGqXNw+c4sA="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + makeWrapper + ]; + + buildInputs = [ + lua5_1 + json_c + libubox-wolfssl + ubus + libxcrypt + ]; + + cmakeFlags = [ + "-DUCODE_SUPPORT=off" + "-DTLS_SUPPORT=on" + "-DLUA_SUPPORT=on" + ]; + + NIX_LDFLAGS = "-lcrypt"; + + postInstall = '' + wrapProgram $out/bin/uhttpd \ + --prefix LD_LIBRARY_PATH : $out/lib/uhttpd + ''; + + passthru.updateScript = unstableGitUpdater { + branch = "master"; + hardcodeZeroVersion = true; + }; + + meta = { + description = "Tiny HTTP server from OpenWrt project"; + homepage = "https://openwrt.org/docs/guide-user/services/webserver/uhttpd"; + license = lib.licenses.isc; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.haylin ]; + mainProgram = "uhttpd"; + }; +}) From 26ebf88a7d17851ed99880bb0406487d85fc7640 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sun, 1 Mar 2026 16:42:52 -0500 Subject: [PATCH 268/429] workflows/test: run when more files are changed --- .github/workflows/test.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 26c8c8736f93..823aa493565c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -55,10 +55,14 @@ jobs: })).map(file => file.filename) if (files.some(file => [ + '.github/workflows/build.yml', + '.github/workflows/check.yml', '.github/workflows/eval.yml', '.github/workflows/lint.yml', '.github/workflows/merge-group.yml', '.github/workflows/test.yml', + 'ci/github-script/supportedSystems.js', + 'ci/supportedBranches.js', ].includes(file))) core.setOutput('merge-group', true) if (files.some(file => [ @@ -71,8 +75,16 @@ jobs: '.github/workflows/pull-request-target.yml', '.github/workflows/test.yml', 'ci/github-script/bot.js', + 'ci/github-script/check-target-branch.js', + 'ci/github-script/commits.js', + 'ci/github-script/lint-commits.js', 'ci/github-script/merge.js', + 'ci/github-script/prepare.js', + 'ci/github-script/reviewers.js', + 'ci/github-script/reviews.js', + 'ci/github-script/supportedSystems.js', 'ci/github-script/withRateLimit.js', + 'ci/supportedBranches.js', ].includes(file))) core.setOutput('pr', true) merge-group: From a588c37c40ec42ee7c602a3080ac4d75ac66cbcf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 02:30:32 +0000 Subject: [PATCH 269/429] vscode-extensions.discloud.discloud: 2.27.15 -> 2.28.2 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 708fd4dd2927..17c06d8b0b47 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1330,8 +1330,8 @@ let mktplcRef = { publisher = "discloud"; name = "discloud"; - version = "2.27.15"; - hash = "sha256-LFZR0AxMC0TKUOKU/Ftz1AkLRazqUptkZQ11NIvv7Hs="; + version = "2.28.2"; + hash = "sha256-zRptDItJuLcHTkKUarpsXlRBa4R84cupKXKtBt5Stmw="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/discloud.discloud/changelog"; From 2fa73152464e09a05a4b4505b5d727b915ac476d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 02:35:58 +0000 Subject: [PATCH 270/429] ty: 0.0.20 -> 0.0.21 --- pkgs/by-name/ty/ty/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index d6049ce4f3c1..7be071bd5555 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ty"; - version = "0.0.20"; + version = "0.0.21"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ty"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-NJ2RA12NZDmYdrSK9p+KfYiE36KA1RkolSchMRU7pHQ="; + hash = "sha256-/R0nw9V0IhuTxRaZNydvk/xGC5V1gYHQxBkAU/Cjsmw="; }; # For Darwin platforms, remove the integration test for file notifications, @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--package=ty" ]; - cargoHash = "sha256-xUYjlSl9uKsk+Wk3xxK6wPrKhFHuqpJNgQ2TSkcGpYE="; + cargoHash = "sha256-NaWWX6EAVkEg/KQ+Up0t2fh/24fnTo6i5dDZoOWErjg="; nativeBuildInputs = [ installShellFiles ]; From 1800b8b05521b1d15826099ca02b2be3182269d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 02:41:32 +0000 Subject: [PATCH 271/429] wiki-go: 1.8.4 -> 1.8.5 --- pkgs/by-name/wi/wiki-go/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wi/wiki-go/package.nix b/pkgs/by-name/wi/wiki-go/package.nix index 88f2b0c9ad69..756c21dcb0ab 100644 --- a/pkgs/by-name/wi/wiki-go/package.nix +++ b/pkgs/by-name/wi/wiki-go/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "wiki-go"; - version = "1.8.4"; + version = "1.8.5"; src = fetchFromGitHub { owner = "leomoon-studios"; repo = "wiki-go"; tag = "v${version}"; - hash = "sha256-bZ1lOLjlx0wxpjM/baBiWljBonv62N7sVQjeiSc975k="; + hash = "sha256-6GgX2wEaQvW5ccayavbQ4FV3yQKUdcsbUfmLrO4Jxng="; }; vendorHash = null; From 477c1d80fc7a1110b4ca019c8d568d2b7ed5d2b0 Mon Sep 17 00:00:00 2001 From: Sandro Date: Fri, 6 Mar 2026 03:45:15 +0100 Subject: [PATCH 272/429] reqable: fix formatting --- pkgs/by-name/re/reqable/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/reqable/package.nix b/pkgs/by-name/re/reqable/package.nix index eacced666f2a..ab612c501383 100644 --- a/pkgs/by-name/re/reqable/package.nix +++ b/pkgs/by-name/re/reqable/package.nix @@ -76,8 +76,8 @@ stdenv.mkDerivation (finalAttrs: { preFixup = '' makeWrapper $out/share/reqable/reqable $out/bin/reqable \ - --prefix LD_LIBRARY_PATH : $out/share/reqable/lib \ - ''${gappsWrapperArgs[@]} + --prefix LD_LIBRARY_PATH : $out/share/reqable/lib \ + ''${gappsWrapperArgs[@]} ''; passthru.updateScript = nix-update-script { }; From 71a463d7237625e3ca570a24aeb58d0c72089dac Mon Sep 17 00:00:00 2001 From: Andres Vargas Date: Thu, 5 Mar 2026 22:48:37 -0400 Subject: [PATCH 273/429] maintainers: add zodman --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3fb6c89bf258..27f4beb6789c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -30096,6 +30096,12 @@ githubId = 873857; name = "Zack Newman"; }; + zodman = { + github = "zodman"; + githubId = 44167; + name = "Andres Vargas"; + email = "zodman@gmail.com"; + }; zoedsoupe = { github = "zoedsoupe"; githubId = 44469426; From e2607465548ec59d83e14f9836ac6c08f90594ea Mon Sep 17 00:00:00 2001 From: Andres Vargas Date: Thu, 5 Mar 2026 22:48:52 -0400 Subject: [PATCH 274/429] weechat-matrix-rs: init at 0-unstable-2025-10-09 --- pkgs/by-name/we/weechat-matrix-rs/package.nix | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 pkgs/by-name/we/weechat-matrix-rs/package.nix diff --git a/pkgs/by-name/we/weechat-matrix-rs/package.nix b/pkgs/by-name/we/weechat-matrix-rs/package.nix new file mode 100644 index 000000000000..0baaef3fe0eb --- /dev/null +++ b/pkgs/by-name/we/weechat-matrix-rs/package.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + pkg-config, + weechat, + openssl, + sqlite, + runCommand, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "weechat-matrix-rs"; + version = "0-unstable-2025-10-09"; + src = fetchFromGitHub { + owner = "poljar"; + repo = "weechat-matrix-rs"; + rev = "4cc5777b630ba4d6a9c964248531f283178a4717"; + hash = "sha256-CF4xDoRYey9F8/XSW/euNb8IjZXyP6k0Nj61shsmyEo="; + }; + cargoHash = "sha256-jAlBCmLJfWWAUHd3ySB930iqAVXMh6ueba7xS///Rt0="; + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + buildInputs = [ + weechat + openssl + sqlite + ]; + postInstall = '' + mkdir -p $out/lib/weechat/plugins + mv $out/lib/libmatrix${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/weechat/plugins/matrix${stdenv.hostPlatform.extensions.sharedLibrary} + ''; + passthru.tests.load-plugin = + runCommand "${finalAttrs.pname}-test-load" + { + nativeBuildInputs = [ weechat ]; + } + '' + weechat -t -d "$(mktemp -d)" \ + --run-command "/plugin load ${finalAttrs.finalPackage}/lib/weechat/plugins/matrix${stdenv.hostPlatform.extensions.sharedLibrary} ; /quit" \ + 2>&1 | tee log + if grep -q 'Plugin "matrix" loaded' log; then + echo "Check passed: matrix plugin loaded into WeeChat." + touch $out + else + echo "Check failed: 'matrix' not found in WeeChat output." + exit 1 + fi + ''; + meta = { + description = "Rust plugin for WeeChat to communicate over Matrix"; + homepage = "https://github.com/poljar/weechat-matrix-rs"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ zodman ]; + platforms = lib.platforms.unix; + }; + +}) From 4bed11bd2e951e38be308db661f298393d9dfcbb Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 4 Mar 2026 21:11:13 +0000 Subject: [PATCH 275/429] python313Packages.plotly: 6.5.2 -> 6.6.0 --- pkgs/development/python-modules/plotly/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index bc76cec9ef89..ffeff510fb61 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -36,16 +36,16 @@ xarray, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "plotly"; - version = "6.5.2"; + version = "6.6.0"; pyproject = true; src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; - tag = "v${version}"; - hash = "sha256-7rMatpaZvHuNPpiXR5eUHultqNnLER1iW+GR3dwgkyo="; + tag = "v${finalAttrs.version}"; + hash = "sha256-t1IYu3PL/B71fhX5LVQrjAKkQSjPC+wZjMnBp4kPTNY="; }; patches = [ @@ -108,7 +108,7 @@ buildPythonPackage rec { which xarray ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; disabledTests = [ # failed pinning test, sensitive to dep versions @@ -169,4 +169,4 @@ buildPythonPackage rec { sarahec ]; }; -} +}) From 885318c44179af53f473306a7863298ae4008f3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 Mar 2026 19:30:00 -0800 Subject: [PATCH 276/429] Revert "python3Packages.python-tado: 0.18.16 -> 0.19.2" This reverts commit bf53e79d907bff9a71828d704347cce25d0e30bb because it broke home-assistant.tests.components.tado. --- .../development/python-modules/python-tado/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/python-tado/default.nix b/pkgs/development/python-modules/python-tado/default.nix index 890dc22bd703..90cba957bc02 100644 --- a/pkgs/development/python-modules/python-tado/default.nix +++ b/pkgs/development/python-modules/python-tado/default.nix @@ -2,35 +2,33 @@ lib, buildPythonPackage, fetchFromGitHub, - poetry-core, pytest-cov-stub, pytest-mock, - pytest-socket, pytestCheckHook, requests, responses, + setuptools, }: buildPythonPackage (finalAttrs: { pname = "python-tado"; - version = "0.19.2"; + version = "0.18.16"; pyproject = true; src = fetchFromGitHub { owner = "wmalgadey"; repo = "PyTado"; tag = finalAttrs.version; - hash = "sha256-me62VPjKU+vh0vo4Fl86sEse1QZYD2zDpxchSiUcxTY="; + hash = "sha256-jHPTu0/DYJXbSqiJXQzmiK6gmtJf88Y0BV1wj/X+qpc="; }; - build-system = [ poetry-core ]; + build-system = [ setuptools ]; dependencies = [ requests ]; nativeCheckInputs = [ pytest-cov-stub pytest-mock - pytest-socket pytestCheckHook responses ]; From bb24bcd33dcdf3165e8fc7ea4e2ee1c3ebcc3db0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 Mar 2026 19:30:36 -0800 Subject: [PATCH 277/429] Revert "python3Packages.python-telegram-bot: 22.5 -> 22.6" This reverts commit 526eb9c5c938b8c00755c24eda8bd80b344aff40 because it broke home-assistant.tests.components.telegram_bot. --- .../python-modules/python-telegram-bot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 0b8ee9e6a532..fdefd6d4867a 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "22.6"; + version = "22.5"; pyproject = true; src = fetchFromGitHub { owner = "python-telegram-bot"; repo = "python-telegram-bot"; tag = "v${version}"; - hash = "sha256-B7tG70Nzt7HKFD1n1Aq5DGGrcTyb4Df9LF31DGN4KQc="; + hash = "sha256-++vDura+7AkqM7gV12O2CRRQ1H7G5G22VHGo4OdyffU="; }; build-system = [ From 04d2b84122beaf95fe4138c798b32dfa1080d78f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 Mar 2026 19:36:30 -0800 Subject: [PATCH 278/429] python3Packages.paddlepaddle: fix build --- pkgs/development/python-modules/paddlepaddle/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/paddlepaddle/default.nix b/pkgs/development/python-modules/paddlepaddle/default.nix index 5f29ff5330a2..b43ed3795ee3 100644 --- a/pkgs/development/python-modules/paddlepaddle/default.nix +++ b/pkgs/development/python-modules/paddlepaddle/default.nix @@ -74,7 +74,7 @@ buildPythonPackage { buildInputs = lib.optionals cudaSupport [ rdma-core ]; pythonRelaxDeps = [ - opt-einsum + "opt_einsum" ]; dependencies = [ @@ -135,7 +135,6 @@ buildPythonPackage { passthru.updateScript = ./update.sh; meta = { - broken = true; description = "Machine Learning Framework from Industrial Practice"; homepage = "https://github.com/PaddlePaddle/Paddle"; license = lib.licenses.asl20; From d16d3b6677d8d777f78a46de18d90b09723ef4ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 03:37:48 +0000 Subject: [PATCH 279/429] terraform-providers.aiven_aiven: 4.51.0 -> 4.52.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index fead5d0e4b99..3b404d31ca30 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -27,13 +27,13 @@ "vendorHash": null }, "aiven_aiven": { - "hash": "sha256-lNDorhkIngyZ8S51lyuI3LRtnFtzVG01Nzo1vRPytbQ=", + "hash": "sha256-2kv5cBEogQXmWcN/fzg0Rxf/SuqLpeOr8O2NoOg57+c=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.51.0", + "rev": "v4.52.0", "spdx": "MIT", - "vendorHash": "sha256-c4eCY/iQ8v/gBX55j22TRxWIeoevi5EJs4TtN9xXfKA=" + "vendorHash": "sha256-mUBHjGpDE7aFiyUovi7/doOrrZelmNJC+QYF5+2dxt0=" }, "akamai_akamai": { "hash": "sha256-vC7hVV/p28y7cv9PONEfRVj5uKgumtbq4HpbOYq9vBQ=", From dc19888f778af83143bf6f4ef523afd3117bc9ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 03:43:43 +0000 Subject: [PATCH 280/429] terraform-providers.hashicorp_google-beta: 7.21.0 -> 7.22.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index fead5d0e4b99..3ff64e95983a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -580,13 +580,13 @@ "vendorHash": "sha256-v/XHGUEpAIpGHErv7GPqfosVLL3xaqBwZHbJKS8fkn4=" }, "hashicorp_google-beta": { - "hash": "sha256-ypC8av5GnFBlUp2eVDZWqnPGrZT8QihYnxsIHw8g+oA=", + "hash": "sha256-wIAgFDHBVErm2NMiQszhnwJ6nWJA4qqDY/a6JdUrmyA=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "repo": "terraform-provider-google-beta", - "rev": "v7.21.0", + "rev": "v7.22.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-KnB6R5yrEeaf4Z+LzQjCeQJjAgHK0kJEJzT1rb3pimY=" + "vendorHash": "sha256-YZQMUGScsYjBkhAQ4DXYlBpAw805iKgX/iXDMTpRr6c=" }, "hashicorp_helm": { "hash": "sha256-S4Fe65f+gEWWxRMC+/i93dwwe7QigPccx4wiqNBpcL8=", From 27c48bc1c9972fed705c971f0fdb88914249523d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 03:50:11 +0000 Subject: [PATCH 281/429] vscode-extensions.ms-vscode.cmake-tools: 1.21.36 -> 1.22.28 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 708fd4dd2927..f429abafe0c4 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3289,8 +3289,8 @@ let mktplcRef = { publisher = "ms-vscode"; name = "cmake-tools"; - version = "1.21.36"; - hash = "sha256-IqgYnesIz46WmJ7kR8LYnr2kkD33oiupi7CrcV6rGRg="; + version = "1.22.28"; + hash = "sha256-ZVtVZ53wvFBchXd9wRCxm1NQkkoTn9Yn4vcbY46GQmY="; }; meta.license = lib.licenses.mit; }; From e777a6e23a48f8310cf5c2b0d51ced440f7e3e57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 03:51:47 +0000 Subject: [PATCH 282/429] vscode-extensions.github.vscode-pull-request-github: 0.126.0 -> 0.128.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 708fd4dd2927..581c5618f6b9 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1955,8 +1955,8 @@ let mktplcRef = { publisher = "github"; name = "vscode-pull-request-github"; - version = "0.126.0"; - hash = "sha256-ii29H3IKuJVIB394aup9G82xQ1J7YJzhs8mQH6+rbgI="; + version = "0.128.0"; + hash = "sha256-ujDnHmhMorewvIH+zJXSnUpnMfQNE5XqHA1lnsq22Qk="; }; meta = { license = lib.licenses.mit; From 51b8c79529852d3a0a96a3c74677292f41e8741e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 04:01:20 +0000 Subject: [PATCH 283/429] asusctl: 6.3.3 -> 6.3.4 --- pkgs/by-name/as/asusctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/as/asusctl/package.nix b/pkgs/by-name/as/asusctl/package.nix index e74c15e6d837..f45ead3382ea 100644 --- a/pkgs/by-name/as/asusctl/package.nix +++ b/pkgs/by-name/as/asusctl/package.nix @@ -18,16 +18,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "asusctl"; - version = "6.3.3"; + version = "6.3.4"; src = fetchFromGitLab { owner = "asus-linux"; repo = "asusctl"; tag = finalAttrs.version; - hash = "sha256-nc6pGxLutxKyd4LiI23e7UfWK45aQiLQRKL6zX7rVO0="; + hash = "sha256-1B4uKX8Aqorxh+QMsUEmSnO56zqYhUb6wLMXPAR5HQo="; }; - cargoHash = "sha256-LZsSnIGTemu+SvJxszPWkA5EIdu8XzruZXaYIibV31Q="; + cargoHash = "sha256-aRsrA1j4nYp2rbQM2FbTfWVDkVfKFFa6L+DtW8mKcmk="; postPatch = '' files=" From f93d1c636f8e3c524ccb6e3db89ebe45058bf81e Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Wed, 4 Mar 2026 21:37:23 -0800 Subject: [PATCH 284/429] python3Packages.monarchmoney: remove unused package Superseded by monarchmoneycommunity, a maintained community fork. --- .../python-modules/monarchmoney/default.nix | 43 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 pkgs/development/python-modules/monarchmoney/default.nix diff --git a/pkgs/development/python-modules/monarchmoney/default.nix b/pkgs/development/python-modules/monarchmoney/default.nix deleted file mode 100644 index aa59035ecda6..000000000000 --- a/pkgs/development/python-modules/monarchmoney/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - aiohttp, - gql, - oathtool, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "monarchmoney"; - version = "0.1.15"; - pyproject = true; - - src = fetchFromGitHub { - owner = "hammem"; - repo = "monarchmoney"; - tag = "v${version}"; - hash = "sha256-I5YCINwJqzdntVGn8T8Yx/cfWOtwgwvyt30swBLQHDo="; - }; - - build-system = [ setuptools ]; - - dependencies = [ - aiohttp - gql - oathtool - ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - pythonImportsCheck = [ "monarchmoney" ]; - - meta = { - description = "Python API for Monarch Money"; - homepage = "https://github.com/hammem/monarchmoney"; - changelog = "https://github.com/hammem/monarchmoney/releases/tag/v${version}"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.jamiemagee ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 01119ba1281d..e002522ff19a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -311,6 +311,7 @@ mapAliases { mkdocs-minify = throw "'mkdocs-minify' has been renamed to/replaced by 'mkdocs-minify-plugin'"; # Converted to throw 2025-10-29 mne-python = throw "'mne-python' has been renamed to/replaced by 'mne'"; # Converted to throw 2025-10-29 modeled = "'modeled' has been removed because it is unmaintained"; # Added 2026-01-19 + monarchmoney = throw "'monarchmoney' has been renamed to/replaced by 'monarchmoneycommunity'"; # Added 2026-03-05 moretools = "'moretools' has been removed because it is unmaintained"; # Added 2026-01-19 mpris-server = throw "mpris-server was removed because it is unused"; # added 2025-10-31 msldap-bad = throw "'msldap-bad' has been renamed to/replaced by 'badldap'"; # added 2025-11-06 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 56f15afcf949..95c056cdd1f4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10090,8 +10090,6 @@ self: super: with self; { monai-deploy = callPackage ../development/python-modules/monai-deploy { }; - monarchmoney = callPackage ../development/python-modules/monarchmoney { }; - monarchmoneycommunity = callPackage ../development/python-modules/monarchmoneycommunity { }; monero = callPackage ../development/python-modules/monero { }; From e1111f8b8635eace51c21af257b3a6ea01384b61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 04:30:12 +0000 Subject: [PATCH 285/429] pyrefly: 0.53.0 -> 0.55.0 --- pkgs/by-name/py/pyrefly/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/py/pyrefly/package.nix b/pkgs/by-name/py/pyrefly/package.nix index 4a922722c45a..184f7088b82e 100644 --- a/pkgs/by-name/py/pyrefly/package.nix +++ b/pkgs/by-name/py/pyrefly/package.nix @@ -10,17 +10,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "pyrefly"; - version = "0.53.0"; + version = "0.55.0"; src = fetchFromGitHub { owner = "facebook"; repo = "pyrefly"; tag = finalAttrs.version; - hash = "sha256-tw4VQw0liyPjZBZxP7U79JLdJcSuitMr53lVdtje5KE="; + hash = "sha256-Pdfi+ZCAnBCCFNI/5NLNexacn1kFDHjnjgkhfw/m1j0="; }; buildAndTestSubdir = "pyrefly"; - cargoHash = "sha256-+LwF0PHBU+do+eg84PGMEt3ri9LjMD+e2p82i2icwh4="; + cargoHash = "sha256-HXJsTE0a8X4c+CvC9e0xp4PVUBrFOpB5R/K/UG5MeDs="; buildInputs = [ rust-jemalloc-sys ]; From 836ccee89759a02ceebf212f839328faf76f768c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 04:35:26 +0000 Subject: [PATCH 286/429] tev: 2.9.0 -> 2.10.0 --- pkgs/by-name/te/tev/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/tev/package.nix b/pkgs/by-name/te/tev/package.nix index a851e34dcb65..9479653c736f 100644 --- a/pkgs/by-name/te/tev/package.nix +++ b/pkgs/by-name/te/tev/package.nix @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { pname = "tev"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "Tom94"; repo = "tev"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-833iKblvIwMADXvzpJS8z2y+3b0puvyw3IFilrlylk8="; + hash = "sha256-o8ejMsaiplnTLiWtjaJnV9z2ZNkiOWy3DLU+x49MJrg="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux ( From 94cc6b5e973020e52e70cece7584804936ec31a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 04:44:59 +0000 Subject: [PATCH 287/429] linuxPackages.xone: 0.5.6 -> 0.5.7 --- pkgs/os-specific/linux/xone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/xone/default.nix b/pkgs/os-specific/linux/xone/default.nix index 2ebc1fc8ca59..fb1c66c6d996 100644 --- a/pkgs/os-specific/linux/xone/default.nix +++ b/pkgs/os-specific/linux/xone/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "xone"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "dlundqvist"; repo = "xone"; tag = "v${finalAttrs.version}"; - hash = "sha256-kMK3xfwUIphsS3AQVhKKXU90dcUKH/hqKWDaotjOeu0="; + hash = "sha256-9bflLH4lPGM7Ziv6w0+HC56jMU0IchL/9udbIqTIMd8="; }; setSourceRoot = '' From 8c6fb9a752528f933499c0617fc8203951c42a75 Mon Sep 17 00:00:00 2001 From: Adam Thompson-Sharpe Date: Mon, 2 Mar 2026 18:40:58 -0500 Subject: [PATCH 288/429] nixos/kiwix-serve: init module Adds a NixOS service module for kiwix-serve, which was requested quite a while ago. kiwix-serve allows one to host ZIM files (such as for archives of Wikipedia) over HTTP. A NixOS VM test that generates and serves a basic ZIM file has also been added. The ZIM file is generated as part of the test, since the output file is relatively large (~60 KB) relative to the source content (~100 bytes). See: --- .../manual/release-notes/rl-2605.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/kiwix-serve.nix | 187 ++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/kiwix-serve/default.nix | 75 +++++++ nixos/tests/kiwix-serve/html/icon.png | Bin 0 -> 84 bytes nixos/tests/kiwix-serve/html/index.html | 11 ++ pkgs/by-name/ki/kiwix-tools/package.nix | 3 + 8 files changed, 280 insertions(+) create mode 100644 nixos/modules/services/misc/kiwix-serve.nix create mode 100644 nixos/tests/kiwix-serve/default.nix create mode 100644 nixos/tests/kiwix-serve/html/icon.png create mode 100644 nixos/tests/kiwix-serve/html/index.html diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index a708c285091b..8a7d7d6b9f23 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -30,6 +30,8 @@ - [qui](https://github.com/autobrr/qui), a modern alternative webUI for qBittorrent, with multi-instance support. Written in Go/React. Available as [services.qui](#opt-services.qui.enable). +- [kiwix-serve](https://wiki.kiwix.org/wiki/Kiwix-serve), a service that serves ZIM files (such as Wikipedia archives) over HTTP. Available as [services.kiwix-serve](#opt-services.kiwix-serve.enable). + - [Remark42](https://remark42.com/), a self-hosted comment engine. Available as [services.remark42](#opt-services.remark42.enable). - [LibreChat](https://www.librechat.ai/), open-source self-hostable ChatGPT clone with Agents and RAG APIs. Available as [services.librechat](#opt-services.librechat.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2db1636f824e..a47b556eca70 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -882,6 +882,7 @@ ./services/misc/jackett.nix ./services/misc/jellyfin.nix ./services/misc/jellyseerr.nix + ./services/misc/kiwix-serve.nix ./services/misc/klipper.nix ./services/misc/languagetool.nix ./services/misc/leaps.nix diff --git a/nixos/modules/services/misc/kiwix-serve.nix b/nixos/modules/services/misc/kiwix-serve.nix new file mode 100644 index 000000000000..7f818d7e9121 --- /dev/null +++ b/nixos/modules/services/misc/kiwix-serve.nix @@ -0,0 +1,187 @@ +{ + config, + lib, + pkgs, + utils, + ... +}: +let + inherit (lib) types; + cfg = config.services.kiwix-serve; + # Create a directory containing symlinks to ZIM files + mkLibrary = + library: + let + libraryEntries = lib.mapAttrsToList (name: path: { + name = "${name}.zim"; + inherit path; + }) library; + + zimsDrv = pkgs.linkFarm "zims" libraryEntries; + + files = map (entry: "${zimsDrv}/${entry.name}") libraryEntries; + in + { + derivation = zimsDrv; + inherit files; + }; +in +{ + options = { + services.kiwix-serve = { + enable = lib.mkEnableOption "the kiwix-serve server"; + + package = lib.mkPackageOption pkgs "kiwix-tools" { }; + + address = lib.mkOption { + type = types.str; + default = "all"; + example = "ipv4"; + description = '' + Listen only on the specified IP address. + Specify "ipv4", "ipv6" or "all" to listen on all IPv4, IPv6, or both types of addresses, respectively. + ''; + }; + + port = lib.mkOption { + type = types.port; + default = 8080; + description = "The port on which to run kiwix-serve."; + }; + + openFirewall = lib.mkOption { + type = types.bool; + default = false; + description = "Whether to open the firewall for the configured port."; + }; + + library = lib.mkOption { + type = types.attrsOf types.path; + default = { }; + example = lib.literalExpression ( + lib.removeSuffix "\n" '' + { + wikipedia = "/data/wikipedia_en_all_maxi_2026-02.zim"; + nix = pkgs.fetchurl { + url = "https://download.kiwix.org/zim/devdocs/devdocs_en_nix_2026-01.zim"; + hash = "sha256-QxB9qDKSzzEU8t4droI08BXdYn+HMVkgiJMO3SoGTqM="; + }; + } + '' + ); + description = '' + A set of ZIM files to serve. The key is used as the name for the ZIM files + (e.g. in the example, the files will be served as `wikipedia.zim` and `nix.zim`). + + Exclusive with [services.kiwix-serve.libraryPath](#opt-services.kiwix-serve.libraryPath). + ''; + }; + + libraryPath = lib.mkOption { + type = types.nullOr types.path; + default = null; + example = "/data/library.xml"; + description = '' + An XML library file listing ZIM files to serve. + For more information, see . + + Exclusive with [services.kiwix-serve.library](#opt-services.kiwix-serve.library). + ''; + }; + + extraArgs = lib.mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ + "--verbose" + "--skipInvalid" + ]; + description = "Extra arguments to pass to kiwix-serve."; + }; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = (cfg.library == { }) != (cfg.libraryPath == null); + message = "Exactly one of services.kiwix-serve.library or services.kiwix-serve.libraryPath must be provided."; + } + ]; + + systemd.services.kiwix-serve = + let + library = mkLibrary cfg.library; + in + { + description = "ZIM file HTTP server"; + documentation = [ "https://kiwix-tools.readthedocs.io/en/latest/kiwix-serve.html" ]; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "exec"; + DynamicUser = true; + Restart = "on-failure"; + ExecStart = utils.escapeSystemdExecArgs ( + [ + (lib.getExe' cfg.package "kiwix-serve") + "--address" + cfg.address + "--port" + cfg.port + ] + ++ lib.optionals (cfg.libraryPath != null) [ + "--library" + cfg.libraryPath + ] + ++ lib.optionals (cfg.library != { }) library.files + ++ cfg.extraArgs + ); + + CapabilityBoundingSet = ""; + DeviceAllow = ""; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateUsers = true; + PrivateTmp = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_NETLINK" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + "~@resources" + ]; + UMask = "0077"; + }; + }; + + networking.firewall = lib.mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.port ]; + }; + }; + + meta = { + maintainers = with lib.maintainers; [ MysteryBlokHed ]; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 343500f195e2..cfd5427f3979 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -840,6 +840,7 @@ in keymap = handleTest ./keymap.nix { }; kimai = runTest ./kimai.nix; kismet = runTest ./kismet.nix; + kiwix-serve = runTest ./kiwix-serve; kmonad = runTest ./kmonad.nix; kmscon = runTest ./kmscon.nix; knot = runTest ./knot.nix; diff --git a/nixos/tests/kiwix-serve/default.nix b/nixos/tests/kiwix-serve/default.nix new file mode 100644 index 000000000000..b30f50c115b4 --- /dev/null +++ b/nixos/tests/kiwix-serve/default.nix @@ -0,0 +1,75 @@ +{ lib, pkgs, ... }: +let + mkTestZim = + name: + pkgs.runCommandLocal "${name}.zim" + { + nativeBuildInputs = [ pkgs.zim-tools ]; + } + '' + ${lib.getExe' pkgs.zim-tools "zimwriterfs"} \ + --name "${name}" \ + --title 'NixOS kiwix-serve Test' \ + --description 'NixOS test of kiwix-serve' \ + --creator Nixpkgs \ + --publisher Nixpkgs \ + --language eng \ + --welcome index.html \ + --illustration icon.png \ + ${./html} \ + $out + ''; + + # Test files must have different names or kiwix-serve will only serve one of them + testZimStore = mkTestZim "test-store"; + testZimOutside = mkTestZim "test-outside"; +in +{ + name = "kiwix-serve"; + meta.maintainers = with lib.maintainers; [ MysteryBlokHed ]; + + nodes = { + machine = { + systemd.services.copy-zim-file = { + description = "Copy test ZIM file to host system to test paths outside of store"; + wantedBy = [ "multi-user.target" ]; + before = [ "kiwix-serve.service" ]; + requiredBy = [ "kiwix-serve.service" ]; + + serviceConfig = { + Type = "oneshot"; + }; + + script = '' + mkdir -p /var/lib/kiwix-serve + cp ${testZimOutside} /var/lib/kiwix-serve/test-outside.zim + ''; + }; + + services.kiwix-serve = { + enable = true; + port = 8080; + library = { + test-store = testZimStore; + test-outside = "/var/lib/kiwix-serve/test-outside.zim"; + }; + }; + }; + }; + + testScript = '' + machine.wait_for_unit("kiwix-serve.service") + machine.wait_for_open_port(8080) + machine.wait_until_succeeds("curl --fail --silent --head http://localhost:8080") + + # ZIM file in store + test_content = machine.succeed("curl --fail --silent --location http://localhost:8080/content/test-store") + print(test_content) + assert "NixOS test of kiwix-serve" in test_content, "kiwix-serve did not provide the expected page for the store ZIM file" + + # ZIM file outside of store + test_content = machine.succeed("curl --fail --silent --location http://localhost:8080/content/test-outside") + print(test_content) + assert "NixOS test of kiwix-serve" in test_content, "kiwix-serve did not provide the expected page for the out-of-store ZIM file" + ''; +} diff --git a/nixos/tests/kiwix-serve/html/icon.png b/nixos/tests/kiwix-serve/html/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e69b9eaa1eb139299859045d4877df563ac40f5a GIT binary patch literal 84 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-Mg|53hWg4QS_}*fOeH~n!3+##lh0a!mAN>E gNL)@%kYK&S!oV27z_|R;EisUCPgg&ebxsLQ0FA*CD*ylh literal 0 HcmV?d00001 diff --git a/nixos/tests/kiwix-serve/html/index.html b/nixos/tests/kiwix-serve/html/index.html new file mode 100644 index 000000000000..c0c37b508812 --- /dev/null +++ b/nixos/tests/kiwix-serve/html/index.html @@ -0,0 +1,11 @@ + + + + + + NixOS kiwix-serve Test + + +

NixOS test of kiwix-serve

+ + diff --git a/pkgs/by-name/ki/kiwix-tools/package.nix b/pkgs/by-name/ki/kiwix-tools/package.nix index fa7cad399f3e..ed389c75bc98 100644 --- a/pkgs/by-name/ki/kiwix-tools/package.nix +++ b/pkgs/by-name/ki/kiwix-tools/package.nix @@ -3,6 +3,7 @@ docopt_cpp, fetchFromGitHub, gitUpdater, + nixosTests, icu, libkiwix, meson, @@ -34,6 +35,8 @@ stdenv.mkDerivation (finalAttrs: { libkiwix ]; + passthru.tests.kiwix-serve = nixosTests.kiwix-serve; + passthru.updateScript = gitUpdater { }; meta = { From 959c31d4911a22224d676548f2cd136afc3fd188 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 04:55:03 +0000 Subject: [PATCH 289/429] python3Packages.django-modeltranslation: 0.19.19 -> 0.20.2 --- .../python-modules/django-modeltranslation/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-modeltranslation/default.nix b/pkgs/development/python-modules/django-modeltranslation/default.nix index 8b443a689702..5c829c48eefb 100644 --- a/pkgs/development/python-modules/django-modeltranslation/default.nix +++ b/pkgs/development/python-modules/django-modeltranslation/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "django-modeltranslation"; - version = "0.19.19"; + version = "0.20.2"; pyproject = true; src = fetchFromGitHub { owner = "deschler"; repo = "django-modeltranslation"; tag = "v${version}"; - hash = "sha256-q00SmHW4GyV6p/+l/UsSkgTUOPEHOWd9420wnzKVNVc="; + hash = "sha256-zjCasSZzIviCBDHyKwQlS0lR5S01AmMjBnWG/iEEJO4="; }; build-system = [ From 3d9a016f9cc92bbb573098572d5a75baee584c59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 04:57:11 +0000 Subject: [PATCH 290/429] python3Packages.pylutron-caseta: 0.26.0 -> 0.27.0 --- pkgs/development/python-modules/pylutron-caseta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index 69b15906de54..0e75b697746c 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pylutron-caseta"; - version = "0.26.0"; + version = "0.27.0"; pyproject = true; src = fetchFromGitHub { owner = "gurumitts"; repo = "pylutron-caseta"; tag = "v${version}"; - hash = "sha256-aH6EX0cpMteCmZCoUd9pwB0sQ7GIhxtesvURIx32adA="; + hash = "sha256-GCLsFEPO4z5Jf8Bi/CChsVqmfZo12UcY1iG6Xbojomo="; }; build-system = [ hatchling ]; From 883bfda4e4ee390980067c1ab1a39be4fdbe1924 Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Thu, 5 Mar 2026 10:21:21 +0000 Subject: [PATCH 291/429] inferno: 0.12.4 -> 0.12.6 Diff: https://github.com/jonhoo/inferno/compare/v0.12.4...v0.12.6 Changelog: https://github.com/jonhoo/inferno/blob/v0.12.6/CHANGELOG.md Signed-off-by: Muhammad Falak R Wani --- pkgs/by-name/in/inferno/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/inferno/package.nix b/pkgs/by-name/in/inferno/package.nix index 46823408c973..cd6f3f87fb76 100644 --- a/pkgs/by-name/in/inferno/package.nix +++ b/pkgs/by-name/in/inferno/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "inferno"; - version = "0.12.4"; + version = "0.12.6"; src = fetchFromGitHub { owner = "jonhoo"; repo = "inferno"; tag = "v${finalAttrs.version}"; - hash = "sha256-8c3JRPUvuo1uQ22vgzgEPXoNSRnUKciEff13QrN3WHI="; + hash = "sha256-maqyxntCm8F8B14+26+ASJNl7JL3Pk+xzwgA2f8r4zc="; fetchSubmodules = true; }; - cargoHash = "sha256-Oj0thDPa1LPBhxp45JA6prIXuHpBpHcw59rMwPQavQ0="; + cargoHash = "sha256-0Zn3KS8Qo39yR+WUxj68eYt9jnDwpf4QUBGBqZPqFIU="; # skip flaky tests checkFlags = [ From f526c696df80f6c729cf337a61e4cc6b344b37ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 05:22:40 +0000 Subject: [PATCH 292/429] check-jsonschema: 0.36.2 -> 0.37.0 --- pkgs/by-name/ch/check-jsonschema/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/check-jsonschema/package.nix b/pkgs/by-name/ch/check-jsonschema/package.nix index 896bde54aadd..eb4774b7d682 100644 --- a/pkgs/by-name/ch/check-jsonschema/package.nix +++ b/pkgs/by-name/ch/check-jsonschema/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "check-jsonschema"; - version = "0.36.2"; + version = "0.37.0"; pyproject = true; src = fetchFromGitHub { owner = "python-jsonschema"; repo = "check-jsonschema"; tag = finalAttrs.version; - hash = "sha256-Cml1pqy8H8mCCE7qte3JS80RZFdNrI6m+Ktd4QgnrF4="; + hash = "sha256-hnsq4i4OXdQShe2fwYb9avtgoZ5efj0VtidJTyatW4E="; }; build-system = with python3Packages; [ setuptools ]; From 1fa820dfddbdacc00d9c574f95088fd210c9f693 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 05:32:25 +0000 Subject: [PATCH 293/429] terraform-providers.ubiquiti-community_unifi: 0.41.13 -> 0.41.17 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index fead5d0e4b99..294a22399a41 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1400,13 +1400,13 @@ "vendorHash": null }, "ubiquiti-community_unifi": { - "hash": "sha256-8mbQpDqs+2vvzmapJmusipo3IbUwyFlLPY3GkwORXpI=", + "hash": "sha256-2IYiy/DLCj+bcEkU+nwLg7Wt2j7bh29cScPcSTGsU5A=", "homepage": "https://registry.terraform.io/providers/ubiquiti-community/unifi", "owner": "ubiquiti-community", "repo": "terraform-provider-unifi", - "rev": "v0.41.13", + "rev": "v0.41.17", "spdx": "MPL-2.0", - "vendorHash": "sha256-kEUmuXSNFFBUlFp7tqa00H+M/NTDSd6j6liFTH6PUVw=" + "vendorHash": "sha256-rixXMK+M6/8g4cw/f+zNzY9x3GkA3nqmkQTPrONoueY=" }, "ucloud_ucloud": { "hash": "sha256-UOVnfWYhntmRHMApQgemjUBsyUIz0bexsc1gwDGGee4=", From d12eea87310dca04ae72be62b64510c235b6e987 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 05:38:03 +0000 Subject: [PATCH 294/429] stevenblack-blocklist: 3.16.63 -> 3.16.65 --- pkgs/by-name/st/stevenblack-blocklist/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index 55be833edd3d..366487a973b8 100644 --- a/pkgs/by-name/st/stevenblack-blocklist/package.nix +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "stevenblack-blocklist"; - version = "3.16.63"; + version = "3.16.65"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; tag = finalAttrs.version; - hash = "sha256-PYB4Dns88vYz7Yo3BOrtEez4IGPBvh1SbHECRO8Hfvc="; + hash = "sha256-tbPVxjpuNYftAM7vIPfDpTV1la9XX8GkQTuPVgvwOtE="; }; outputs = [ From 4e52f57f73c13eedf99bb2ee6fb6098287f8d22b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 Mar 2026 21:36:37 -0800 Subject: [PATCH 295/429] flexget: 3.17.11 -> 3.19.0 Diff: https://github.com/Flexget/Flexget/compare/v3.17.11...v3.19.0 Changelog: https://github.com/Flexget/Flexget/releases/tag/v3.19.0 --- pkgs/by-name/fl/flexget/package.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix index a539085f0edd..75e58d1f61b4 100644 --- a/pkgs/by-name/fl/flexget/package.nix +++ b/pkgs/by-name/fl/flexget/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "flexget"; - version = "3.17.11"; + version = "3.19.0"; pyproject = true; src = fetchFromGitHub { owner = "Flexget"; repo = "Flexget"; tag = "v${finalAttrs.version}"; - hash = "sha256-Qfq6TXSNAnIq8m3I7noFe6pIq6PmUTQKUjN+ZC4NxyU="; + hash = "sha256-77jGAju6ZKSsJWHgqJ7aC4xG7Iycwr3mGfRCNDPknEY="; }; pythonRelaxDeps = true; @@ -68,10 +68,10 @@ python3Packages.buildPythonApplication (finalAttrs: { transmission-rpc qbittorrent-api deluge-client - cloudscraper python-telegram-bot boto3 - libtorrent-rasterbar + matrix-nio + subliminal ]; pythonImportsCheck = [ @@ -158,6 +158,12 @@ python3Packages.buildPythonApplication (finalAttrs: { "TestYamlLists" ]; + disabledTestPaths = [ + # FIXME package pytest-ftpserver + "tests/ftp/test_ftp_download.py" + "tests/ftp/test_ftp_list.py" + ]; + meta = { homepage = "https://flexget.com/"; changelog = "https://github.com/Flexget/Flexget/releases/tag/${finalAttrs.src.tag}"; From 48daca5dccd749ef193f01247303ea4f053e63c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 06:00:27 +0000 Subject: [PATCH 296/429] grafanaPlugins.grafana-exploretraces-app: 1.3.2 -> 1.3.3 --- .../grafana/plugins/grafana-exploretraces-app/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix index 68f086894c53..e58c45ca4c67 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "grafana-exploretraces-app"; - version = "1.3.2"; - zipHash = "sha256-JXDZ7rC5Y38qJVmiEq2oz1DoWGIh9VX0bCZxdwlbDMo="; + version = "1.3.3"; + zipHash = "sha256-J3fPZy6y0B0vRpc2Cvvc8JN+Df1EDR3iNjvK/fJqzac="; meta = { description = "Opinionated traces app"; license = lib.licenses.agpl3Only; From 051c771b33641474f88cd027adf8b2ec8f0a7953 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 06:11:48 +0000 Subject: [PATCH 297/429] aws-vault: 7.9.8 -> 7.9.9 --- pkgs/by-name/aw/aws-vault/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix index ff6914e98d9b..41f1fc7d2a64 100644 --- a/pkgs/by-name/aw/aws-vault/package.nix +++ b/pkgs/by-name/aw/aws-vault/package.nix @@ -10,17 +10,17 @@ }: buildGoModule (finalAttrs: { pname = "aws-vault"; - version = "7.9.8"; + version = "7.9.9"; src = fetchFromGitHub { owner = "ByteNess"; repo = "aws-vault"; rev = "v${finalAttrs.version}"; - hash = "sha256-qbz6iWU6aZ8ehckJqBUy5ovcuHVBU0XqonQxH7m44Zo="; + hash = "sha256-Ennf8V1WorldzFfXUrRKmJomG4yrP19qBg0okEX+NWQ="; }; proxyVendor = true; - vendorHash = "sha256-K6uW+0yoKBDtBtAZIcVcbqnqD6tQJbSvGGs0wL0R+Wg="; + vendorHash = "sha256-mqw0Hp14wz2FOg7deXC3iiHu55W+yKwf4+JUK+x9nKA="; nativeBuildInputs = [ installShellFiles From 4c29057589abac22698e95d9107c27dbf9f89fda Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 06:35:30 +0000 Subject: [PATCH 298/429] uv: 0.10.6 -> 0.10.8 --- pkgs/by-name/uv/uv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 38b3d07f983c..e2369f7fc84d 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.10.6"; + version = "0.10.8"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-KOoAj5v0k9SDsiFmjjaiLMRGn+VELulF//Rvv62U7CU="; + hash = "sha256-kdIzLKdpqEnIo4ca7fAaerF8IRw1UTpn3deMZ/HCbAk="; }; - cargoHash = "sha256-IY1Js0PrUjYX4pqUQY44BX41YGpjxCY5tceRaoiiz0o="; + cargoHash = "sha256-ZIgDdP3O9MI5k6hePo2yMcrVoGVRm9Fno5NVqUbOSWw="; buildInputs = [ rust-jemalloc-sys From fbfc4fb40539c1da5de8a6c83fffbbcb9e37e9b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 06:39:24 +0000 Subject: [PATCH 299/429] coinlive: 0.2.2 -> 0.2.5 --- pkgs/by-name/co/coinlive/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/coinlive/package.nix b/pkgs/by-name/co/coinlive/package.nix index 2eb87a47a43a..986de5138c46 100644 --- a/pkgs/by-name/co/coinlive/package.nix +++ b/pkgs/by-name/co/coinlive/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "coinlive"; - version = "0.2.2"; + version = "0.2.5"; src = fetchFromGitHub { owner = "mayeranalytics"; repo = "coinlive"; tag = "v${finalAttrs.version}"; - hash = "sha256-llw97jjfPsDd4nYi6lb9ug6sApPoD54WlzpJswvdbRs="; + hash = "sha256-FQAxY0ZiC8bkp1s2CIpQeC6ZBNKm5/qmaebPuDcHtd4="; }; - cargoHash = "sha256-OswilwabVfoKIeHxo7sxCvgGH5dRfyTmnKED+TcxSV8="; + cargoHash = "sha256-1mzfuH5988PDKBsbKl0R1v/3/3Hk3LJtklqMA83tEOY="; nativeBuildInputs = [ pkg-config ]; From 1e4698c776918100cac25ca150cd132b282a21c5 Mon Sep 17 00:00:00 2001 From: Alastair Pharo Date: Fri, 6 Mar 2026 18:00:13 +1100 Subject: [PATCH 300/429] binaryen: remove asppsa from maintainer list This is myself. I'm unfortunately not able to contribute to this maintenance anymore. --- pkgs/development/compilers/binaryen/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 5955fea3e628..6826c2ab2d51 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -97,7 +97,6 @@ stdenv.mkDerivation rec { description = "Compiler infrastructure and toolchain library for WebAssembly, in C++"; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ - asppsa willcohen ]; license = lib.licenses.asl20; From 2cc2e0225f9882364846163abb0665243a8222ba Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 6 Mar 2026 08:41:24 +0100 Subject: [PATCH 301/429] Revert "ci: module maintainer review requests; nixos/modules: init `meta.teams`" --- ci/eval/compare/default.nix | 11 +- ci/eval/compare/maintainers.nix | 156 ++++++------ ci/eval/compare/test.nix | 228 ------------------ modules/generic/meta-maintainers.nix | 58 ++--- modules/generic/meta-maintainers/test.nix | 10 +- nixos/modules/config/vte.nix | 2 +- nixos/modules/config/xdg/autostart.nix | 2 +- nixos/modules/config/xdg/icons.nix | 2 +- nixos/modules/config/xdg/menus.nix | 2 +- nixos/modules/config/xdg/mime.nix | 2 +- nixos/modules/config/xdg/portal.nix | 2 +- nixos/modules/config/xdg/portals/lxqt.nix | 2 +- nixos/modules/config/xdg/sounds.nix | 2 +- nixos/modules/programs/dsearch.nix | 2 +- nixos/modules/programs/geary.nix | 2 +- nixos/modules/programs/gnome-disks.nix | 2 +- nixos/modules/programs/gnome-terminal.nix | 2 +- nixos/modules/programs/nm-applet.nix | 2 +- nixos/modules/programs/steam.nix | 2 +- nixos/modules/programs/thunar.nix | 2 +- nixos/modules/programs/wayland/dms-shell.nix | 2 +- nixos/modules/programs/wayland/hyprland.nix | 2 +- nixos/modules/programs/wayland/hyprlock.nix | 2 +- nixos/modules/programs/xfconf.nix | 2 +- nixos/modules/security/acme/default.nix | 2 +- nixos/modules/security/apparmor.nix | 2 +- .../services/cluster/rancher/default.nix | 3 +- .../buildbot/master.nix | 2 +- .../buildbot/worker.nix | 2 +- .../gitlab-runner/runner.nix | 2 +- .../modules/services/databases/clickhouse.nix | 2 +- .../services/desktop-managers/budgie.nix | 2 +- .../services/desktop-managers/cosmic.nix | 2 +- .../services/desktop-managers/gnome.nix | 2 +- .../services/desktop-managers/lomiri.nix | 2 +- .../services/desktop-managers/pantheon.nix | 2 +- .../services/desktops/accountsservice.nix | 2 +- nixos/modules/services/desktops/geoclue2.nix | 2 +- .../services/desktops/gnome/at-spi2-core.nix | 2 +- .../desktops/gnome/evolution-data-server.nix | 2 +- .../services/desktops/gnome/gcr-ssh-agent.nix | 2 +- .../desktops/gnome/glib-networking.nix | 2 +- .../gnome/gnome-browser-connector.nix | 2 +- .../desktops/gnome/gnome-initial-setup.nix | 2 +- .../services/desktops/gnome/gnome-keyring.nix | 2 +- .../desktops/gnome/gnome-online-accounts.nix | 2 +- .../desktops/gnome/gnome-remote-desktop.nix | 2 +- .../desktops/gnome/gnome-settings-daemon.nix | 2 +- .../desktops/gnome/gnome-software.nix | 2 +- .../desktops/gnome/gnome-user-share.nix | 2 +- .../services/desktops/gnome/localsearch.nix | 2 +- .../modules/services/desktops/gnome/rygel.nix | 2 +- .../modules/services/desktops/gnome/sushi.nix | 2 +- .../services/desktops/gnome/tinysparql.nix | 2 +- nixos/modules/services/desktops/gvfs.nix | 2 +- .../services/desktops/pipewire/pipewire.nix | 3 +- nixos/modules/services/desktops/tumbler.nix | 2 +- nixos/modules/services/desktops/zeitgeist.nix | 2 +- .../display-managers/cosmic-greeter.nix | 2 +- .../services/display-managers/dms-greeter.nix | 2 +- .../modules/services/display-managers/gdm.nix | 2 +- .../home-automation/home-assistant.nix | 2 +- nixos/modules/services/matrix/dendrite.nix | 2 +- nixos/modules/services/misc/forgejo.nix | 2 +- nixos/modules/services/misc/gitlab.nix | 2 +- nixos/modules/services/networking/epmd.nix | 2 +- .../services/networking/jibri/default.nix | 2 +- nixos/modules/services/networking/jicofo.nix | 2 +- nixos/modules/services/networking/jigasi.nix | 2 +- .../services/networking/jitsi-videobridge.nix | 2 +- .../services/networking/modemmanager.nix | 2 +- .../services/networking/networkmanager.nix | 5 +- nixos/modules/services/security/reaction.nix | 10 +- nixos/modules/services/wayland/hypridle.nix | 2 +- .../modules/services/web-apps/jitsi-meet.nix | 2 +- nixos/modules/services/web-apps/nextcloud.nix | 2 +- .../services/web-apps/peertube-runner.nix | 2 +- .../x11/desktop-managers/enlightenment.nix | 2 +- .../services/x11/desktop-managers/lumina.nix | 2 +- .../services/x11/desktop-managers/lxqt.nix | 2 +- .../services/x11/desktop-managers/xfce.nix | 2 +- .../display-managers/account-service-util.nix | 2 +- .../lightdm-greeters/lomiri.nix | 2 +- .../lightdm-greeters/pantheon.nix | 2 +- .../services/x11/display-managers/lightdm.nix | 2 +- nixos/modules/services/x11/touchegg.nix | 2 +- nixos/modules/virtualisation/containers.nix | 2 +- nixos/modules/virtualisation/cri-o.nix | 2 +- nixos/modules/virtualisation/incus-agent.nix | 2 +- .../virtualisation/incus-virtual-machine.nix | 2 +- nixos/modules/virtualisation/incus.nix | 2 +- .../modules/virtualisation/lxc-container.nix | 2 +- .../virtualisation/lxc-image-metadata.nix | 2 +- .../virtualisation/lxc-instance-common.nix | 2 +- nixos/modules/virtualisation/lxc.nix | 2 +- nixos/modules/virtualisation/lxcfs.nix | 2 +- .../modules/virtualisation/podman/default.nix | 2 +- .../podman/network-socket-ghostunnel.nix | 3 +- .../virtualisation/podman/network-socket.nix | 3 +- nixos/modules/virtualisation/xen-dom0.nix | 2 +- 100 files changed, 210 insertions(+), 458 deletions(-) delete mode 100644 ci/eval/compare/test.nix diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix index ed1129d75f2e..f1473367a7d9 100644 --- a/ci/eval/compare/default.nix +++ b/ci/eval/compare/default.nix @@ -123,7 +123,9 @@ let # - values: lists of `packagePlatformPath`s diffAttrs = builtins.fromJSON (builtins.readFile "${combined}/combined-diff.json"); + changedPackagePlatformAttrs = convertToPackagePlatformAttrs diffAttrs.changed; rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs diffAttrs.rebuilds; + removedPackagePlatformAttrs = convertToPackagePlatformAttrs diffAttrs.removed; changed-paths = let @@ -160,10 +162,9 @@ let inherit (callPackage ./maintainers.nix { - affectedAttrPaths = map (a: a.packagePath) ( - convertToPackagePlatformAttrs (diffAttrs.changed ++ diffAttrs.removed) - ); - changedFiles = lib.importJSON touchedFilesJson; + changedattrs = lib.attrNames (lib.groupBy (a: a.name) changedPackagePlatformAttrs); + changedpathsjson = touchedFilesJson; + removedattrs = lib.attrNames (lib.groupBy (a: a.name) removedPackagePlatformAttrs); }) users teams @@ -180,7 +181,7 @@ runCommand "compare" ]; users = builtins.toJSON users; teams = builtins.toJSON teams; - packages = builtins.toJSON (lib.map (lib.concatStringsSep ".") packages); + packages = builtins.toJSON packages; passAsFile = [ "users" "teams" diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix index 903e42f733f6..daecc1c154da 100644 --- a/ci/eval/compare/maintainers.nix +++ b/ci/eval/compare/maintainers.nix @@ -1,54 +1,70 @@ -# Figure out which maintainers (users/teams) are relevant for a PR: -# - All maintainers that can be linked directly to changedFiles -# - Maintainers of affectedAttrPaths if a file directly related to the attribute is in changedFiles -# -# Files and attributes are linked in various ways: -# - pkgs/by-name//* is linked to pkgs. -# - The file position of various attributes of pkgs. -# - Explicitly specified file positions in derivations -# -# Test with -# nix-instantiate --eval --strict --json test.nix -A result | jq -# -# Empty list as an output means success { - # Files that were changed - # Type: ListOf (Nixpkgs-root-relative path) - changedFiles, - # Attributes whose value was affected by the change - # Type: ListOf (ListOf String) - affectedAttrPaths, - - pkgs ? import ../../.. { + lib, + changedattrs, + changedpathsjson, + removedattrs, +}: +let + pkgs = import ../../.. { system = "x86_64-linux"; # We should never try to ping maintainers through package aliases, this can only lead to errors. # One example case is, where an attribute is a throw alias, but then re-introduced in a PR. # This would trigger the throw. By disabling aliases, we can fallback gracefully below. config.allowAliases = false; - overlays = [ ]; - }, - lib, -}: -let - nixpkgsRoot = toString ../../.. + "/"; - stripNixpkgsRootFromKeys = lib.mapAttrs' ( - file: value: lib.nameValuePair (lib.removePrefix nixpkgsRoot file) value - ); + }; - moduleMeta = (pkgs.nixos { }).config.meta; + changedpaths = lib.importJSON changedpathsjson; - # Currently just nixos module maintainers, but in the future we can use this for code owners too - fileUsers = stripNixpkgsRootFromKeys moduleMeta.maintainers; - fileTeams = stripNixpkgsRootFromKeys moduleMeta.teams; + # Extract attributes that changed from by-name paths. + # This allows pinging reviewers for pure refactors. + touchedattrs = lib.pipe changedpaths [ + (lib.filter (changed: lib.hasPrefix "pkgs/by-name/" changed && changed != "pkgs/by-name/README.md")) + (map (lib.splitString "/")) + (map (path: lib.elemAt path 3)) + lib.unique + ]; - anyMatchingFile = filename: lib.any (lib.hasPrefix filename) changedFiles; + anyMatchingFile = filename: lib.any (lib.hasPrefix filename) changedpaths; anyMatchingFiles = files: lib.any anyMatchingFile files; + sharded = name: "${lib.substring 0 2 name}/${name}"; + + attrsWithMaintainers = lib.pipe (changedattrs ++ removedattrs ++ touchedattrs) [ + # An attribute can appear in changed/removed *and* touched + lib.unique + (map ( + name: + let + path = lib.splitString "." name; + # Some packages might be reported as changed on a different platform, but + # not even have an attribute on the platform the maintainers are requested on. + # Fallback to `null` for these to filter them out below. + package = lib.attrByPath path null pkgs; + in + { + inherit name package; + # Adds all files in by-name to each package, no matter whether they are discoverable + # via meta attributes below. For example, this allows pinging maintainers for + # updates to .json files. + # TODO: Support by-name package sets. + filenames = lib.optional (lib.length path == 1) "pkgs/by-name/${sharded (lib.head path)}/"; + # meta.maintainers also contains all individual team members. + # We only want to ping individuals if they're added individually as maintainers, not via teams. + users = package.meta.nonTeamMaintainers or [ ]; + teams = package.meta.teams or [ ]; + } + )) + # No need to match up packages without maintainers with their files. + # This also filters out attributes where `package = null`, which is the + # case for libintl, for example. + (lib.filter (pkg: pkg.users != [ ] || pkg.teams != [ ])) + ]; + relevantFilenames = drv: (lib.unique ( - map (pos: lib.removePrefix nixpkgsRoot pos.file) ( + map (pos: lib.removePrefix "${toString ../../..}/" pos.file) ( lib.filter (x: x != null) [ (drv.meta.maintainersPosition or null) (drv.meta.teamsPosition or null) @@ -71,82 +87,50 @@ let ) )); - relevantAffectedAttrPaths = lib.filter ( - attrPath: - # Some packages might be reported as changed on a different platform, but - # not even have an attribute on the platform the maintainers are requested on. - # Fallback to `null` for these to filter them out - let - package = lib.attrByPath attrPath null pkgs; - in - package != null && anyMatchingFiles (relevantFilenames package) - ) affectedAttrPaths; + attrsWithFilenames = map ( + pkg: pkg // { filenames = pkg.filenames ++ relevantFilenames pkg.package; } + ) attrsWithMaintainers; - # Extract attributes that changed from by-name paths. - # This allows pinging reviewers for pure refactors. - changedByNameAttrPaths = lib.pipe changedFiles [ - (lib.filter (changed: lib.hasPrefix "pkgs/by-name/" changed)) - (map (lib.splitString "/")) - # Filters out e.g. pkgs/by-name/README.md - (lib.filter (path: lib.length path > 3)) - (map (path: lib.elemAt path 3)) - (map lib.singleton) - ]; - - # An attribute can appear in affected *and* touched - attrPathsToGetMaintainersFor = lib.unique (relevantAffectedAttrPaths ++ changedByNameAttrPaths); - - attrPathEntities = lib.concatMap ( - attrPath: - let - package = lib.getAttrFromPath attrPath pkgs; - in - # meta.maintainers also contains all individual team members. - # We only want to ping individuals if they're added individually as maintainers, not via teams. - userPings { inherit attrPath; } (package.meta.nonTeamMaintainers or [ ]) - ++ lib.concatMap (teamPings { inherit attrPath; }) (package.meta.teams or [ ]) - ) attrPathsToGetMaintainersFor; - - changedFileEntities = lib.concatMap ( - file: - userPings { inherit file; } (fileUsers.${file} or [ ]) - ++ lib.concatMap (teamPings { inherit file; }) (fileTeams.${file} or [ ]) - ) changedFiles; + attrsWithModifiedFiles = lib.filter (pkg: anyMatchingFiles pkg.filenames) attrsWithFilenames; userPings = - context: + pkg: map (maintainer: { type = "user"; userId = maintainer.githubId; - inherit context; + packageName = pkg.name; }); teamPings = - context: team: - if team ? githubId then + pkg: team: + if team ? github then [ { type = "team"; teamId = team.githubId; - inherit context; + packageName = pkg.name; } ] else - userPings context team.members; + userPings pkg team.members; - byType = lib.groupBy (ping: ping.type) (attrPathEntities ++ changedFileEntities); + maintainersToPing = lib.concatMap ( + pkg: userPings pkg pkg.users ++ lib.concatMap (teamPings pkg) pkg.teams + ) attrsWithModifiedFiles; + + byType = lib.groupBy (ping: ping.type) maintainersToPing; byUser = lib.pipe (byType.user or [ ]) [ (lib.groupBy (ping: toString ping.userId)) - (lib.mapAttrs (_user: lib.map (pkg: pkg.context))) + (lib.mapAttrs (_user: lib.map (pkg: pkg.packageName))) ]; byTeam = lib.pipe (byType.team or [ ]) [ (lib.groupBy (ping: toString ping.teamId)) - (lib.mapAttrs (_team: lib.map (pkg: pkg.context))) + (lib.mapAttrs (_team: lib.map (pkg: pkg.packageName))) ]; in { users = byUser; teams = byTeam; - packages = attrPathsToGetMaintainersFor; + packages = lib.catAttrs "name" attrsWithModifiedFiles; } diff --git a/ci/eval/compare/test.nix b/ci/eval/compare/test.nix deleted file mode 100644 index 323d71d87680..000000000000 --- a/ci/eval/compare/test.nix +++ /dev/null @@ -1,228 +0,0 @@ -{ - pkgs ? import ../../.. { - config = { }; - overlays = [ ]; - }, - lib ? pkgs.lib, -}: -let - fun = import ./maintainers.nix; - - mockPkgs = - { - packages ? [ ], - modules ? [ ], - githubTeams ? true, - }: - lib.updateManyAttrsByPath - (lib.imap0 (i: p: { - path = p; - update = _: { - meta.maintainersPosition.file = lib.concatStringsSep "/" p; - meta.nonTeamMaintainers = [ { githubId = i; } ]; - meta.teams = - if githubTeams then [ { githubId = i + 100; } ] else [ { members = [ { githubId = i + 100; } ]; } ]; - }; - }) packages) - { - nixos = - { }: - { - config.meta.maintainers = lib.listToAttrs ( - lib.imap0 (i: m: lib.nameValuePair m [ { githubId = i; } ]) modules - ); - config.meta.teams = lib.listToAttrs ( - lib.imap0 ( - i: m: - lib.nameValuePair m ( - if githubTeams then [ { githubId = i + 100; } ] else [ { members = [ { githubId = i + 100; } ]; } ] - ) - ) modules - ); - }; - }; - - tests = { - testEmpty = { - expr = fun { - pkgs = mockPkgs { }; - inherit lib; - changedFiles = [ ]; - affectedAttrPaths = [ ]; - }; - expected = { - packages = [ ]; - teams = { }; - users = { }; - }; - }; - testNonExistentAffected = { - expr = fun { - pkgs = mockPkgs { }; - inherit lib; - changedFiles = [ "a" ]; - affectedAttrPaths = [ [ "b" ] ]; - }; - expected = { - packages = [ ]; - teams = { }; - users = { }; - }; - }; - testIrrelevantAffected = { - expr = fun { - pkgs = mockPkgs { - packages = [ [ "b" ] ]; - }; - inherit lib; - changedFiles = [ "a" ]; - affectedAttrPaths = [ [ "b" ] ]; - }; - expected = { - packages = [ ]; - teams = { }; - users = { }; - }; - }; - testRelevantAffected = { - expr = fun { - pkgs = mockPkgs { - packages = [ [ "b" ] ]; - }; - inherit lib; - # Also tests that subpaths work - changedFiles = [ "b/c" ]; - affectedAttrPaths = [ [ "b" ] ]; - }; - expected = { - packages = [ [ "b" ] ]; - teams."100" = [ - { attrPath = [ "b" ]; } - ]; - users."0" = [ - { attrPath = [ "b" ]; } - ]; - }; - }; - testRelevantAffectedNonGitHub = { - expr = fun { - pkgs = mockPkgs { - packages = [ [ "b" ] ]; - githubTeams = false; - }; - inherit lib; - changedFiles = [ "b/c" ]; - affectedAttrPaths = [ [ "b" ] ]; - }; - expected = { - packages = [ [ "b" ] ]; - teams = { }; - users."0" = [ - { attrPath = [ "b" ]; } - ]; - users."100" = [ - { attrPath = [ "b" ]; } - ]; - }; - }; - testByNameChanged = { - expr = fun { - pkgs = mockPkgs { - packages = [ [ "hello" ] ]; - }; - inherit lib; - changedFiles = [ "pkgs/by-name/he/hello/sources.json" ]; - affectedAttrPaths = [ ]; - }; - expected = { - packages = [ [ "hello" ] ]; - teams."100" = [ - { attrPath = [ "hello" ]; } - ]; - users."0" = [ - { attrPath = [ "hello" ]; } - ]; - }; - }; - testByNameReadmeChanged = { - expr = fun { - pkgs = mockPkgs { - packages = [ [ "hello" ] ]; - }; - inherit lib; - changedFiles = [ "pkgs/by-name/README.md" ]; - affectedAttrPaths = [ ]; - }; - expected = { - packages = [ ]; - teams = { }; - users = { }; - }; - }; - testNoDuplicates = { - expr = fun { - pkgs = mockPkgs { - packages = [ [ "hello" ] ]; - }; - inherit lib; - changedFiles = [ - "hello" - "pkgs/by-name/he/hello/sources.json" - ]; - affectedAttrPaths = [ [ "hello" ] ]; - }; - expected = { - packages = [ [ "hello" ] ]; - teams."100" = [ - { attrPath = [ "hello" ]; } - ]; - users."0" = [ - { attrPath = [ "hello" ]; } - ]; - }; - }; - testModuleMaintainers = { - expr = fun { - pkgs = mockPkgs { - modules = [ "a" ]; - }; - inherit lib; - changedFiles = [ "a" ]; - affectedAttrPaths = [ ]; - }; - expected = { - packages = [ ]; - teams."100" = [ - { file = "a"; } - ]; - users."0" = [ - { file = "a"; } - ]; - }; - }; - testModuleMaintainersNonGithub = { - expr = fun { - pkgs = mockPkgs { - modules = [ "a" ]; - githubTeams = false; - }; - inherit lib; - changedFiles = [ "a" ]; - affectedAttrPaths = [ ]; - }; - expected = { - packages = [ ]; - teams = { }; - users."100" = [ - { file = "a"; } - ]; - users."0" = [ - { file = "a"; } - ]; - }; - }; - }; -in -{ - result = lib.runTests tests; -} diff --git a/modules/generic/meta-maintainers.nix b/modules/generic/meta-maintainers.nix index ce37dae03db6..f9e8a19aea82 100644 --- a/modules/generic/meta-maintainers.nix +++ b/modules/generic/meta-maintainers.nix @@ -4,12 +4,39 @@ let inherit (lib) mkOption + mkOptionType types ; - # The resulting value of this type shows where all values were defined - sourceList = types.listOf types.raw // { - merge = loc: defs: lib.listToAttrs (lib.map ({ file, value }: lib.nameValuePair file value) defs); + maintainer = mkOptionType { + name = "maintainer"; + check = email: lib.elem email (lib.attrValues lib.maintainers); + merge = loc: defs: { + # lib.last: Perhaps this could be merged instead, if "at most once per module" + # is a problem (see option description). + ${(lib.last defs).file} = (lib.last defs).value; + }; + }; + + listOfMaintainers = types.listOf maintainer // { + merge = + loc: defs: + lib.zipAttrs ( + lib.flatten ( + lib.imap1 ( + n: def: + lib.imap1 ( + m: def': + maintainer.merge (loc ++ [ "[${toString n}-${toString m}]" ]) [ + { + inherit (def) file; + value = def'; + } + ] + ) def.value + ) defs + ) + ); }; in { @@ -17,14 +44,7 @@ in options = { meta = { maintainers = mkOption { - type = - let - allMaintainers = lib.attrValues lib.maintainers; - in - lib.types.addCheck sourceList (lib.all (v: lib.elem v allMaintainers)) - // { - description = "list of lib.maintainers"; - }; + type = listOfMaintainers; default = [ ]; example = lib.literalExpression "[ lib.maintainers.alice lib.maintainers.bob ]"; description = '' @@ -34,22 +54,6 @@ in The option value is not a list of maintainers, but an attribute set that maps module file names to lists of maintainers. ''; }; - teams = mkOption { - type = - let - allTeams = lib.attrValues lib.teams; - in - lib.types.addCheck sourceList (lib.all (v: lib.elem v allTeams)) - // { - description = "list of lib.teams"; - }; - default = [ ]; - example = lib.literalExpression "[ lib.teams.acme lib.teams.haskell ]"; - description = '' - List of team maintainers of each module. - This option should be defined at most once per module. - ''; - }; }; }; meta.maintainers = with lib.maintainers; [ diff --git a/modules/generic/meta-maintainers/test.nix b/modules/generic/meta-maintainers/test.nix index a9859a6ee2dc..e4b37780ca83 100644 --- a/modules/generic/meta-maintainers/test.nix +++ b/modules/generic/meta-maintainers/test.nix @@ -14,17 +14,9 @@ let }; in rec { - # Inject ghost into lib.maintainers so it passes the addCheck validation - lib = (import ../../../lib).extend ( - final: prev: { - maintainers = prev.maintainers // { - inherit ghost; - }; - } - ); + lib = import ../../../lib; example = lib.evalModules { - specialArgs.lib = lib; modules = [ ../meta-maintainers.nix { diff --git a/nixos/modules/config/vte.nix b/nixos/modules/config/vte.nix index f3ec58012b0d..8ed746d4966d 100644 --- a/nixos/modules/config/vte.nix +++ b/nixos/modules/config/vte.nix @@ -22,7 +22,7 @@ in { meta = { - teams = [ lib.teams.gnome ]; + maintainers = lib.teams.gnome.members; }; options = { diff --git a/nixos/modules/config/xdg/autostart.nix b/nixos/modules/config/xdg/autostart.nix index 8310c377d43b..8fc3cb9920fa 100644 --- a/nixos/modules/config/xdg/autostart.nix +++ b/nixos/modules/config/xdg/autostart.nix @@ -1,7 +1,7 @@ { config, lib, ... }: { meta = { - teams = [ lib.teams.freedesktop ]; + maintainers = lib.teams.freedesktop.members; }; options = { diff --git a/nixos/modules/config/xdg/icons.nix b/nixos/modules/config/xdg/icons.nix index 41eee42767f4..7810c57ef386 100644 --- a/nixos/modules/config/xdg/icons.nix +++ b/nixos/modules/config/xdg/icons.nix @@ -6,7 +6,7 @@ }: { meta = { - teams = [ lib.teams.freedesktop ]; + maintainers = lib.teams.freedesktop.members; }; options = { diff --git a/nixos/modules/config/xdg/menus.nix b/nixos/modules/config/xdg/menus.nix index efbfdc5f2383..6c05d49189ad 100644 --- a/nixos/modules/config/xdg/menus.nix +++ b/nixos/modules/config/xdg/menus.nix @@ -1,7 +1,7 @@ { config, lib, ... }: { meta = { - teams = [ lib.teams.freedesktop ]; + maintainers = lib.teams.freedesktop.members; }; options = { diff --git a/nixos/modules/config/xdg/mime.nix b/nixos/modules/config/xdg/mime.nix index 59d62a32010b..79955a03ef2f 100644 --- a/nixos/modules/config/xdg/mime.nix +++ b/nixos/modules/config/xdg/mime.nix @@ -13,7 +13,7 @@ in { meta = { - teams = [ lib.teams.freedesktop ]; + maintainers = lib.teams.freedesktop.members ++ [ ]; }; options = { diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix index 6bc6ce5e33e7..5fd9d7fdd1bb 100644 --- a/nixos/modules/config/xdg/portal.nix +++ b/nixos/modules/config/xdg/portal.nix @@ -32,7 +32,7 @@ in ]; meta = { - teams = [ teams.freedesktop ]; + maintainers = teams.freedesktop.members; }; options.xdg.portal = { diff --git a/nixos/modules/config/xdg/portals/lxqt.nix b/nixos/modules/config/xdg/portals/lxqt.nix index 423fcae1b2b1..77a5f144730d 100644 --- a/nixos/modules/config/xdg/portals/lxqt.nix +++ b/nixos/modules/config/xdg/portals/lxqt.nix @@ -10,7 +10,7 @@ let in { meta = { - teams = [ lib.teams.lxqt ]; + maintainers = lib.teams.lxqt.members; }; options.xdg.portal.lxqt = { diff --git a/nixos/modules/config/xdg/sounds.nix b/nixos/modules/config/xdg/sounds.nix index e23ced7f76dd..8b5bb67e4109 100644 --- a/nixos/modules/config/xdg/sounds.nix +++ b/nixos/modules/config/xdg/sounds.nix @@ -6,7 +6,7 @@ }: { meta = { - teams = [ lib.teams.freedesktop ]; + maintainers = lib.teams.freedesktop.members; }; options = { diff --git a/nixos/modules/programs/dsearch.nix b/nixos/modules/programs/dsearch.nix index 5e99478054d3..f1597189fa38 100644 --- a/nixos/modules/programs/dsearch.nix +++ b/nixos/modules/programs/dsearch.nix @@ -49,5 +49,5 @@ in systemd.user.services.dsearch.wantedBy = mkIf cfg.systemd.enable [ cfg.systemd.target ]; }; - meta.teams = [ lib.teams.danklinux ]; + meta.maintainers = lib.teams.danklinux.members; } diff --git a/nixos/modules/programs/geary.nix b/nixos/modules/programs/geary.nix index 6c881dc8ccaf..0cbfe5b0605c 100644 --- a/nixos/modules/programs/geary.nix +++ b/nixos/modules/programs/geary.nix @@ -11,7 +11,7 @@ let in { meta = { - teams = [ lib.teams.gnome ]; + maintainers = lib.teams.gnome.members; }; options = { diff --git a/nixos/modules/programs/gnome-disks.nix b/nixos/modules/programs/gnome-disks.nix index c6de53d844f3..e6f93c6fdfe6 100644 --- a/nixos/modules/programs/gnome-disks.nix +++ b/nixos/modules/programs/gnome-disks.nix @@ -10,7 +10,7 @@ { meta = { - teams = [ lib.teams.gnome ]; + maintainers = lib.teams.gnome.members; }; ###### interface diff --git a/nixos/modules/programs/gnome-terminal.nix b/nixos/modules/programs/gnome-terminal.nix index f7ade6a184c4..aea0e97c3634 100644 --- a/nixos/modules/programs/gnome-terminal.nix +++ b/nixos/modules/programs/gnome-terminal.nix @@ -16,7 +16,7 @@ in { meta = { - teams = [ lib.teams.gnome ]; + maintainers = lib.teams.gnome.members; }; options = { diff --git a/nixos/modules/programs/nm-applet.nix b/nixos/modules/programs/nm-applet.nix index a1c69f52f624..7aecbadd2ebf 100644 --- a/nixos/modules/programs/nm-applet.nix +++ b/nixos/modules/programs/nm-applet.nix @@ -10,7 +10,7 @@ let in { meta = { - teams = [ lib.teams.freedesktop ]; + maintainers = lib.teams.freedesktop.members; }; options.programs.nm-applet = { diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix index 2ae30243c432..6fa66f681457 100644 --- a/nixos/modules/programs/steam.nix +++ b/nixos/modules/programs/steam.nix @@ -285,5 +285,5 @@ in ]; }; - meta.teams = [ lib.teams.steam ]; + meta.maintainers = lib.teams.steam.members; } diff --git a/nixos/modules/programs/thunar.nix b/nixos/modules/programs/thunar.nix index c565f3ef1cec..76da7d94c67c 100644 --- a/nixos/modules/programs/thunar.nix +++ b/nixos/modules/programs/thunar.nix @@ -11,7 +11,7 @@ let in { meta = { - teams = [ lib.teams.xfce ]; + maintainers = lib.teams.xfce.members; }; options = { diff --git a/nixos/modules/programs/wayland/dms-shell.nix b/nixos/modules/programs/wayland/dms-shell.nix index b24253b57c23..53f84c1a41b1 100644 --- a/nixos/modules/programs/wayland/dms-shell.nix +++ b/nixos/modules/programs/wayland/dms-shell.nix @@ -226,5 +226,5 @@ in hardware.graphics.enable = lib.mkDefault true; }; - meta.teams = [ lib.teams.danklinux ]; + meta.maintainers = lib.teams.danklinux.members; } diff --git a/nixos/modules/programs/wayland/hyprland.nix b/nixos/modules/programs/wayland/hyprland.nix index 744f7af70fe5..44aedc3d248e 100644 --- a/nixos/modules/programs/wayland/hyprland.nix +++ b/nixos/modules/programs/wayland/hyprland.nix @@ -130,5 +130,5 @@ in ] "Nvidia patches are no longer needed") ]; - meta.teams = [ lib.teams.hyprland ]; + meta.maintainers = lib.teams.hyprland.members; } diff --git a/nixos/modules/programs/wayland/hyprlock.nix b/nixos/modules/programs/wayland/hyprlock.nix index c1ba14ddf771..e05d8f826a4c 100644 --- a/nixos/modules/programs/wayland/hyprlock.nix +++ b/nixos/modules/programs/wayland/hyprlock.nix @@ -26,5 +26,5 @@ in security.pam.services.hyprlock = { }; }; - meta.teams = [ lib.teams.hyprland ]; + meta.maintainers = lib.teams.hyprland.members; } diff --git a/nixos/modules/programs/xfconf.nix b/nixos/modules/programs/xfconf.nix index 74a05cc1a798..cc9b6ddf7ac7 100644 --- a/nixos/modules/programs/xfconf.nix +++ b/nixos/modules/programs/xfconf.nix @@ -11,7 +11,7 @@ let in { meta = { - teams = [ lib.teams.xfce ]; + maintainers = lib.teams.xfce.members; }; options = { diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix index cb3a0010a758..1b262e285e19 100644 --- a/nixos/modules/security/acme/default.nix +++ b/nixos/modules/security/acme/default.nix @@ -1218,7 +1218,7 @@ in ]; meta = { - teams = [ lib.teams.acme ]; + maintainers = lib.teams.acme.members; doc = ./default.md; }; } diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index d446bb37a722..6b059c2bd522 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -272,5 +272,5 @@ in }; }; - meta.teams = [ lib.teams.apparmor ]; + meta.maintainers = lib.teams.apparmor.members; } diff --git a/nixos/modules/services/cluster/rancher/default.nix b/nixos/modules/services/cluster/rancher/default.nix index c511da5a62f5..3ed0f75d081e 100644 --- a/nixos/modules/services/cluster/rancher/default.nix +++ b/nixos/modules/services/cluster/rancher/default.nix @@ -962,6 +962,5 @@ in (import ./rke2.nix args) ]; - meta.teams = [ lib.teams.k3s ]; - meta.maintainers = pkgs.rke2.meta.maintainers; + meta.maintainers = pkgs.rke2.meta.maintainers ++ lib.teams.k3s.members; } diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index 1cf585604b5e..42e88e9ddbe3 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -313,5 +313,5 @@ in '') ]; - meta.teams = [ lib.teams.buildbot ]; + meta.maintainers = lib.teams.buildbot.members; } diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix index c16720b0bf67..b1e1e7e254b5 100644 --- a/nixos/modules/services/continuous-integration/buildbot/worker.nix +++ b/nixos/modules/services/continuous-integration/buildbot/worker.nix @@ -196,6 +196,6 @@ in }; }; - meta.teams = [ lib.teams.buildbot ]; + meta.maintainers = lib.teams.buildbot.members; } diff --git a/nixos/modules/services/continuous-integration/gitlab-runner/runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner/runner.nix index 693229b87d97..b95d30ceea4a 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner/runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner/runner.nix @@ -893,5 +893,5 @@ in ) ]; - meta.teams = [ teams.gitlab ]; + meta.maintainers = teams.gitlab.members; } diff --git a/nixos/modules/services/databases/clickhouse.nix b/nixos/modules/services/databases/clickhouse.nix index 50c291a10be6..de9371de513a 100644 --- a/nixos/modules/services/databases/clickhouse.nix +++ b/nixos/modules/services/databases/clickhouse.nix @@ -13,7 +13,7 @@ let in { - meta.maintainers = with lib.maintainers; [ thevar1able ]; + meta.maintainers = [ "thevar1able" ]; ###### interface diff --git a/nixos/modules/services/desktop-managers/budgie.nix b/nixos/modules/services/desktop-managers/budgie.nix index 36f2946970bd..160ac04ecd6d 100644 --- a/nixos/modules/services/desktop-managers/budgie.nix +++ b/nixos/modules/services/desktop-managers/budgie.nix @@ -61,7 +61,7 @@ let notExcluded = pkg: utils.disablePackageByName pkg config.environment.budgie.excludePackages; in { - meta.teams = [ lib.teams.budgie ]; + meta.maintainers = lib.teams.budgie.members; imports = [ (lib.mkRenamedOptionModule diff --git a/nixos/modules/services/desktop-managers/cosmic.nix b/nixos/modules/services/desktop-managers/cosmic.nix index c780a5164922..26b185cc7742 100644 --- a/nixos/modules/services/desktop-managers/cosmic.nix +++ b/nixos/modules/services/desktop-managers/cosmic.nix @@ -44,7 +44,7 @@ let ]; in { - meta.teams = [ lib.teams.cosmic ]; + meta.maintainers = lib.teams.cosmic.members; options = { services.desktopManager.cosmic = { diff --git a/nixos/modules/services/desktop-managers/gnome.nix b/nixos/modules/services/desktop-managers/gnome.nix index ddd13354612e..5c11388eb97b 100644 --- a/nixos/modules/services/desktop-managers/gnome.nix +++ b/nixos/modules/services/desktop-managers/gnome.nix @@ -82,7 +82,7 @@ in { meta = { doc = ./gnome.md; - teams = [ lib.teams.gnome ]; + maintainers = lib.teams.gnome.members; }; imports = [ diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index 1f40afb3732a..b82c194be92c 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -292,5 +292,5 @@ in }) ]; - meta.teams = [ lib.teams.lomiri ]; + meta.maintainers = lib.teams.lomiri.members; } diff --git a/nixos/modules/services/desktop-managers/pantheon.nix b/nixos/modules/services/desktop-managers/pantheon.nix index b9498a0adb83..1fe99c0f66ac 100644 --- a/nixos/modules/services/desktop-managers/pantheon.nix +++ b/nixos/modules/services/desktop-managers/pantheon.nix @@ -25,7 +25,7 @@ in meta = { doc = ./pantheon.md; - teams = [ teams.pantheon ]; + maintainers = teams.pantheon.members; }; imports = [ diff --git a/nixos/modules/services/desktops/accountsservice.nix b/nixos/modules/services/desktops/accountsservice.nix index fd328e357ce2..758f7383ca63 100644 --- a/nixos/modules/services/desktops/accountsservice.nix +++ b/nixos/modules/services/desktops/accountsservice.nix @@ -7,7 +7,7 @@ }: { meta = { - teams = [ lib.teams.freedesktop ]; + maintainers = lib.teams.freedesktop.members; }; ###### interface diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix index e44816cf2542..ffc48d6b9435 100644 --- a/nixos/modules/services/desktops/geoclue2.nix +++ b/nixos/modules/services/desktops/geoclue2.nix @@ -373,6 +373,6 @@ in }; meta = { - teams = [ lib.teams.pantheon ]; + maintainers = [ ] ++ lib.teams.pantheon.members; }; } diff --git a/nixos/modules/services/desktops/gnome/at-spi2-core.nix b/nixos/modules/services/desktops/gnome/at-spi2-core.nix index 77070843e04e..293a3166b187 100644 --- a/nixos/modules/services/desktops/gnome/at-spi2-core.nix +++ b/nixos/modules/services/desktops/gnome/at-spi2-core.nix @@ -10,7 +10,7 @@ { meta = { - teams = [ lib.teams.gnome ]; + maintainers = lib.teams.gnome.members; }; ###### interface diff --git a/nixos/modules/services/desktops/gnome/evolution-data-server.nix b/nixos/modules/services/desktops/gnome/evolution-data-server.nix index 4437be835604..539fcf25342e 100644 --- a/nixos/modules/services/desktops/gnome/evolution-data-server.nix +++ b/nixos/modules/services/desktops/gnome/evolution-data-server.nix @@ -10,7 +10,7 @@ { meta = { - teams = [ lib.teams.gnome ]; + maintainers = lib.teams.gnome.members; }; ###### interface diff --git a/nixos/modules/services/desktops/gnome/gcr-ssh-agent.nix b/nixos/modules/services/desktops/gnome/gcr-ssh-agent.nix index eb1bad3b15c4..d88f1a618049 100644 --- a/nixos/modules/services/desktops/gnome/gcr-ssh-agent.nix +++ b/nixos/modules/services/desktops/gnome/gcr-ssh-agent.nix @@ -13,7 +13,7 @@ let in { meta = { - teams = [ lib.teams.gnome ]; + maintainers = lib.teams.gnome.members; }; options = { diff --git a/nixos/modules/services/desktops/gnome/glib-networking.nix b/nixos/modules/services/desktops/gnome/glib-networking.nix index 048db8cf54a3..558abca0aa31 100644 --- a/nixos/modules/services/desktops/gnome/glib-networking.nix +++ b/nixos/modules/services/desktops/gnome/glib-networking.nix @@ -10,7 +10,7 @@ { meta = { - teams = [ lib.teams.gnome ]; + maintainers = lib.teams.gnome.members; }; ###### interface diff --git a/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix b/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix index 17c1dd9045e8..335ebc9a144d 100644 --- a/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix +++ b/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix @@ -16,7 +16,7 @@ in { meta = { - teams = [ teams.gnome ]; + maintainers = teams.gnome.members; }; options = { diff --git a/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix index e72574795e65..3df01b59738d 100644 --- a/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix +++ b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix @@ -48,7 +48,7 @@ in { meta = { - teams = [ lib.teams.gnome ]; + maintainers = lib.teams.gnome.members; }; ###### interface diff --git a/nixos/modules/services/desktops/gnome/gnome-keyring.nix b/nixos/modules/services/desktops/gnome/gnome-keyring.nix index 9140d261a770..550c6ba8eff5 100644 --- a/nixos/modules/services/desktops/gnome/gnome-keyring.nix +++ b/nixos/modules/services/desktops/gnome/gnome-keyring.nix @@ -12,7 +12,7 @@ in { meta = { - teams = [ lib.teams.gnome ]; + maintainers = lib.teams.gnome.members; }; options = { diff --git a/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix b/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix index 7ec9c7e06296..920c4cf8133e 100644 --- a/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix +++ b/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix @@ -10,7 +10,7 @@ { meta = { - teams = [ lib.teams.gnome ]; + maintainers = lib.teams.gnome.members; }; ###### interface diff --git a/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix b/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix index 958fbb546dc3..6e685557ecf0 100644 --- a/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix +++ b/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix @@ -8,7 +8,7 @@ { meta = { - teams = [ lib.teams.gnome ]; + maintainers = lib.teams.gnome.members; }; ###### interface diff --git a/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix b/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix index 7d6f7f7f3478..06d001ab8134 100644 --- a/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix +++ b/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix @@ -16,7 +16,7 @@ in { meta = { - teams = [ lib.teams.gnome ]; + maintainers = lib.teams.gnome.members; }; ###### interface diff --git a/nixos/modules/services/desktops/gnome/gnome-software.nix b/nixos/modules/services/desktops/gnome/gnome-software.nix index 6bbe4d5487ab..ced2549a9e21 100644 --- a/nixos/modules/services/desktops/gnome/gnome-software.nix +++ b/nixos/modules/services/desktops/gnome/gnome-software.nix @@ -7,7 +7,7 @@ { meta = { - teams = [ lib.teams.gnome ]; + maintainers = lib.teams.gnome.members; }; options = { diff --git a/nixos/modules/services/desktops/gnome/gnome-user-share.nix b/nixos/modules/services/desktops/gnome/gnome-user-share.nix index eb869106c818..c6d0f723c047 100644 --- a/nixos/modules/services/desktops/gnome/gnome-user-share.nix +++ b/nixos/modules/services/desktops/gnome/gnome-user-share.nix @@ -10,7 +10,7 @@ { meta = { - teams = [ lib.teams.gnome ]; + maintainers = lib.teams.gnome.members; }; ###### interface diff --git a/nixos/modules/services/desktops/gnome/localsearch.nix b/nixos/modules/services/desktops/gnome/localsearch.nix index 90018c557ec1..9160d1f06431 100644 --- a/nixos/modules/services/desktops/gnome/localsearch.nix +++ b/nixos/modules/services/desktops/gnome/localsearch.nix @@ -7,7 +7,7 @@ { meta = { - teams = [ lib.teams.gnome ]; + maintainers = lib.teams.gnome.members; }; imports = [ diff --git a/nixos/modules/services/desktops/gnome/rygel.nix b/nixos/modules/services/desktops/gnome/rygel.nix index 410550b8990c..e8a147ed6e76 100644 --- a/nixos/modules/services/desktops/gnome/rygel.nix +++ b/nixos/modules/services/desktops/gnome/rygel.nix @@ -14,7 +14,7 @@ in { meta = { - teams = [ lib.teams.gnome ]; + maintainers = lib.teams.gnome.members; }; ###### interface diff --git a/nixos/modules/services/desktops/gnome/sushi.nix b/nixos/modules/services/desktops/gnome/sushi.nix index d8aff2a7a0bd..ea99c7ce30f0 100644 --- a/nixos/modules/services/desktops/gnome/sushi.nix +++ b/nixos/modules/services/desktops/gnome/sushi.nix @@ -10,7 +10,7 @@ { meta = { - teams = [ lib.teams.gnome ]; + maintainers = lib.teams.gnome.members; }; ###### interface diff --git a/nixos/modules/services/desktops/gnome/tinysparql.nix b/nixos/modules/services/desktops/gnome/tinysparql.nix index 3811780ddbc4..551b5800e84c 100644 --- a/nixos/modules/services/desktops/gnome/tinysparql.nix +++ b/nixos/modules/services/desktops/gnome/tinysparql.nix @@ -10,7 +10,7 @@ let in { meta = { - teams = [ lib.teams.gnome ]; + maintainers = lib.teams.gnome.members; }; imports = [ diff --git a/nixos/modules/services/desktops/gvfs.nix b/nixos/modules/services/desktops/gvfs.nix index 004810327798..315141705546 100644 --- a/nixos/modules/services/desktops/gvfs.nix +++ b/nixos/modules/services/desktops/gvfs.nix @@ -16,7 +16,7 @@ in { meta = { - teams = [ lib.teams.gnome ]; + maintainers = lib.teams.gnome.members; }; ###### interface diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix index 77cdfa9a573e..3f4cf2af05b2 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -85,8 +85,7 @@ let }; in { - meta.teams = [ teams.freedesktop ]; - meta.maintainers = [ maintainers.k900 ]; + meta.maintainers = teams.freedesktop.members ++ [ maintainers.k900 ]; ###### interface options = { diff --git a/nixos/modules/services/desktops/tumbler.nix b/nixos/modules/services/desktops/tumbler.nix index 9143466fafef..12b0184d42c9 100644 --- a/nixos/modules/services/desktops/tumbler.nix +++ b/nixos/modules/services/desktops/tumbler.nix @@ -18,7 +18,7 @@ in ]; meta = { - teams = [ lib.teams.pantheon ]; + maintainers = [ ] ++ lib.teams.pantheon.members; }; ###### interface diff --git a/nixos/modules/services/desktops/zeitgeist.nix b/nixos/modules/services/desktops/zeitgeist.nix index fe065c4a4d7a..227287dd2377 100644 --- a/nixos/modules/services/desktops/zeitgeist.nix +++ b/nixos/modules/services/desktops/zeitgeist.nix @@ -8,7 +8,7 @@ { meta = { - teams = [ lib.teams.pantheon ]; + maintainers = [ ] ++ lib.teams.pantheon.members; }; ###### interface diff --git a/nixos/modules/services/display-managers/cosmic-greeter.nix b/nixos/modules/services/display-managers/cosmic-greeter.nix index 93320b9be90a..8886a4766e4e 100644 --- a/nixos/modules/services/display-managers/cosmic-greeter.nix +++ b/nixos/modules/services/display-managers/cosmic-greeter.nix @@ -16,7 +16,7 @@ let in { - meta.teams = [ lib.teams.cosmic ]; + meta.maintainers = lib.teams.cosmic.members; options.services.displayManager.cosmic-greeter = { enable = lib.mkEnableOption "COSMIC greeter"; diff --git a/nixos/modules/services/display-managers/dms-greeter.nix b/nixos/modules/services/display-managers/dms-greeter.nix index abdd6e2ddf3b..d049daa9b24f 100644 --- a/nixos/modules/services/display-managers/dms-greeter.nix +++ b/nixos/modules/services/display-managers/dms-greeter.nix @@ -321,5 +321,5 @@ in services.libinput.enable = mkDefault true; }; - meta.teams = [ lib.teams.danklinux ]; + meta.maintainers = lib.teams.danklinux.members; } diff --git a/nixos/modules/services/display-managers/gdm.nix b/nixos/modules/services/display-managers/gdm.nix index 9fc92e91018c..e46c8cf72fe7 100644 --- a/nixos/modules/services/display-managers/gdm.nix +++ b/nixos/modules/services/display-managers/gdm.nix @@ -105,7 +105,7 @@ in ]; meta = { - teams = [ lib.teams.gnome ]; + maintainers = lib.teams.gnome.members; }; ###### interface diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index eb4b475d4187..dc1900f52c1e 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -171,7 +171,7 @@ in meta = { buildDocsInSandbox = false; - teams = [ lib.teams.home-assistant ]; + maintainers = lib.teams.home-assistant.members; }; options.services.home-assistant = { diff --git a/nixos/modules/services/matrix/dendrite.nix b/nixos/modules/services/matrix/dendrite.nix index 302bd42b5e37..2c31266457df 100644 --- a/nixos/modules/services/matrix/dendrite.nix +++ b/nixos/modules/services/matrix/dendrite.nix @@ -341,5 +341,5 @@ in }; }; }; - meta.teams = [ lib.teams.matrix ]; + meta.maintainers = lib.teams.matrix.members; } diff --git a/nixos/modules/services/misc/forgejo.nix b/nixos/modules/services/misc/forgejo.nix index 6834ca2008ea..9b85fc8dc133 100644 --- a/nixos/modules/services/misc/forgejo.nix +++ b/nixos/modules/services/misc/forgejo.nix @@ -849,5 +849,5 @@ in }; meta.doc = ./forgejo.md; - meta.teams = [ lib.teams.forgejo ]; + meta.maintainers = lib.teams.forgejo.members; } diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 0601454e9b2e..c353caed9e03 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -1911,5 +1911,5 @@ in }; meta.doc = ./gitlab.md; - meta.teams = [ teams.gitlab ]; + meta.maintainers = teams.gitlab.members; } diff --git a/nixos/modules/services/networking/epmd.nix b/nixos/modules/services/networking/epmd.nix index d2aceb5a9bb1..c17a7c974fa7 100644 --- a/nixos/modules/services/networking/epmd.nix +++ b/nixos/modules/services/networking/epmd.nix @@ -63,5 +63,5 @@ in }; }; - meta.teams = [ lib.teams.beam ]; + meta.maintainers = lib.teams.beam.members; } diff --git a/nixos/modules/services/networking/jibri/default.nix b/nixos/modules/services/networking/jibri/default.nix index 861a6713b017..e07bf5131a92 100644 --- a/nixos/modules/services/networking/jibri/default.nix +++ b/nixos/modules/services/networking/jibri/default.nix @@ -444,5 +444,5 @@ in }; }; - meta.teams = [ lib.teams.jitsi ]; + meta.maintainers = lib.teams.jitsi.members; } diff --git a/nixos/modules/services/networking/jicofo.nix b/nixos/modules/services/networking/jicofo.nix index 9c2139eff1ab..9d0fbfd74081 100644 --- a/nixos/modules/services/networking/jicofo.nix +++ b/nixos/modules/services/networking/jicofo.nix @@ -166,5 +166,5 @@ in lib.mkDefault "${pkgs.jicofo}/etc/jitsi/jicofo/logging.properties-journal"; }; - meta.teams = [ lib.teams.jitsi ]; + meta.maintainers = lib.teams.jitsi.members; } diff --git a/nixos/modules/services/networking/jigasi.nix b/nixos/modules/services/networking/jigasi.nix index c6bcbd28dead..54b2f36685f6 100644 --- a/nixos/modules/services/networking/jigasi.nix +++ b/nixos/modules/services/networking/jigasi.nix @@ -243,5 +243,5 @@ in lib.mkDefault "${stateDir}/logging.properties-journal"; }; - meta.teams = [ lib.teams.jitsi ]; + meta.maintainers = lib.teams.jitsi.members; } diff --git a/nixos/modules/services/networking/jitsi-videobridge.nix b/nixos/modules/services/networking/jitsi-videobridge.nix index bd9692e6338a..a55760d5cae2 100644 --- a/nixos/modules/services/networking/jitsi-videobridge.nix +++ b/nixos/modules/services/networking/jitsi-videobridge.nix @@ -331,5 +331,5 @@ in ]; }; - meta.teams = [ lib.teams.jitsi ]; + meta.maintainers = lib.teams.jitsi.members; } diff --git a/nixos/modules/services/networking/modemmanager.nix b/nixos/modules/services/networking/modemmanager.nix index 604340fd0748..fefee7a448eb 100644 --- a/nixos/modules/services/networking/modemmanager.nix +++ b/nixos/modules/services/networking/modemmanager.nix @@ -9,7 +9,7 @@ let in { meta = { - teams = [ lib.teams.freedesktop ]; + maintainers = lib.teams.freedesktop.members; }; options = with lib; { diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 2cb3532471c8..1f3773c70b00 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -142,8 +142,9 @@ in { meta = { - teams = [ lib.teams.freedesktop ]; - maintainers = [ lib.maintainers.frontear ]; + maintainers = teams.freedesktop.members ++ [ + lib.maintainers.frontear + ]; }; ###### interface diff --git a/nixos/modules/services/security/reaction.nix b/nixos/modules/services/security/reaction.nix index ba0cc6581dbc..039e507ae57f 100644 --- a/nixos/modules/services/security/reaction.nix +++ b/nixos/modules/services/security/reaction.nix @@ -299,8 +299,10 @@ in environment.systemPackages = [ cfg.package ]; }; - meta.teams = [ lib.teams.ngi ]; - meta.maintainers = with lib.maintainers; [ - ppom - ]; + meta.maintainers = + with lib.maintainers; + [ + ppom + ] + ++ lib.teams.ngi.members; } diff --git a/nixos/modules/services/wayland/hypridle.nix b/nixos/modules/services/wayland/hypridle.nix index 29e77c6be34f..4ccb126b56f2 100644 --- a/nixos/modules/services/wayland/hypridle.nix +++ b/nixos/modules/services/wayland/hypridle.nix @@ -28,5 +28,5 @@ in }; }; - meta.teams = [ lib.teams.hyprland ]; + meta.maintainers = lib.teams.hyprland.members; } diff --git a/nixos/modules/services/web-apps/jitsi-meet.nix b/nixos/modules/services/web-apps/jitsi-meet.nix index 18da068fa5c6..b7993cfc46dc 100644 --- a/nixos/modules/services/web-apps/jitsi-meet.nix +++ b/nixos/modules/services/web-apps/jitsi-meet.nix @@ -756,5 +756,5 @@ in }; meta.doc = ./jitsi-meet.md; - meta.teams = [ lib.teams.jitsi ]; + meta.maintainers = lib.teams.jitsi.members; } diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index d069480f3d70..cff0f6ff1872 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -1774,5 +1774,5 @@ in ); meta.doc = ./nextcloud.md; - meta.teams = [ lib.teams.nextcloud ]; + meta.maintainers = lib.teams.nextcloud.members; } diff --git a/nixos/modules/services/web-apps/peertube-runner.nix b/nixos/modules/services/web-apps/peertube-runner.nix index 4756569d9d9c..9b126b7fa97c 100644 --- a/nixos/modules/services/web-apps/peertube-runner.nix +++ b/nixos/modules/services/web-apps/peertube-runner.nix @@ -252,5 +252,5 @@ in }; }; - meta.teams = [ lib.teams.ngi ]; + meta.maintainers = lib.teams.ngi.members; } diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index df132f95e95c..bc5c2b0273e7 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -25,7 +25,7 @@ in { meta = { - teams = [ teams.enlightenment ]; + maintainers = teams.enlightenment.members; }; imports = [ diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixos/modules/services/x11/desktop-managers/lumina.nix index a0cd79f7aae7..74fabced3af3 100644 --- a/nixos/modules/services/x11/desktop-managers/lumina.nix +++ b/nixos/modules/services/x11/desktop-managers/lumina.nix @@ -16,7 +16,7 @@ in { meta = { - teams = [ teams.lumina ]; + maintainers = teams.lumina.members; }; options = { diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix index 8948eff23d46..1ccaa28f8642 100644 --- a/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -15,7 +15,7 @@ in { meta = { - teams = [ teams.lxqt ]; + maintainers = teams.lxqt.members; }; options = { diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 2d53eb58f287..55da49799e31 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -15,7 +15,7 @@ let in { meta = { - teams = [ teams.xfce ]; + maintainers = teams.xfce.members; }; imports = [ diff --git a/nixos/modules/services/x11/display-managers/account-service-util.nix b/nixos/modules/services/x11/display-managers/account-service-util.nix index 697d5b9e940d..0f4d1c0729ad 100644 --- a/nixos/modules/services/x11/display-managers/account-service-util.nix +++ b/nixos/modules/services/x11/display-managers/account-service-util.nix @@ -40,6 +40,6 @@ python3.pkgs.buildPythonApplication { ''; meta = { - teams = [ lib.teams.pantheon ]; + maintainers = [ ] ++ lib.teams.pantheon.members; }; } diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/lomiri.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/lomiri.nix index d8db7706d89f..387f485e2fea 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/lomiri.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/lomiri.nix @@ -13,7 +13,7 @@ let in { - meta.teams = [ lib.teams.lomiri ]; + meta.maintainers = lib.teams.lomiri.members; options = { services.xserver.displayManager.lightdm.greeters.lomiri = { diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix index 3c61ba1556c8..05e03befdad6 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix @@ -16,7 +16,7 @@ let in { meta = { - teams = [ lib.teams.pantheon ]; + maintainers = [ ] ++ lib.teams.pantheon.members; }; options = { diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 467207ecd92b..1ace9c1b8c1f 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -73,7 +73,7 @@ let in { meta = { - teams = [ lib.teams.pantheon ]; + maintainers = [ ] ++ lib.teams.pantheon.members; }; # Note: the order in which lightdm greeter modules are imported diff --git a/nixos/modules/services/x11/touchegg.nix b/nixos/modules/services/x11/touchegg.nix index cb1b9eb4adc8..def3dac738e0 100644 --- a/nixos/modules/services/x11/touchegg.nix +++ b/nixos/modules/services/x11/touchegg.nix @@ -13,7 +13,7 @@ let in { meta = { - teams = [ teams.pantheon ]; + maintainers = teams.pantheon.members; }; ###### interface diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 6386a57079f2..a0c7e826223d 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -13,7 +13,7 @@ let in { meta = { - teams = [ lib.teams.podman ]; + maintainers = [ ] ++ lib.teams.podman.members; }; options.virtualisation.containers = { diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index 68cfc2ccaad9..ddaccf8199a1 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -21,7 +21,7 @@ let in { meta = { - teams = [ teams.podman ]; + maintainers = teams.podman.members; }; options.virtualisation.cri-o = { diff --git a/nixos/modules/virtualisation/incus-agent.nix b/nixos/modules/virtualisation/incus-agent.nix index 34c08e8ee014..bfb9eeb75d33 100644 --- a/nixos/modules/virtualisation/incus-agent.nix +++ b/nixos/modules/virtualisation/incus-agent.nix @@ -10,7 +10,7 @@ let in { meta = { - teams = [ lib.teams.lxc ]; + maintainers = lib.teams.lxc.members; }; options = { diff --git a/nixos/modules/virtualisation/incus-virtual-machine.nix b/nixos/modules/virtualisation/incus-virtual-machine.nix index d714b7fdc36c..8899fc34bb85 100644 --- a/nixos/modules/virtualisation/incus-virtual-machine.nix +++ b/nixos/modules/virtualisation/incus-virtual-machine.nix @@ -10,7 +10,7 @@ let in { meta = { - teams = [ lib.teams.lxc ]; + maintainers = lib.teams.lxc.members; }; imports = [ diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix index 1b8908d0d3d6..7101407fb5bc 100644 --- a/nixos/modules/virtualisation/incus.nix +++ b/nixos/modules/virtualisation/incus.nix @@ -176,7 +176,7 @@ let in { meta = { - teams = [ lib.teams.lxc ]; + maintainers = lib.teams.lxc.members; }; options = { diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix index ec206d6a5ece..a6964b8b2c9a 100644 --- a/nixos/modules/virtualisation/lxc-container.nix +++ b/nixos/modules/virtualisation/lxc-container.nix @@ -7,7 +7,7 @@ { meta = { - teams = [ lib.teams.lxc ]; + maintainers = lib.teams.lxc.members; }; imports = [ diff --git a/nixos/modules/virtualisation/lxc-image-metadata.nix b/nixos/modules/virtualisation/lxc-image-metadata.nix index 1ac1bd2e4e5e..d27f476a59b8 100644 --- a/nixos/modules/virtualisation/lxc-image-metadata.nix +++ b/nixos/modules/virtualisation/lxc-image-metadata.nix @@ -71,7 +71,7 @@ in ]; meta = { - teams = [ lib.teams.lxc ]; + maintainers = lib.teams.lxc.members; }; options = { diff --git a/nixos/modules/virtualisation/lxc-instance-common.nix b/nixos/modules/virtualisation/lxc-instance-common.nix index d3056be46fe3..ff27b1931f8b 100644 --- a/nixos/modules/virtualisation/lxc-instance-common.nix +++ b/nixos/modules/virtualisation/lxc-instance-common.nix @@ -2,7 +2,7 @@ { meta = { - teams = [ lib.teams.lxc ]; + maintainers = lib.teams.lxc.members; }; imports = [ diff --git a/nixos/modules/virtualisation/lxc.nix b/nixos/modules/virtualisation/lxc.nix index eca2eb8115ab..903006a6dabf 100644 --- a/nixos/modules/virtualisation/lxc.nix +++ b/nixos/modules/virtualisation/lxc.nix @@ -13,7 +13,7 @@ in { meta = { - teams = [ lib.teams.lxc ]; + maintainers = lib.teams.lxc.members; }; options.virtualisation.lxc = { diff --git a/nixos/modules/virtualisation/lxcfs.nix b/nixos/modules/virtualisation/lxcfs.nix index 711bcf655d22..f7347af19148 100644 --- a/nixos/modules/virtualisation/lxcfs.nix +++ b/nixos/modules/virtualisation/lxcfs.nix @@ -12,7 +12,7 @@ let in { meta = { - teams = [ lib.teams.lxc ]; + maintainers = lib.teams.lxc.members; }; ###### interface diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix index c0acbe4cac3d..63cc4c5e3f63 100644 --- a/nixos/modules/virtualisation/podman/default.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -63,7 +63,7 @@ in ]; meta = { - teams = [ lib.teams.podman ]; + maintainers = lib.teams.podman.members; }; options.virtualisation.podman = { diff --git a/nixos/modules/virtualisation/podman/network-socket-ghostunnel.nix b/nixos/modules/virtualisation/podman/network-socket-ghostunnel.nix index 962ca39b1598..d5b4bef5f0d9 100644 --- a/nixos/modules/virtualisation/podman/network-socket-ghostunnel.nix +++ b/nixos/modules/virtualisation/podman/network-socket-ghostunnel.nix @@ -35,6 +35,5 @@ in }; - meta.teams = [ lib.teams.podman ]; - meta.maintainers = [ lib.maintainers.roberth ]; + meta.maintainers = lib.teams.podman.members ++ [ lib.maintainers.roberth ]; } diff --git a/nixos/modules/virtualisation/podman/network-socket.nix b/nixos/modules/virtualisation/podman/network-socket.nix index d3a49d204f8a..39434216d780 100644 --- a/nixos/modules/virtualisation/podman/network-socket.nix +++ b/nixos/modules/virtualisation/podman/network-socket.nix @@ -95,6 +95,5 @@ in networking.firewall.allowedTCPPorts = lib.optional (cfg.enable && cfg.openFirewall) cfg.port; }; - meta.teams = [ lib.teams.podman ]; - meta.maintainers = [ lib.maintainers.roberth ]; + meta.maintainers = lib.teams.podman.members ++ [ lib.maintainers.roberth ]; } diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index 2cc939631f84..bbd6bfb57751 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -937,6 +937,6 @@ in }; meta = { doc = ./xen.md; - teams = [ teams.xen ]; + maintainers = teams.xen.members; }; } From dbd6da5fafa2b1dd2b3678880291805e177b6421 Mon Sep 17 00:00:00 2001 From: Dan Xin Date: Fri, 6 Mar 2026 14:23:55 +0800 Subject: [PATCH 302/429] stats: 2.11.62 -> 2.12.1 Diff: https://github.com/exelban/stats/compare/v2.11.62...v2.12.1 Changelog: https://github.com/exelban/stats/releases/tag/v2.12.1 --- pkgs/by-name/st/stats/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index 73d64c7610b9..aa1bfd2049e6 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "stats"; - version = "2.11.62"; + version = "2.12.1"; src = fetchurl { url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg"; - hash = "sha256-23xTP1NbJ43eWISELAUu7aZuIW2cr5O8jV2nRppi9Yw="; + hash = "sha256-li4pCrwt37Wmmk3VAJT9XTcqPQ4HywQObUVSSgzARsE="; }; sourceRoot = "."; From e4074f13905f5117d20ad71358596b41694863aa Mon Sep 17 00:00:00 2001 From: Leon Klingele Date: Fri, 6 Mar 2026 06:42:40 +0100 Subject: [PATCH 303/429] go_1_26: 1.26.0 -> 1.26.1 Signed-off-by: Leon Klingele --- pkgs/development/compilers/go/1.26.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.26.nix b/pkgs/development/compilers/go/1.26.nix index 78ef28f01a79..57c3227d5f76 100644 --- a/pkgs/development/compilers/go/1.26.nix +++ b/pkgs/development/compilers/go/1.26.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.26.0"; + version = "1.26.1"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-yRMqih9r0qpKrR10uCMdlSdJUEg6SVBlfubFbm6Bd5A="; + hash = "sha256-MXIpPQSyCdwRRGmOe6E/BHf2uoxf/QvmbCD9vJeF37s="; }; strictDeps = true; From 616131f3cf2419e1e656241fc9fcaf63239c8510 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 08:19:01 +0000 Subject: [PATCH 304/429] grpc-health-probe: 0.4.45 -> 0.4.46 --- pkgs/by-name/gr/grpc-health-probe/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/grpc-health-probe/package.nix b/pkgs/by-name/gr/grpc-health-probe/package.nix index cc70b77db279..0169bc7b2c50 100644 --- a/pkgs/by-name/gr/grpc-health-probe/package.nix +++ b/pkgs/by-name/gr/grpc-health-probe/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "grpc-health-probe"; - version = "0.4.45"; + version = "0.4.46"; src = fetchFromGitHub { owner = "grpc-ecosystem"; repo = "grpc-health-probe"; rev = "v${finalAttrs.version}"; - hash = "sha256-kzliXJJHVw75wBJ7GKkCxKiuE7tnprIrm1ss9FoHKB8="; + hash = "sha256-+HLYlC0B97iI0Z0bJ1bLTVGi/VtynKmmLBnlS3KcpXY="; }; tags = [ @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { "-X main.versionTag=${finalAttrs.version}" ]; - vendorHash = "sha256-WGY4vj1a+sOKKmuY+1RD/GPOKIUunfdBor0xG64IJY8="; + vendorHash = "sha256-4JvUAA1yt9s3pSEGtP7TY96rco64yaNnGC9ZlyzKM5g="; nativeInstallCheckInputs = [ versionCheckHook From 213ebf03abdf1af415787416e294d3d04611ec25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 08:19:18 +0000 Subject: [PATCH 305/429] home-assistant-custom-lovelace-modules.advanced-camera-card: 7.27.3 -> 7.27.4 --- .../custom-lovelace-modules/advanced-camera-card/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix index 7492d0895f40..d480e09d7bbb 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "advanced-camera-card"; - version = "7.27.3"; + version = "7.27.4"; src = fetchzip { url = "https://github.com/dermotduffy/advanced-camera-card/releases/download/v${version}/advanced-camera-card.zip"; - hash = "sha256-1O0li7OIG0AtNmj2fTuQ8HXWvL0ocx7jCsTKdaUOBcI="; + hash = "sha256-lBdJBn/TLU3ezZnUJLt4eH87n1pOizS68RfLHYyRUq0="; }; # TODO: build from source once yarn berry support lands in nixpkgs From 6f87691cdd95f75bc3aed7054b6fce3156e0a805 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 6 Mar 2026 08:04:43 +0100 Subject: [PATCH 306/429] libvirt: fix darwin build --- pkgs/by-name/li/libvirt/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/li/libvirt/package.nix b/pkgs/by-name/li/libvirt/package.nix index e8544e5204b6..123407423908 100644 --- a/pkgs/by-name/li/libvirt/package.nix +++ b/pkgs/by-name/li/libvirt/package.nix @@ -165,6 +165,7 @@ stdenv.mkDerivation rec { # Darwin doesn’t support -fsemantic-interposition, but the problem doesn’t seem to affect Mach-O. # See https://gitlab.com/libvirt/libvirt/-/merge_requests/235 sed -i "s/not supported_cc_flags.contains('-fsemantic-interposition')/false/" meson.build + sed -i '/qemucapabilitiestest/d' tests/meson.build sed -i '/qemufirmwaretest/d' tests/meson.build sed -i '/qemuhotplugtest/d' tests/meson.build sed -i '/qemuvhostusertest/d' tests/meson.build From b571bcb9b7edcd49c0f71fadde6ae5d4b7c12610 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 6 Mar 2026 09:41:15 +0100 Subject: [PATCH 307/429] diff-pdf: migrate to by-name --- .../diff-pdf/default.nix => by-name/di/diff-pdf/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{applications/misc/diff-pdf/default.nix => by-name/di/diff-pdf/package.nix} (95%) diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/by-name/di/diff-pdf/package.nix similarity index 95% rename from pkgs/applications/misc/diff-pdf/default.nix rename to pkgs/by-name/di/diff-pdf/package.nix index c4b9d33aed63..b0e258f82e63 100644 --- a/pkgs/applications/misc/diff-pdf/default.nix +++ b/pkgs/by-name/di/diff-pdf/package.nix @@ -7,7 +7,7 @@ pkg-config, cairo, poppler, - wxGTK, + wxwidgets_3_2, }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo poppler - wxGTK + wxwidgets_3_2 ]; preConfigure = "./bootstrap"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 803a078e5245..b8bc5e466ab7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10232,10 +10232,6 @@ with pkgs; diffpdf = libsForQt5.callPackage ../applications/misc/diffpdf { }; - diff-pdf = callPackage ../applications/misc/diff-pdf { - wxGTK = wxwidgets_3_2; - }; - mypaint-brushes1 = callPackage ../development/libraries/mypaint-brushes/1.0.nix { }; mypaint-brushes = callPackage ../development/libraries/mypaint-brushes { }; From df5f0e2053f5c8b2d047e0f59c586c0459a37fe5 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 6 Mar 2026 09:47:07 +0100 Subject: [PATCH 308/429] wxmaxima: migrate to by-name --- .../default.nix => by-name/wx/wxmaxima/package.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 6 ------ 2 files changed, 3 insertions(+), 9 deletions(-) rename pkgs/{applications/science/math/wxmaxima/default.nix => by-name/wx/wxmaxima/package.nix} (92%) diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/by-name/wx/wxmaxima/package.nix similarity index 92% rename from pkgs/applications/science/math/wxmaxima/default.nix rename to pkgs/by-name/wx/wxmaxima/package.nix index c05d363566ea..f22dc9cba856 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/by-name/wx/wxmaxima/package.nix @@ -6,7 +6,7 @@ cmake, gettext, maxima, - wxGTK, + wxwidgets_3_2, adwaita-icon-theme, glib, }: @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { }; buildInputs = [ - wxGTK + wxwidgets_3_2 maxima # So it won't embed svg files into headers. adwaita-icon-theme @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DwxWidgets_LIBRARIES=${wxGTK}/lib" + "-DwxWidgets_LIBRARIES=${wxwidgets_3_2}/lib" ]; preConfigure = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 803a078e5245..832cbd078aa9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11941,12 +11941,6 @@ with pkgs; lisp-compiler = ecl; }; - wxmaxima = callPackage ../applications/science/math/wxmaxima { - wxGTK = wxwidgets_3_2.override { - withWebKit = true; - }; - }; - yacas-gui = yacas.override { enableGui = true; enableJupyter = false; From ae2217e30ce451a40521a982fc5b0c56b4f41f7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 08:54:17 +0000 Subject: [PATCH 309/429] home-assistant-custom-components.versatile_thermostat: 9.0.2 -> 9.0.3 --- .../custom-components/versatile_thermostat/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix b/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix index 453f27399019..aa6c83e99680 100644 --- a/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix +++ b/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix @@ -10,13 +10,13 @@ buildHomeAssistantComponent rec { owner = "jmcollin78"; domain = "versatile_thermostat"; - version = "9.0.2"; + version = "9.0.3"; src = fetchFromGitHub { inherit owner; repo = domain; tag = version; - hash = "sha256-TPV6VfWyFsJdHfZtRhs0XvyOpnpw+utzf3eZQL4aALY="; + hash = "sha256-nPGxC+U2NeZ6xKNJVsTkiDZ/dMenQq0BPBfGzjVchBo="; }; dependencies = [ From c8704486ebbe185233e4ae47d33cba5f3afd3b1d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Mar 2026 19:26:16 +0100 Subject: [PATCH 310/429] python3Packages.iamdata: 0.1.202603041 -> 0.1.202603051 Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202603041...v0.1.202603051 Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202603051 --- pkgs/development/python-modules/iamdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index d66c4572a393..4ea1cb897056 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "iamdata"; - version = "0.1.202603041"; + version = "0.1.202603051"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-LsBAC6EAHl/vrGmiOy/fJoUhq5a73Qs07M7Fh7bF6mY="; + hash = "sha256-f6NQH4RVZxf27A3gKDiewigdNw9IELikQSFmGSx9hng="; }; __darwinAllowLocalNetworking = true; From d91e3506eeb7705f49b0eef6deac5c112f6e1554 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Fri, 6 Mar 2026 10:33:12 +0100 Subject: [PATCH 311/429] v4l2loopback: use substituteInPlace --replace-fail --- pkgs/os-specific/linux/v4l2loopback/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index 418efb57d438..475c212fd67e 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; preBuild = '' - substituteInPlace Makefile --replace "modules_install" "INSTALL_MOD_PATH=$out modules_install" + substituteInPlace Makefile --replace-fail "modules_install" "INSTALL_MOD_PATH=$out modules_install" sed -i '/depmod/d' Makefile ''; From 21cbaf5572e7c3d18a13df7d22951b6aba624712 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 6 Mar 2026 09:45:20 +0000 Subject: [PATCH 312/429] radicle-ci-broker: 0.25.0 -> 0.26.0 Changelog: https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:zwTxygwuz5LDGBq255RA2CbNGrz8/tree/NEWS.md --- pkgs/by-name/ra/radicle-ci-broker/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/radicle-ci-broker/package.nix b/pkgs/by-name/ra/radicle-ci-broker/package.nix index 07f74a9cb9c6..ccafa6032a3c 100644 --- a/pkgs/by-name/ra/radicle-ci-broker/package.nix +++ b/pkgs/by-name/ra/radicle-ci-broker/package.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "radicle-ci-broker"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromRadicle { seed = "seed.radicle.xyz"; repo = "zwTxygwuz5LDGBq255RA2CbNGrz8"; node = "z6MkgEMYod7Hxfy9qCvDv5hYHkZ4ciWmLFgfvm3Wn1b2w2FV"; tag = "v${finalAttrs.version}"; - hash = "sha256-28PS85ME0Yg6+FnYw8GRNeo56z5efAqSE7FNk7wiTuI="; + hash = "sha256-ns2X+XD1AL7vo9fsAm1WTj/HRBmZ9eJhIH/WYF+j4uM="; leaveDotGit = true; postFetch = '' git -C $out rev-parse --short HEAD > $out/.git_head @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; }; - cargoHash = "sha256-v+ax8DmXZFxYGYL7WaX5W/UIByuYcvkAMQIqpb6Emyw="; + cargoHash = "sha256-dMc11UB8qzP9uIF9eU+ScwCTmUS/6yLkRYfTxZYnCa0="; postPatch = '' substituteInPlace build.rs \ From 7bb34b14685787a17b7fbafe512261c52346eb0d Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 6 Mar 2026 09:45:18 +0000 Subject: [PATCH 313/429] radicle-job: 0.4.0 -> 0.5.1 Changelog: https://app.radicle.xyz/nodes/iris.radicle.xyz/rad:z2UcCU1LgMshWvXj6hXSDDrwB8q8M/tree/CHANGELOG.md --- pkgs/by-name/ra/radicle-job/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/radicle-job/package.nix b/pkgs/by-name/ra/radicle-job/package.nix index 005817420272..bbbf3b3de996 100644 --- a/pkgs/by-name/ra/radicle-job/package.nix +++ b/pkgs/by-name/ra/radicle-job/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "radicle-job"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromRadicle { seed = "iris.radicle.xyz"; repo = "z2UcCU1LgMshWvXj6hXSDDrwB8q8M"; tag = "releases/v${finalAttrs.version}"; - hash = "sha256-EGNs0IOJSp5SMJ3tdGCxIAN6hvVFwWWUmXoB914jw3k="; + hash = "sha256-1gvOpdgnug46PUD+4LZF8u73L3XpQGMGZyQCvnYvkgE="; }; - cargoHash = "sha256-+DD2cGfxN0rmFhCazEuRiv3JfLXIC4FjaYHmugCmk+g="; + cargoHash = "sha256-nRif/ab+7r9ODuZVXOnYbEDHiipFg91XjezS1OBYYb4="; nativeCheckInputs = [ radicle-node From 102be9db8e24ee381b1c1e214ef3603c1c3a8ee8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 10:28:38 +0000 Subject: [PATCH 314/429] python3Packages.mprisify: 1.0.0 -> 1.0.1 --- pkgs/development/python-modules/mprisify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mprisify/default.nix b/pkgs/development/python-modules/mprisify/default.nix index bf91f8e449f2..9fb239d856ed 100644 --- a/pkgs/development/python-modules/mprisify/default.nix +++ b/pkgs/development/python-modules/mprisify/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { pname = "mprisify"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; src = fetchFromGitLab { owner = "zehkira"; repo = "mprisify"; tag = "v${version}"; - hash = "sha256-05i3N61cqRgGaBjYOEhxeCSV2wDh9yMaXTvEZ/JGrZo="; + hash = "sha256-ir/zv6GGU1TMPoUB05oqWUNt4eEcFzfQ9gShlKYdUfc="; }; build-system = [ setuptools ]; From 7395b31bd249d3bd536a9121e53228ec7c1f4cc0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 10:36:17 +0000 Subject: [PATCH 315/429] lichess-bot: 2026.2.13.1 -> 2026.3.6.3 --- pkgs/by-name/li/lichess-bot/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/lichess-bot/package.nix b/pkgs/by-name/li/lichess-bot/package.nix index 0efd1d770106..f44f339399c0 100644 --- a/pkgs/by-name/li/lichess-bot/package.nix +++ b/pkgs/by-name/li/lichess-bot/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication { pname = "lichess-bot"; - version = "2026.2.13.1"; + version = "2026.3.6.3"; pyproject = false; src = fetchFromGitHub { owner = "lichess-bot-devs"; repo = "lichess-bot"; - rev = "960bcad4ec5069547cc5fcfd496c47a70280ff56"; - hash = "sha256-Dc6R9OufJCcTN32Hx2BVauTwaO9/gWRq24hJ4pWRObY="; + rev = "02ab2363c707cf0f3ff60a6ee914f131c5d05a94"; + hash = "sha256-S0ezzzA0Ft0YSp3knuahjwjvXUGPsrAzG2jqPKrWsRA="; }; propagatedBuildInputs = with python3Packages; [ From a47284cfd8925d1159ab6539fcb6466bafe9b04f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 10:47:13 +0000 Subject: [PATCH 316/429] redpanda-client: 25.3.8 -> 25.3.10 --- pkgs/by-name/re/redpanda-client/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix index a5ec91abb183..cde2a6dc5ded 100644 --- a/pkgs/by-name/re/redpanda-client/package.nix +++ b/pkgs/by-name/re/redpanda-client/package.nix @@ -7,12 +7,12 @@ stdenv, }: let - version = "25.3.8"; + version = "25.3.10"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-u2V820cjduk6V99Kpsr8YADee07ivos8XIK1ZRXCrN4="; + sha256 = "sha256-cfT+hh5h/tR6bSJBhE01GcJaQLJa3KFsJLn24bVrr48="; }; in buildGoModule rec { From 038080c840678b023b56a943f7e6350b1c787381 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 10:47:15 +0000 Subject: [PATCH 317/429] terraform-providers.spotinst_spotinst: 1.232.4 -> 1.232.5 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 003c979bccb2..4031f14c7fd6 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1247,11 +1247,11 @@ "vendorHash": "sha256-EOr4Ps0IYYOtRq19tt87NFfCEvJTaFBGb5B4mKMll7c=" }, "spotinst_spotinst": { - "hash": "sha256-yDwEtptwNXu/IpoKUK98UkpivTgJaY1FfsshsVpaaOk=", + "hash": "sha256-dZStuj7YjSF9X5/AEkrZyqDT2l2orpV4jY6CJrXjOgA=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.232.4", + "rev": "v1.232.5", "spdx": "MPL-2.0", "vendorHash": "sha256-Cj7RVITkFxIjAZAqHFhnoTa4lTZFXG22ny801g0Y+NE=" }, From ca363a08a9be5ac34fc9fb85f471e54e505f0340 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Fri, 6 Mar 2026 11:50:26 +0100 Subject: [PATCH 318/429] various: switch buildRustPackage packages to finalAttrs pattern this shouldn't create any rebuilds the move was done with the following script ```fish #!/usr/bin/env fish # nix shell .#nixfmt nixpkgs#{nixf-diagnose,ripgrep,sd} set base (git rev-parse HEAD) set scope pkgs/by-name set builder buildRustPackage set files (rg --files-with-matches -F "$builder rec {" $scope | sort -u) for file in $files echo $file sd -F "$builder rec {" "$builder (finalAttrs: {" $file # version sd -F 'version}' 'finalAttrs.version}' $file sd -F '${version' '${finalAttrs.version' $file sd -F '= version' '= finalAttrs.version' $file sd -F 'inherit version;' 'inherit (finalAttrs) version;' $file sd -F ' + version;' ' + finalAttrs.version;' $file sd 'replaceStrings (.*) version' 'replaceStrings $1 finalAttrs.version' $file sd -F 'splitVersion version' 'splitVersion finalAttrs.version' $file sd -F 'versionAtLeast version' 'versionAtLeast finalAttrs.version' $file sd 'versions\.([a-z]+) version' 'versions.$1 finalAttrs.version' $file # src sd -F 'src}' 'finalAttrs.src}' $file sd -F '${src' '${finalAttrs.src' $file sd -F '= src' '= finalAttrs.src' $file sd -F 'inherit src;' 'inherit (finalAttrs) src;' $file sd -F 'inherit (src' 'inherit (finalAttrs.src' $file # pname sd -F 'pname}' 'finalAttrs.pname}' $file sd -F '${pname' '${finalAttrs.pname' $file sd -F '= pname' '= finalAttrs.pname' $file sd -F 'inherit pname;' 'inherit (finalAttrs) pname;' $file # combinations sd -F 'inherit version src;' 'inherit (finalAttrs) version src;' $file sd -F 'inherit src version;' 'inherit (finalAttrs) src version;' $file sd -F 'inherit version pname;' 'inherit (finalAttrs) version pname;' $file sd -F 'inherit pname version;' 'inherit (finalAttrs) pname version;' $file sd -F 'inherit pname src version;' 'inherit (finalAttrs) pname src version;' $file sd -F 'inherit pname version src;' 'inherit (finalAttrs) pname version src;' $file sd -F 'inherit src pname version;' 'inherit (finalAttrs) src pname version;' $file sd -F 'inherit src version pname;' 'inherit (finalAttrs) src version pname;' $file sd -F 'inherit version pname src;' 'inherit (finalAttrs) version pname src;' $file sd -F 'inherit version src pname;' 'inherit (finalAttrs) version src pname;' $file # meta sd -F '${meta' '${finalAttrs.meta' $file sd -F '= meta' '= finalAttrs.meta' $file sd -F 'inherit (meta' 'inherit (finalAttrs.meta' $file # cargo sd -F 'cargoRoot}' 'finalAttrs.cargoRoot}' $file sd -F '${cargoRoot' '${finalAttrs.cargoRoot' $file sd -F '= cargoRoot' '= finalAttrs.cargoRoot' $file sd -F 'cargoBuildFlags}' 'finalAttrs.cargoBuildFlags}' $file sd -F '${cargoBuildFlags' '${finalAttrs.cargoBuildFlags' $file sd -F '= cargoBuildFlags' '= finalAttrs.cargoBuildFlags' $file # patches sd -F 'patches}' 'finalAttrs.patches}' $file sd -F '${patches' '${finalAttrs.patches' $file sd -F '= patches' '= finalAttrs.patches' $file # passthru sd -F 'passthru}' 'finalAttrs.passthru}' $file sd -F '${passthru' '${finalAttrs.passthru' $file sd -F '= passthru' '= finalAttrs.passthru' $file # *buildInputs sd -F 'buildInputs}' 'finalAttrs.buildInputs}' $file sd -F 'makeLibraryPath buildInputs' 'makeLibraryPath finalAttrs.buildInputs' $file sd -F 'nativeBuildInputs}' 'finalAttrs.nativeBuildInputs}' $file sd -F 'propagatedBuildInputs}' 'finalAttrs.propagatedBuildInputs}' $file # other sd -F 'desktopItem}' 'finalAttrs.desktopItem}' $file sd -F 'runtimeLibs}' 'finalAttrs.runtimeLibs}' $file sd -F 'libPath}' 'finalAttrs.libPath}' $file sd -F 'runtimeDependencies}' 'finalAttrs.runtimeDependencies}' $file sd -F 'nativeRuntimeInputs}' 'finalAttrs.nativeRuntimeInputs}' $file sd -F '(!doCheck)' '(!finalAttrs.doCheck)' $file sd -F 'optional doCheck' 'optional finalAttrs.doCheck' $file sd -F 'optionals doCheck' 'optionals finalAttrs.doCheck' $file sd -F '++ runtimeDependencies' '++ finalAttrs.runtimeDependencies' $file # close finalAttrs lambda echo ')' >>$file # catch some errors early if ! nixfmt $file git restore $file continue end if ! nixf-diagnose -i sema-primop-overridden $file git restore $file continue end end set torestore (rg -F .finalAttrs --files-with-matches $scope) if test (count $torestore) -gt 0 git restore $torestore end # set torestore (rg -F finalAttrs.pname --files-with-matches $scope) # if test (count $torestore) -gt 0 # git restore $torestore # end # commit for faster eval times git add pkgs git commit --no-gpg-sign -m temp set torestore for file in $files # file hasn't changed if git diff --quiet $base $file continue end # try to eval the package to definitely catch all errors echo $file set pname (string split / $file -f 4) if ! nix eval .#$pname set torestore $torestore $file end end # restore files that don't eval git reset --soft $base git restore --staged . if test (count $torestore) -gt 0 git restore $torestore end ``` after that some manual cleanup was done: - restore all files that cause merge conflicts with staging # Conflicts: # pkgs/by-name/ca/cargo-chef/package.nix # pkgs/by-name/ca/cargo-public-api/package.nix # pkgs/by-name/ca/cargo-update/package.nix # pkgs/by-name/le/leetcode-cli/package.nix --- pkgs/by-name/am/amdgpu_top/package.nix | 8 ++++---- pkgs/by-name/an/ansi/package.nix | 6 +++--- pkgs/by-name/ap/apkeep/package.nix | 8 ++++---- pkgs/by-name/as/asahi-bless/package.nix | 8 ++++---- pkgs/by-name/as/asahi-btsync/package.nix | 8 ++++---- pkgs/by-name/as/asahi-nvram/package.nix | 8 ++++---- pkgs/by-name/as/asahi-wifisync/package.nix | 8 ++++---- pkgs/by-name/as/asciinema-scenario/package.nix | 6 +++--- pkgs/by-name/au/authoscope/package.nix | 10 +++++----- pkgs/by-name/ba/bao/package.nix | 8 ++++---- pkgs/by-name/bk/bk/package.nix | 6 +++--- pkgs/by-name/bo/book-summary/package.nix | 6 +++--- pkgs/by-name/ca/cargo-all-features/package.nix | 6 +++--- pkgs/by-name/ca/cargo-apk/package.nix | 6 +++--- pkgs/by-name/ca/cargo-audit/package.nix | 8 ++++---- pkgs/by-name/ca/cargo-bazel/package.nix | 6 +++--- pkgs/by-name/ca/cargo-binutils/package.nix | 8 ++++---- pkgs/by-name/ca/cargo-bolero/package.nix | 6 +++--- pkgs/by-name/ca/cargo-c/package.nix | 10 +++++----- pkgs/by-name/ca/cargo-chef/package.nix | 6 +++--- pkgs/by-name/ca/cargo-cyclonedx/package.nix | 6 +++--- pkgs/by-name/ca/cargo-gra/package.nix | 6 +++--- pkgs/by-name/ca/cargo-hf2/package.nix | 6 +++--- pkgs/by-name/ca/cargo-license/package.nix | 6 +++--- pkgs/by-name/ca/cargo-lock/package.nix | 8 ++++---- pkgs/by-name/ca/cargo-mommy/package.nix | 6 +++--- pkgs/by-name/ca/cargo-public-api/package.nix | 8 ++++---- pkgs/by-name/ca/cargo-rail/package.nix | 8 ++++---- pkgs/by-name/ca/cargo-run-bin/package.nix | 8 ++++---- pkgs/by-name/ca/cargo-tally/package.nix | 8 ++++---- pkgs/by-name/ca/cargo-toml-lint/package.nix | 8 ++++---- pkgs/by-name/ca/cargo-ui/package.nix | 8 ++++---- .../by-name/ca/cargo-unused-features/package.nix | 6 +++--- pkgs/by-name/ca/cargo-update/package.nix | 8 ++++---- pkgs/by-name/ca/cargo-workspaces/package.nix | 8 ++++---- pkgs/by-name/ca/cargo2junit/package.nix | 6 +++--- pkgs/by-name/cf/cfonts/package.nix | 6 +++--- pkgs/by-name/ch/changelogging/package.nix | 8 ++++---- pkgs/by-name/ch/checkpwn/package.nix | 8 ++++---- pkgs/by-name/ch/cherrybomb/package.nix | 8 ++++---- pkgs/by-name/ci/citron/package.nix | 6 +++--- pkgs/by-name/cl/clang-tidy-sarif/package.nix | 6 +++--- pkgs/by-name/cl/clini/package.nix | 6 +++--- pkgs/by-name/cl/clippy-sarif/package.nix | 6 +++--- pkgs/by-name/co/colmena/package.nix | 10 +++++----- pkgs/by-name/co/color-lsp/package.nix | 6 +++--- pkgs/by-name/cs/csv2svg/package.nix | 6 +++--- pkgs/by-name/di/diffedit3/package.nix | 6 +++--- pkgs/by-name/do/dotenvy/package.nix | 6 +++--- pkgs/by-name/do/dotslash/package.nix | 6 +++--- pkgs/by-name/du/duckscript/package.nix | 6 +++--- pkgs/by-name/el/elf2uf2-rs/package.nix | 6 +++--- pkgs/by-name/ev/eva/package.nix | 6 +++--- pkgs/by-name/ew/eww/package.nix | 6 +++--- pkgs/by-name/fa/faketty/package.nix | 8 ++++---- pkgs/by-name/fl/flowgger/package.nix | 6 +++--- pkgs/by-name/fo/fortanix-sgx-tools/package.nix | 6 +++--- pkgs/by-name/fr/frawk/package.nix | 8 ++++---- pkgs/by-name/fr/french-numbers/package.nix | 6 +++--- pkgs/by-name/ge/gel/package.nix | 8 ++++---- pkgs/by-name/ge/genemichaels/package.nix | 6 +++--- pkgs/by-name/gh/gh-cal/package.nix | 6 +++--- pkgs/by-name/gi/gitlab-timelogs/package.nix | 8 ++++---- pkgs/by-name/gl/globe-cli/package.nix | 6 +++--- pkgs/by-name/gp/gpustat/package.nix | 8 ++++---- pkgs/by-name/gr/grass-sass/package.nix | 8 ++++---- pkgs/by-name/ha/habitat/package.nix | 10 +++++----- pkgs/by-name/ha/hadolint-sarif/package.nix | 6 +++--- pkgs/by-name/ha/halloy/package.nix | 16 ++++++++-------- pkgs/by-name/ha/hayagriva/package.nix | 8 ++++---- pkgs/by-name/hu/huniq/package.nix | 6 +++--- pkgs/by-name/hv/hvm/package.nix | 6 +++--- pkgs/by-name/i3/i3-open-next-ws/package.nix | 6 +++--- pkgs/by-name/in/inputplug/package.nix | 6 +++--- pkgs/by-name/jf/jfmt/package.nix | 10 +++++----- pkgs/by-name/ju/just-formatter/package.nix | 6 +++--- pkgs/by-name/ke/keepass-diff/package.nix | 6 +++--- pkgs/by-name/ki/kind2/package.nix | 6 +++--- pkgs/by-name/kr/krabby/package.nix | 8 ++++---- pkgs/by-name/le/lemmeknow/package.nix | 8 ++++---- pkgs/by-name/li/license-generator/package.nix | 6 +++--- pkgs/by-name/lo/loco/package.nix | 6 +++--- pkgs/by-name/ls/lscolors/package.nix | 8 ++++---- pkgs/by-name/md/mdbook-katex/package.nix | 8 ++++---- pkgs/by-name/md/mdbook-pdf/package.nix | 8 ++++---- pkgs/by-name/md/mdevctl/package.nix | 6 +++--- pkgs/by-name/me/meow/package.nix | 8 ++++---- pkgs/by-name/mo/movine/package.nix | 6 +++--- pkgs/by-name/ne/nethoscope/package.nix | 12 ++++++------ pkgs/by-name/nf/nflz/package.nix | 6 +++--- pkgs/by-name/ni/nix-template/package.nix | 10 +++++----- pkgs/by-name/oc/oculante/package.nix | 8 ++++---- pkgs/by-name/ov/overlayed/package.nix | 10 +++++----- pkgs/by-name/pa/paging-calculator/package.nix | 8 ++++---- pkgs/by-name/pa/panamax/package.nix | 6 +++--- pkgs/by-name/pe/perseus-cli/package.nix | 6 +++--- pkgs/by-name/pi/pijul/package.nix | 6 +++--- pkgs/by-name/pi/pipe-rename/package.nix | 6 +++--- pkgs/by-name/pr/preserves-tools/package.nix | 6 +++--- pkgs/by-name/pr/probe-rs-tools/package.nix | 10 +++++----- pkgs/by-name/pr/process-viewer/package.nix | 6 +++--- .../pr/prometheus-wireguard-exporter/package.nix | 6 +++--- .../pr/protoc-gen-prost-crate/package.nix | 6 +++--- .../pr/protoc-gen-prost-serde/package.nix | 6 +++--- pkgs/by-name/pr/protoc-gen-prost/package.nix | 6 +++--- pkgs/by-name/pr/protoc-gen-tonic/package.nix | 6 +++--- pkgs/by-name/pr/protox/package.nix | 8 ++++---- pkgs/by-name/pu/pulldown-cmark/package.nix | 6 +++--- pkgs/by-name/ra/rav1e/package.nix | 8 ++++---- pkgs/by-name/ra/ravedude/package.nix | 8 ++++---- pkgs/by-name/re/regex-cli/package.nix | 6 +++--- pkgs/by-name/re/reshape/package.nix | 8 ++++---- pkgs/by-name/re/restic-browser/package.nix | 16 ++++++++-------- pkgs/by-name/rs/rsign2/package.nix | 6 +++--- pkgs/by-name/rs/rsonpath/package.nix | 8 ++++---- pkgs/by-name/ru/rust-audit-info/package.nix | 6 +++--- pkgs/by-name/ru/rustfinity/package.nix | 6 +++--- pkgs/by-name/ru/rustycli/package.nix | 8 ++++---- pkgs/by-name/sa/safe-rm/package.nix | 6 +++--- pkgs/by-name/sa/samply/package.nix | 8 ++++---- pkgs/by-name/sa/sarif-fmt/package.nix | 6 +++--- pkgs/by-name/se/sea-orm-cli/package.nix | 6 +++--- pkgs/by-name/sg/sgxs-tools/package.nix | 6 +++--- pkgs/by-name/sh/shellcheck-sarif/package.nix | 6 +++--- pkgs/by-name/si/sigi/package.nix | 6 +++--- pkgs/by-name/sl/slimevr/package.nix | 14 +++++++------- pkgs/by-name/sp/specr-transpile/package.nix | 6 +++--- pkgs/by-name/sp/spr/package.nix | 6 +++--- pkgs/by-name/ss/ssh-agent-switcher/package.nix | 8 ++++---- pkgs/by-name/st/star-history/package.nix | 6 +++--- pkgs/by-name/st/starry/package.nix | 6 +++--- pkgs/by-name/su/sudachi-rs/package.nix | 10 +++++----- pkgs/by-name/sv/svd2rust/package.nix | 8 ++++---- pkgs/by-name/sv/svdtools/package.nix | 8 ++++---- pkgs/by-name/sv/svlint/package.nix | 8 ++++---- pkgs/by-name/sw/swayr/package.nix | 8 ++++---- pkgs/by-name/sw/swayrbar/package.nix | 8 ++++---- pkgs/by-name/sy/syndicate-server/package.nix | 6 +++--- pkgs/by-name/ta/talecast/package.nix | 6 +++--- pkgs/by-name/te/termimage/package.nix | 8 ++++---- pkgs/by-name/te/textplots/package.nix | 6 +++--- pkgs/by-name/to/toipe/package.nix | 6 +++--- pkgs/by-name/to/toml2json/package.nix | 6 +++--- pkgs/by-name/tr/trashy/package.nix | 8 ++++---- pkgs/by-name/tr/treedome/package.nix | 14 +++++++------- pkgs/by-name/tt/ttfb/package.nix | 8 ++++---- pkgs/by-name/tu/tuifeed/package.nix | 6 +++--- pkgs/by-name/tw/twiggy/package.nix | 6 +++--- pkgs/by-name/ty/typst-live/package.nix | 6 +++--- pkgs/by-name/un/unpfs/package.nix | 10 +++++----- pkgs/by-name/vo/vopono/package.nix | 6 +++--- pkgs/by-name/vr/vrc-get/package.nix | 6 +++--- pkgs/by-name/wa/wambo/package.nix | 8 ++++---- pkgs/by-name/wc/wchisp/package.nix | 8 ++++---- pkgs/by-name/we/wezterm/package.nix | 10 +++++----- pkgs/by-name/wh/when-cli/package.nix | 6 +++--- pkgs/by-name/wi/wiremix/package.nix | 6 +++--- pkgs/by-name/wl/wleave/package.nix | 10 +++++----- pkgs/by-name/wl/wlink/package.nix | 8 ++++---- pkgs/by-name/wy/wyvern/package.nix | 6 +++--- pkgs/by-name/xq/xq/package.nix | 6 +++--- pkgs/by-name/zb/zbus-xmlgen/package.nix | 6 +++--- pkgs/by-name/zi/zine/package.nix | 8 ++++---- 163 files changed, 590 insertions(+), 590 deletions(-) diff --git a/pkgs/by-name/am/amdgpu_top/package.nix b/pkgs/by-name/am/amdgpu_top/package.nix index d7d2b29079bf..b56bfde91e81 100644 --- a/pkgs/by-name/am/amdgpu_top/package.nix +++ b/pkgs/by-name/am/amdgpu_top/package.nix @@ -14,14 +14,14 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "amdgpu_top"; version = "0.11.2"; src = fetchFromGitHub { owner = "Umio-Yasuno"; repo = "amdgpu_top"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-yw73bKO91O05WBQNwjcQ+AqxYgGXXC7XJzUnMx5/IWc="; }; @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { ''; postFixup = '' - patchelf --set-rpath "${lib.makeLibraryPath buildInputs}" $out/bin/${pname} + patchelf --set-rpath "${lib.makeLibraryPath finalAttrs.buildInputs}" $out/bin/${finalAttrs.pname} ''; passthru.updateScript = nix-update-script { }; @@ -62,4 +62,4 @@ rustPlatform.buildRustPackage rec { platforms = lib.platforms.linux; mainProgram = "amdgpu_top"; }; -} +}) diff --git a/pkgs/by-name/an/ansi/package.nix b/pkgs/by-name/an/ansi/package.nix index 6018ba5ad953..5441ac127b4a 100644 --- a/pkgs/by-name/an/ansi/package.nix +++ b/pkgs/by-name/an/ansi/package.nix @@ -4,12 +4,12 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "ansi-escape-sequences-cli"; version = "0.2.2"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-55CdEw1bVgabWRbZIRe9jytwDf70Y92nITwDRQaTXaQ="; }; @@ -26,4 +26,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ phip1611 ]; mainProgram = "ansi"; }; -} +}) diff --git a/pkgs/by-name/ap/apkeep/package.nix b/pkgs/by-name/ap/apkeep/package.nix index 05f480b418e2..06a389193cb0 100644 --- a/pkgs/by-name/ap/apkeep/package.nix +++ b/pkgs/by-name/ap/apkeep/package.nix @@ -6,12 +6,12 @@ pkg-config, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "apkeep"; version = "0.18.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Sk8CQaMXtPPJh2nGgGthyzuvkVViQ0jtqPjAqo2dtpg="; }; @@ -32,9 +32,9 @@ rustPlatform.buildRustPackage rec { meta = { description = "Command-line tool for downloading APK files from various sources"; homepage = "https://github.com/EFForg/apkeep"; - changelog = "https://github.com/EFForg/apkeep/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/EFForg/apkeep/blob/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ ]; mainProgram = "apkeep"; }; -} +}) diff --git a/pkgs/by-name/as/asahi-bless/package.nix b/pkgs/by-name/as/asahi-bless/package.nix index f7127f9e2858..00edbc973005 100644 --- a/pkgs/by-name/as/asahi-bless/package.nix +++ b/pkgs/by-name/as/asahi-bless/package.nix @@ -4,17 +4,17 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "asahi-bless"; version = "0.4.1"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-SNaA+CEuCBwo4c54qWGs5AdkBYb9IWY1cQ0dRd/noe8="; }; cargoHash = "sha256-nfSJ9RkzFAWlxlfoUKk8ZmIXDJXoSyHCGgRgMy9FDkw="; - cargoDepsName = pname; + cargoDepsName = finalAttrs.pname; meta = { description = "Tool to select active boot partition on ARM Macs"; @@ -24,4 +24,4 @@ rustPlatform.buildRustPackage rec { mainProgram = "asahi-bless"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/as/asahi-btsync/package.nix b/pkgs/by-name/as/asahi-btsync/package.nix index 86093c310485..f60c1a8d5174 100644 --- a/pkgs/by-name/as/asahi-btsync/package.nix +++ b/pkgs/by-name/as/asahi-btsync/package.nix @@ -4,17 +4,17 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "asahi-btsync"; version = "0.2.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-jp05WcwY1cWh4mBQj+3jRCZoG32OhDvTB84hOAGemX8="; }; cargoHash = "sha256-gGWhi0T7xDIsbzfw/KL3TSneLvQaiz/2xbpHeZt1i3I="; - cargoDepsName = pname; + cargoDepsName = finalAttrs.pname; meta = { description = "Tool to sync Bluetooth pairing keys with macos on ARM Macs"; @@ -24,4 +24,4 @@ rustPlatform.buildRustPackage rec { mainProgram = "asahi-btsync"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/as/asahi-nvram/package.nix b/pkgs/by-name/as/asahi-nvram/package.nix index 779866ec040a..555a30bf00f8 100644 --- a/pkgs/by-name/as/asahi-nvram/package.nix +++ b/pkgs/by-name/as/asahi-nvram/package.nix @@ -4,17 +4,17 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "asahi-nvram"; version = "0.2.3"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-zfUvPHAPrYhzgeiirGuqZaWnLBH0PHsqOUy2e972bWM="; }; cargoHash = "sha256-NW/puo/Xoum7DjSQjBgilQcKbY3mAfVgXxUK6+1H1JI="; - cargoDepsName = pname; + cargoDepsName = finalAttrs.pname; meta = { description = "Tool to read and write nvram variables on ARM Macs"; @@ -24,4 +24,4 @@ rustPlatform.buildRustPackage rec { mainProgram = "asahi-nvram"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/as/asahi-wifisync/package.nix b/pkgs/by-name/as/asahi-wifisync/package.nix index 45257bc7ca54..d09fb0020e30 100644 --- a/pkgs/by-name/as/asahi-wifisync/package.nix +++ b/pkgs/by-name/as/asahi-wifisync/package.nix @@ -4,17 +4,17 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "asahi-wifisync"; version = "0.2.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-wKd6rUUnegvl6cHODVQlllaOXuAGlmwx9gr73I/2l/c="; }; cargoHash = "sha256-ZxgRxQyDID3mBpr8dhHScctk14Pm9V51Gn24d24JyVk="; - cargoDepsName = pname; + cargoDepsName = finalAttrs.pname; meta = { description = "Tool to sync Wifi passwords with macos on ARM Macs"; @@ -24,4 +24,4 @@ rustPlatform.buildRustPackage rec { mainProgram = "asahi-wifisync"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/as/asciinema-scenario/package.nix b/pkgs/by-name/as/asciinema-scenario/package.nix index 825d4a0aacad..4b4e869f0119 100644 --- a/pkgs/by-name/as/asciinema-scenario/package.nix +++ b/pkgs/by-name/as/asciinema-scenario/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "asciinema-scenario"; version = "0.3.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-fnX5CIYLdFqi04PQPVIAYDGn+xXi016l8pPcIrYIhmQ="; }; @@ -21,4 +21,4 @@ rustPlatform.buildRustPackage rec { license = with lib.licenses; [ mit ]; mainProgram = "asciinema-scenario"; }; -} +}) diff --git a/pkgs/by-name/au/authoscope/package.nix b/pkgs/by-name/au/authoscope/package.nix index ffb127a47281..33f69185e491 100644 --- a/pkgs/by-name/au/authoscope/package.nix +++ b/pkgs/by-name/au/authoscope/package.nix @@ -10,14 +10,14 @@ zlib, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "authoscope"; version = "0.8.1"; src = fetchFromGitHub { owner = "kpcyrd"; repo = "authoscope"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-SKgb/N249s0+Rb59moBT/MeFb4zAAElCMQJto0diyUk="; }; @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { ]; postInstall = '' - installManPage docs/${pname}.1 + installManPage docs/${finalAttrs.pname}.1 ''; # Tests requires access to httpin.org @@ -46,8 +46,8 @@ rustPlatform.buildRustPackage rec { meta = { description = "Scriptable network authentication cracker"; homepage = "https://github.com/kpcyrd/authoscope"; - changelog = "https://github.com/kpcyrd/authoscope/releases/tag/v${version}"; + changelog = "https://github.com/kpcyrd/authoscope/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/by-name/ba/bao/package.nix b/pkgs/by-name/ba/bao/package.nix index f5ff37553f54..b6bd08820396 100644 --- a/pkgs/by-name/ba/bao/package.nix +++ b/pkgs/by-name/ba/bao/package.nix @@ -4,13 +4,13 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "bao"; version = "0.13.1"; src = fetchCrate { - inherit version; - pname = "${pname}_bin"; + inherit (finalAttrs) version; + pname = "${finalAttrs.pname}_bin"; hash = "sha256-8h5otpu3z2Hgy0jMCITJNr8Q4iVdlR5Lea2X+WuenWs="; }; @@ -26,4 +26,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "bao"; }; -} +}) diff --git a/pkgs/by-name/bk/bk/package.nix b/pkgs/by-name/bk/bk/package.nix index f7d7489e5aff..1f80a6d9be2d 100644 --- a/pkgs/by-name/bk/bk/package.nix +++ b/pkgs/by-name/bk/bk/package.nix @@ -6,12 +6,12 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "bk"; version = "0.6.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-rSMvx/zUZqRRgj48TVVG7RwQT8e70m0kertRJysDY4Y="; }; @@ -39,4 +39,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ vuimuich ]; mainProgram = "bk"; }; -} +}) diff --git a/pkgs/by-name/bo/book-summary/package.nix b/pkgs/by-name/bo/book-summary/package.nix index af508d86bee9..ef293a300f6f 100644 --- a/pkgs/by-name/bo/book-summary/package.nix +++ b/pkgs/by-name/bo/book-summary/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "book-summary"; version = "0.2.1"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-dxM6bqgHp4IaG03NriHvoT3al2u5Sz/I5ajlgzpjG1c="; }; @@ -21,4 +21,4 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/dvogt23/book-summary"; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-all-features/package.nix b/pkgs/by-name/ca/cargo-all-features/package.nix index 58abcbd4ae39..a8ff6f785845 100644 --- a/pkgs/by-name/ca/cargo-all-features/package.nix +++ b/pkgs/by-name/ca/cargo-all-features/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-all-features"; version = "1.12.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-pD0lyI2zSOeEDk1Lch4Qf5mo8Z8Peiy2XF5iQ62vsaI="; }; @@ -31,4 +31,4 @@ rustPlatform.buildRustPackage rec { matthiasbeyer ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-apk/package.nix b/pkgs/by-name/ca/cargo-apk/package.nix index 33638f035fc5..148de073aeb5 100644 --- a/pkgs/by-name/ca/cargo-apk/package.nix +++ b/pkgs/by-name/ca/cargo-apk/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-apk"; version = "0.9.6"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-1vCrM+0SNefd7FrRXnSjLhM3/MSVJfcL4k1qAstX+/A="; }; @@ -25,4 +25,4 @@ rustPlatform.buildRustPackage rec { ]; maintainers = with lib.maintainers; [ nickcao ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-audit/package.nix b/pkgs/by-name/ca/cargo-audit/package.nix index 87efa3ecb51c..fd6fc312778d 100644 --- a/pkgs/by-name/ca/cargo-audit/package.nix +++ b/pkgs/by-name/ca/cargo-audit/package.nix @@ -7,12 +7,12 @@ zlib, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-audit"; version = "0.22.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Ha2yVyu9331NaqiW91NEwCTIeW+3XPiqZzmatN5KOws="; }; @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { description = "Audit Cargo.lock files for crates with security vulnerabilities"; mainProgram = "cargo-audit"; homepage = "https://rustsec.org"; - changelog = "https://github.com/rustsec/rustsec/blob/cargo-audit/v${version}/cargo-audit/CHANGELOG.md"; + changelog = "https://github.com/rustsec/rustsec/blob/cargo-audit/v${finalAttrs.version}/cargo-audit/CHANGELOG.md"; license = with lib.licenses; [ mit # or asl20 @@ -46,4 +46,4 @@ rustPlatform.buildRustPackage rec { jk ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-bazel/package.nix b/pkgs/by-name/ca/cargo-bazel/package.nix index 795a3e6a1d21..4b206b6c04d6 100644 --- a/pkgs/by-name/ca/cargo-bazel/package.nix +++ b/pkgs/by-name/ca/cargo-bazel/package.nix @@ -6,12 +6,12 @@ libz, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-bazel"; version = "0.17.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-KWcxZxzDbiBfBpr37M6HoqHMCYXq6sTVxU9KR3PIiJc="; }; @@ -29,4 +29,4 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ rickvanprim ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-binutils/package.nix b/pkgs/by-name/ca/cargo-binutils/package.nix index b6905c4a2a02..8b773c5b1e70 100644 --- a/pkgs/by-name/ca/cargo-binutils/package.nix +++ b/pkgs/by-name/ca/cargo-binutils/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-binutils"; version = "0.4.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-AF1MRBH8ULnHNHT2FS/LxMH+b06QMTIZMIR8mmkn17c="; }; @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { In order for this to work, you either need to run `rustup component add llvm-tools` or install the `llvm-tools` component using your Nix library (e.g. fenix or rust-overlay) ''; homepage = "https://github.com/rust-embedded/cargo-binutils"; - changelog = "https://github.com/rust-embedded/cargo-binutils/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/rust-embedded/cargo-binutils/blob/v${finalAttrs.version}/CHANGELOG.md"; license = with lib.licenses; [ asl20 mit @@ -32,4 +32,4 @@ rustPlatform.buildRustPackage rec { newam ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-bolero/package.nix b/pkgs/by-name/ca/cargo-bolero/package.nix index 15a37cd59700..55e26723c9c4 100644 --- a/pkgs/by-name/ca/cargo-bolero/package.nix +++ b/pkgs/by-name/ca/cargo-bolero/package.nix @@ -8,12 +8,12 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-bolero"; version = "0.13.4"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-lfBpHaY2UCBMg45S4IW8fcpkGkKJoT4qqR2yq5KiXuE="; }; @@ -36,4 +36,4 @@ rustPlatform.buildRustPackage rec { license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ ekleog ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-c/package.nix b/pkgs/by-name/ca/cargo-c/package.nix index ce4cb935bcbc..effa2325438f 100644 --- a/pkgs/by-name/ca/cargo-c/package.nix +++ b/pkgs/by-name/ca/cargo-c/package.nix @@ -14,13 +14,13 @@ let # this version may need to be updated along with package version cargoVersion = "0.93.0"; in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-c"; version = "0.10.19"; src = fetchCrate { - inherit pname; - version = "${version}+cargo-${cargoVersion}"; + inherit (finalAttrs) pname; + version = "${finalAttrs.version}+cargo-${cargoVersion}"; hash = "sha256-PrBmB+0tmU2MAUnRr+wx4g9hu0Y9i6WfR8U89bwiLVY="; }; @@ -63,11 +63,11 @@ rustPlatform.buildRustPackage rec { to be used by any C (and C-compatible) software. ''; homepage = "https://github.com/lu-zero/cargo-c"; - changelog = "https://github.com/lu-zero/cargo-c/releases/tag/v${version}"; + changelog = "https://github.com/lu-zero/cargo-c/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ cpu matthiasbeyer ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-chef/package.nix b/pkgs/by-name/ca/cargo-chef/package.nix index e3b19a86c32d..a5fb2f0c576a 100644 --- a/pkgs/by-name/ca/cargo-chef/package.nix +++ b/pkgs/by-name/ca/cargo-chef/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-chef"; version = "0.1.75"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-FETYJrx5+yNOzMVIgJQ0yNLi2PB7cA128n8hAXIhx3E="; }; @@ -22,4 +22,4 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ kkharji ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-cyclonedx/package.nix b/pkgs/by-name/ca/cargo-cyclonedx/package.nix index c265434b9825..b0335bf0799d 100644 --- a/pkgs/by-name/ca/cargo-cyclonedx/package.nix +++ b/pkgs/by-name/ca/cargo-cyclonedx/package.nix @@ -8,14 +8,14 @@ curl, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-cyclonedx"; version = "0.5.7"; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-rust-cargo"; - rev = "${pname}-${version}"; + rev = "${finalAttrs.pname}-${finalAttrs.version}"; hash = "sha256-T/9eHI2P8eCZAqMTeZz1yEi5nljQWfHrdNiU3h3h74U="; }; @@ -49,4 +49,4 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ nikstur ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-gra/package.nix b/pkgs/by-name/ca/cargo-gra/package.nix index ae989ce3e263..9a0bc8e5663d 100644 --- a/pkgs/by-name/ca/cargo-gra/package.nix +++ b/pkgs/by-name/ca/cargo-gra/package.nix @@ -4,12 +4,12 @@ lib, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-gra"; version = "0.6.2"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-JbBcpp/E3WlQrwdxMsbSdmIEnDTQj/1XDwAWJsniRu0="; }; @@ -22,4 +22,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ bot-wxt1221 ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-hf2/package.nix b/pkgs/by-name/ca/cargo-hf2/package.nix index d588c3ee32d8..9127e8b0e084 100644 --- a/pkgs/by-name/ca/cargo-hf2/package.nix +++ b/pkgs/by-name/ca/cargo-hf2/package.nix @@ -6,12 +6,12 @@ libusb1, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-hf2"; version = "0.3.3"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-0o3j7YfgNNnfbrv9Gppo24DqYlDCxhtsJHIhAV214DU="; }; @@ -28,4 +28,4 @@ rustPlatform.buildRustPackage rec { license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ astrobeastie ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-license/package.nix b/pkgs/by-name/ca/cargo-license/package.nix index 71d1ffee7ee2..ff18e5aaa5f2 100644 --- a/pkgs/by-name/ca/cargo-license/package.nix +++ b/pkgs/by-name/ca/cargo-license/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-license"; version = "0.7.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-bOBrjChkQM6POZZn53JmJcIn1x+ygF5mthZihMskxIk="; }; @@ -25,4 +25,4 @@ rustPlatform.buildRustPackage rec { matthiasbeyer ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-lock/package.nix b/pkgs/by-name/ca/cargo-lock/package.nix index 8140b02e7c42..4057181239de 100644 --- a/pkgs/by-name/ca/cargo-lock/package.nix +++ b/pkgs/by-name/ca/cargo-lock/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-lock"; version = "11.0.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Gz459c2IWD19RGBg2TyHbI/VNCelha+R0FeNkAaHksU="; }; @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { description = "Self-contained Cargo.lock parser with graph analysis"; mainProgram = "cargo-lock"; homepage = "https://github.com/rustsec/rustsec/tree/main/cargo-lock"; - changelog = "https://github.com/rustsec/rustsec/blob/cargo-lock/v${version}/cargo-lock/CHANGELOG.md"; + changelog = "https://github.com/rustsec/rustsec/blob/cargo-lock/v${finalAttrs.version}/cargo-lock/CHANGELOG.md"; license = with lib.licenses; [ asl20 # or mit @@ -30,4 +30,4 @@ rustPlatform.buildRustPackage rec { matthiasbeyer ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-mommy/package.nix b/pkgs/by-name/ca/cargo-mommy/package.nix index 21c85ae6f273..bebaaee671e8 100644 --- a/pkgs/by-name/ca/cargo-mommy/package.nix +++ b/pkgs/by-name/ca/cargo-mommy/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-mommy"; version = "0.3.1"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-2WR6xUYL/bLgZlI4ADbPAtdLq0y4MoVP8Loxdu/58Wc="; }; @@ -25,4 +25,4 @@ rustPlatform.buildRustPackage rec { ]; maintainers = with lib.maintainers; [ GoldsteinE ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-public-api/package.nix b/pkgs/by-name/ca/cargo-public-api/package.nix index 177486c90f51..fb5fe7e22995 100644 --- a/pkgs/by-name/ca/cargo-public-api/package.nix +++ b/pkgs/by-name/ca/cargo-public-api/package.nix @@ -7,12 +7,12 @@ openssl, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-public-api"; version = "0.51.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-fnkoIXv6QYJPYtsLZldOEjOxke6YVDEds3jF5SGZGKE="; }; @@ -32,8 +32,8 @@ rustPlatform.buildRustPackage rec { description = "List and diff the public API of Rust library crates between releases and commits. Detect breaking API changes and semver violations"; mainProgram = "cargo-public-api"; homepage = "https://github.com/Enselic/cargo-public-api"; - changelog = "https://github.com/Enselic/cargo-public-api/releases/tag/v${version}"; + changelog = "https://github.com/Enselic/cargo-public-api/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ matthiasbeyer ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-rail/package.nix b/pkgs/by-name/ca/cargo-rail/package.nix index 864461fafb47..5ebb59b32ffe 100644 --- a/pkgs/by-name/ca/cargo-rail/package.nix +++ b/pkgs/by-name/ca/cargo-rail/package.nix @@ -7,12 +7,12 @@ openssl, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-rail"; version = "0.7.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-L8yh47lYvXVGOr8jDZ4Gk2rIfUnr88q9OR5/iDrJua0="; }; @@ -60,9 +60,9 @@ rustPlatform.buildRustPackage rec { description = "Graph-aware monorepo orchestration for Rust workspaces"; mainProgram = "cargo-rail"; homepage = "https://github.com/loadingalias/cargo-rail"; - changelog = "https://github.com/loadingalias/cargo-rail/releases/tag/v${version}"; + changelog = "https://github.com/loadingalias/cargo-rail/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ matthiasbeyer ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-run-bin/package.nix b/pkgs/by-name/ca/cargo-run-bin/package.nix index 13b7fecb6155..e93513c0a371 100644 --- a/pkgs/by-name/ca/cargo-run-bin/package.nix +++ b/pkgs/by-name/ca/cargo-run-bin/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-run-bin"; version = "1.7.4"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-79DJ6j2sai1dTdcXf0qD97TCNZuGRSUobLGahoApMss="; }; @@ -22,11 +22,11 @@ rustPlatform.buildRustPackage rec { description = "Build, cache, and run binaries scoped in Cargo.toml rather than installing globally. This acts similarly to npm run and gomodrun, and allows your teams to always be running the same tooling versions"; mainProgram = "cargo-bin"; homepage = "https://github.com/dustinblackman/cargo-run-bin"; - changelog = "https://github.com/dustinblackman/cargo-run-bin/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/dustinblackman/cargo-run-bin/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ mightyiam matthiasbeyer ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-tally/package.nix b/pkgs/by-name/ca/cargo-tally/package.nix index cbe27fcec99d..0f84275cf0d8 100644 --- a/pkgs/by-name/ca/cargo-tally/package.nix +++ b/pkgs/by-name/ca/cargo-tally/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-tally"; version = "1.0.73"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-aYVo/mI4YoohwxXoIL9vpuPN526sPnQMV1PnUqJEO2U="; }; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { description = "Graph the number of crates that depend on your crate over time"; mainProgram = "cargo-tally"; homepage = "https://github.com/dtolnay/cargo-tally"; - changelog = "https://github.com/dtolnay/cargo-tally/releases/tag/${version}"; + changelog = "https://github.com/dtolnay/cargo-tally/releases/tag/${finalAttrs.version}"; license = with lib.licenses; [ asl20 # or mit @@ -28,4 +28,4 @@ rustPlatform.buildRustPackage rec { matthiasbeyer ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-toml-lint/package.nix b/pkgs/by-name/ca/cargo-toml-lint/package.nix index 050940e3bf53..c92fe46f4cb7 100644 --- a/pkgs/by-name/ca/cargo-toml-lint/package.nix +++ b/pkgs/by-name/ca/cargo-toml-lint/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-toml-lint"; version = "0.1.1"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-U3y9gnFvkqJmyFqRAUQorJQY0iRzAE9UUXzFmgZIyaM="; }; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { description = "Simple linter for Cargo.toml manifests"; mainProgram = "cargo-toml-lint"; homepage = "https://github.com/fuellabs/cargo-toml-lint"; - changelog = "https://github.com/fuellabs/cargo-toml-lint/releases/tag/v${version}"; + changelog = "https://github.com/fuellabs/cargo-toml-lint/releases/tag/v${finalAttrs.version}"; license = with lib.licenses; [ asl20 # or mit @@ -29,4 +29,4 @@ rustPlatform.buildRustPackage rec { matthiasbeyer ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-ui/package.nix b/pkgs/by-name/ca/cargo-ui/package.nix index 35f2618f79e1..c39fc868fd0a 100644 --- a/pkgs/by-name/ca/cargo-ui/package.nix +++ b/pkgs/by-name/ca/cargo-ui/package.nix @@ -16,12 +16,12 @@ libxcb, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-ui"; version = "0.3.3"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-M/ljgtTHMSc7rY/a8CpKGNuOSdVDwRt6+tzPPHdpKOw="; }; @@ -64,7 +64,7 @@ rustPlatform.buildRustPackage rec { description = "GUI for Cargo"; mainProgram = "cargo-ui"; homepage = "https://github.com/slint-ui/cargo-ui"; - changelog = "https://github.com/slint-ui/cargo-ui/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/slint-ui/cargo-ui/blob/v${finalAttrs.version}/CHANGELOG.md"; license = with lib.licenses; [ mit asl20 @@ -74,4 +74,4 @@ rustPlatform.buildRustPackage rec { matthiasbeyer ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-unused-features/package.nix b/pkgs/by-name/ca/cargo-unused-features/package.nix index a846e13f9193..5f1e77b5d509 100644 --- a/pkgs/by-name/ca/cargo-unused-features/package.nix +++ b/pkgs/by-name/ca/cargo-unused-features/package.nix @@ -8,12 +8,12 @@ openssl, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-unused-features"; version = "0.2.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-gdwIbbQDw/DgBV9zY2Rk/oWjPv1SS/+oFnocsMo2Axo="; }; @@ -43,4 +43,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "unused-features"; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-update/package.nix b/pkgs/by-name/ca/cargo-update/package.nix index d36d2d4e44fd..1a40b3b8522b 100644 --- a/pkgs/by-name/ca/cargo-update/package.nix +++ b/pkgs/by-name/ca/cargo-update/package.nix @@ -14,12 +14,12 @@ zlib, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-update"; version = "18.1.1"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-q7o9CPz9d4cBkrrnp2JY4CZiYkKx/ebVlrS4D34RbIo="; }; @@ -63,7 +63,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Cargo subcommand for checking and applying updates to installed executables"; homepage = "https://github.com/nabijaczleweli/cargo-update"; - changelog = "https://github.com/nabijaczleweli/cargo-update/releases/tag/v${version}"; + changelog = "https://github.com/nabijaczleweli/cargo-update/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ gerschtli @@ -71,4 +71,4 @@ rustPlatform.buildRustPackage rec { matthiasbeyer ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-workspaces/package.nix b/pkgs/by-name/ca/cargo-workspaces/package.nix index 1d103eebe0ed..61273d48fab1 100644 --- a/pkgs/by-name/ca/cargo-workspaces/package.nix +++ b/pkgs/by-name/ca/cargo-workspaces/package.nix @@ -8,12 +8,12 @@ zlib, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-workspaces"; version = "0.4.2"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-/h7v5Wq7YsNMVzLHw3QQmcknbjARpI7HFPAUGX72wZ0="; }; @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { commands and more. ''; homepage = "https://github.com/pksunkara/cargo-workspaces"; - changelog = "https://github.com/pksunkara/cargo-workspaces/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/pksunkara/cargo-workspaces/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ macalinao @@ -49,4 +49,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "cargo-workspaces"; }; -} +}) diff --git a/pkgs/by-name/ca/cargo2junit/package.nix b/pkgs/by-name/ca/cargo2junit/package.nix index 3e4f10adaa6a..53621c16ef21 100644 --- a/pkgs/by-name/ca/cargo2junit/package.nix +++ b/pkgs/by-name/ca/cargo2junit/package.nix @@ -4,12 +4,12 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo2junit"; version = "0.1.13"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-R3a87nXCnGhdeyR7409hFR5Cj3TFUWqaLNOtlXPsvto="; }; @@ -26,4 +26,4 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ alekseysidorov ]; }; -} +}) diff --git a/pkgs/by-name/cf/cfonts/package.nix b/pkgs/by-name/cf/cfonts/package.nix index 48c0aa7f68b3..ab8e1c6b559d 100644 --- a/pkgs/by-name/cf/cfonts/package.nix +++ b/pkgs/by-name/cf/cfonts/package.nix @@ -3,12 +3,12 @@ rustPlatform, fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cfonts"; version = "1.3.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-rgdqQzJyb1/bYB3S1MD/53vdQ+GaxOvGHuPE6dxMRB0="; }; @@ -21,4 +21,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ leifhelm ]; mainProgram = "cfonts"; }; -} +}) diff --git a/pkgs/by-name/ch/changelogging/package.nix b/pkgs/by-name/ch/changelogging/package.nix index 36453e475290..8dd4af5e1d59 100644 --- a/pkgs/by-name/ch/changelogging/package.nix +++ b/pkgs/by-name/ch/changelogging/package.nix @@ -6,12 +6,12 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "changelogging"; version = "0.7.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-orTUCBHacD0MQNfhOUWdh9RxT/9YNvgfCHFDr2eNQic="; }; @@ -25,10 +25,10 @@ rustPlatform.buildRustPackage rec { meta = { description = "CLI tool for building changelogs from fragments"; homepage = "https://github.com/nekitdev/changelogging"; - changelog = "https://github.com/nekitdev/changelogging/releases/tag/v${version}"; + changelog = "https://github.com/nekitdev/changelogging/releases/tag/v${finalAttrs.version}"; platforms = lib.platforms.all; license = lib.licenses.mit; maintainers = [ lib.maintainers.nekitdev ]; mainProgram = "changelogging"; }; -} +}) diff --git a/pkgs/by-name/ch/checkpwn/package.nix b/pkgs/by-name/ch/checkpwn/package.nix index e1d0989d0997..09dc613976e2 100644 --- a/pkgs/by-name/ch/checkpwn/package.nix +++ b/pkgs/by-name/ch/checkpwn/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "checkpwn"; version = "0.5.6"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-M0Jb+8rKn4KVuumNSsM6JEbSOoBOFy9mmXiCnUnDgak="; }; @@ -23,9 +23,9 @@ rustPlatform.buildRustPackage rec { meta = { description = "Check Have I Been Pwned and see if it's time for you to change passwords"; homepage = "https://github.com/brycx/checkpwn"; - changelog = "https://github.com/brycx/checkpwn/releases/tag/${version}"; + changelog = "https://github.com/brycx/checkpwn/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = [ ]; mainProgram = "checkpwn"; }; -} +}) diff --git a/pkgs/by-name/ch/cherrybomb/package.nix b/pkgs/by-name/ch/cherrybomb/package.nix index b4d993e7bb48..4ba45531fd30 100644 --- a/pkgs/by-name/ch/cherrybomb/package.nix +++ b/pkgs/by-name/ch/cherrybomb/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cherrybomb"; version = "1.0.1"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-MHKBP102U1Ug9wZm9x4+opZgG8f6Hx03FvoLV4qaDgY="; }; @@ -19,8 +19,8 @@ rustPlatform.buildRustPackage rec { description = "CLI tool that helps you avoid undefined user behavior by validating your API specifications"; mainProgram = "cherrybomb"; homepage = "https://github.com/blst-security/cherrybomb"; - changelog = "https://github.com/blst-security/cherrybomb/releases/tag/v${version}"; + changelog = "https://github.com/blst-security/cherrybomb/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ci/citron/package.nix b/pkgs/by-name/ci/citron/package.nix index 3a446d38826f..07f0501a327b 100644 --- a/pkgs/by-name/ci/citron/package.nix +++ b/pkgs/by-name/ci/citron/package.nix @@ -7,12 +7,12 @@ pkg-config, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "citron"; version = "0.15.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-6wJ4UfiwpV9zFuBR8SYj6eBiRqQitFs7wRe5R51Z3SA="; }; @@ -37,4 +37,4 @@ rustPlatform.buildRustPackage rec { platforms = lib.platforms.linux; mainProgram = "citron"; }; -} +}) diff --git a/pkgs/by-name/cl/clang-tidy-sarif/package.nix b/pkgs/by-name/cl/clang-tidy-sarif/package.nix index 5d72cfb7c4d0..c5de9f3aa0b3 100644 --- a/pkgs/by-name/cl/clang-tidy-sarif/package.nix +++ b/pkgs/by-name/cl/clang-tidy-sarif/package.nix @@ -5,12 +5,12 @@ nix-update-script, versionCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "clang-tidy-sarif"; version = "0.8.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ALwEsF1n6WYqITfYTn8mIyn3sxTbDux17FxKIorKkFc="; }; @@ -30,4 +30,4 @@ rustPlatform.buildRustPackage rec { mainProgram = "clang-tidy-sarif"; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/by-name/cl/clini/package.nix b/pkgs/by-name/cl/clini/package.nix index 9400013eb9c4..a6a8e45f6215 100644 --- a/pkgs/by-name/cl/clini/package.nix +++ b/pkgs/by-name/cl/clini/package.nix @@ -4,12 +4,12 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "clini"; version = "0.1.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-+HnoYFRG7GGef5lV4CUsUzqPzFUzXDajprLu25SCMQo="; }; @@ -22,4 +22,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ Flakebi ]; mainProgram = "clini"; }; -} +}) diff --git a/pkgs/by-name/cl/clippy-sarif/package.nix b/pkgs/by-name/cl/clippy-sarif/package.nix index 959014615688..2b221ff106fb 100644 --- a/pkgs/by-name/cl/clippy-sarif/package.nix +++ b/pkgs/by-name/cl/clippy-sarif/package.nix @@ -6,12 +6,12 @@ nix-update-script, versionCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "clippy-sarif"; version = "0.8.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-pqu7jIKksjn52benebICQEhgCW59MX+RRTcHm2ufjWE="; }; @@ -32,4 +32,4 @@ rustPlatform.buildRustPackage rec { mainProgram = "clippy-sarif"; inherit (clippy.meta) platforms; }; -} +}) diff --git a/pkgs/by-name/co/colmena/package.nix b/pkgs/by-name/co/colmena/package.nix index cc5ccb1fa0dd..f95c311db6e7 100644 --- a/pkgs/by-name/co/colmena/package.nix +++ b/pkgs/by-name/co/colmena/package.nix @@ -12,14 +12,14 @@ testers, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "colmena"; version = "0.4.0"; src = fetchFromGitHub { owner = "zhaofengli"; repo = "colmena"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-01bfuSY4gnshhtqA1EJCw2CMsKkAx+dHS+sEpQ2+EAQ="; }; @@ -57,17 +57,17 @@ rustPlatform.buildRustPackage rec { passthru = { # We guarantee CLI and Nix API stability for the same minor version - apiVersion = builtins.concatStringsSep "." (lib.take 2 (lib.splitVersion version)); + apiVersion = builtins.concatStringsSep "." (lib.take 2 (lib.splitVersion finalAttrs.version)); tests.version = testers.testVersion { package = colmena; }; }; meta = { description = "Simple, stateless NixOS deployment tool"; - homepage = "https://colmena.cli.rs/${passthru.apiVersion}"; + homepage = "https://colmena.cli.rs/${finalAttrs.passthru.apiVersion}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ zhaofengli ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "colmena"; }; -} +}) diff --git a/pkgs/by-name/co/color-lsp/package.nix b/pkgs/by-name/co/color-lsp/package.nix index 1aae44dc65ec..81c7e61a824e 100644 --- a/pkgs/by-name/co/color-lsp/package.nix +++ b/pkgs/by-name/co/color-lsp/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "color-lsp"; version = "0.3.0"; src = fetchFromGitHub { owner = "huacnlee"; repo = "color-lsp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-p58rAVznBzhBv7gVvaEjMpCrk9kFuEjUvY6U4uMXUE8="; }; @@ -37,4 +37,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "color-lsp"; }; -} +}) diff --git a/pkgs/by-name/cs/csv2svg/package.nix b/pkgs/by-name/cs/csv2svg/package.nix index 57bc999692ad..3f3d5943d4ef 100644 --- a/pkgs/by-name/cs/csv2svg/package.nix +++ b/pkgs/by-name/cs/csv2svg/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "csv2svg"; version = "0.1.9"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-3VebLFkeJLK97jqoPXt4Wt6QTR0Zyu+eQV9oaLBSeHE="; }; @@ -22,4 +22,4 @@ rustPlatform.buildRustPackage rec { maintainers = [ ]; mainProgram = "csv2svg"; }; -} +}) diff --git a/pkgs/by-name/di/diffedit3/package.nix b/pkgs/by-name/di/diffedit3/package.nix index 4230b63a4977..b82cd45dc91a 100644 --- a/pkgs/by-name/di/diffedit3/package.nix +++ b/pkgs/by-name/di/diffedit3/package.nix @@ -7,12 +7,12 @@ diffedit3, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "diffedit3"; version = "0.6.1"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-tlrP97XMAAnk5H5wTHPsP1DMSmDqV9wJp1n+22jUtnM="; }; @@ -32,4 +32,4 @@ rustPlatform.buildRustPackage rec { mainProgram = "diffedit3"; maintainers = with lib.maintainers; [ thoughtpolice ]; }; -} +}) diff --git a/pkgs/by-name/do/dotenvy/package.nix b/pkgs/by-name/do/dotenvy/package.nix index a3112fea3695..d511802badca 100644 --- a/pkgs/by-name/do/dotenvy/package.nix +++ b/pkgs/by-name/do/dotenvy/package.nix @@ -4,12 +4,12 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "dotenvy"; version = "0.15.7"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-virK/TpYBmwTf5UCQCqC/df8iKYAzPBfsQ1nQkFKF2Y="; }; @@ -29,4 +29,4 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ phlip9 ]; }; -} +}) diff --git a/pkgs/by-name/do/dotslash/package.nix b/pkgs/by-name/do/dotslash/package.nix index f2f48c3d7168..50886608da9c 100644 --- a/pkgs/by-name/do/dotslash/package.nix +++ b/pkgs/by-name/do/dotslash/package.nix @@ -7,12 +7,12 @@ dotslash, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "dotslash"; version = "0.5.7"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-VFesGum2xjknUuCwIojntdst5dmhvZb78ejJ2OG1FVI="; }; @@ -45,4 +45,4 @@ rustPlatform.buildRustPackage rec { mainProgram = "dotslash"; maintainers = with lib.maintainers; [ thoughtpolice ]; }; -} +}) diff --git a/pkgs/by-name/du/duckscript/package.nix b/pkgs/by-name/du/duckscript/package.nix index ddd44b75d796..e769cf55f975 100644 --- a/pkgs/by-name/du/duckscript/package.nix +++ b/pkgs/by-name/du/duckscript/package.nix @@ -8,12 +8,12 @@ libiconv, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "duckscript_cli"; version = "0.11.1"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-afxzZkmmYnprUBquH681VHMDs3Co9C71chNoKbu6lEY="; }; @@ -35,4 +35,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ mkg20001 ]; mainProgram = "duck"; }; -} +}) diff --git a/pkgs/by-name/el/elf2uf2-rs/package.nix b/pkgs/by-name/el/elf2uf2-rs/package.nix index dbdf6d3c2360..434781557bcb 100644 --- a/pkgs/by-name/el/elf2uf2-rs/package.nix +++ b/pkgs/by-name/el/elf2uf2-rs/package.nix @@ -7,12 +7,12 @@ udev, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "elf2uf2-rs"; version = "2.2.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-e0i8ecjfNZxQgX5kDU1T8yAGUl4J7mbgG+ueBFsyTNA="; }; @@ -35,4 +35,4 @@ rustPlatform.buildRustPackage rec { moni ]; }; -} +}) diff --git a/pkgs/by-name/ev/eva/package.nix b/pkgs/by-name/ev/eva/package.nix index 9581b05f91f9..87d70a0370bf 100644 --- a/pkgs/by-name/ev/eva/package.nix +++ b/pkgs/by-name/ev/eva/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "eva"; version = "0.3.1"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-eX2d9h6zNbheS68j3lyhJW05JZmQN2I2MdcmiZB8Mec="; }; @@ -24,4 +24,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "eva"; }; -} +}) diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix index 8656401e6a45..16330866a4be 100644 --- a/pkgs/by-name/ew/eww/package.nix +++ b/pkgs/by-name/ew/eww/package.nix @@ -13,7 +13,7 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "eww"; version = "0.6.0-unstable-2025-06-30"; @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { "eww" ]; - cargoTestFlags = cargoBuildFlags; + cargoTestFlags = finalAttrs.cargoBuildFlags; # requires unstable rust features env.RUSTC_BOOTSTRAP = 1; @@ -76,4 +76,4 @@ rustPlatform.buildRustPackage rec { mainProgram = "eww"; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/fa/faketty/package.nix b/pkgs/by-name/fa/faketty/package.nix index 994669ea4e03..040dd0981080 100644 --- a/pkgs/by-name/fa/faketty/package.nix +++ b/pkgs/by-name/fa/faketty/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "faketty"; version = "1.0.20"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-1AX2DBFOSUcORSQCo/5Vd8puE4hJU9VDfVqxcZDKrrY="; }; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Wrapper to execute a command in a pty, even if redirecting the output"; homepage = "https://github.com/dtolnay/faketty"; - changelog = "https://github.com/dtolnay/faketty/releases/tag/${version}"; + changelog = "https://github.com/dtolnay/faketty/releases/tag/${finalAttrs.version}"; license = with lib.licenses; [ asl20 # or mit @@ -30,4 +30,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "faketty"; }; -} +}) diff --git a/pkgs/by-name/fl/flowgger/package.nix b/pkgs/by-name/fl/flowgger/package.nix index 7b77f21e45e3..c493ef10c54e 100644 --- a/pkgs/by-name/fl/flowgger/package.nix +++ b/pkgs/by-name/fl/flowgger/package.nix @@ -7,12 +7,12 @@ capnproto, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "flowgger"; version = "0.3.2"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-eybahv1A/AIpAXGj6/md8k+b9fu9gSchU16fnAWZP2s="; }; @@ -38,4 +38,4 @@ rustPlatform.buildRustPackage rec { maintainers = [ ]; mainProgram = "flowgger"; }; -} +}) diff --git a/pkgs/by-name/fo/fortanix-sgx-tools/package.nix b/pkgs/by-name/fo/fortanix-sgx-tools/package.nix index 1916af6c65ed..1283f597381f 100644 --- a/pkgs/by-name/fo/fortanix-sgx-tools/package.nix +++ b/pkgs/by-name/fo/fortanix-sgx-tools/package.nix @@ -6,7 +6,7 @@ openssl_3, protobuf, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "fortanix-sgx-tools"; version = "0.6.1"; nativeBuildInputs = [ @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl_3 ]; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-IVkmZs3imzj8uN8kqEzN/Oio3H+Nqzu8ORjARNx1TpQ="; }; @@ -27,4 +27,4 @@ rustPlatform.buildRustPackage rec { platforms = [ "x86_64-linux" ]; license = lib.licenses.mpl20; }; -} +}) diff --git a/pkgs/by-name/fr/frawk/package.nix b/pkgs/by-name/fr/frawk/package.nix index 3c775a9fb7a0..dda9b3554be1 100644 --- a/pkgs/by-name/fr/frawk/package.nix +++ b/pkgs/by-name/fr/frawk/package.nix @@ -15,12 +15,12 @@ assert lib.assertMsg ( !(lib.elem "default" features || lib.elem "llvm_backend" features) ) "LLVM support has been dropped due to LLVM 12 EOL."; -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "frawk"; version = "0.4.8"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-wPnMJDx3aF1Slx5pjLfii366pgNU3FJBdznQLuUboYA="; }; @@ -51,11 +51,11 @@ rustPlatform.buildRustPackage rec { description = "Small programming language for writing short programs processing textual data"; mainProgram = "frawk"; homepage = "https://github.com/ezrosent/frawk"; - changelog = "https://github.com/ezrosent/frawk/releases/tag/v${version}"; + changelog = "https://github.com/ezrosent/frawk/releases/tag/v${finalAttrs.version}"; license = with lib.licenses; [ mit # or asl20 ]; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/fr/french-numbers/package.nix b/pkgs/by-name/fr/french-numbers/package.nix index 93d8f596a1f3..a5ba539ac20f 100644 --- a/pkgs/by-name/fr/french-numbers/package.nix +++ b/pkgs/by-name/fr/french-numbers/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "french-numbers"; version = "1.2.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-6mcqT0RZddHlzjyZzx0JGTfCRcQ2UQ3Qlmk0VVNzsnI="; }; @@ -27,4 +27,4 @@ rustPlatform.buildRustPackage rec { mainProgram = "french-numbers"; maintainers = with lib.maintainers; [ samueltardieu ]; }; -} +}) diff --git a/pkgs/by-name/ge/gel/package.nix b/pkgs/by-name/ge/gel/package.nix index 00adee1a1533..69f1120e93f1 100644 --- a/pkgs/by-name/ge/gel/package.nix +++ b/pkgs/by-name/ge/gel/package.nix @@ -14,19 +14,19 @@ gel, testers, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "gel"; version = "7.10.2"; src = fetchFromGitHub { owner = "geldata"; repo = "gel-cli"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Fy4J7puunqB5TeUsafnOotoWNvtTGiMJZ06YII14zIM="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-VRZjI8C0u+6MkQgzt0PApeUtrGR5UqvnLZxityMGnDo="; }; @@ -80,4 +80,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "gel"; }; -} +}) diff --git a/pkgs/by-name/ge/genemichaels/package.nix b/pkgs/by-name/ge/genemichaels/package.nix index eb4dbbe8ca60..532aef28d5a6 100644 --- a/pkgs/by-name/ge/genemichaels/package.nix +++ b/pkgs/by-name/ge/genemichaels/package.nix @@ -5,12 +5,12 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "genemichaels"; version = "0.9.5"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-KaGG2amPk/+fL7xLAfZw4SmCzXc+hS/9IkBG7G6sngI="; }; @@ -25,4 +25,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ djacu ]; mainProgram = "genemichaels"; }; -} +}) diff --git a/pkgs/by-name/gh/gh-cal/package.nix b/pkgs/by-name/gh/gh-cal/package.nix index cc536d75408a..f4dc936968d0 100644 --- a/pkgs/by-name/gh/gh-cal/package.nix +++ b/pkgs/by-name/gh/gh-cal/package.nix @@ -5,12 +5,12 @@ pkg-config, openssl, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "gh-cal"; version = "0.1.3"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-x9DekflZoXxH964isWCi6YuV3v/iIyYOuRYVgKaUBx0="; }; @@ -26,4 +26,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ loicreynier ]; mainProgram = "gh-cal"; }; -} +}) diff --git a/pkgs/by-name/gi/gitlab-timelogs/package.nix b/pkgs/by-name/gi/gitlab-timelogs/package.nix index df72922fd8c6..5df5d02c4620 100644 --- a/pkgs/by-name/gi/gitlab-timelogs/package.nix +++ b/pkgs/by-name/gi/gitlab-timelogs/package.nix @@ -8,12 +8,12 @@ stdenv, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "gitlab-timelogs"; version = "0.7.1"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-DNMJczR4yaglIOcNmb2E1g+UP0VeJaIb5TvdKUcWzc0="; }; @@ -37,11 +37,11 @@ rustPlatform.buildRustPackage rec { gitlab-timelogs is not associated with the official GitLab project! ''; homepage = "https://github.com/phip1611/gitlab-timelogs"; - changelog = "https://github.com/phip1611/gitlab-timelogs/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/phip1611/gitlab-timelogs/blob/v${finalAttrs.version}/CHANGELOG.md"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ blitz phip1611 ]; }; -} +}) diff --git a/pkgs/by-name/gl/globe-cli/package.nix b/pkgs/by-name/gl/globe-cli/package.nix index 5851c4917bff..668c093c75cd 100644 --- a/pkgs/by-name/gl/globe-cli/package.nix +++ b/pkgs/by-name/gl/globe-cli/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "globe-cli"; version = "0.2.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Np1f/mSMIMZU3hE0Fur8bOHhOH3rZyroGiVAqfiIs7g="; }; @@ -22,4 +22,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ devhell ]; mainProgram = "globe"; }; -} +}) diff --git a/pkgs/by-name/gp/gpustat/package.nix b/pkgs/by-name/gp/gpustat/package.nix index c5a31cef73c5..f8c9d136ae46 100644 --- a/pkgs/by-name/gp/gpustat/package.nix +++ b/pkgs/by-name/gp/gpustat/package.nix @@ -15,14 +15,14 @@ makeWrapper, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "gpustat"; version = "0.1.5"; src = fetchFromGitHub { owner = "arduano"; repo = "gpustat"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-M9P/qfw/tp9ogkNOE3b2fD2rGFnii1/VwmqJHqXb7Mg="; }; @@ -60,7 +60,7 @@ rustPlatform.buildRustPackage rec { # https://github.com/emilk/egui/issues/2486 postFixup = '' wrapProgram $out/bin/gpustat \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}:/run/opengl-driver/lib" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}:/run/opengl-driver/lib" ''; meta = { @@ -71,4 +71,4 @@ rustPlatform.buildRustPackage rec { mainProgram = "gpustat"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gr/grass-sass/package.nix b/pkgs/by-name/gr/grass-sass/package.nix index a2f3bb0e9bbc..89d9370552f8 100644 --- a/pkgs/by-name/gr/grass-sass/package.nix +++ b/pkgs/by-name/gr/grass-sass/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "grass"; version = "0.13.4"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-uk4XLF0QsH9Nhz73PmdSpwhxPdCh+DlNNqtbJtLWgNI="; }; @@ -22,10 +22,10 @@ rustPlatform.buildRustPackage rec { description = "Sass compiler written purely in Rust"; homepage = "https://github.com/connorskees/grass"; changelog = "https://github.com/connorskees/grass/blob/master/CHANGELOG.md#${ - lib.replaceStrings [ "." ] [ "" ] version + lib.replaceStrings [ "." ] [ "" ] finalAttrs.version }"; license = lib.licenses.mit; maintainers = [ ]; mainProgram = "grass"; }; -} +}) diff --git a/pkgs/by-name/ha/habitat/package.nix b/pkgs/by-name/ha/habitat/package.nix index fa0cce0a36a5..ce2533f304fa 100644 --- a/pkgs/by-name/ha/habitat/package.nix +++ b/pkgs/by-name/ha/habitat/package.nix @@ -11,14 +11,14 @@ cacert, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "habitat"; version = "1.6.1245"; src = fetchFromGitHub { owner = "habitat-sh"; repo = "habitat"; - rev = version; + rev = finalAttrs.version; hash = "sha256-n2ylJSCXPnnPHadfZaRS/3vxtnvkXhiTzCyObK7hmEk="; }; @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { "-p" "hab" ]; - cargoTestFlags = cargoBuildFlags; + cargoTestFlags = finalAttrs.cargoBuildFlags; env = { OPENSSL_NO_VENDOR = true; @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Application automation framework"; homepage = "https://www.habitat.sh"; - changelog = "https://github.com/habitat-sh/habitat/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/habitat-sh/habitat/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ rushmorem @@ -60,4 +60,4 @@ rustPlatform.buildRustPackage rec { mainProgram = "hab"; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/ha/hadolint-sarif/package.nix b/pkgs/by-name/ha/hadolint-sarif/package.nix index 6cde38b324f3..11d0116195d4 100644 --- a/pkgs/by-name/ha/hadolint-sarif/package.nix +++ b/pkgs/by-name/ha/hadolint-sarif/package.nix @@ -5,12 +5,12 @@ nix-update-script, versionCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "hadolint-sarif"; version = "0.8.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-7xvo194lCQpDtLgwX6rZEkwG3hYTp5czjw4GrEaivsI="; }; @@ -30,4 +30,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ getchoo ]; mainProgram = "hadolint-sarif"; }; -} +}) diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix index 45b27c7afb96..936a5aedb254 100644 --- a/pkgs/by-name/ha/halloy/package.nix +++ b/pkgs/by-name/ha/halloy/package.nix @@ -19,14 +19,14 @@ alsa-lib, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "halloy"; version = "2026.2"; src = fetchFromGitHub { owner = "squidowl"; repo = "halloy"; - tag = version; + tag = finalAttrs.version; hash = "sha256-xx4r6vdUeh0yr986+Z67xtViQA7mMpsXmTohu3jIwMs="; }; @@ -58,7 +58,7 @@ rustPlatform.buildRustPackage rec { desktopName = "Halloy"; comment = "IRC client written in Rust"; icon = "org.squidowl.halloy"; - exec = pname; + exec = finalAttrs.pname; terminal = false; mimeTypes = [ "x-scheme-handler/irc" @@ -99,11 +99,11 @@ rustPlatform.buildRustPackage rec { APP_DIR="$out/Applications/Halloy.app/Contents" mkdir -p "$APP_DIR/MacOS" - cp -r ${src}/assets/macos/Halloy.app/Contents/* "$APP_DIR" + cp -r ${finalAttrs.src}/assets/macos/Halloy.app/Contents/* "$APP_DIR" substituteInPlace "$APP_DIR/Info.plist" \ - --replace-fail "{{ VERSION }}" "${version}" \ - --replace-fail "{{ BUILD }}" "${version}-nixpkgs" + --replace-fail "{{ VERSION }}" "${finalAttrs.version}" \ + --replace-fail "{{ BUILD }}" "${finalAttrs.version}-nixpkgs" makeWrapper "$out/bin/halloy" "$APP_DIR/MacOS/halloy" ''; @@ -113,7 +113,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "IRC application"; homepage = "https://github.com/squidowl/halloy"; - changelog = "https://github.com/squidowl/halloy/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/squidowl/halloy/blob/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab @@ -122,4 +122,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "halloy"; }; -} +}) diff --git a/pkgs/by-name/ha/hayagriva/package.nix b/pkgs/by-name/ha/hayagriva/package.nix index 8c80544781ff..54ce9213f6a5 100644 --- a/pkgs/by-name/ha/hayagriva/package.nix +++ b/pkgs/by-name/ha/hayagriva/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "hayagriva"; version = "0.9.1"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-9PGo/TPk5QuiVoa5wUGyHufW/VaxqhinxS+u2JMPZBY="; }; @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Work with references: Literature database management, storage, and citation formatting"; homepage = "https://github.com/typst/hayagriva"; - changelog = "https://github.com/typst/hayagriva/releases/tag/v${version}"; + changelog = "https://github.com/typst/hayagriva/releases/tag/v${finalAttrs.version}"; license = with lib.licenses; [ asl20 mit @@ -37,4 +37,4 @@ rustPlatform.buildRustPackage rec { maintainers = [ ]; mainProgram = "hayagriva"; }; -} +}) diff --git a/pkgs/by-name/hu/huniq/package.nix b/pkgs/by-name/hu/huniq/package.nix index 7894b3bc06c4..4e96eddf1921 100644 --- a/pkgs/by-name/hu/huniq/package.nix +++ b/pkgs/by-name/hu/huniq/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "huniq"; version = "2.7.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-5GvHM05qY/Jj1mPYwn88Zybn6Nn5nJIaw0XP8iCcrwE="; }; @@ -22,4 +22,4 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.bsd3; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/hv/hvm/package.nix b/pkgs/by-name/hv/hvm/package.nix index 1766f3206b67..0a0554e8e57f 100644 --- a/pkgs/by-name/hv/hvm/package.nix +++ b/pkgs/by-name/hv/hvm/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "hvm"; version = "2.0.22"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-AD8mv47m4E6H8BVkxTExyhrR7VEnuB/KxnRl2puPnX4="; }; @@ -28,4 +28,4 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/i3/i3-open-next-ws/package.nix b/pkgs/by-name/i3/i3-open-next-ws/package.nix index 97e4be1c3ead..704616e09426 100644 --- a/pkgs/by-name/i3/i3-open-next-ws/package.nix +++ b/pkgs/by-name/i3/i3-open-next-ws/package.nix @@ -3,12 +3,12 @@ rustPlatform, fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "i3-open-next-ws"; version = "0.1.5"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-eYHCm8jEv6Ll6/h1kcYHNxWGnVWI41ZB96Jec9oZFsY="; }; @@ -22,4 +22,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ quantenzitrone ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/in/inputplug/package.nix b/pkgs/by-name/in/inputplug/package.nix index e73d44672eb7..ba5a4ab47a60 100644 --- a/pkgs/by-name/in/inputplug/package.nix +++ b/pkgs/by-name/in/inputplug/package.nix @@ -8,12 +8,12 @@ stdenv, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "inputplug"; version = "0.4.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-8Gy0h0QMcittnjuKm+atIJNsY2d6Ua29oab4fkUU+wE="; }; @@ -40,4 +40,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ jecaro ]; mainProgram = "inputplug"; }; -} +}) diff --git a/pkgs/by-name/jf/jfmt/package.nix b/pkgs/by-name/jf/jfmt/package.nix index 8dc94b31e770..fdcc8ab9c69b 100644 --- a/pkgs/by-name/jf/jfmt/package.nix +++ b/pkgs/by-name/jf/jfmt/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "jfmt"; version = "1.2.1"; src = fetchFromGitHub { owner = "scruffystuffs"; - repo = "${pname}.rs"; - rev = "v${version}"; + repo = "${finalAttrs.pname}.rs"; + rev = "v${finalAttrs.version}"; hash = "sha256-X3wk669G07BTPAT5xGbAfIu2Qk90aaJIi1CLmOnSG80="; }; @@ -21,8 +21,8 @@ rustPlatform.buildRustPackage rec { description = "CLI utility to format json files"; mainProgram = "jfmt"; homepage = "https://github.com/scruffystuffs/jfmt.rs"; - changelog = "https://github.com/scruffystuffs/jfmt.rs/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/scruffystuffs/jfmt.rs/blob/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ lib.maintainers.psibi ]; }; -} +}) diff --git a/pkgs/by-name/ju/just-formatter/package.nix b/pkgs/by-name/ju/just-formatter/package.nix index 1fcbc2062e75..9e9c06d57bf3 100644 --- a/pkgs/by-name/ju/just-formatter/package.nix +++ b/pkgs/by-name/ju/just-formatter/package.nix @@ -4,12 +4,12 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "just-formatter"; version = "1.1.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-HTv55WquFieWmkEKX5sbBOVyYxzjcB/NrMkxbQsff90="; }; @@ -22,4 +22,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ vuimuich ]; mainProgram = "just-formatter"; }; -} +}) diff --git a/pkgs/by-name/ke/keepass-diff/package.nix b/pkgs/by-name/ke/keepass-diff/package.nix index 43eb581f74da..8f88ece7ce57 100644 --- a/pkgs/by-name/ke/keepass-diff/package.nix +++ b/pkgs/by-name/ke/keepass-diff/package.nix @@ -4,12 +4,12 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "keepass-diff"; version = "1.2.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-CqLH5Dosp26YfqgOVcZilfo5svAEv+pAbi1zebGMnb4="; }; @@ -22,4 +22,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ wamserma ]; mainProgram = "keepass-diff"; }; -} +}) diff --git a/pkgs/by-name/ki/kind2/package.nix b/pkgs/by-name/ki/kind2/package.nix index c571fd6d0058..ae643a3a6ed7 100644 --- a/pkgs/by-name/ki/kind2/package.nix +++ b/pkgs/by-name/ki/kind2/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "kind2"; version = "0.3.10"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-X2sjfYrSSym289jDJV3hNmcwyQCMnrabmGCUKD5wfdY="; }; @@ -32,4 +32,4 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/kr/krabby/package.nix b/pkgs/by-name/kr/krabby/package.nix index fb561c29c2ca..e1bfcdb77b98 100644 --- a/pkgs/by-name/kr/krabby/package.nix +++ b/pkgs/by-name/kr/krabby/package.nix @@ -3,12 +3,12 @@ rustPlatform, fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "krabby"; version = "0.3.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-UcvCIazuVoqYb4iz62MrOVtQli4EqzrEpg3imv3sXHY="; }; @@ -17,9 +17,9 @@ rustPlatform.buildRustPackage rec { meta = { description = "Print pokemon sprites in your terminal"; homepage = "https://github.com/yannjor/krabby"; - changelog = "https://github.com/yannjor/krabby/releases/tag/v${version}"; + changelog = "https://github.com/yannjor/krabby/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ ruby0b ]; mainProgram = "krabby"; }; -} +}) diff --git a/pkgs/by-name/le/lemmeknow/package.nix b/pkgs/by-name/le/lemmeknow/package.nix index 178ddb6c29cf..b4d9c94b46e0 100644 --- a/pkgs/by-name/le/lemmeknow/package.nix +++ b/pkgs/by-name/le/lemmeknow/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "lemmeknow"; version = "0.8.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Q82tP4xNWAooFjHeJCFmuULnWlFbgca/9Y2lm8rVXKs="; }; @@ -18,9 +18,9 @@ rustPlatform.buildRustPackage rec { meta = { description = "Tool to identify anything"; homepage = "https://github.com/swanandx/lemmeknow"; - changelog = "https://github.com/swanandx/lemmeknow/releases/tag/v${version}"; + changelog = "https://github.com/swanandx/lemmeknow/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = [ ]; mainProgram = "lemmeknow"; }; -} +}) diff --git a/pkgs/by-name/li/license-generator/package.nix b/pkgs/by-name/li/license-generator/package.nix index cf2cb52e0b02..ada5fe7091f0 100644 --- a/pkgs/by-name/li/license-generator/package.nix +++ b/pkgs/by-name/li/license-generator/package.nix @@ -4,12 +4,12 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "license-generator"; version = "1.3.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-jp7NQfDh512oThZbLj0NbqcH7rxV2R0kDv1wsiTNf/M="; }; @@ -22,4 +22,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ loicreynier ]; mainProgram = "license-generator"; }; -} +}) diff --git a/pkgs/by-name/lo/loco/package.nix b/pkgs/by-name/lo/loco/package.nix index 672730e845c0..0c2f26e70c07 100644 --- a/pkgs/by-name/lo/loco/package.nix +++ b/pkgs/by-name/lo/loco/package.nix @@ -4,12 +4,12 @@ fetchCrate, nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "loco"; version = "0.16.3"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-DdrLABMiTutIhUHvUw29DYZIT+YHLNJjoTT5kWMeAkU="; }; @@ -30,4 +30,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ sebrut ]; mainProgram = "loco"; }; -} +}) diff --git a/pkgs/by-name/ls/lscolors/package.nix b/pkgs/by-name/ls/lscolors/package.nix index f9f5f933f379..652d2a242fc3 100644 --- a/pkgs/by-name/ls/lscolors/package.nix +++ b/pkgs/by-name/ls/lscolors/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "lscolors"; version = "0.21.0"; src = fetchCrate { - inherit version pname; + inherit (finalAttrs) version pname; hash = "sha256-75RE72Vy4HRRjwa7qOybnUAzxxhBUKSlKfrLrm6Ish8="; }; @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Rust library and tool to colorize paths using LS_COLORS"; homepage = "https://github.com/sharkdp/lscolors"; - changelog = "https://github.com/sharkdp/lscolors/releases/tag/v${version}"; + changelog = "https://github.com/sharkdp/lscolors/releases/tag/v${finalAttrs.version}"; license = with lib.licenses; [ asl20 # or mit @@ -31,4 +31,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ SuperSandro2000 ]; mainProgram = "lscolors"; }; -} +}) diff --git a/pkgs/by-name/md/mdbook-katex/package.nix b/pkgs/by-name/md/mdbook-katex/package.nix index 974a078ae76d..37d8826f09a5 100644 --- a/pkgs/by-name/md/mdbook-katex/package.nix +++ b/pkgs/by-name/md/mdbook-katex/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "mdbook-katex"; version = "0.9.4"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-xwIW8igfxO9vsck8ktDBc7XFLuYzwqI3I4nLDTYC8JI="; }; @@ -18,11 +18,11 @@ rustPlatform.buildRustPackage rec { meta = { description = "Preprocessor for mdbook, rendering LaTeX equations to HTML at build time"; mainProgram = "mdbook-katex"; - homepage = "https://github.com/lzanini/${pname}"; + homepage = "https://github.com/lzanini/${finalAttrs.pname}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ lovesegfault matthiasbeyer ]; }; -} +}) diff --git a/pkgs/by-name/md/mdbook-pdf/package.nix b/pkgs/by-name/md/mdbook-pdf/package.nix index e900fdc318f0..8ab294850278 100644 --- a/pkgs/by-name/md/mdbook-pdf/package.nix +++ b/pkgs/by-name/md/mdbook-pdf/package.nix @@ -6,12 +6,12 @@ openssl, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "mdbook-pdf"; version = "0.1.13"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-aADHRlIVWVc43DEfZx8ha/E4FaiAoKtjHccx+LAghtU="; }; @@ -35,11 +35,11 @@ rustPlatform.buildRustPackage rec { description = "Backend for mdBook written in Rust for generating PDF"; mainProgram = "mdbook-pdf"; homepage = "https://github.com/HollowMan6/mdbook-pdf"; - changelog = "https://github.com/HollowMan6/mdbook-pdf/releases/tag/v${version}"; + changelog = "https://github.com/HollowMan6/mdbook-pdf/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ hollowman6 matthiasbeyer ]; }; -} +}) diff --git a/pkgs/by-name/md/mdevctl/package.nix b/pkgs/by-name/md/mdevctl/package.nix index dd5ca6aac258..2ab57c55cbb0 100644 --- a/pkgs/by-name/md/mdevctl/package.nix +++ b/pkgs/by-name/md/mdevctl/package.nix @@ -7,12 +7,12 @@ udevCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "mdevctl"; version = "1.4.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Zh+Dj3X87tTpqT/weZMpf7f3obqikjPy9pi50ifp6wQ="; }; @@ -49,4 +49,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ edwtjo ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/me/meow/package.nix b/pkgs/by-name/me/meow/package.nix index 43f3b158b6d9..479de620613f 100644 --- a/pkgs/by-name/me/meow/package.nix +++ b/pkgs/by-name/me/meow/package.nix @@ -5,13 +5,13 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "meow"; version = "2.1.5"; src = fetchCrate { - inherit version; - crateName = "${pname}-cli"; + inherit (finalAttrs) version; + crateName = "${finalAttrs.pname}-cli"; sha256 = "sha256-6tf4/KRZj+1zlxnNgz3kw/HYR2QKg0kEwu+TbKah3e8="; }; @@ -30,4 +30,4 @@ rustPlatform.buildRustPackage rec { mainProgram = "meow"; maintainers = with lib.maintainers; [ pixelsergey ]; }; -} +}) diff --git a/pkgs/by-name/mo/movine/package.nix b/pkgs/by-name/mo/movine/package.nix index 7040bbad4a76..41a1f0238ba1 100644 --- a/pkgs/by-name/mo/movine/package.nix +++ b/pkgs/by-name/mo/movine/package.nix @@ -6,12 +6,12 @@ openssl, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "movine"; version = "0.11.4"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-wa2GfV2Y8oX8G+1LbWnb2KH/+QbUYL9GXgOOVHpzbN8="; }; @@ -49,4 +49,4 @@ rustPlatform.buildRustPackage rec { ''; maintainers = with lib.maintainers; [ netcrns ]; }; -} +}) diff --git a/pkgs/by-name/ne/nethoscope/package.nix b/pkgs/by-name/ne/nethoscope/package.nix index 279b0681d6b6..8bc21edc41bd 100644 --- a/pkgs/by-name/ne/nethoscope/package.nix +++ b/pkgs/by-name/ne/nethoscope/package.nix @@ -8,14 +8,14 @@ expect, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "nethoscope"; version = "0.1.1"; src = fetchFromGitHub { owner = "vvilhonen"; repo = "nethoscope"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-v7GO+d4b0N3heN10+WSUJEpcShKmx4BPR1FyZoELWzc="; }; @@ -36,10 +36,10 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; installCheckPhase = '' - if [[ "$(${expect}/bin/unbuffer "$out/bin/${pname}" --help 2> /dev/null | strings | grep ${version} | tr -d '\n')" == " ${version}" ]]; then - echo '${pname} smoke check passed' + if [[ "$(${expect}/bin/unbuffer "$out/bin/${finalAttrs.pname}" --help 2> /dev/null | strings | grep ${finalAttrs.version} | tr -d '\n')" == " ${finalAttrs.version}" ]]; then + echo '${finalAttrs.pname} smoke check passed' else - echo '${pname} smoke check failed' + echo '${finalAttrs.pname} smoke check failed' return 1 fi ''; @@ -57,4 +57,4 @@ rustPlatform.buildRustPackage rec { mainProgram = "nethoscope"; }; -} +}) diff --git a/pkgs/by-name/nf/nflz/package.nix b/pkgs/by-name/nf/nflz/package.nix index fcc7ce4a48c6..43196b9c0ff2 100644 --- a/pkgs/by-name/nf/nflz/package.nix +++ b/pkgs/by-name/nf/nflz/package.nix @@ -4,12 +4,12 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "nflz"; version = "1.0.2"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-c9+79zrIU/M1Rh+DiaLJzbrNSa4IKrYk1gP0dsabUiw="; }; @@ -33,4 +33,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ phip1611 ]; mainProgram = "nflz"; }; -} +}) diff --git a/pkgs/by-name/ni/nix-template/package.nix b/pkgs/by-name/ni/nix-template/package.nix index e454b017109f..96e12a744fc7 100644 --- a/pkgs/by-name/ni/nix-template/package.nix +++ b/pkgs/by-name/ni/nix-template/package.nix @@ -10,15 +10,15 @@ pkg-config, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "nix-template"; version = "0.4.1"; src = fetchFromGitHub { - name = "${pname}-${version}-src"; + name = "${finalAttrs.pname}-${finalAttrs.version}-src"; owner = "jonringer"; repo = "nix-template"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-42u5FmTIKHpfQ2zZQXIrFkAN2/XvU0wWnCRrQkQzcNI="; }; @@ -48,9 +48,9 @@ rustPlatform.buildRustPackage rec { meta = { description = "Make creating nix expressions easy"; homepage = "https://github.com/jonringer/nix-template/"; - changelog = "https://github.com/jonringer/nix-template/releases/tag/v${version}"; + changelog = "https://github.com/jonringer/nix-template/releases/tag/v${finalAttrs.version}"; license = lib.licenses.cc0; maintainers = [ ]; mainProgram = "nix-template"; }; -} +}) diff --git a/pkgs/by-name/oc/oculante/package.nix b/pkgs/by-name/oc/oculante/package.nix index 948288be260a..fd5eb689ce2b 100644 --- a/pkgs/by-name/oc/oculante/package.nix +++ b/pkgs/by-name/oc/oculante/package.nix @@ -21,7 +21,7 @@ wrapGAppsHook3, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "oculante"; version = "0.9.2.1-unstable-2025-10-08"; @@ -76,7 +76,7 @@ rustPlatform.buildRustPackage rec { patchFlags = [ "-p1" - "--directory=../${pname}-${version}-vendor" + "--directory=../${finalAttrs.pname}-${finalAttrs.version}-vendor" ]; postInstall = '' @@ -98,11 +98,11 @@ rustPlatform.buildRustPackage rec { broken = stdenv.hostPlatform.isDarwin; description = "Minimalistic crossplatform image viewer written in Rust"; homepage = "https://github.com/woelper/oculante"; - changelog = "https://github.com/woelper/oculante/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/woelper/oculante/blob/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; mainProgram = "oculante"; maintainers = with lib.maintainers; [ dit7ya ]; }; -} +}) diff --git a/pkgs/by-name/ov/overlayed/package.nix b/pkgs/by-name/ov/overlayed/package.nix index 87891f774e09..9da60c7f8b75 100644 --- a/pkgs/by-name/ov/overlayed/package.nix +++ b/pkgs/by-name/ov/overlayed/package.nix @@ -17,14 +17,14 @@ openssl, webkitgtk_4_1, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "overlayed"; version = "0.6.2"; src = fetchFromGitHub { owner = "overlayeddev"; repo = "overlayed"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3GFg8czBf1csojXUNC51xFXJnGuXltP6D46fCt6q24I="; }; @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-6wN4nZQWrY0J5E+auj17B3iJ/84hzBXYA/bJsX/N5pk="; pnpmDeps = fetchPnpmDeps { - inherit pname version src; + inherit (finalAttrs) pname version src; pnpm = pnpm_9; fetcherVersion = 3; hash = "sha256-KJZuucXB7BEMnqPmgytveG/IBEzq4mgMo9ZJHPe/gVs="; @@ -73,10 +73,10 @@ rustPlatform.buildRustPackage rec { meta = { description = "Modern discord voice chat overlay"; homepage = "https://github.com/overlayeddev/overlayed"; - changelog = "https://github.com/overlayeddev/overlayed/releases/tag/v${version}"; + changelog = "https://github.com/overlayeddev/overlayed/releases/tag/v${finalAttrs.version}"; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ bot-wxt1221 ]; license = lib.licenses.agpl3Plus; mainProgram = "overlayed"; }; -} +}) diff --git a/pkgs/by-name/pa/paging-calculator/package.nix b/pkgs/by-name/pa/paging-calculator/package.nix index daeccc261ed7..6fd238e3b66d 100644 --- a/pkgs/by-name/pa/paging-calculator/package.nix +++ b/pkgs/by-name/pa/paging-calculator/package.nix @@ -4,12 +4,12 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "paging-calculator"; version = "0.4.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-mTHBARrcq8cJxzh80v/fGr5vACAMyy/DhN8zpQTV0jM="; }; @@ -26,8 +26,8 @@ rustPlatform.buildRustPackage rec { which level of the page table. ''; homepage = "https://github.com/phip1611/paging-calculator"; - changelog = "https://github.com/phip1611/paging-calculator/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/phip1611/paging-calculator/blob/v${finalAttrs.version}/CHANGELOG.md"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ phip1611 ]; }; -} +}) diff --git a/pkgs/by-name/pa/panamax/package.nix b/pkgs/by-name/pa/panamax/package.nix index ce6b79f82927..eb2d4b6d1f89 100644 --- a/pkgs/by-name/pa/panamax/package.nix +++ b/pkgs/by-name/pa/panamax/package.nix @@ -8,12 +8,12 @@ zlib, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "panamax"; version = "1.0.14"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-gIgw6JMGpHNXE/PZoz3jRdmjIWy4hETYf24Nd7/Jr/g="; }; @@ -37,4 +37,4 @@ rustPlatform.buildRustPackage rec { ]; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/pe/perseus-cli/package.nix b/pkgs/by-name/pe/perseus-cli/package.nix index f0644e26c303..0de27545fe47 100644 --- a/pkgs/by-name/pe/perseus-cli/package.nix +++ b/pkgs/by-name/pe/perseus-cli/package.nix @@ -6,12 +6,12 @@ wasm-pack, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "perseus-cli"; version = "0.3.1"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-IYjLx9/4oWSXa4jhOtGw1GOHmrR7LQ6bWyN5zbOuEFs="; }; @@ -31,4 +31,4 @@ rustPlatform.buildRustPackage rec { license = with lib.licenses; [ mit ]; mainProgram = "perseus"; }; -} +}) diff --git a/pkgs/by-name/pi/pijul/package.nix b/pkgs/by-name/pi/pijul/package.nix index 66c34335693d..9642d452aa42 100644 --- a/pkgs/by-name/pi/pijul/package.nix +++ b/pkgs/by-name/pi/pijul/package.nix @@ -12,12 +12,12 @@ libgit2 ? null, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "pijul"; version = "1.0.0-beta.9"; src = fetchCrate { - inherit version pname; + inherit (finalAttrs) version pname; hash = "sha256-jy0mzgLw9iWuoWe2ictMTL3cHnjJ5kzs6TAK+pdm28g="; }; @@ -55,4 +55,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "pijul"; }; -} +}) diff --git a/pkgs/by-name/pi/pipe-rename/package.nix b/pkgs/by-name/pi/pipe-rename/package.nix index 0cb2fc75d38c..11e5008e6600 100644 --- a/pkgs/by-name/pi/pipe-rename/package.nix +++ b/pkgs/by-name/pi/pipe-rename/package.nix @@ -5,12 +5,12 @@ python3, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "pipe-rename"; version = "1.6.6"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-eZldAhqmoIkNZaI6r31hI43KCPDDeWk3fKpY3/BaUQE="; }; @@ -35,4 +35,4 @@ rustPlatform.buildRustPackage rec { maintainers = [ ]; mainProgram = "renamer"; }; -} +}) diff --git a/pkgs/by-name/pr/preserves-tools/package.nix b/pkgs/by-name/pr/preserves-tools/package.nix index 9d0cab01237e..13995bc1e512 100644 --- a/pkgs/by-name/pr/preserves-tools/package.nix +++ b/pkgs/by-name/pr/preserves-tools/package.nix @@ -6,12 +6,12 @@ installShellFiles, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "preserves-tools"; version = "4.996.1"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Uyh5mXCypX3TDxxJtnTe6lBoVI8aqdG56ywn7htDGUY="; }; @@ -31,4 +31,4 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.asl20; mainProgram = "preserves-tool"; }; -} +}) diff --git a/pkgs/by-name/pr/probe-rs-tools/package.nix b/pkgs/by-name/pr/probe-rs-tools/package.nix index 55de3239cb2a..7529bfad0593 100644 --- a/pkgs/by-name/pr/probe-rs-tools/package.nix +++ b/pkgs/by-name/pr/probe-rs-tools/package.nix @@ -16,20 +16,20 @@ let hash = "sha256-yjxld5ebm2jpfyzkw+vngBfHu5Nfh2ioLUKQQDY4KYo="; }; in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "probe-rs-tools"; version = "0.31.0"; src = fetchFromGitHub { owner = "probe-rs"; repo = "probe-rs"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ZcH2FBKsbBtTYfRQgPfOOODDpyB7VydcO7F7pq8xzD0="; }; cargoHash = "sha256-fVmwZw34lK6eKkqNT/SW5wzeeyWg6Qp48eso6yibICE="; - buildAndTestSubdir = pname; + buildAndTestSubdir = finalAttrs.pname; nativeBuildInputs = [ # required by libz-sys, no option for dynamic linking @@ -76,7 +76,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "CLI tool for on-chip debugging and flashing of ARM chips"; homepage = "https://probe.rs/"; - changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/probe-rs/probe-rs/blob/v${finalAttrs.version}/CHANGELOG.md"; license = with lib.licenses; [ asl20 # or mit @@ -86,4 +86,4 @@ rustPlatform.buildRustPackage rec { newam ]; }; -} +}) diff --git a/pkgs/by-name/pr/process-viewer/package.nix b/pkgs/by-name/pr/process-viewer/package.nix index d6a41c3821ac..570128c7752e 100644 --- a/pkgs/by-name/pr/process-viewer/package.nix +++ b/pkgs/by-name/pr/process-viewer/package.nix @@ -6,12 +6,12 @@ gtk4, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "process-viewer"; version = "0.5.8"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-mEmtLCtHlrCurjKKJ3vEtEkLBik4LwuUED5UeQ1QLws="; }; @@ -34,4 +34,4 @@ rustPlatform.buildRustPackage rec { maintainers = [ lib.maintainers.matthiasbeyer ]; mainProgram = "process_viewer"; }; -} +}) diff --git a/pkgs/by-name/pr/prometheus-wireguard-exporter/package.nix b/pkgs/by-name/pr/prometheus-wireguard-exporter/package.nix index 0a433fb020a7..72a475518566 100644 --- a/pkgs/by-name/pr/prometheus-wireguard-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-wireguard-exporter/package.nix @@ -7,14 +7,14 @@ nixosTests, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "wireguard-exporter"; version = "3.6.6"; src = fetchFromGitHub { owner = "MindFlavor"; repo = "prometheus_wireguard_exporter"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-2e31ZuGJvpvu7L2Lb+n6bZWpC1JhETzEzSiNaxxsAtA="; }; @@ -41,4 +41,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "prometheus_wireguard_exporter"; }; -} +}) diff --git a/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix b/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix index 5594ab1e206b..269b1129b2a5 100644 --- a/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix +++ b/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix @@ -5,12 +5,12 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "protoc-gen-prost-crate"; version = "0.5.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-FBgvDhlyVAegF5n9U6Tunn+MpXdek4f1xWIS3sJ4soI="; }; @@ -29,4 +29,4 @@ rustPlatform.buildRustPackage rec { sitaaax ]; }; -} +}) diff --git a/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix b/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix index 86a12a1754e8..8de7cd5140e3 100644 --- a/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix +++ b/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix @@ -5,12 +5,12 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "protoc-gen-prost-serde"; version = "0.4.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-tgsGyUVoQZQcOqh56KGVwS3VcxwbKzBL3P2VpYs72Ok="; }; @@ -29,4 +29,4 @@ rustPlatform.buildRustPackage rec { sitaaax ]; }; -} +}) diff --git a/pkgs/by-name/pr/protoc-gen-prost/package.nix b/pkgs/by-name/pr/protoc-gen-prost/package.nix index f617dd125123..0a335695ac34 100644 --- a/pkgs/by-name/pr/protoc-gen-prost/package.nix +++ b/pkgs/by-name/pr/protoc-gen-prost/package.nix @@ -5,12 +5,12 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "protoc-gen-prost"; version = "0.5.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-oeoPQ3hYMQl6sXszpnw6er2HBkxpo4s17XjR0VRKrSA="; }; @@ -29,4 +29,4 @@ rustPlatform.buildRustPackage rec { sitaaax ]; }; -} +}) diff --git a/pkgs/by-name/pr/protoc-gen-tonic/package.nix b/pkgs/by-name/pr/protoc-gen-tonic/package.nix index cf7450a19af5..693c430e014c 100644 --- a/pkgs/by-name/pr/protoc-gen-tonic/package.nix +++ b/pkgs/by-name/pr/protoc-gen-tonic/package.nix @@ -5,12 +5,12 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "protoc-gen-tonic"; version = "0.5.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-F3AVlkyIbSaA6u7/Pm6qM9AuONddSwqcCU6OAHoVwxk="; }; @@ -29,4 +29,4 @@ rustPlatform.buildRustPackage rec { sitaaax ]; }; -} +}) diff --git a/pkgs/by-name/pr/protox/package.nix b/pkgs/by-name/pr/protox/package.nix index 33c738a4cb44..2621e20aa2ab 100644 --- a/pkgs/by-name/pr/protox/package.nix +++ b/pkgs/by-name/pr/protox/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "protox"; version = "0.9.1"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-3Bh+VDSsol2Pz3UVDSxx8KNJbzKParU/OoNcSNgVTJM="; }; @@ -24,11 +24,11 @@ rustPlatform.buildRustPackage rec { description = "Rust implementation of the protobuf compiler"; mainProgram = "protox"; homepage = "https://github.com/andrewhickman/protox"; - changelog = "https://github.com/andrewhickman/protox/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/andrewhickman/protox/blob/${finalAttrs.version}/CHANGELOG.md"; license = with lib.licenses; [ asl20 mit ]; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/pu/pulldown-cmark/package.nix b/pkgs/by-name/pu/pulldown-cmark/package.nix index f40f92099c3d..9309be6f8de8 100644 --- a/pkgs/by-name/pu/pulldown-cmark/package.nix +++ b/pkgs/by-name/pu/pulldown-cmark/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "pulldown-cmark"; version = "0.13.1"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-iQjA2mt1l0mP8yevWwjrfN/u9FXBnIv+ObjMSOsqlhw="; }; @@ -22,4 +22,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ CobaltCause ]; mainProgram = "pulldown-cmark"; }; -} +}) diff --git a/pkgs/by-name/ra/rav1e/package.nix b/pkgs/by-name/ra/rav1e/package.nix index 60a5608aa6b2..bfe1e64d7cf4 100644 --- a/pkgs/by-name/ra/rav1e/package.nix +++ b/pkgs/by-name/ra/rav1e/package.nix @@ -11,12 +11,12 @@ rav1e, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "rav1e"; version = "0.8.1"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-GCfh2v3w5C8h4GuPKkTMUAhPspT1W0drrRpELCJWeTI="; }; @@ -64,9 +64,9 @@ rustPlatform.buildRustPackage rec { Features: https://github.com/xiph/rav1e#features ''; homepage = "https://github.com/xiph/rav1e"; - changelog = "https://github.com/xiph/rav1e/releases/tag/v${version}"; + changelog = "https://github.com/xiph/rav1e/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ getchoo ]; mainProgram = "rav1e"; }; -} +}) diff --git a/pkgs/by-name/ra/ravedude/package.nix b/pkgs/by-name/ra/ravedude/package.nix index 218fe53555d3..202de58d4938 100644 --- a/pkgs/by-name/ra/ravedude/package.nix +++ b/pkgs/by-name/ra/ravedude/package.nix @@ -12,12 +12,12 @@ stdenv, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "ravedude"; version = "0.2.2"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Ar2oQx7dKKfzkM3FMcJXiPHxNa0KcMRht38q+NgowfU="; }; @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { updateScript = nix-update-script { }; tests.version = testers.testVersion { package = ravedude; - version = "v${version}"; + version = "v${finalAttrs.version}"; }; }; @@ -56,4 +56,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "ravedude"; }; -} +}) diff --git a/pkgs/by-name/re/regex-cli/package.nix b/pkgs/by-name/re/regex-cli/package.nix index 52cd85274791..4e2cc1c34167 100644 --- a/pkgs/by-name/re/regex-cli/package.nix +++ b/pkgs/by-name/re/regex-cli/package.nix @@ -5,12 +5,12 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "regex-cli"; version = "0.2.3"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ytI1C2QRUfInIChwtSaHze7VJnP9UIcO93e2wjz2/I0="; }; @@ -28,4 +28,4 @@ rustPlatform.buildRustPackage rec { ]; maintainers = with lib.maintainers; [ mdaniels5757 ]; }; -} +}) diff --git a/pkgs/by-name/re/reshape/package.nix b/pkgs/by-name/re/reshape/package.nix index 08ea40d2bf3b..6d8a4ca269e6 100644 --- a/pkgs/by-name/re/reshape/package.nix +++ b/pkgs/by-name/re/reshape/package.nix @@ -6,12 +6,12 @@ postgresql, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "reshape"; version = "0.8.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-viS//3ZFqogI0BbZ0rypo5zpQUgqKiLgK585iw3BMgM="; }; @@ -34,8 +34,8 @@ rustPlatform.buildRustPackage rec { description = "Easy-to-use, zero-downtime schema migration tool for Postgres"; mainProgram = "reshape"; homepage = "https://github.com/fabianlindfors/reshape"; - changelog = "https://github.com/fabianlindfors/reshape/releases/tag/v${version}"; + changelog = "https://github.com/fabianlindfors/reshape/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ilyakooo0 ]; }; -} +}) diff --git a/pkgs/by-name/re/restic-browser/package.nix b/pkgs/by-name/re/restic-browser/package.nix index 3a4d48430c47..bc6118b8cbbc 100644 --- a/pkgs/by-name/re/restic-browser/package.nix +++ b/pkgs/by-name/re/restic-browser/package.nix @@ -14,22 +14,22 @@ nix-update-script, restic, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "restic-browser"; version = "0.3.3"; src = fetchFromGitHub { owner = "emuell"; repo = "restic-browser"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-K8JEt1kOvu/G3S1O6W/ee2JM968bgPR/FeGaBKP6elU="; }; cargoHash = "sha256-/EgSr46mJV84s/MG/3nUnU6XQ8RtEWiWo0gFtegblEQ="; npmDeps = fetchNpmDeps { - name = "${pname}-npm-deps-${version}"; - inherit src; + name = "${finalAttrs.pname}-npm-deps-${finalAttrs.version}"; + inherit (finalAttrs) src; hash = "sha256-uyn5cXMKm7+LLuF+n94pBTypLiPvfAs5INDEtd9cHs0="; }; @@ -51,11 +51,11 @@ rustPlatform.buildRustPackage rec { ]; cargoRoot = "src-tauri"; - buildAndTestSubdir = cargoRoot; + buildAndTestSubdir = finalAttrs.cargoRoot; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/bin - ln -s $out/Applications/Restic-Browser.app/Contents/MacOS/Restic-Browser $out/bin/${meta.mainProgram} + ln -s $out/Applications/Restic-Browser.app/Contents/MacOS/Restic-Browser $out/bin/${finalAttrs.meta.mainProgram} ''; passthru.updateScript = nix-update-script { }; @@ -63,10 +63,10 @@ rustPlatform.buildRustPackage rec { meta = { description = "GUI to browse and restore restic backup repositories"; homepage = "https://github.com/emuell/restic-browser"; - changelog = "https://github.com/emuell/restic-browser/releases/tag/v${version}"; + changelog = "https://github.com/emuell/restic-browser/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ js6pak ]; mainProgram = "restic-browser"; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/rs/rsign2/package.nix b/pkgs/by-name/rs/rsign2/package.nix index 97e3d174c71a..ce148c92f940 100644 --- a/pkgs/by-name/rs/rsign2/package.nix +++ b/pkgs/by-name/rs/rsign2/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "rsign2"; version = "0.6.5"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-cjucecEg5ERPsiaDuGESf2u9RTYHpQmHwWPnx1ask0I="; }; @@ -22,4 +22,4 @@ rustPlatform.buildRustPackage rec { maintainers = [ ]; mainProgram = "rsign"; }; -} +}) diff --git a/pkgs/by-name/rs/rsonpath/package.nix b/pkgs/by-name/rs/rsonpath/package.nix index 134b3c8715c0..cdcf2f612a33 100644 --- a/pkgs/by-name/rs/rsonpath/package.nix +++ b/pkgs/by-name/rs/rsonpath/package.nix @@ -5,7 +5,7 @@ unstableGitUpdater, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "rsonpath"; version = "0.9.1-unstable-2024-11-15"; @@ -23,14 +23,14 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-9pSn0f0VWsBg1z1UYGRtMb1z23htRm7qLmO80zvSjN8="; cargoBuildFlags = [ "-p=rsonpath" ]; - cargoTestFlags = cargoBuildFlags; + cargoTestFlags = finalAttrs.cargoBuildFlags; meta = { description = "Experimental JSONPath engine for querying massive streamed datasets"; homepage = "https://github.com/v0ldek/rsonpath"; - changelog = "https://github.com/v0ldek/rsonpath/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/v0ldek/rsonpath/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ ]; mainProgram = "rq"; }; -} +}) diff --git a/pkgs/by-name/ru/rust-audit-info/package.nix b/pkgs/by-name/ru/rust-audit-info/package.nix index 79000840d662..e9fd0c24fb99 100644 --- a/pkgs/by-name/ru/rust-audit-info/package.nix +++ b/pkgs/by-name/ru/rust-audit-info/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "rust-audit-info"; version = "0.5.4"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-zxdF65/9cgdDLM7HA30NCEZj1S5SogH+oM3aq55K0os="; }; @@ -25,4 +25,4 @@ rustPlatform.buildRustPackage rec { ]; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ru/rustfinity/package.nix b/pkgs/by-name/ru/rustfinity/package.nix index 948f1d279589..a73d835f43aa 100644 --- a/pkgs/by-name/ru/rustfinity/package.nix +++ b/pkgs/by-name/ru/rustfinity/package.nix @@ -6,12 +6,12 @@ pkg-config, openssl, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "rustfinity"; version = "0.3.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-5UhKL6lXli1mGorThv3SFclVKDATmxklZQ+S5hwqQgc="; }; @@ -38,4 +38,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ nartsiss ]; mainProgram = "rustfinity"; }; -} +}) diff --git a/pkgs/by-name/ru/rustycli/package.nix b/pkgs/by-name/ru/rustycli/package.nix index 9303dcd74ce4..f6385251cb37 100644 --- a/pkgs/by-name/ru/rustycli/package.nix +++ b/pkgs/by-name/ru/rustycli/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "rustycli"; version = "0.1.1"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-4Txw6Cmwwgu7K8VIVoX9GR76VUqAEw6uYptmczbjqg0="; }; @@ -22,8 +22,8 @@ rustPlatform.buildRustPackage rec { description = "Access the rust playground right in terminal"; mainProgram = "rustycli"; homepage = "https://github.com/pwnwriter/rustycli"; - changelog = "https://github.com/pwnwriter/rustycli/releases/tag/v${version}"; + changelog = "https://github.com/pwnwriter/rustycli/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = [ lib.maintainers.matthiasbeyer ]; }; -} +}) diff --git a/pkgs/by-name/sa/safe-rm/package.nix b/pkgs/by-name/sa/safe-rm/package.nix index 40e7b4c900a2..aac13f960d2f 100644 --- a/pkgs/by-name/sa/safe-rm/package.nix +++ b/pkgs/by-name/sa/safe-rm/package.nix @@ -6,13 +6,13 @@ installShellFiles, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "safe-rm"; version = "1.1.0"; src = fetchgit { url = "https://git.launchpad.net/safe-rm"; - tag = "${pname}-${version}"; + tag = "${finalAttrs.pname}-${finalAttrs.version}"; sha256 = "sha256-7+4XwsjzLBCQmHDYNwhlN4Yg3eL43GUEbq8ROtuP2Kw="; }; @@ -40,4 +40,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ SuperSandro2000 ]; mainProgram = "safe-rm"; }; -} +}) diff --git a/pkgs/by-name/sa/samply/package.nix b/pkgs/by-name/sa/samply/package.nix index 9ff815ea6c3d..cd6e8cf43277 100644 --- a/pkgs/by-name/sa/samply/package.nix +++ b/pkgs/by-name/sa/samply/package.nix @@ -6,12 +6,12 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "samply"; version = "0.13.1"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-zTwAsE6zXY3esO7x6UTCO2DbzdUSKZ6qc5Rr9qcI+Z8="; }; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Command line profiler for macOS and Linux"; homepage = "https://github.com/mstange/samply"; - changelog = "https://github.com/mstange/samply/releases/tag/samply-v${version}"; + changelog = "https://github.com/mstange/samply/releases/tag/samply-v${finalAttrs.version}"; license = with lib.licenses; [ asl20 mit @@ -33,4 +33,4 @@ rustPlatform.buildRustPackage rec { maintainers = [ ]; mainProgram = "samply"; }; -} +}) diff --git a/pkgs/by-name/sa/sarif-fmt/package.nix b/pkgs/by-name/sa/sarif-fmt/package.nix index b001378b1895..1443d093ec1f 100644 --- a/pkgs/by-name/sa/sarif-fmt/package.nix +++ b/pkgs/by-name/sa/sarif-fmt/package.nix @@ -6,12 +6,12 @@ nix-update-script, versionCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "sarif-fmt"; version = "0.8.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Xc9uc//5wTBWJ89mcaC/4c8/xtTvnu8g2Aa1viUhluo="; }; @@ -46,4 +46,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ getchoo ]; mainProgram = "sarif-fmt"; }; -} +}) diff --git a/pkgs/by-name/se/sea-orm-cli/package.nix b/pkgs/by-name/se/sea-orm-cli/package.nix index aee39070a119..7e393463c090 100644 --- a/pkgs/by-name/se/sea-orm-cli/package.nix +++ b/pkgs/by-name/se/sea-orm-cli/package.nix @@ -7,12 +7,12 @@ nix-update-script, versionCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "sea-orm-cli"; version = "1.1.19"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-dsise5MDhR4pcD3ZWDUzTG0Q4Fg/VdKw2Q59/g6BabA="; }; @@ -40,4 +40,4 @@ rustPlatform.buildRustPackage rec { ]; maintainers = with lib.maintainers; [ traxys ]; }; -} +}) diff --git a/pkgs/by-name/sg/sgxs-tools/package.nix b/pkgs/by-name/sg/sgxs-tools/package.nix index 2f6025a3cb09..e80dbf630a52 100644 --- a/pkgs/by-name/sg/sgxs-tools/package.nix +++ b/pkgs/by-name/sg/sgxs-tools/package.nix @@ -6,7 +6,7 @@ openssl_3, protobuf, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "sgxs-tools"; version = "0.9.2"; nativeBuildInputs = [ @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl_3 ]; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-vLbSjDULrYL8emQTha4fhEbr00OlhXNa00QhCKCnWDc="; }; @@ -27,4 +27,4 @@ rustPlatform.buildRustPackage rec { platforms = [ "x86_64-linux" ]; license = lib.licenses.mpl20; }; -} +}) diff --git a/pkgs/by-name/sh/shellcheck-sarif/package.nix b/pkgs/by-name/sh/shellcheck-sarif/package.nix index 2d94ecebb8ab..fa24a97c5586 100644 --- a/pkgs/by-name/sh/shellcheck-sarif/package.nix +++ b/pkgs/by-name/sh/shellcheck-sarif/package.nix @@ -5,12 +5,12 @@ nix-update-script, versionCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "shellcheck-sarif"; version = "0.8.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-G69DiDl78vkPuLodsRTL7dbbIFtNNF/XWuLZpCHKJws="; }; @@ -30,4 +30,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ getchoo ]; mainProgram = "shellcheck-sarif"; }; -} +}) diff --git a/pkgs/by-name/si/sigi/package.nix b/pkgs/by-name/si/sigi/package.nix index c1fa1fdf8d68..7e16c9f82c67 100644 --- a/pkgs/by-name/si/sigi/package.nix +++ b/pkgs/by-name/si/sigi/package.nix @@ -7,12 +7,12 @@ sigi, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "sigi"; version = "3.7.1"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Tsrfan7aejP2oy9x9VoTIq0ba0s0tnx1RTlAB0v6eis="; }; @@ -35,4 +35,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ booniepepper ]; mainProgram = "sigi"; }; -} +}) diff --git a/pkgs/by-name/sl/slimevr/package.nix b/pkgs/by-name/sl/slimevr/package.nix index a1e7f9a1af53..fa3a8c37f6da 100644 --- a/pkgs/by-name/sl/slimevr/package.nix +++ b/pkgs/by-name/sl/slimevr/package.nix @@ -20,14 +20,14 @@ libayatana-appindicator, udevCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "slimevr"; version = "18.1.0"; src = fetchFromGitHub { owner = "SlimeVR"; repo = "SlimeVR-Server"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vU/dcKRlNsixr3TaCrqNkCd2ewAb38fLymb+ZslAum4="; # solarxr fetchSubmodules = true; @@ -38,8 +38,8 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-X5IgWZlkvsstMN3YS4r+NJl6RVfREfZqKUrfsrUPQuU="; pnpmDeps = fetchPnpmDeps { - pname = "${pname}-pnpm-deps"; - inherit version src; + pname = "${finalAttrs.pname}-pnpm-deps"; + inherit (finalAttrs) version src; pnpm = pnpm_9; fetcherVersion = 3; hash = "sha256-deVfRZcMFkOVWXmNUiixmd5WBfIFKxG2Gw3CfshspYo="; @@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec { patches = [ # Upstream code uses Git to find the program version. (replaceVars ./gui-no-git.patch { - version = src.tag; + version = finalAttrs.src.tag; }) # By default, SlimeVR will give a big warning about our `JAVA_TOOL_OPTIONS` changes. ./no-java-tool-options-warning.patch @@ -121,7 +121,7 @@ rustPlatform.buildRustPackage rec { meta = { homepage = "https://slimevr.dev"; - changelog = "https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v${version}"; + changelog = "https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v${finalAttrs.version}"; description = "App for facilitating full-body tracking in virtual reality"; longDescription = '' App for SlimeVR ecosystem. It orchestrates communication between multiple sensors and integrations, like SteamVR. @@ -153,4 +153,4 @@ rustPlatform.buildRustPackage rec { broken = stdenv.hostPlatform.isDarwin; mainProgram = "slimevr"; }; -} +}) diff --git a/pkgs/by-name/sp/specr-transpile/package.nix b/pkgs/by-name/sp/specr-transpile/package.nix index 85b9dcb5a4b3..05b0080f53f6 100644 --- a/pkgs/by-name/sp/specr-transpile/package.nix +++ b/pkgs/by-name/sp/specr-transpile/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "specr-transpile"; version = "0.1.25"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-yB4b7VaZ22zk8jhQijBOWRks22TV19q9IQNlVXyBlss="; }; @@ -25,4 +25,4 @@ rustPlatform.buildRustPackage rec { ]; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/sp/spr/package.nix b/pkgs/by-name/sp/spr/package.nix index 0bee8f388093..fa5cb12f9d70 100644 --- a/pkgs/by-name/sp/spr/package.nix +++ b/pkgs/by-name/sp/spr/package.nix @@ -6,12 +6,12 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "spr"; version = "1.3.7"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-YmmPxsDoV1sYmqY0Jfqm3xTPmu7WWuIUQyOaICu3stM="; }; @@ -28,4 +28,4 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ spacedentist ]; }; -} +}) diff --git a/pkgs/by-name/ss/ssh-agent-switcher/package.nix b/pkgs/by-name/ss/ssh-agent-switcher/package.nix index cb4892fee7de..24507ef5306b 100644 --- a/pkgs/by-name/ss/ssh-agent-switcher/package.nix +++ b/pkgs/by-name/ss/ssh-agent-switcher/package.nix @@ -8,14 +8,14 @@ shtk, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "ssh-agent-switcher"; version = "1.0.1"; src = fetchFromGitHub { owner = "jmmv"; repo = "ssh-agent-switcher"; - tag = "ssh-agent-switcher-${version}"; + tag = "ssh-agent-switcher-${finalAttrs.version}"; hash = "sha256-p9W0H25pWDB+GCrwLwuVruX9p8b8kICpp+6I11ym1aw="; }; @@ -56,10 +56,10 @@ rustPlatform.buildRustPackage rec { connection-specific forwarded agents. ''; homepage = "https://github.com/jmmv/ssh-agent-switcher"; - changelog = "https://github.com/jmmv/ssh-agent-switcher/blob/ssh-agent-switcher-${version}/NEWS.md"; + changelog = "https://github.com/jmmv/ssh-agent-switcher/blob/ssh-agent-switcher-${finalAttrs.version}/NEWS.md"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.jmmv ]; mainProgram = "ssh-agent-switcher"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/st/star-history/package.nix b/pkgs/by-name/st/star-history/package.nix index 08171a2fe258..fc3c097a8735 100644 --- a/pkgs/by-name/st/star-history/package.nix +++ b/pkgs/by-name/st/star-history/package.nix @@ -6,12 +6,12 @@ openssl, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "star-history"; version = "1.0.32"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-JilIVnxSXEK525TK+mHal+37G7PYcaQogVC2ozYeLY4="; }; @@ -31,4 +31,4 @@ rustPlatform.buildRustPackage rec { maintainers = [ lib.maintainers.matthiasbeyer ]; mainProgram = "star-history"; }; -} +}) diff --git a/pkgs/by-name/st/starry/package.nix b/pkgs/by-name/st/starry/package.nix index e477e6c6464b..b165cf6ec788 100644 --- a/pkgs/by-name/st/starry/package.nix +++ b/pkgs/by-name/st/starry/package.nix @@ -6,12 +6,12 @@ openssl, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "starry"; version = "2.0.2"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-/ZUmMLEqlpqu+Ja/3XjFJf+OFZJCz7rp5MrQBEjwsXs="; }; @@ -32,4 +32,4 @@ rustPlatform.buildRustPackage rec { maintainers = [ ]; mainProgram = "starry"; }; -} +}) diff --git a/pkgs/by-name/su/sudachi-rs/package.nix b/pkgs/by-name/su/sudachi-rs/package.nix index e7f8ad7081eb..cfa5adff59b4 100644 --- a/pkgs/by-name/su/sudachi-rs/package.nix +++ b/pkgs/by-name/su/sudachi-rs/package.nix @@ -8,14 +8,14 @@ writeScript, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "sudachi-rs"; version = "0.6.10"; src = fetchFromGitHub { owner = "WorksApplications"; repo = "sudachi.rs"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2sJ9diE/EjrQmFcCc4VluE4Gu4RebTYitd7zzfgj3g4="; }; @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { ''; tests = { # detects an error that sudachidict is not found - cli = runCommand "${pname}-cli-test" { } '' + cli = runCommand "${finalAttrs.pname}-cli-test" { } '' mkdir $out echo "高輪ゲートウェイ駅" | ${lib.getExe sudachi-rs} > $out/result ''; @@ -58,9 +58,9 @@ rustPlatform.buildRustPackage rec { meta = { description = "Japanese morphological analyzer"; homepage = "https://github.com/WorksApplications/sudachi.rs"; - changelog = "https://github.com/WorksApplications/sudachi.rs/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/WorksApplications/sudachi.rs/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ natsukium ]; mainProgram = "sudachi"; }; -} +}) diff --git a/pkgs/by-name/sv/svd2rust/package.nix b/pkgs/by-name/sv/svd2rust/package.nix index 69c4d149f4be..abe33497cf3a 100644 --- a/pkgs/by-name/sv/svd2rust/package.nix +++ b/pkgs/by-name/sv/svd2rust/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "svd2rust"; version = "0.37.1"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-50g5YVmVYTLYJdaWXk91OYdlghDchkyHXS9j2Z7IXSw="; }; @@ -24,11 +24,11 @@ rustPlatform.buildRustPackage rec { description = "Generate Rust register maps (`struct`s) from SVD files"; mainProgram = "svd2rust"; homepage = "https://github.com/rust-embedded/svd2rust"; - changelog = "https://github.com/rust-embedded/svd2rust/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/rust-embedded/svd2rust/blob/v${finalAttrs.version}/CHANGELOG.md"; license = with lib.licenses; [ mit asl20 ]; maintainers = with lib.maintainers; [ newam ]; }; -} +}) diff --git a/pkgs/by-name/sv/svdtools/package.nix b/pkgs/by-name/sv/svdtools/package.nix index 5fad65e92739..1e5f2d55b8e1 100644 --- a/pkgs/by-name/sv/svdtools/package.nix +++ b/pkgs/by-name/sv/svdtools/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "svdtools"; version = "0.5.0"; src = fetchCrate { - inherit version pname; + inherit (finalAttrs) version pname; hash = "sha256-2GemBVTRvYC5bvlYgJKmDJM78ZoE63B1QwV8cfSHYPg="; }; @@ -19,11 +19,11 @@ rustPlatform.buildRustPackage rec { description = "Tools to handle vendor-supplied, often buggy SVD files"; mainProgram = "svdtools"; homepage = "https://github.com/stm32-rs/svdtools"; - changelog = "https://github.com/stm32-rs/svdtools/blob/v${version}/CHANGELOG-rust.md"; + changelog = "https://github.com/stm32-rs/svdtools/blob/v${finalAttrs.version}/CHANGELOG-rust.md"; license = with lib.licenses; [ asl20 # or mit ]; maintainers = with lib.maintainers; [ newam ]; }; -} +}) diff --git a/pkgs/by-name/sv/svlint/package.nix b/pkgs/by-name/sv/svlint/package.nix index 3b8e4a2a246a..ab034ccce9f5 100644 --- a/pkgs/by-name/sv/svlint/package.nix +++ b/pkgs/by-name/sv/svlint/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "svlint"; version = "0.9.5"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-RjdhXp9Dm6ZrRfJKsjnzAFgXTIQB3DJmDMwwtQD4Uzw="; }; @@ -24,8 +24,8 @@ rustPlatform.buildRustPackage rec { description = "SystemVerilog linter"; mainProgram = "svlint"; homepage = "https://github.com/dalance/svlint"; - changelog = "https://github.com/dalance/svlint/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/dalance/svlint/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ trepetti ]; }; -} +}) diff --git a/pkgs/by-name/sw/swayr/package.nix b/pkgs/by-name/sw/swayr/package.nix index c10d2d883e3f..00ee429a6385 100644 --- a/pkgs/by-name/sw/swayr/package.nix +++ b/pkgs/by-name/sw/swayr/package.nix @@ -4,14 +4,14 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "swayr"; version = "0.28.2"; src = fetchFromSourcehut { owner = "~tsdh"; repo = "swayr"; - rev = "swayr-${version}"; + rev = "swayr-${finalAttrs.version}"; hash = "sha256-uT8MYgH9kANQ0t+7jqjOOvQIZf5ImdQruZLLlCejwcc="; }; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { ]; # don't build swayrbar - buildAndTestSubdir = pname; + buildAndTestSubdir = finalAttrs.pname; preCheck = '' export HOME=$TMPDIR @@ -36,4 +36,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ artturin ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/sw/swayrbar/package.nix b/pkgs/by-name/sw/swayrbar/package.nix index 4a83479ba26b..2628029b1765 100644 --- a/pkgs/by-name/sw/swayrbar/package.nix +++ b/pkgs/by-name/sw/swayrbar/package.nix @@ -7,21 +7,21 @@ pulseaudio, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "swayrbar"; version = "0.5.0"; src = fetchFromSourcehut { owner = "~tsdh"; repo = "swayr"; - tag = "swayrbar-${version}"; + tag = "swayrbar-${finalAttrs.version}"; sha256 = "sha256-uT8MYgH9kANQ0t+7jqjOOvQIZf5ImdQruZLLlCejwcc="; }; cargoHash = "sha256-Aj4U2xyfNhf3HDSEd1SQ5TyO2MXn2/hrfnG0ZayzMtU="; # don't build swayr - buildAndTestSubdir = pname; + buildAndTestSubdir = finalAttrs.pname; nativeBuildInputs = [ makeWrapper ]; @@ -43,4 +43,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ ilkecan ]; mainProgram = "swayrbar"; }; -} +}) diff --git a/pkgs/by-name/sy/syndicate-server/package.nix b/pkgs/by-name/sy/syndicate-server/package.nix index 4f6219b3596a..a865cef55339 100644 --- a/pkgs/by-name/sy/syndicate-server/package.nix +++ b/pkgs/by-name/sy/syndicate-server/package.nix @@ -7,14 +7,14 @@ versionCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "syndicate-server"; version = "0.50.1"; src = fetchFromGitea { domain = "git.syndicate-lang.org"; owner = "syndicate-lang"; repo = "syndicate-rs"; - rev = "${pname}-v${version}"; + rev = "${finalAttrs.pname}-v${finalAttrs.version}"; hash = "sha256-orQN83DE+ZNgdx2PVcYrte/rVDFFtuQuRDKzeumpsLo="; }; @@ -37,4 +37,4 @@ rustPlatform.buildRustPackage rec { mainProgram = "syndicate-server"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ta/talecast/package.nix b/pkgs/by-name/ta/talecast/package.nix index 944f455be6fd..5d5f3a1c25aa 100644 --- a/pkgs/by-name/ta/talecast/package.nix +++ b/pkgs/by-name/ta/talecast/package.nix @@ -9,12 +9,12 @@ talecast, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "talecast"; version = "0.1.39"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-RwB+X+i3CEcTyKac81he9/cT2aQ4M7AqgqSDBEvhFJU="; }; @@ -41,4 +41,4 @@ rustPlatform.buildRustPackage rec { getchoo ]; }; -} +}) diff --git a/pkgs/by-name/te/termimage/package.nix b/pkgs/by-name/te/termimage/package.nix index a709121cf69b..a29e858955b2 100644 --- a/pkgs/by-name/te/termimage/package.nix +++ b/pkgs/by-name/te/termimage/package.nix @@ -6,12 +6,12 @@ ronn, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "termimage"; version = "1.2.1"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-1FOPe466GqQfiIpsQT9DJn+FupI2vy9b4+7p31ceY6M="; }; @@ -32,9 +32,9 @@ rustPlatform.buildRustPackage rec { meta = { description = "Display images in your terminal"; homepage = "https://github.com/nabijaczleweli/termimage"; - changelog = "https://github.com/nabijaczleweli/termimage/releases/tag/v${version}"; + changelog = "https://github.com/nabijaczleweli/termimage/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = [ ]; mainProgram = "termimage"; }; -} +}) diff --git a/pkgs/by-name/te/textplots/package.nix b/pkgs/by-name/te/textplots/package.nix index e0954ba32f9f..8745af7752c8 100644 --- a/pkgs/by-name/te/textplots/package.nix +++ b/pkgs/by-name/te/textplots/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "textplots"; version = "0.8.5"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-83EAe6O8ETsuGJ5MK6kt68OnJL+r+BAYkFzvzlxHyp4="; }; @@ -24,4 +24,4 @@ rustPlatform.buildRustPackage rec { maintainers = [ ]; mainProgram = "textplots"; }; -} +}) diff --git a/pkgs/by-name/to/toipe/package.nix b/pkgs/by-name/to/toipe/package.nix index 8b3269d6bf22..5d045bd6dfb4 100644 --- a/pkgs/by-name/to/toipe/package.nix +++ b/pkgs/by-name/to/toipe/package.nix @@ -4,12 +4,12 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "toipe"; version = "0.5.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-L4JemOxpynGYsA8FgHnMv/hrogLSRaaiIzDjxzZDqjM="; }; @@ -24,4 +24,4 @@ rustPlatform.buildRustPackage rec { samyak ]; }; -} +}) diff --git a/pkgs/by-name/to/toml2json/package.nix b/pkgs/by-name/to/toml2json/package.nix index 4ad4615abd68..8a9fe91b00f7 100644 --- a/pkgs/by-name/to/toml2json/package.nix +++ b/pkgs/by-name/to/toml2json/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "toml2json"; version = "1.4.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ZqHXtk6bPYm/20DjFhVmrc9+wYAmSEBLxqNgyzPGO2c="; }; @@ -22,4 +22,4 @@ rustPlatform.buildRustPackage rec { license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ rvarago ]; }; -} +}) diff --git a/pkgs/by-name/tr/trashy/package.nix b/pkgs/by-name/tr/trashy/package.nix index 29f0bf8cc70b..11550cb69e0d 100644 --- a/pkgs/by-name/tr/trashy/package.nix +++ b/pkgs/by-name/tr/trashy/package.nix @@ -6,12 +6,12 @@ stdenv, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "trashy"; version = "2.0.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-1xHyhAV8hpgMngQdamRzEliyG60t+I3KfsDJi0+180o="; }; @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Simple, fast, and featureful alternative to rm and trash-cli"; homepage = "https://github.com/oberblastmeister/trashy"; - changelog = "https://github.com/oberblastmeister/trashy/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/oberblastmeister/trashy/blob/v${finalAttrs.version}/CHANGELOG.md"; license = with lib.licenses; [ asl20 # or mit @@ -41,4 +41,4 @@ rustPlatform.buildRustPackage rec { # darwin is unsupported due to https://github.com/Byron/trash-rs/issues/8 platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/tr/treedome/package.nix b/pkgs/by-name/tr/treedome/package.nix index dcb7ab920818..10610883a69c 100644 --- a/pkgs/by-name/tr/treedome/package.nix +++ b/pkgs/by-name/tr/treedome/package.nix @@ -17,13 +17,13 @@ sqlite, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "treedome"; version = "0.6.1"; src = fetchgit { url = "https://codeberg.org/solver-orgz/treedome"; - rev = version; + rev = finalAttrs.version; hash = "sha256-qa87pgNHGRhP1G4TEFHYrkiJ9AHWG7PUdgxEF4X9EM8="; fetchLFS = true; }; @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Rg65BiHQF7bBBCtc5F+gY31yhcuI0+IDfxr3pFmxT+w="; offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; + yarnLock = "${finalAttrs.src}/yarn.lock"; hash = "sha256-Q0xsi1xymQne6qN0oxm4YkaDLnGL17iuj70CTdQlxzM="; }; @@ -59,10 +59,10 @@ rustPlatform.buildRustPackage rec { ]; cargoRoot = "src-tauri"; - buildAndTestSubdir = cargoRoot; + buildAndTestSubdir = finalAttrs.cargoRoot; env = { - VERGEN_GIT_DESCRIBE = version; + VERGEN_GIT_DESCRIBE = finalAttrs.version; }; # WEBKIT_DISABLE_COMPOSITING_MODE essential in NVIDIA + compositor https://github.com/NixOS/nixpkgs/issues/212064#issuecomment-1400202079 @@ -78,6 +78,6 @@ rustPlatform.buildRustPackage rec { platforms = [ "x86_64-linux" ]; mainProgram = "treedome"; maintainers = with lib.maintainers; [ tengkuizdihar ]; - changelog = "https://codeberg.org/solver-orgz/treedome/releases/tag/${version}"; + changelog = "https://codeberg.org/solver-orgz/treedome/releases/tag/${finalAttrs.version}"; }; -} +}) diff --git a/pkgs/by-name/tt/ttfb/package.nix b/pkgs/by-name/tt/ttfb/package.nix index 700d432adc51..2ae7d6ccf528 100644 --- a/pkgs/by-name/tt/ttfb/package.nix +++ b/pkgs/by-name/tt/ttfb/package.nix @@ -4,12 +4,12 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "ttfb"; version = "1.15.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-OOVqCWeF5cHMweEGWYIiWWWsw1QlNDFgnia05Qxo7uo="; }; @@ -28,8 +28,8 @@ rustPlatform.buildRustPackage rec { connect, and TLS handshake. ''; homepage = "https://github.com/phip1611/ttfb"; - changelog = "https://github.com/phip1611/ttfb/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/phip1611/ttfb/blob/v${finalAttrs.version}/CHANGELOG.md"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ phip1611 ]; }; -} +}) diff --git a/pkgs/by-name/tu/tuifeed/package.nix b/pkgs/by-name/tu/tuifeed/package.nix index 04f1f2bde729..b3a908863599 100644 --- a/pkgs/by-name/tu/tuifeed/package.nix +++ b/pkgs/by-name/tu/tuifeed/package.nix @@ -4,12 +4,12 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "tuifeed"; version = "0.4.2"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-CL6cd9OfvnA5N4W3rGl7XLcnlSrh3kcqA7idxexkjA4="; }; @@ -24,4 +24,4 @@ rustPlatform.buildRustPackage rec { license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ devhell ]; }; -} +}) diff --git a/pkgs/by-name/tw/twiggy/package.nix b/pkgs/by-name/tw/twiggy/package.nix index 8e05be8b3294..814db9513754 100644 --- a/pkgs/by-name/tw/twiggy/package.nix +++ b/pkgs/by-name/tw/twiggy/package.nix @@ -4,12 +4,12 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "twiggy"; version = "0.8.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-FguDuah3MlC0wgz8VnXV5xepIVhTwYmQzijgX0sbdNY="; }; @@ -25,4 +25,4 @@ rustPlatform.buildRustPackage rec { ]; maintainers = with lib.maintainers; [ lucperkins ]; }; -} +}) diff --git a/pkgs/by-name/ty/typst-live/package.nix b/pkgs/by-name/ty/typst-live/package.nix index 9d467741c865..f0ff5bbc17f1 100644 --- a/pkgs/by-name/ty/typst-live/package.nix +++ b/pkgs/by-name/ty/typst-live/package.nix @@ -6,12 +6,12 @@ typst, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "typst-live"; version = "0.8.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-bR4Rhhs6rAC6C1nfPFj/3rCtfEziuTGn5m33CR0qZkU="; }; @@ -33,4 +33,4 @@ rustPlatform.buildRustPackage rec { maintainers = [ lib.maintainers.matthiasbeyer ]; mainProgram = "typst-live"; }; -} +}) diff --git a/pkgs/by-name/un/unpfs/package.nix b/pkgs/by-name/un/unpfs/package.nix index 99d7d9662bdf..81afb2c18d84 100644 --- a/pkgs/by-name/un/unpfs/package.nix +++ b/pkgs/by-name/un/unpfs/package.nix @@ -4,7 +4,7 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "unpfs"; version = "0-unstable-2021-04-23"; @@ -15,15 +15,15 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-zyDkUb+bFsVnxAE4UODbnRtDim7gqUNuY22vuxMsLZM="; }; - sourceRoot = "${src.name}/example/unpfs"; + sourceRoot = "${finalAttrs.src.name}/example/unpfs"; cargoHash = "sha256-jRe1lgzfhzBUsS6wwwlqxxomap2TIDOyF3YBv20GJ14="; env.RUSTC_BOOTSTRAP = 1; postInstall = '' - install -D -m 0444 ../../README* -t "$out/share/doc/${pname}" - install -D -m 0444 ../../LICEN* -t "$out/share/doc/${pname}" + install -D -m 0444 ../../README* -t "$out/share/doc/${finalAttrs.pname}" + install -D -m 0444 ../../LICEN* -t "$out/share/doc/${finalAttrs.pname}" ''; meta = { @@ -36,4 +36,4 @@ rustPlatform.buildRustPackage rec { platforms = with lib.platforms; linux; mainProgram = "unpfs"; }; -} +}) diff --git a/pkgs/by-name/vo/vopono/package.nix b/pkgs/by-name/vo/vopono/package.nix index 193ea8e1951d..0c3e627aa545 100644 --- a/pkgs/by-name/vo/vopono/package.nix +++ b/pkgs/by-name/vo/vopono/package.nix @@ -4,12 +4,12 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "vopono"; version = "0.10.15"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-78G0Dm0WAEjjud+vrl7n3Uh6NnMQhs3uY4DIeSTKTJs="; }; @@ -23,4 +23,4 @@ rustPlatform.buildRustPackage rec { maintainers = [ lib.maintainers.romildo ]; mainProgram = "vopono"; }; -} +}) diff --git a/pkgs/by-name/vr/vrc-get/package.nix b/pkgs/by-name/vr/vrc-get/package.nix index 8ac6ee897fb4..6cfdd0c005a5 100644 --- a/pkgs/by-name/vr/vrc-get/package.nix +++ b/pkgs/by-name/vr/vrc-get/package.nix @@ -8,12 +8,12 @@ buildPackages, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "vrc-get"; version = "1.9.1"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-b/rlHfm+AfrluCqoTyBqx86xVaNV3QBGollk5HyD4xk="; }; @@ -44,4 +44,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ bddvlpr ]; mainProgram = "vrc-get"; }; -} +}) diff --git a/pkgs/by-name/wa/wambo/package.nix b/pkgs/by-name/wa/wambo/package.nix index 59858ea651a9..79d644b968df 100644 --- a/pkgs/by-name/wa/wambo/package.nix +++ b/pkgs/by-name/wa/wambo/package.nix @@ -4,12 +4,12 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "wambo"; version = "0.4.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-3EwNC78DhSXbVFSg6q+66yge4S1m5icJ5nOhoy9qsRI="; }; @@ -25,8 +25,8 @@ rustPlatform.buildRustPackage rec { and so on. ''; homepage = "https://github.com/phip1611/wambo"; - changelog = "https://github.com/phip1611/wambo/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/phip1611/wambo/blob/v${finalAttrs.version}/CHANGELOG.md"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ phip1611 ]; }; -} +}) diff --git a/pkgs/by-name/wc/wchisp/package.nix b/pkgs/by-name/wc/wchisp/package.nix index 1dfd5e55cf15..b9f2952b9a71 100644 --- a/pkgs/by-name/wc/wchisp/package.nix +++ b/pkgs/by-name/wc/wchisp/package.nix @@ -9,12 +9,12 @@ versionCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "wchisp"; version = "0.3.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-6WNXsRvbldEjAykMn1DCiuKctBrsTHGv1fJuRXBblu0="; }; @@ -36,11 +36,11 @@ rustPlatform.buildRustPackage rec { meta = { description = "Command-line implementation of WCHISPTool, for flashing ch32 MCUs"; homepage = "https://ch32-rs.github.io/wchisp/"; - changelog = "https://github.com/ch32-rs/wchisp/releases/tag/v${version}"; + changelog = "https://github.com/ch32-rs/wchisp/releases/tag/v${finalAttrs.version}"; license = with lib.licenses; [ gpl2Only ]; platforms = with lib.platforms; linux ++ darwin ++ windows; broken = !stdenv.hostPlatform.isLinux; maintainers = with lib.maintainers; [ jwillikers ]; mainProgram = "wchisp"; }; -} +}) diff --git a/pkgs/by-name/we/wezterm/package.nix b/pkgs/by-name/we/wezterm/package.nix index dc80579ddf0b..7b7a27b4c3e3 100644 --- a/pkgs/by-name/we/wezterm/package.nix +++ b/pkgs/by-name/we/wezterm/package.nix @@ -26,7 +26,7 @@ zlib, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "wezterm"; version = "0-unstable-2026-01-17"; @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { }; postPatch = '' - echo ${version} > .tag + echo ${finalAttrs.version} > .tag # hash does not work well with NixOS substituteInPlace assets/shell-integration/wezterm.sh \ @@ -88,7 +88,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' mkdir -p $out/nix-support - echo "${passthru.terminfo}" >> $out/nix-support/propagated-user-env-packages + echo "${finalAttrs.passthru.terminfo}" >> $out/nix-support/propagated-user-env-packages install -Dm644 assets/icon/terminal.png $out/share/icons/hicolor/128x128/apps/org.wezfurlong.wezterm.png install -Dm644 assets/wezterm.desktop $out/share/applications/org.wezfurlong.wezterm.desktop @@ -142,7 +142,7 @@ rustPlatform.buildRustPackage rec { } '' mkdir -p $out/share/terminfo $out/nix-support - tic -x -o $out/share/terminfo ${src}/termwiz/data/wezterm.terminfo + tic -x -o $out/share/terminfo ${finalAttrs.src}/termwiz/data/wezterm.terminfo ''; tests = { @@ -163,4 +163,4 @@ rustPlatform.buildRustPackage rec { SuperSandro2000 ]; }; -} +}) diff --git a/pkgs/by-name/wh/when-cli/package.nix b/pkgs/by-name/wh/when-cli/package.nix index 028c4318af26..38ddafd80644 100644 --- a/pkgs/by-name/wh/when-cli/package.nix +++ b/pkgs/by-name/wh/when-cli/package.nix @@ -3,12 +3,12 @@ fetchCrate, rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "when-cli"; version = "0.4.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-LWssrLl2HKul24N3bJdf2ePqeR4PCROrTiVY5sqzB2M="; }; @@ -21,4 +21,4 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ loicreynier ]; }; -} +}) diff --git a/pkgs/by-name/wi/wiremix/package.nix b/pkgs/by-name/wi/wiremix/package.nix index 3fb9751d0a59..b79ec57956c2 100644 --- a/pkgs/by-name/wi/wiremix/package.nix +++ b/pkgs/by-name/wi/wiremix/package.nix @@ -6,12 +6,12 @@ pipewire, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "wiremix"; version = "0.9.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-gs6KqluASHTf4fURZKEmNvERguQEH5UDc4044uJddrU="; }; @@ -34,4 +34,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ tsowell ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/wl/wleave/package.nix b/pkgs/by-name/wl/wleave/package.nix index 3f106d649f5a..38b720e12d4f 100644 --- a/pkgs/by-name/wl/wleave/package.nix +++ b/pkgs/by-name/wl/wleave/package.nix @@ -17,14 +17,14 @@ librsvg, libxml2, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "wleave"; version = "0.6.2"; src = fetchFromGitHub { owner = "AMNatty"; repo = "wleave"; - rev = version; + rev = finalAttrs.version; hash = "sha256-+0EKnaxRaHRxRvhASuvfpUijEZJFimR4zSzOyC3FOkQ="; }; @@ -49,10 +49,10 @@ rustPlatform.buildRustPackage rec { postPatch = '' substituteInPlace src/config.rs \ - --replace-fail "/etc/wleave" "$out/etc/${pname}" + --replace-fail "/etc/wleave" "$out/etc/${finalAttrs.pname}" substituteInPlace layout.json \ - --replace-fail "/usr/share/wleave" "$out/share/${pname}" + --replace-fail "/usr/share/wleave" "$out/share/${finalAttrs.pname}" ''; postInstall = '' @@ -81,4 +81,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ ludovicopiero ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/wl/wlink/package.nix b/pkgs/by-name/wl/wlink/package.nix index d4a3cfcf9b50..15d577b1d76a 100644 --- a/pkgs/by-name/wl/wlink/package.nix +++ b/pkgs/by-name/wl/wlink/package.nix @@ -10,12 +10,12 @@ versionCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "wlink"; version = "0.1.1"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-YxozhEJh/KBirlA6ymIEbJY3r7wYSeTL40W2xQLyue0="; }; @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "WCH-Link flash tool for WCH's RISC-V MCUs(CH32V, CH56X, CH57X, CH58X, CH59X, CH32L103, CH32X035, CH641, CH643)"; homepage = "https://github.com/ch32-rs/wlink"; - changelog = "https://github.com/ch32-rs/wlink/releases/tag/v${version}"; + changelog = "https://github.com/ch32-rs/wlink/releases/tag/v${finalAttrs.version}"; license = with lib.licenses; [ mit # or asl20 @@ -48,4 +48,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ jwillikers ]; mainProgram = "wlink"; }; -} +}) diff --git a/pkgs/by-name/wy/wyvern/package.nix b/pkgs/by-name/wy/wyvern/package.nix index 4147598dc0f9..a857de845e07 100644 --- a/pkgs/by-name/wy/wyvern/package.nix +++ b/pkgs/by-name/wy/wyvern/package.nix @@ -7,12 +7,12 @@ openssl, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "wyvern"; version = "1.4.1"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-OjL3wEoh4fT2nKqb7lMefP5B0vYyUaTRj09OXPEVfW4="; }; @@ -34,4 +34,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ _0x4A6F ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/xq/xq/package.nix b/pkgs/by-name/xq/xq/package.nix index 560b34e17fd7..891f566119b9 100644 --- a/pkgs/by-name/xq/xq/package.nix +++ b/pkgs/by-name/xq/xq/package.nix @@ -4,12 +4,12 @@ fetchCrate, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "xq"; version = "0.4.1"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Qe+crretlKJRoNPO2+aHxCmMO9MecqGjOuvdhr4a0NU="; }; @@ -25,4 +25,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ matthewcroughan ]; mainProgram = "xq"; }; -} +}) diff --git a/pkgs/by-name/zb/zbus-xmlgen/package.nix b/pkgs/by-name/zb/zbus-xmlgen/package.nix index 2813bad39a43..34546ffe72c6 100644 --- a/pkgs/by-name/zb/zbus-xmlgen/package.nix +++ b/pkgs/by-name/zb/zbus-xmlgen/package.nix @@ -6,12 +6,12 @@ rustfmt, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "zbus_xmlgen"; version = "5.2.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-CFXOPUWjbzNkE8mb+AC4ZtdvV0MSb/eBr1C0WyreAoU="; }; @@ -32,4 +32,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ qyliss ]; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/by-name/zi/zine/package.nix b/pkgs/by-name/zi/zine/package.nix index 786afde2d789..9a9e3349f052 100644 --- a/pkgs/by-name/zi/zine/package.nix +++ b/pkgs/by-name/zi/zine/package.nix @@ -6,12 +6,12 @@ openssl, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "zine"; version = "0.16.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-pUoMMgZQ+oDs9Yhc1rQuy9cUWiR800DlIe8wxQjnIis="; }; @@ -33,11 +33,11 @@ rustPlatform.buildRustPackage rec { meta = { description = "Simple and opinionated tool to build your own magazine"; homepage = "https://github.com/zineland/zine"; - changelog = "https://github.com/zineland/zine/releases/tag/v${version}"; + changelog = "https://github.com/zineland/zine/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dit7ya ]; mainProgram = "zine"; }; -} +}) From 3f9a09b808a812367fa997c63d7cc918458ef94e Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Sun, 22 Feb 2026 04:49:18 +0100 Subject: [PATCH 319/429] various: fix pname misuse in buildRustApplication packages after this all uses of 'inherit (finalAttrs) pname;' or 'finalAttrs.pname' in these packages are in my opinion legit uses. e.g.: - for inheriting the pname and version in fetchPnpmDeps, fetchCargoDeps or fetchCrate - for use in creating the (p-)name of small sub-packages like tests or updateScripts. - for cargoDepsName - for buildAndTestSubdir --- pkgs/by-name/am/amdgpu_top/package.nix | 2 +- pkgs/by-name/au/authoscope/package.nix | 2 +- pkgs/by-name/br/browsers/package.nix | 2 +- pkgs/by-name/ca/cargo-cyclonedx/package.nix | 2 +- pkgs/by-name/en/engage/package.nix | 4 ++-- pkgs/by-name/fu/furtherance/package.nix | 2 +- pkgs/by-name/ha/halloy/package.nix | 2 +- pkgs/by-name/jf/jfmt/package.nix | 2 +- pkgs/by-name/md/mdbook-katex/package.nix | 2 +- pkgs/by-name/ne/nethoscope/package.nix | 2 +- pkgs/by-name/rc/rclone-ui/package.nix | 2 +- pkgs/by-name/sa/safe-rm/package.nix | 2 +- pkgs/by-name/sh/shh/package.nix | 6 +++--- pkgs/by-name/si/similarity/package.nix | 2 +- pkgs/by-name/sy/syndicate-server/package.nix | 2 +- pkgs/by-name/un/unpfs/package.nix | 4 ++-- pkgs/by-name/wl/wleave/package.nix | 4 ++-- 17 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/am/amdgpu_top/package.nix b/pkgs/by-name/am/amdgpu_top/package.nix index b56bfde91e81..cec01b1898d2 100644 --- a/pkgs/by-name/am/amdgpu_top/package.nix +++ b/pkgs/by-name/am/amdgpu_top/package.nix @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; postFixup = '' - patchelf --set-rpath "${lib.makeLibraryPath finalAttrs.buildInputs}" $out/bin/${finalAttrs.pname} + patchelf --set-rpath "${lib.makeLibraryPath finalAttrs.buildInputs}" $out/bin/${finalAttrs.meta.mainProgram} ''; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/au/authoscope/package.nix b/pkgs/by-name/au/authoscope/package.nix index 33f69185e491..a03421e2278a 100644 --- a/pkgs/by-name/au/authoscope/package.nix +++ b/pkgs/by-name/au/authoscope/package.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; postInstall = '' - installManPage docs/${finalAttrs.pname}.1 + installManPage docs/authoscope.1 ''; # Tests requires access to httpin.org diff --git a/pkgs/by-name/br/browsers/package.nix b/pkgs/by-name/br/browsers/package.nix index ad0227477728..d17f73efcb8d 100644 --- a/pkgs/by-name/br/browsers/package.nix +++ b/pkgs/by-name/br/browsers/package.nix @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mv $out/share/applications/software.Browsers.template.desktop $out/share/applications/software.Browsers.desktop substituteInPlace \ $out/share/applications/software.Browsers.desktop \ - --replace-fail 'Exec=€ExecCommand€' 'Exec=${finalAttrs.pname} %u' + --replace-fail 'Exec=€ExecCommand€' 'Exec=${finalAttrs.meta.mainProgram} %u' cp -r resources $out for size in 16 32 128 256 512; do install -m 444 \ diff --git a/pkgs/by-name/ca/cargo-cyclonedx/package.nix b/pkgs/by-name/ca/cargo-cyclonedx/package.nix index b0335bf0799d..94eb1dc807d4 100644 --- a/pkgs/by-name/ca/cargo-cyclonedx/package.nix +++ b/pkgs/by-name/ca/cargo-cyclonedx/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-rust-cargo"; - rev = "${finalAttrs.pname}-${finalAttrs.version}"; + rev = "cargo-cyclonedx-${finalAttrs.version}"; hash = "sha256-T/9eHI2P8eCZAqMTeZz1yEi5nljQWfHrdNiU3h3h74U="; }; diff --git a/pkgs/by-name/en/engage/package.nix b/pkgs/by-name/en/engage/package.nix index 2d57f8307c77..7c1fc1f965ae 100644 --- a/pkgs/by-name/en/engage/package.nix +++ b/pkgs/by-name/en/engage/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; env = { - ENGAGE_DOCS_LINK = "file://${placeholder "doc"}/share/doc/${finalAttrs.pname}/index.html"; + ENGAGE_DOCS_LINK = "file://${placeholder "doc"}/share/doc/engage/index.html"; }; src = fetchFromGitLab { @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ${lib.getExe mdbook} build mkdir -p "$doc/share/doc" - mv public "$doc/share/doc/${finalAttrs.pname}" + mv public "$doc/share/doc/engage" ''; meta = { diff --git a/pkgs/by-name/fu/furtherance/package.nix b/pkgs/by-name/fu/furtherance/package.nix index 88d16f3e5f46..40265eeddc54 100644 --- a/pkgs/by-name/fu/furtherance/package.nix +++ b/pkgs/by-name/fu/furtherance/package.nix @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' - patchelf $out/bin/${finalAttrs.pname} \ + patchelf $out/bin/${finalAttrs.meta.mainProgram} \ --add-rpath ${ lib.makeLibraryPath [ vulkan-loader diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix index 936a5aedb254..8d4932a0e1b7 100644 --- a/pkgs/by-name/ha/halloy/package.nix +++ b/pkgs/by-name/ha/halloy/package.nix @@ -58,7 +58,7 @@ rustPlatform.buildRustPackage (finalAttrs: { desktopName = "Halloy"; comment = "IRC client written in Rust"; icon = "org.squidowl.halloy"; - exec = finalAttrs.pname; + exec = finalAttrs.meta.mainProgram; terminal = false; mimeTypes = [ "x-scheme-handler/irc" diff --git a/pkgs/by-name/jf/jfmt/package.nix b/pkgs/by-name/jf/jfmt/package.nix index fdcc8ab9c69b..bfb31436d274 100644 --- a/pkgs/by-name/jf/jfmt/package.nix +++ b/pkgs/by-name/jf/jfmt/package.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "scruffystuffs"; - repo = "${finalAttrs.pname}.rs"; + repo = "jfmt.rs"; rev = "v${finalAttrs.version}"; hash = "sha256-X3wk669G07BTPAT5xGbAfIu2Qk90aaJIi1CLmOnSG80="; }; diff --git a/pkgs/by-name/md/mdbook-katex/package.nix b/pkgs/by-name/md/mdbook-katex/package.nix index 37d8826f09a5..d46f185af21a 100644 --- a/pkgs/by-name/md/mdbook-katex/package.nix +++ b/pkgs/by-name/md/mdbook-katex/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Preprocessor for mdbook, rendering LaTeX equations to HTML at build time"; mainProgram = "mdbook-katex"; - homepage = "https://github.com/lzanini/${finalAttrs.pname}"; + homepage = "https://github.com/lzanini/mdbook-katex"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ lovesegfault diff --git a/pkgs/by-name/ne/nethoscope/package.nix b/pkgs/by-name/ne/nethoscope/package.nix index 8bc21edc41bd..0c88f51bc0d6 100644 --- a/pkgs/by-name/ne/nethoscope/package.nix +++ b/pkgs/by-name/ne/nethoscope/package.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; installCheckPhase = '' - if [[ "$(${expect}/bin/unbuffer "$out/bin/${finalAttrs.pname}" --help 2> /dev/null | strings | grep ${finalAttrs.version} | tr -d '\n')" == " ${finalAttrs.version}" ]]; then + if [[ "$(${expect}/bin/unbuffer "$out/bin/${finalAttrs.meta.mainProgram}" --help 2> /dev/null | strings | grep ${finalAttrs.version} | tr -d '\n')" == " ${finalAttrs.version}" ]]; then echo '${finalAttrs.pname} smoke check passed' else echo '${finalAttrs.pname} smoke check failed' diff --git a/pkgs/by-name/rc/rclone-ui/package.nix b/pkgs/by-name/rc/rclone-ui/package.nix index 8fe408e1d7ce..b89245f10ba0 100644 --- a/pkgs/by-name/rc/rclone-ui/package.nix +++ b/pkgs/by-name/rc/rclone-ui/package.nix @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: { postPatch = '' substituteInPlace src-tauri/tauri.conf.json \ - --replace-fail '"mainBinaryName": "Rclone UI"' '"mainBinaryName": "${finalAttrs.pname}"' + --replace-fail '"mainBinaryName": "Rclone UI"' '"mainBinaryName": "${finalAttrs.meta.mainProgram}"' substituteInPlace src-tauri/Cargo.toml \ --replace-fail 'name = "app"' 'name = "${finalAttrs.pname}"' ''; diff --git a/pkgs/by-name/sa/safe-rm/package.nix b/pkgs/by-name/sa/safe-rm/package.nix index aac13f960d2f..d82c0a55d48a 100644 --- a/pkgs/by-name/sa/safe-rm/package.nix +++ b/pkgs/by-name/sa/safe-rm/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchgit { url = "https://git.launchpad.net/safe-rm"; - tag = "${finalAttrs.pname}-${finalAttrs.version}"; + tag = "safe-rm-${finalAttrs.version}"; sha256 = "sha256-7+4XwsjzLBCQmHDYNwhlN4Yg3eL43GUEbq8ROtuP2Kw="; }; diff --git a/pkgs/by-name/sh/shh/package.nix b/pkgs/by-name/sh/shh/package.nix index 8bfe3869fdf4..429634129b24 100644 --- a/pkgs/by-name/sh/shh/package.nix +++ b/pkgs/by-name/sh/shh/package.nix @@ -85,9 +85,9 @@ rustPlatform.buildRustPackage (finalAttrs: { installManPage target/mangen/* - installShellCompletion --cmd ${finalAttrs.pname} \ - target/shellcomplete/${finalAttrs.pname}.{bash,fish} \ - --zsh target/shellcomplete/_${finalAttrs.pname} + installShellCompletion --cmd ${finalAttrs.meta.mainProgram} \ + target/shellcomplete/${finalAttrs.meta.mainProgram}.{bash,fish} \ + --zsh target/shellcomplete/_${finalAttrs.meta.mainProgram} ''; # RUST_BACKTRACE = 1; diff --git a/pkgs/by-name/si/similarity/package.nix b/pkgs/by-name/si/similarity/package.nix index 7ee56ceacbf2..95d384534cb8 100644 --- a/pkgs/by-name/si/similarity/package.nix +++ b/pkgs/by-name/si/similarity/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-7qLC1RvjBXd9JFrJdDTIngZhMvyQV1ko3MXRr/2y7hA="; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.pname}-ts"; + versionCheckProgram = "${placeholder "out"}/bin/similarity-ts"; doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sy/syndicate-server/package.nix b/pkgs/by-name/sy/syndicate-server/package.nix index a865cef55339..31e17ac2e43f 100644 --- a/pkgs/by-name/sy/syndicate-server/package.nix +++ b/pkgs/by-name/sy/syndicate-server/package.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: { domain = "git.syndicate-lang.org"; owner = "syndicate-lang"; repo = "syndicate-rs"; - rev = "${finalAttrs.pname}-v${finalAttrs.version}"; + rev = "syndicate-server-v${finalAttrs.version}"; hash = "sha256-orQN83DE+ZNgdx2PVcYrte/rVDFFtuQuRDKzeumpsLo="; }; diff --git a/pkgs/by-name/un/unpfs/package.nix b/pkgs/by-name/un/unpfs/package.nix index 81afb2c18d84..046848534e8a 100644 --- a/pkgs/by-name/un/unpfs/package.nix +++ b/pkgs/by-name/un/unpfs/package.nix @@ -22,8 +22,8 @@ rustPlatform.buildRustPackage (finalAttrs: { env.RUSTC_BOOTSTRAP = 1; postInstall = '' - install -D -m 0444 ../../README* -t "$out/share/doc/${finalAttrs.pname}" - install -D -m 0444 ../../LICEN* -t "$out/share/doc/${finalAttrs.pname}" + install -D -m 0444 ../../README* -t "$out/share/doc/unpfs" + install -D -m 0444 ../../LICEN* -t "$out/share/doc/unpfs" ''; meta = { diff --git a/pkgs/by-name/wl/wleave/package.nix b/pkgs/by-name/wl/wleave/package.nix index 38b720e12d4f..e2dfe0dd73ec 100644 --- a/pkgs/by-name/wl/wleave/package.nix +++ b/pkgs/by-name/wl/wleave/package.nix @@ -49,10 +49,10 @@ rustPlatform.buildRustPackage (finalAttrs: { postPatch = '' substituteInPlace src/config.rs \ - --replace-fail "/etc/wleave" "$out/etc/${finalAttrs.pname}" + --replace-fail "/etc/wleave" "$out/etc/wleave" substituteInPlace layout.json \ - --replace-fail "/usr/share/wleave" "$out/share/${finalAttrs.pname}" + --replace-fail "/usr/share/wleave" "$out/share/wleave" ''; postInstall = '' From 627c228bca1931f7ba5e0224e05b3d512db7a056 Mon Sep 17 00:00:00 2001 From: Paul Alcock <25768075+Guilvareux@users.noreply.github.com> Date: Mon, 5 Jan 2026 22:56:35 +0000 Subject: [PATCH 320/429] groovy-language-server: init at 0-unstable-2025-12-03 --- .../gr/groovy-language-server/deps.json | 351 ++++++++++++++++++ .../gr/groovy-language-server/package.nix | 66 ++++ 2 files changed, 417 insertions(+) create mode 100644 pkgs/by-name/gr/groovy-language-server/deps.json create mode 100644 pkgs/by-name/gr/groovy-language-server/package.nix diff --git a/pkgs/by-name/gr/groovy-language-server/deps.json b/pkgs/by-name/gr/groovy-language-server/deps.json new file mode 100644 index 000000000000..d47e5e960a51 --- /dev/null +++ b/pkgs/by-name/gr/groovy-language-server/deps.json @@ -0,0 +1,351 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://plugins.gradle.org/m2": { + "com/fasterxml#oss-parent/38": { + "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug=" + }, + "com/fasterxml#oss-parent/50": { + "pom": "sha256-9dpV3XuI+xcMRoAdF3dKZS+y9FgftbHQpfyGqhgrhXc=" + }, + "com/fasterxml#oss-parent/58": { + "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" + }, + "com/fasterxml/jackson#jackson-bom/2.17.2": { + "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI=" + }, + "com/fasterxml/jackson#jackson-parent/2.17": { + "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" + }, + "com/fasterxml/woodstox#woodstox-core/6.5.1": { + "jar": "sha256-ySjWBmXGQV+xw5d1z5XPxE9/RYDPWrAbHDgOv/12iH8=", + "pom": "sha256-SDllThaxcU509Rq8s3jYNWgUq49NUnPR3S8c6KOQrdw=" + }, + "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/8.3.6": { + "pom": "sha256-vI+Lii1Izey8uwCD39qhI2EVvzDYzJ3foE1W6T7J3e4=" + }, + "com/gradleup/shadow#shadow-gradle-plugin/8.3.6": { + "jar": "sha256-fOIOvwHuKe7FJFY70UK6wpHXUTXtedDZUamP0skmXDs=", + "module": "sha256-+8pm1Bwrz9HiUE9uzIIf4BqbAIx27qnJQM+Ay1aaI/8=", + "pom": "sha256-lRJfSJrSuJ5gJXMmnK9h9tSF26gvHcuNCYDODfK2stA=" + }, + "commons-io#commons-io/2.17.0": { + "jar": "sha256-SqTKSPPf0wt4Igt4gdjLk+rECT7JQ2G2vvqUh5mKVQs=", + "pom": "sha256-SEqTn/9TELjLXGuQKcLc8VXT+TuLjWKF8/VrsroJ/Ek=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { + "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" + }, + "jakarta/platform#jakartaee-api-parent/9.1.0": { + "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" + }, + "org/apache#apache/31": { + "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" + }, + "org/apache#apache/33": { + "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" + }, + "org/apache/ant#ant-launcher/1.10.15": { + "jar": "sha256-XIVRmQMHoDIzbZjdrtVJo5ponwfU1Ma5UGAb8is9ahs=", + "pom": "sha256-ea+EKil53F/gAivAc8SYgQ7q2DvGKD7t803E3+MNrJU=" + }, + "org/apache/ant#ant-parent/1.10.15": { + "pom": "sha256-SYhPGHPFEHzCN/QoXER3R5uwgEvwc3OUgBsI114rvrA=" + }, + "org/apache/ant#ant/1.10.15": { + "jar": "sha256-djrNpKaViMnqiBepUoUf8ML8S/+h0IHCVl3EB/KdV5Q=", + "pom": "sha256-R4DmHoeBbu4fIdGE7Jl7Zfk9tfS5BCwXitsp4j50JdY=" + }, + "org/apache/commons#commons-parent/74": { + "pom": "sha256-gOthsMh/3YJqBpMTsotnLaPxiFgy2kR7Uebophl+fss=" + }, + "org/apache/groovy#groovy-bom/4.0.22": { + "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=", + "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U=" + }, + "org/apache/logging#logging-parent/11.3.0": { + "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A=" + }, + "org/apache/logging/log4j#log4j-api/2.24.1": { + "jar": "sha256-bne7Ip/I3K8JA4vutekDCyLp4BtRtFiwGDzmaevMku8=", + "pom": "sha256-IzAaISnUEAiZJfSvQa7LUlhKPcxFJoI+EyNOyst+c+M=" + }, + "org/apache/logging/log4j#log4j-bom/2.24.1": { + "pom": "sha256-vGPPsrS5bbS9cwyWLoJPtpKMuEkCwUFuR3q1y3KwsNM=" + }, + "org/apache/logging/log4j#log4j-core/2.24.1": { + "jar": "sha256-ALzziEcsqApocBQYF2O2bXdxd/Isu/F5/WDhsaybybA=", + "pom": "sha256-JyQstBek3xl47t/GlYtFyJgg+WzH9NFtH0gr/CN24M0=" + }, + "org/apache/logging/log4j#log4j/2.24.1": { + "pom": "sha256-+NcAm1Rl2KhT0QuEG8Bve3JnXwza71OoDprNFDMkfto=" + }, + "org/apache/maven#maven-api-meta/4.0.0-alpha-9": { + "jar": "sha256-MsT1yturaAw0lS+ctXBFehODzOxMmlewOSYH1xkcaUk=", + "pom": "sha256-2ePDXW/aysuNGLn2QoYJDH/65yjWbLJq9aJmgZUNvnk=" + }, + "org/apache/maven#maven-api-xml/4.0.0-alpha-9": { + "jar": "sha256-KbJijQ8CgRlxWRaEnBnu1FsyzcZ+sTVReYxzr6SqI9Y=", + "pom": "sha256-N2bjAzOTTJIvUlj6M0uHXyi7ABJ/8D3vANl/KlOnrps=" + }, + "org/apache/maven#maven-api/4.0.0-alpha-9": { + "pom": "sha256-ZYvglXcymzX5TemWdb8O/HI26ZYbXHhfMyqkfyKUcfA=" + }, + "org/apache/maven#maven-bom/4.0.0-alpha-9": { + "pom": "sha256-4EfSnTUI/yd6Wsk1u5J/NUkQLMbTec5a4p4pYzeE0Rw=" + }, + "org/apache/maven#maven-parent/41": { + "pom": "sha256-di/N1M6GIcX6Ciz2SVrSaXKoCT60Mqo+QCvC1OJQDFM=" + }, + "org/apache/maven#maven-xml-impl/4.0.0-alpha-9": { + "jar": "sha256-JucCuIHVeuTuiNAsAJQLpkBjcF7mkgWuiVi/g5qLBrE=", + "pom": "sha256-us0USYVzbUMmuuRChHM78eMTKX3NolNGTkYpsddoGPc=" + }, + "org/apache/maven#maven/4.0.0-alpha-9": { + "pom": "sha256-5QzZ/zefQ3H3/ywsrFF5YfPS9n7fgJCHU8e9UGuRPX4=" + }, + "org/codehaus/plexus#plexus-utils/4.0.2": { + "jar": "sha256-iVcnTnX+LCeLFCjdFqDa7uHdOBUstu/4Fhd6wo/Mtpc=", + "pom": "sha256-UVHBO918w6VWlYOn9CZzkvAT/9MRXquNtfht5CCjZq8=" + }, + "org/codehaus/plexus#plexus-xml/4.0.4": { + "jar": "sha256-Bp54tTcQjcYSSmcHP8mYJkeR9rZJnpVaOOcrs+T+Gt8=", + "pom": "sha256-Ohb3yn7CRzFFtGHgpylREI1H4SThjIRMCFsaY3jGEVE=" + }, + "org/codehaus/plexus#plexus/18": { + "pom": "sha256-tD7onIiQueW8SNB5/LTETwgrUTklM1bcRVgGozw92P0=" + }, + "org/codehaus/woodstox#stax2-api/4.2.1": { + "jar": "sha256-Z4Vn5ItRpCxlxpnyZlOa09Z21LGlsK19iezoudV3JXk=", + "pom": "sha256-edpBDIwPRqP46K2zDWwkzNYGW272v96HvZfpiB6gouc=" + }, + "org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" + }, + "org/jdom#jdom2/2.0.6.1": { + "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=", + "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M=" + }, + "org/junit#junit-bom/5.10.1": { + "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", + "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" + }, + "org/junit#junit-bom/5.10.2": { + "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", + "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" + }, + "org/junit#junit-bom/5.10.3": { + "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", + "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" + }, + "org/junit#junit-bom/5.11.0": { + "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=", + "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0=" + }, + "org/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" + }, + "org/mockito#mockito-bom/5.7.0": { + "pom": "sha256-dlcAW89JAw1nzF1S3rxm3xj0jVTbs+1GZ/1yWwZ5+6A=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm-commons/9.7.1": { + "jar": "sha256-mlebVNKSrZvhcdQxP9RznGNVksK1rDpFm70QSc3exqA=", + "pom": "sha256-C/HTHaDJ+djtwvJ9u/279z8acVtyzS+ijz8ZWZTXStE=" + }, + "org/ow2/asm#asm-tree/9.7.1": { + "jar": "sha256-mSmIH1nra4QOhtVFcMd7Wc5yHRBObf16QJeJkcLTtB8=", + "pom": "sha256-E7kF9l5/1DynZ09Azao3Z5ukhYxsnZ+48Xp6/ZuqvJ4=" + }, + "org/ow2/asm#asm/9.7.1": { + "jar": "sha256-jK3UOsXrbQneBfrsyji5F6BAu5E5x+3rTMgcdAtxMoE=", + "pom": "sha256-cimwOzCnPukQCActnkVppR2FR/roxQ9SeEGu9MGwuqg=" + }, + "org/springframework#spring-framework-bom/5.3.39": { + "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=", + "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs=" + }, + "org/vafer#jdependency/2.12": { + "jar": "sha256-xuxNA/nwT7ZEjTavQ6HMBpoh7LXocBM90Y/tT02x3mg=", + "pom": "sha256-LY6Zq9RS9eZCxtK74xACuSh5naw6CeA+PknyE3ozt+s=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.13.1": { + "pom": "sha256-+IEKzlDd/j/ag9ESbeZdmdXSUVoUo2uIvrG5mkdpeDY=" + }, + "com/google/code/gson#gson-parent/2.8.9": { + "pom": "sha256-sW4CbmNCfBlyrQ/GhwPsN5sVduQRuknDL6mjGrC7z/s=" + }, + "com/google/code/gson#gson/2.13.1": { + "jar": "sha256-lIVZQtSZLxEpRtPeHDNOcJI3uBJtgTC/B4B8AYpKISA=", + "pom": "sha256-wPZXItdcDljNGDWzBGBG9ga12mmZBBYfjba3j+ubQBo=" + }, + "com/google/code/gson#gson/2.8.9": { + "pom": "sha256-r97W5qaQ+/OtSuZa2jl/CpCl9jCzA9G3QbnJeSb91N4=" + }, + "com/google/code/gson/gson/maven-metadata": { + "xml": { + "groupId": "com.google.code.gson", + "lastUpdated": "20250910210152", + "release": "2.13.2" + } + }, + "com/google/errorprone#error_prone_annotations/2.38.0": { + "jar": "sha256-ZmHVM1CQpfxh3YadIJW8bB4hVuOqR6bkq6vfZMmaeIk=", + "pom": "sha256-MAe++K/zro6hLYHD/qy08Vl5ss9cPjj8kYmpjeoUEWc=" + }, + "com/google/errorprone#error_prone_parent/2.38.0": { + "pom": "sha256-5iRYpqPmMIG8fFezwPrJ8E92zjL2BlMttp/is9R7k0w=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/27.1-jre": { + "pom": "sha256-02EBZcbeK02NZBhIdxe2PFK1o5xeNaVT4khz7LYOBig=" + }, + "com/google/guava#guava/27.1-jre": { + "jar": "sha256-SlqnDMlopNE35ZmtN1U+XP7tImXowZNHbXEZA2xTb+c=", + "pom": "sha256-vZnXUAYTGuJcmGCh1j6E42Nx8RL9sML+PV1qs46esnE=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/j2objc#j2objc-annotations/1.1": { + "jar": "sha256-KZSn63jycQvT07+2ObLJTiGc7awNTQhNUW54wW3d7PY=", + "pom": "sha256-8MmMVx6Tp8tN0Y3w+jCPCWPnoGIKwtQkTmHnCdA61r4=" + }, + "io/github/classgraph#classgraph/4.8.179": { + "jar": "sha256-FlWDV/I0BSNwEJEnpF1pqb1thkaSVZR5JjRIbcSLFZ0=", + "pom": "sha256-CWp5YnTWPaeMCTueed63lFJp3CK8F+ZqKYhazkQwaJs=" + }, + "org/apache/groovy#groovy-bom/4.0.26": { + "module": "sha256-b3I9IpHN+uqPpoZ/frp77Klvt4SQXfvikjG0eW7I6RE=", + "pom": "sha256-uJshtYixe2Q/ou7HxAbgoah541ctzuy9VU9aB+IfV4Y=" + }, + "org/apache/groovy#groovy/4.0.26": { + "jar": "sha256-rjGW7TH6EehQb5xAprNP2v8GqO7aeKim666xoqCtNdw=", + "module": "sha256-iHirxopScW4GksyMF92KlqCuqwJAWRW2ddOLy8TcBj0=", + "pom": "sha256-U7zPSFI/Wg3l7ce4/KqH5P03xUOc5u0NotFuQ+HFoZc=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/checkerframework#checker-qual/2.5.2": { + "jar": "sha256-ZLAmkci51OdwD47i50Lc5+osboHmYrdSLJ7jv1aMBAo=", + "pom": "sha256-3EzUOKNkYtATwjOMjiBtECoyKgDzNynolV7iGYWcnt4=" + }, + "org/codehaus/mojo#animal-sniffer-annotations/1.17": { + "jar": "sha256-kmVPST7P7FIILnY1Tw6/h2SNw9XOwuPDzblHwBZ0elM=", + "pom": "sha256-6VarXS60j6uuEjANDNLTKU1KKkGrwgaMI8tNYK12y+U=" + }, + "org/codehaus/mojo#animal-sniffer-parent/1.17": { + "pom": "sha256-GKA98W4qGExYLbexJWM8Fft3FAJ6hMG1MtcpM9wIuB8=" + }, + "org/codehaus/mojo#mojo-parent/40": { + "pom": "sha256-/GSNzcQE+L9m4Fg5FOz5gBdmGCASJ76hFProUEPLdV4=" + }, + "org/eclipse/lsp4j#org.eclipse.lsp4j.generator/0.12.0": { + "jar": "sha256-Z+n3bmWwaJ+DQCtKJVYB9XT39/BZNzf7YJOBpeNJWNA=", + "pom": "sha256-kQG827F78EbIiqontTzE8JBLtqAp4VtlzK9Mbj3i0CM=" + }, + "org/eclipse/lsp4j#org.eclipse.lsp4j.jsonrpc/0.12.0": { + "jar": "sha256-JChsfNd0qt0l/hKxLDVvg5KKHDD7wRv0xHIuJAhKKoE=", + "pom": "sha256-bB4yhp5MWTT1qH5sBvnFTe3bETpMwOSssX5n9ilRJMo=" + }, + "org/eclipse/lsp4j#org.eclipse.lsp4j/0.12.0": { + "jar": "sha256-H/zfyRy2ZgnbUuWosC0s+tGbUTz4ijeBfxzqZWD2QZA=", + "pom": "sha256-PGd71XWBFzjkmPf8ca/tEZU7QmAX2guTD/5gIhIKEgM=" + }, + "org/eclipse/xtend#org.eclipse.xtend.lib.macro/2.24.0": { + "jar": "sha256-spZ16xanOIOJeL6CTBChEkHlm7bUuvUq4C9RkWNtLUs=", + "pom": "sha256-YCmLxCvHTKa8wNsSwEFVoJB56Um6xahz7qd62nGLZjg=" + }, + "org/eclipse/xtend#org.eclipse.xtend.lib/2.24.0": { + "jar": "sha256-N+utsAd8Pw6TR8y78toY+k7rlnW1329emb7KF58Nk1A=", + "pom": "sha256-rtBfqIaEP7Zn6JpcESNGDRPUG9y4h21OJAWXQ/vIFrQ=" + }, + "org/eclipse/xtext#org.eclipse.xtext.xbase.lib/2.24.0": { + "jar": "sha256-+Xm8u7mEKk95UAIB7W2rWjQnRg6A76Xh547MiSeaYA4=", + "pom": "sha256-wS9vllqtfnBmA0tWnHCifByweQgvavOdu5EjliqtDWI=" + }, + "org/eclipse/xtext#xtext-dev-bom/2.24.0": { + "pom": "sha256-cSkcymQrSjcWVaKEY2j/ESjJd3PQH732uuoUQ8WfZA0=" + }, + "org/junit#junit-bom/5.11.4": { + "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=", + "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU=" + }, + "org/junit#junit-bom/5.14.1": { + "module": "sha256-J4rLEczJmYaUIkOG+W+0lBoi7bQstEbJLg8fMwFLa0g=", + "pom": "sha256-AbAd+jZlULQKxXYFSKfXKLYQnRfEUeg4ZNHl4M6GLJQ=" + }, + "org/junit/jupiter#junit-jupiter-api/5.11.4": { + "jar": "sha256-q4PvnlGsRZfVnSa0tYgSEpVQ4vV5pATIr30J9c5bQpM=", + "module": "sha256-puov77OqWGj9engK4doRYudt2jdgtIAVwqQZ0jcv88s=", + "pom": "sha256-US0j/znHZmWho2RVJiMLz4ib1JiEME9/6+BHsBjuszk=" + }, + "org/junit/jupiter#junit-jupiter-api/5.14.1": { + "jar": "sha256-FvFvDDwe+XrbgwSEGUZp7ZaDtDTObzj+OgG9KQaubFk=", + "module": "sha256-HqGu5CCahEG/xHY0pqTWaNN/EHLJwk1y4znUcSjmHaI=", + "pom": "sha256-l4D8P9mTDQcs9gyFmJl286lLgBStYZGLdQqMiPG3THM=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.11.4": { + "module": "sha256-25EWOorwBaMnmFZd1nU3clGJWQ3qttoDsx292kVoahg=", + "pom": "sha256-sKMjsNA0REQdE9RjC0DbXvhBYNLC9YXU1kbcOIL5kgc=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.14.1": { + "jar": "sha256-30SqGNBc7RP6aDbKIUwiTK8//95N8g6c5936+1ydAvg=", + "module": "sha256-5atm8Uf7UmGRL5hwCi+EbAUqGumalvqK25oF+JzuajE=", + "pom": "sha256-tEleIOlqHWjoGA7m2QCdJ8QujM8zUr2X3QGe87VZGxw=" + }, + "org/junit/platform#junit-platform-commons/1.11.4": { + "jar": "sha256-nt2Wmw0GcMVBBbyRrnm9HG9QPhIRX6uoIHO4TIa7wzQ=", + "module": "sha256-C54mJcj0aLPNQTLMCoBfif5B+FLRrf/3Xz6xRlyhy2s=", + "pom": "sha256-zRLSt8JC8WVUjtnJQGFg3O22CAkltHz3MeD9rl+0vOI=" + }, + "org/junit/platform#junit-platform-commons/1.14.1": { + "jar": "sha256-OaHyR6ujNGvgtORtuzwJAxwM/K0RHX2ZBHlbkX6MHHo=", + "module": "sha256-SuQSly6ZIp5QFsuYmrio5gGHRdA4kM7DfcBAr4f0dIA=", + "pom": "sha256-AFNyKBaiOCD49xkGajg8/6LbksfbUhEok8nEc790Bhg=" + }, + "org/junit/platform#junit-platform-engine/1.11.4": { + "module": "sha256-v2zh+1lR3Gx942re72rq9474LWODHFzOvOOI2p/F/iU=", + "pom": "sha256-lDRxV5mEIS++adA+3sfC/0+6sYiL4LgMJl6nCGn9ir0=" + }, + "org/junit/platform#junit-platform-engine/1.14.1": { + "jar": "sha256-qJMQ3WndmscDHbmZfcq5oUgVEvpUYHfkIZzvouKH68c=", + "module": "sha256-EyNTFL5HT0GAeK3pdyMBWxaR7uN25Ce+j4GfBUCV5CY=", + "pom": "sha256-REQYxkZ2Eo3MTsfMtmbIChg3cKXZ8eQ/gxD3kTwR3cA=" + }, + "org/junit/platform#junit-platform-launcher/1.14.1": { + "jar": "sha256-w6L9iZpsGZZGeIVFD4o5C/XKmaJGG1WJF+OjjXHqB7c=", + "module": "sha256-eI2j5KuAQTvLYylRt/cNtrhRrynQskIowFIcKue1cAI=", + "pom": "sha256-5AYKI9RxXTF6it+vKcZC1O+pgxhANROv0u7pklwAJYs=" + }, + "org/opentest4j#opentest4j/1.3.0": { + "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", + "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=", + "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/by-name/gr/groovy-language-server/package.nix b/pkgs/by-name/gr/groovy-language-server/package.nix new file mode 100644 index 000000000000..fe0ef47618f1 --- /dev/null +++ b/pkgs/by-name/gr/groovy-language-server/package.nix @@ -0,0 +1,66 @@ +{ + lib, + jdk, + stdenv, + gradle, + makeWrapper, + fetchFromGitHub, +}: +stdenv.mkDerivation (finalAttrs: rec { + pname = "groovy-language-server"; + version = "0-unstable-2025-12-03"; + + src = fetchFromGitHub { + name = "${pname}-${version}"; + owner = "GroovyLanguageServer"; + repo = "groovy-language-server"; + rev = "0746b250604c0a75bf620f7257aed8df12d025c3"; + hash = "sha256-rLi6xvGFVRvAVmP59Te1MxKA6HzQ+qPtEC5lMws5tFQ="; + }; + + mitmCache = gradle.fetchDeps { + pkg = finalAttrs.finalPackage; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + gradleFlags = [ "-Dfile.encoding=utf-8" ]; + + gradleBuildTask = "shadowJar"; + + doCheck = true; + + nativeBuildInputs = [ + gradle + makeWrapper + ]; + + buildInputs = [ + jdk + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/java + mkdir -p $out/bin + + cp build/libs/${pname}-${version}-all.jar $out/share/java + + makeWrapper "${jdk}/bin/java" "$out/bin/${pname}" \ + --add-flags "-jar $out/share/java/${pname}-${version}-all.jar" \ + --set CLASSPATH "$out/share/java/${pname}-${version}-all.jar:\$CLASSPATH" + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/GroovyLanguageServer/groovy-language-server"; + description = "Groovy Language Server"; + longDescription = "Groovy Language Server"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = [ ]; + }; +}) From e61e7980a389f4dec7c719d2eb4a1eec69ee5715 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 6 Mar 2026 10:55:53 +0000 Subject: [PATCH 321/429] radicle-native-ci: 0.12.0 -> 0.13.0 Changelog: https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z3qg5TKmN83afz2fj9z3fQjU8vaYE/tree/NEWS.md --- pkgs/by-name/ra/radicle-native-ci/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/radicle-native-ci/package.nix b/pkgs/by-name/ra/radicle-native-ci/package.nix index cde2a8d630ef..e0e51db4d816 100644 --- a/pkgs/by-name/ra/radicle-native-ci/package.nix +++ b/pkgs/by-name/ra/radicle-native-ci/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "radicle-native-ci"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromRadicle { seed = "seed.radicle.xyz"; repo = "z3qg5TKmN83afz2fj9z3fQjU8vaYE"; node = "z6MkgEMYod7Hxfy9qCvDv5hYHkZ4ciWmLFgfvm3Wn1b2w2FV"; tag = "v${finalAttrs.version}"; - hash = "sha256-Hi5QdYVFSvP8AEKcH7yIA7PpaTSe0hBcF3vgCNilCKg="; + hash = "sha256-FCuyOgBjwK4GNOFku0loNRwjrQ8emvhHWq1pOE/QL3s="; }; - cargoHash = "sha256-N1XyMarKCctor5r7AePMuV/BzWiQwXphJFqye0cqO3k="; + cargoHash = "sha256-zA71hm5/8Pu9aUgBq8PetSnE8Ah1wu1ItOoGE8YfQR0="; preCheck = '' git config --global user.name nixbld From 56a367b41caef286199775859819aa578b787465 Mon Sep 17 00:00:00 2001 From: Paul Alcock <25768075+Guilvareux@users.noreply.github.com> Date: Fri, 6 Mar 2026 10:52:08 +0000 Subject: [PATCH 322/429] groovy-language-server: add guilvareux as a maintainer --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/by-name/gr/groovy-language-server/package.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 006ca49d55c8..a19bd6c7d18c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9980,6 +9980,12 @@ githubId = 1949438; name = "Guillaume Matheron"; }; + guilvareux = { + email = "paul@alcock.dev"; + github = "guilvareux"; + githubId = 25768075; + name = "Paul Alcock"; + }; guitargeek = { email = "jonas.rembser@cern.ch"; github = "guitargeek"; diff --git a/pkgs/by-name/gr/groovy-language-server/package.nix b/pkgs/by-name/gr/groovy-language-server/package.nix index fe0ef47618f1..e8052422f7d1 100644 --- a/pkgs/by-name/gr/groovy-language-server/package.nix +++ b/pkgs/by-name/gr/groovy-language-server/package.nix @@ -61,6 +61,6 @@ stdenv.mkDerivation (finalAttrs: rec { longDescription = "Groovy Language Server"; license = licenses.asl20; platforms = platforms.all; - maintainers = [ ]; + maintainers = [ maintainers.guilvareux ]; }; }) From 9271004f8475aaac7f45113f50136cc330b2851b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 11:05:00 +0000 Subject: [PATCH 323/429] terraform-providers.f5networks_bigip: 1.24.2 -> 1.25.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 003c979bccb2..2903c977be4c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -391,11 +391,11 @@ "vendorHash": null }, "f5networks_bigip": { - "hash": "sha256-V+CA+8nICGzj0etByXZzaO/GMIFGA0fzG0PW1FH7Qxw=", + "hash": "sha256-aUf9eRpfxzdpz6Lv36xWxSW++tSMxYvqy9xtkko/bfc=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.24.2", + "rev": "v1.25.0", "spdx": "MPL-2.0", "vendorHash": null }, From a8aa3fbdff33bae74a08939a8ae7f901a17d00a2 Mon Sep 17 00:00:00 2001 From: Fede Barcelona Date: Fri, 6 Mar 2026 12:07:39 +0100 Subject: [PATCH 324/429] zeroclaw: 0.1.7 -> 0.1.8 --- pkgs/by-name/ze/zeroclaw/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zeroclaw/package.nix b/pkgs/by-name/ze/zeroclaw/package.nix index 1d24f1e92816..454cf0b435ca 100644 --- a/pkgs/by-name/ze/zeroclaw/package.nix +++ b/pkgs/by-name/ze/zeroclaw/package.nix @@ -9,17 +9,18 @@ writableTmpDirAsHomeHook, gitMinimal, versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "zeroclaw"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "zeroclaw-labs"; repo = "zeroclaw"; tag = "v${finalAttrs.version}"; - hash = "sha256-D4/2h7TlOwAU4tl1xcdULRfO21KmP+zLlqQ8DzLqnjQ="; + hash = "sha256-6EVUk+wp3Rjhk/q2htXq41TMD+rGFO0nJbVWNbLWj5U="; }; postPatch = @@ -31,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ln -s ${zeroclaw-web} web/dist ''; - cargoHash = "sha256-sbC+fdMzjrx0dF5zHBHzMgZeIPQth1oXNqilooVZF8s="; + cargoHash = "sha256-pJbWbqbvO2CF0jKhfD8VK9z+Gn9vY1UR4OV+XMt1n80="; nativeBuildInputs = [ pkg-config @@ -56,6 +57,8 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Fast, small, and fully autonomous AI assistant infrastructure — deploy anywhere, swap anything"; homepage = "https://github.com/zeroclaw-labs/zeroclaw"; From efe60c90558a929c1b523d6b87db1f6f396c3ad5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 11:28:42 +0000 Subject: [PATCH 325/429] terraform-providers.hashicorp_tfe: 0.74.0 -> 0.74.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 003c979bccb2..cf8d347b6108 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -652,11 +652,11 @@ "vendorHash": "sha256-GlkqFg9Bgs+Hi59PYAxqq3YW9ji1qeuX4vz59wQ4pRw=" }, "hashicorp_tfe": { - "hash": "sha256-+FIiatVTff/MNk1Ik0vZDii7yjeWQLO5BLqSrs2bGME=", + "hash": "sha256-dak9/lYjL+2gbXyjxRqS61wr4YJRHFzHNJdCPJqiaW4=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.74.0", + "rev": "v0.74.1", "spdx": "MPL-2.0", "vendorHash": "sha256-GAwAGw8N4B/jCtcR2ok3g/0j//CHK9yPaBj+otJLjKc=" }, From efee25678bee39e4cde4a438f43bc1c91936d6cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 11:34:54 +0000 Subject: [PATCH 326/429] vscode-extensions.github.copilot-chat: 0.37.6 -> 0.37.9 --- .../editors/vscode/extensions/github.copilot-chat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix index 2b3c69355a0e..74fc871cfa24 100644 --- a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix +++ b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "github"; name = "copilot-chat"; - version = "0.37.6"; - hash = "sha256-tCrrF2Emr/rNJola58ExWKfLuAyOvPqszPLd5SRVcac="; + version = "0.37.9"; + hash = "sha256-AGfjenshM1yQ/rHDpCbCU2HDSS4cPGIPxe8MQ7O0/Dc="; }; meta = { From 6c41776beefd06dd21c5804ae05cb7fad1cd64ed Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Fri, 6 Mar 2026 12:56:02 +0100 Subject: [PATCH 327/429] rl-2605: clarify `nodejs` breaking changes --- doc/release-notes/rl-2605.section.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index dd8a7bfd701f..610dcb5d42bb 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -203,8 +203,6 @@ - `services.openssh.settings.AcceptEnv` now explicitly defined as an option that takes a list of strings, to facilitate option merging. Setting it to a string value is no longer supported. -- `nodejs-slim` has a `npm` and a `corepack` outputs, and `nodejs` no longer has a `libv8` output. - - All Xfce packages have been moved to top level (e.g. if you previously added `pkgs.xfce.xfce4-whiskermenu-plugin` to `environment.systemPackages`, you will need to change it to `pkgs.xfce4-whiskermenu-plugin`). The `xfce` scope will be removed in NixOS 26.11. - `spacefm` was removed because it appeared to be unmaintained upstream. @@ -264,6 +262,10 @@ gnuradioMinimal.override { - The `nodejs_latest` alias now points to `nodejs_25` instead of `nodejs_24`. +- `nodejs-slim` no longer exposes a `corepack` executable, it has been moved to an ad-hoc output; to restore the previous behavior, `nodejs-slim.corepack` must be explicitely included. + +- `nodejs` is now a simple wrapper for `nodejs-slim`+`nodejs-slim.npm`+`nodejs-slim.corepack`, meaning it is no longer possible to reference or override its attributes or outputs (e.g. `nodejs.libv8` must be replaced with `nodejs-slim.libv8`, `nodejs.nativeBuildInputs` with `nodejs-slim.nativeBuildInputs`, etc.). + - `mold` is now wrapped by default. - `neovim` now disables by default the `python3` and `ruby` providers, unused by most users and reducing closure size from 365MiB to 240MiB. From e50a46604eec8b7319c3a11f8efcd4461312b4b4 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Fri, 6 Mar 2026 12:00:00 +0000 Subject: [PATCH 328/429] dsniff: fix build with gcc15 --- pkgs/by-name/ds/dsniff/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ds/dsniff/package.nix b/pkgs/by-name/ds/dsniff/package.nix index 8d935d49f6f2..09e9e286b03b 100644 --- a/pkgs/by-name/ds/dsniff/package.nix +++ b/pkgs/by-name/ds/dsniff/package.nix @@ -114,6 +114,7 @@ stdenv.mkDerivation (finalAttrs: { ]; NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" + "-std=gnu17" ]; }; postPatch = '' From f27451f92ee0085bd7fb352ec54f47cb6b8d0df4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Mar 2026 13:01:06 +0100 Subject: [PATCH 329/429] pqcscan: init at 0.8.0 Post-Quantum Cryptography Scanner https://github.com/anvilsecure/pqcscan --- pkgs/by-name/pq/pqcscan/package.nix | 33 +++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/pq/pqcscan/package.nix diff --git a/pkgs/by-name/pq/pqcscan/package.nix b/pkgs/by-name/pq/pqcscan/package.nix new file mode 100644 index 000000000000..ed8c754c378b --- /dev/null +++ b/pkgs/by-name/pq/pqcscan/package.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + versionCheckHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "pqcscan"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "anvilsecure"; + repo = "pqcscan"; + tag = finalAttrs.version; + hash = "sha256-+IwUESqmxvZu53n5ORNoYVD8JiSwAjD9AudnsXfIKvc="; + }; + + cargoHash = "sha256-ZZm1I4fsw4PDCVZYuyhy4fC5ocfz1Snrv9vMltF26x8="; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + doInstallCheck = true; + + meta = { + description = "Post-Quantum Cryptography Scanner"; + homepage = "https://github.com/anvilsecure/pqcscan"; + changelog = "https://github.com/anvilsecure/pqcscan/releases/tag/${finalAttrs.src.rev}"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "pqcscan"; + }; +}) From d1c05a88856c559e11b828aceb2d3a5ecd426580 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 06:36:27 +0000 Subject: [PATCH 330/429] caddy: 2.11.1 -> 2.11.2 --- nixos/tests/caddy.nix | 2 +- pkgs/by-name/ca/caddy/package.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/tests/caddy.nix b/nixos/tests/caddy.nix index c86ce21c5919..ea59c1cf49b5 100644 --- a/nixos/tests/caddy.nix +++ b/nixos/tests/caddy.nix @@ -73,7 +73,7 @@ services.caddy = { package = pkgs.caddy.withPlugins { plugins = [ "github.com/caddyserver/replace-response@v0.0.0-20241211194404-3865845790a7" ]; - hash = "sha256-P6rYPJeJcKZgH/d29YQrPf68uWWuav2tQq/2+sVT3tg="; + hash = "sha256-Quib7+jFf2ElS4yvrJhuLiedX3lBNwxpEDskxxyVu+8="; }; configFile = pkgs.writeText "Caddyfile" '' { diff --git a/pkgs/by-name/ca/caddy/package.nix b/pkgs/by-name/ca/caddy/package.nix index a69e26e6c51e..f3a93f1b014b 100644 --- a/pkgs/by-name/ca/caddy/package.nix +++ b/pkgs/by-name/ca/caddy/package.nix @@ -11,7 +11,7 @@ versionCheckHook, }: let - version = "2.11.1"; + version = "2.11.2"; dist = fetchFromGitHub { owner = "caddyserver"; repo = "dist"; @@ -27,10 +27,10 @@ buildGo125Module (finalAttrs: { owner = "caddyserver"; repo = "caddy"; tag = "v${finalAttrs.version}"; - hash = "sha256-8NvRodMtq9Yrock7QRvF6ZOjuqpiK0KS3UeJzYcIbsg="; + hash = "sha256-QoGq8+lhaSQuC1VwIYE8h8N/ZC1ozfmIwmsIPk29Jos="; }; - vendorHash = "sha256-jZ/oxAVBedbFEnqXrQnya2vLQZjXubAc1vUKwpUL66M="; + vendorHash = "sha256-zlwVgSEr01bbgV7N9szwqa9cPjBU34Cu7vqj4/MoSuU="; ldflags = [ "-s" From cff5b9cf6f9063491c6b21c68c18a5a5073c7915 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 12:35:30 +0000 Subject: [PATCH 331/429] goarista: 0-unstable-2025-09-01 -> 0-unstable-2025-12-01 --- pkgs/by-name/go/goarista/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/go/goarista/package.nix b/pkgs/by-name/go/goarista/package.nix index cb5de911aad4..a548cc334a10 100644 --- a/pkgs/by-name/go/goarista/package.nix +++ b/pkgs/by-name/go/goarista/package.nix @@ -7,16 +7,16 @@ buildGoModule { pname = "goarista"; - version = "0-unstable-2025-09-01"; + version = "0-unstable-2025-12-01"; src = fetchFromGitHub { owner = "aristanetworks"; repo = "goarista"; - rev = "4c0e3d6d22a8b50c5a7e107011bbd843ea3a1f76"; - hash = "sha256-S1RKLcLhy8gPQlbJM4txOCqNWVHQOlJq2zY4Rdhfdls="; + rev = "a373d7c9f0d9de57f4e1fcfe9adc868c7104f9cd"; + hash = "sha256-WxMo2cMYsorJ2aYNc2DAjxXYLh2CHJqbtGjJYtl2r68="; }; - vendorHash = "sha256-n+P3L3dT2kYuTyI2qX/nrLRgFIUsP3kkwNZmRQ8EFRs="; + vendorHash = "sha256-LS99/DKKh+KHtbI5n8/Dw47Le5qowRQYLuCA+Apwi8I="; passthru.updateScript = ./update.sh; From d5c39c8e20d2346a0548a0949007d215a0e6c364 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 12:44:32 +0000 Subject: [PATCH 332/429] protoc-gen-validate: 1.3.2 -> 1.3.3 --- pkgs/by-name/pr/protoc-gen-validate/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/protoc-gen-validate/package.nix b/pkgs/by-name/pr/protoc-gen-validate/package.nix index ae0e787357c0..49b74e45ccde 100644 --- a/pkgs/by-name/pr/protoc-gen-validate/package.nix +++ b/pkgs/by-name/pr/protoc-gen-validate/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "protoc-gen-validate"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "bufbuild"; repo = "protoc-gen-validate"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-4KmYDfitAYLfdgTUg3SlQLjWoYBnGOuF7C3xHWm/lNM="; + sha256 = "sha256-YujY2XNNtrVw7+kUxSwF9gbD2AzPV6zKV0zSun89VEY="; }; vendorHash = "sha256-r4oT4Jd21hQccvGEqOXpEKqUy6lvMKN+vF8e2KxY6oQ="; From 46402e96dc3e582852cbebb9d2d7ee452e27ba6e Mon Sep 17 00:00:00 2001 From: Kumpelinus Date: Mon, 15 Sep 2025 13:54:18 +0000 Subject: [PATCH 333/429] maintainers: add kumpelinus --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3fb6c89bf258..0baff179fec8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14519,6 +14519,12 @@ github = "kulczwoj"; githubId = 58049191; }; + kumpelinus = { + name = "Kumpelinus"; + email = "linus@kump.dev"; + github = "kumpelinus"; + githubId = 174106140; + }; KunyaKud = { name = "KunyaKud"; email = "wafuu@posteo.net"; From 83c73bb773457d14fb13998fb1bc331a172a5671 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 12:51:42 +0000 Subject: [PATCH 334/429] python3Packages.linode-metadata: 0.3.3 -> 0.3.4 --- pkgs/development/python-modules/linode-metadata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/linode-metadata/default.nix b/pkgs/development/python-modules/linode-metadata/default.nix index 1eeccb8c576b..72939e0dd56e 100644 --- a/pkgs/development/python-modules/linode-metadata/default.nix +++ b/pkgs/development/python-modules/linode-metadata/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "linode-metadata"; - version = "0.3.3"; + version = "0.3.4"; src = fetchPypi { pname = "linode_metadata"; inherit version; - hash = "sha256-E4qOA7xNuexf/nvTY8qGodLtlD1oGz81eSsA3oIHmGs="; + hash = "sha256-6b0u1/Z2Q8iKLgFAu4ZbA6vK228sPMXgudsfa5PbAj0="; }; pyproject = true; From 1d369d11242b1f0e43197ea0ea871387942b6095 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 12:51:45 +0000 Subject: [PATCH 335/429] yara-x: 1.13.0 -> 1.14.0 --- pkgs/by-name/ya/yara-x/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix index fe3cf78432c8..2350b2972e6b 100644 --- a/pkgs/by-name/ya/yara-x/package.nix +++ b/pkgs/by-name/ya/yara-x/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "yara-x"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara-x"; tag = "v${finalAttrs.version}"; - hash = "sha256-EEvy0UtmBlgC3b57SOwr7dI49R7PYeFqsZKyzo0zx9w="; + hash = "sha256-gGkBmJoUa9WiIozSwhe18N8i5uSiKsSQ3J1NAT41ro4="; }; - cargoHash = "sha256-ihNFGlPhPLCIDvFnMqKA+flD/mv9wcKgQ1txO71xOp4="; + cargoHash = "sha256-j+sIxYPvkI1EnAN7LcBoS4m04rYdKlK48tGO0uFa7KU="; env = { CARGO_PROFILE_RELEASE_LTO = "fat"; From 036f79fe4608485a7cf636d3a368600117ab4ea0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 12:56:03 +0000 Subject: [PATCH 336/429] sirikali: 1.8.5 -> 1.8.6 --- pkgs/by-name/si/sirikali/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/sirikali/package.nix b/pkgs/by-name/si/sirikali/package.nix index e374f7ccdcb7..29f4d407479f 100644 --- a/pkgs/by-name/si/sirikali/package.nix +++ b/pkgs/by-name/si/sirikali/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sirikali"; - version = "1.8.5"; + version = "1.8.6"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = "sirikali"; rev = finalAttrs.version; - hash = "sha256-OaZrgX6zxp1ZP72xiBl0+h0nAQb1Z1eiqaSYdtxsDzQ="; + hash = "sha256-x3YCnIAPAJ5mOUboo+8Wg8ePyPYKoO++aSh3nSOj00I="; }; buildInputs = [ From ca33af68b2953f3a3633da2d1df2fb55982f5fd0 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Wed, 11 Feb 2026 14:37:50 +0100 Subject: [PATCH 337/429] stremio: drop stremio still depends on `qt5.qtwebengine`, which is vulnerable and unmaintained upstream since April 2025. --- pkgs/by-name/st/stremio/package.nix | 69 ----------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 69 deletions(-) delete mode 100644 pkgs/by-name/st/stremio/package.nix diff --git a/pkgs/by-name/st/stremio/package.nix b/pkgs/by-name/st/stremio/package.nix deleted file mode 100644 index 55b5ce50284c..000000000000 --- a/pkgs/by-name/st/stremio/package.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchurl, - libsForQt5, - ffmpeg, - mpv, - nodejs, -}: -stdenv.mkDerivation (finalAttrs: { - pname = "stremio-shell"; - version = "4.4.168"; - - src = fetchFromGitHub { - owner = "Stremio"; - repo = "stremio-shell"; - tag = "v${finalAttrs.version}"; - hash = "sha256-pz1mie0kJov06GcyitvZu5Gg0Vz3YnigjDqFujGKqZM="; - fetchSubmodules = true; - meta.license = lib.licenses.gpl3Only; - }; - - # check server-url.txt - server = fetchurl rec { - pname = "stremio-server"; - version = "4.20.8"; - url = "https://dl.strem.io/server/v${version}/desktop/server.js"; - hash = "sha256-cRMgD1d1yVj9FBvFAqgIqwDr+7U3maE8OrCsqExftHY="; - meta.license = lib.licenses.unfree; - }; - - buildInputs = [ - libsForQt5.qt5.qtwebengine - mpv - ]; - - nativeBuildInputs = [ - libsForQt5.qmake - libsForQt5.qt5.wrapQtAppsHook - ]; - - postInstall = '' - mkdir -p $out/{bin,share/applications} - ln -s $out/opt/stremio/stremio $out/bin/stremio - mv $out/opt/stremio/smartcode-stremio.desktop $out/share/applications - install -Dm 644 images/stremio_window.png $out/share/pixmaps/smartcode-stremio.png - ln -s ${nodejs}/bin/node $out/opt/stremio/node - ln -s $server $out/opt/stremio/server.js - wrapProgram $out/bin/stremio \ - --suffix PATH ":" ${lib.makeBinPath [ ffmpeg ]} - ''; - - meta = { - mainProgram = "stremio"; - description = "Modern media center that gives you the freedom to watch everything you want"; - homepage = "https://www.stremio.com/"; - # (Server-side) 4.x versions of the web UI are closed-source - license = with lib.licenses; [ - gpl3Only - # server.js is unfree - unfree - ]; - maintainers = with lib.maintainers; [ - griffi-gh - ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 01ed4ae0138a..55c10face816 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1846,6 +1846,7 @@ mapAliases { StormLib = throw "'StormLib' has been renamed to/replaced by 'stormlib'"; # Converted to throw 2025-10-27 strawberry-qt5 = throw "strawberry-qt5 has been replaced by strawberry"; # Converted to throw 2025-07-19 strawberry-qt6 = throw "strawberry-qt6 has been replaced by strawberry"; # Added 2025-07-19 + stremio = throw "'stremio' has been removed as it depended on the vulnerable and outdated qt5 webengine. On Linux, consider using 'stremio-linux-shell' instead."; # Added 2026-02-11 stringsWithDeps = warnAlias "'stringsWithDeps' has been removed from pkgs, use `lib.stringsWithDeps` instead" lib.stringsWithDeps; # Added 2025-10-30 subberthehut = throw "'subberthehut' has been removed as it was unmaintained upstream"; # Added 2025-05-17 sublime-music = throw "`sublime-music` has been removed because upstream has announced it is no longer maintained. Upstream suggests using `supersonic` instead."; # Added 2025-09-20 From ca42fa71214d9caaac59f1bb1f101264271a1f78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 13:05:01 +0000 Subject: [PATCH 338/429] iio-hyprland: 0-unstable-2025-10-06 -> 0-unstable-2026-02-26 --- pkgs/by-name/ii/iio-hyprland/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ii/iio-hyprland/package.nix b/pkgs/by-name/ii/iio-hyprland/package.nix index 95f364565ceb..d6fa7010aa22 100644 --- a/pkgs/by-name/ii/iio-hyprland/package.nix +++ b/pkgs/by-name/ii/iio-hyprland/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation { pname = "iio-hyprland"; - version = "0-unstable-2025-10-06"; + version = "0-unstable-2026-02-26"; src = fetchFromGitHub { owner = "JeanSchoeller"; repo = "iio-hyprland"; - rev = "801c4722ea678ddf103fc0ff4c3c0211d13ad046"; - hash = "sha256-asLtzpUbwr+Wq2uQvITORBnrxh/mIZneYyfhdsElTeI="; + rev = "1dec30019fbe8cd375b6050eb597a01328435d79"; + hash = "sha256-YTbCWQVmpshvtY//e6kPQtbn/Msbjx9NN0j0LQFzfNE="; }; buildInputs = [ dbus ]; From 3092d4aa48679cd9a16d8df523ef7d1a7d2e0d14 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 6 Mar 2026 15:21:31 +0200 Subject: [PATCH 339/429] rust-addr2line: 0.25.0 -> 0.26.0 --- pkgs/by-name/ru/rust-addr2line/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/rust-addr2line/package.nix b/pkgs/by-name/ru/rust-addr2line/package.nix index 7017045781a8..080efe047c50 100644 --- a/pkgs/by-name/ru/rust-addr2line/package.nix +++ b/pkgs/by-name/ru/rust-addr2line/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage rec { pname = "rust-addr2line"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "gimli-rs"; repo = "addr2line"; tag = version; - hash = "sha256-1kjFrDHfvGdU5FfSaLE+EFN83XjF0iSpydwsucjV7NQ="; + hash = "sha256-+GrX5/AgKlU0rNIKkt4XAQFab6G6F4DN4Qkol8Jd5DQ="; }; cargoBuildFlags = "--bin addr2line --features bin"; - cargoHash = "sha256-IJ+hZ36QL5Awq4vI+ajTTHwbRU4paG+bnB/TZU9bCCk="; + cargoHash = "sha256-aC69kyyMNwifIsjRPCgKxqguKtU7zSN8Mn9tChXykNo="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; From 2782f894a979f32fe1d815c59426e8354448d843 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 6 Mar 2026 15:25:12 +0200 Subject: [PATCH 340/429] rust-addr2line: add myself to maintainers --- pkgs/by-name/ru/rust-addr2line/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ru/rust-addr2line/package.nix b/pkgs/by-name/ru/rust-addr2line/package.nix index 080efe047c50..4b0d5dce9441 100644 --- a/pkgs/by-name/ru/rust-addr2line/package.nix +++ b/pkgs/by-name/ru/rust-addr2line/package.nix @@ -33,7 +33,10 @@ rustPlatform.buildRustPackage rec { mit asl20 ]; - maintainers = [ lib.maintainers.axka ]; + maintainers = [ + lib.maintainers.axka + lib.maintainers.flokli + ]; mainProgram = "addr2line"; }; } From e2c47506f954606e845f82cbeb74cbdcf6c856ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 13:54:48 +0000 Subject: [PATCH 341/429] checkov: 3.2.506 -> 3.2.507 --- pkgs/by-name/ch/checkov/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index 57dfe82d415b..660ce3d5f7a1 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -35,14 +35,14 @@ let in python3.pkgs.buildPythonApplication (finalAttrs: { pname = "checkov"; - version = "3.2.506"; + version = "3.2.507"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = finalAttrs.version; - hash = "sha256-E2WkVgFx7qAzmpaUOamYcBc5uAlvlnkc/NyhT569vgc="; + hash = "sha256-xXrJfK/4bA8pvb6zuYIeOKIncc3fh1EIhn6ymfio034="; }; pythonRelaxDeps = [ From b6ea0708f49b9e457175e39ed255995c65b5ca27 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 13:55:18 +0000 Subject: [PATCH 342/429] home-assistant-custom-lovelace-modules.mini-media-player: 1.16.10 -> 1.16.11 --- .../custom-lovelace-modules/mini-media-player/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/package.nix index 7420d5621ae1..5762e612c9fc 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "mini-media-player"; - version = "1.16.10"; + version = "1.16.11"; src = fetchFromGitHub { owner = "kalkih"; repo = "mini-media-player"; rev = "v${version}"; - hash = "sha256-nUZL+zYZoWjhs0Xc/3EeuwewryEl4/g3Dv70Q/85bQc="; + hash = "sha256-jbT+skF/WQmfPob6TZ7ff9mgnWvC9siE+WgFONXqGbw="; }; - npmDepsHash = "sha256-GkkrPeBADjabLiCPvehR6p4Z9LRNgSPInaESd2rLC6U="; + npmDepsHash = "sha256-crF/KesvY5GvH14n9KrND5O7sJxsSV2Nbcod2stesvg="; installPhase = '' runHook preInstall From 4c9f8a284847a41775ff283a8216a6072cfd1ca4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 13:59:26 +0000 Subject: [PATCH 343/429] golangci-lint: 2.10.1 -> 2.11.0 --- pkgs/by-name/go/golangci-lint/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix index 8a351907cc59..ed13b8133837 100644 --- a/pkgs/by-name/go/golangci-lint/package.nix +++ b/pkgs/by-name/go/golangci-lint/package.nix @@ -14,16 +14,16 @@ buildGo126Module (finalAttrs: { pname = "golangci-lint"; - version = "2.10.1"; + version = "2.11.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; tag = "v${finalAttrs.version}"; - hash = "sha256-rHttQ+QJ9JrFvgfoX68Y0lD6BUv/aoOpRRFvZ1BIGIs="; + hash = "sha256-Q8C5uEX+vXO9bBkCTROHGGUCKuiQzs2aBn2vjVEmWQk="; }; - vendorHash = "sha256-yREpROQJ300+mii7R2oiyDjOGcYXBpv3o/park0TJYE="; + vendorHash = "sha256-RTdHfQRg/MLt+VJ4mcbOui6L7T4c1kFT66ROnjs6nKU="; subPackages = [ "cmd/golangci-lint" ]; From 418289e250f532b31c673cf8d4463a70e4f18a56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Fri, 6 Mar 2026 08:53:40 -0500 Subject: [PATCH 344/429] trilium-desktop: manage electron version in update script --- pkgs/by-name/tr/trilium-desktop/update.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trilium-desktop/update.sh b/pkgs/by-name/tr/trilium-desktop/update.sh index eefaa8c308b2..13f217de8426 100755 --- a/pkgs/by-name/tr/trilium-desktop/update.sh +++ b/pkgs/by-name/tr/trilium-desktop/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p coreutils curl jq +#!nix-shell -i bash -p coreutils curl jq gnused set -euo pipefail cd $(dirname "${BASH_SOURCE[0]}") @@ -8,7 +8,11 @@ setKV () { sed -i "s|$2 = \".*\"|$2 = \"${3:-}\"|" $1 } -version=$(curl -s --show-error "https://api.github.com/repos/TriliumNext/Trilium/releases/latest" | jq -r '.tag_name' | tail -c +2) +curl_github() { + curl -s --show-error -L ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "$@" +} + +version=$(curl_github "https://api.github.com/repos/TriliumNext/Trilium/releases/latest" | jq -r '.tag_name' | tail -c +2) setKV ./package.nix version $version # Update desktop application @@ -20,6 +24,8 @@ setKV ./package.nix x86_64-linux.hash $sha256_linux64 setKV ./package.nix aarch64-linux.hash $sha256_linux64_arm setKV ./package.nix x86_64-darwin.hash $sha256_darwin64 setKV ./package.nix aarch64-darwin.hash $sha256_darwin64_arm +electronVersion=$(curl_github "https://raw.githubusercontent.com/TriliumNext/Trilium/v$version/apps/desktop/package.json" | jq -r ".devDependencies.electron" | sed -r 's|^\^?([0-9]+).*|\1|') +sed -r "s|(electron_)[0-9]+|\1$electronVersion|" -i ./package.nix # Update server sha256_linux64_server=$(nix store prefetch-file --json --hash-type sha256 https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-x64.tar.xz | jq -r .hash) From 8c48d2fbcfba1a2b19bd58ac080756a7b228db9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Mon, 2 Mar 2026 08:28:13 -0500 Subject: [PATCH 345/429] trilium: 0.101.3 -> 0.102.0 --- pkgs/by-name/tr/trilium-desktop/package.nix | 14 +++++++------- pkgs/by-name/tr/trilium-server/package.nix | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/tr/trilium-desktop/package.nix b/pkgs/by-name/tr/trilium-desktop/package.nix index a9354e903191..e846362e50e6 100644 --- a/pkgs/by-name/tr/trilium-desktop/package.nix +++ b/pkgs/by-name/tr/trilium-desktop/package.nix @@ -5,7 +5,7 @@ fetchurl, makeBinaryWrapper, # use specific electron since it has to load a compiled module - electron_39, + electron_40, autoPatchelfHook, makeDesktopItem, copyDesktopItems, @@ -15,7 +15,7 @@ let pname = "trilium-desktop"; - version = "0.101.3"; + version = "0.102.0"; triliumSource = os: arch: hash: { url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-${os}-${arch}.zip"; @@ -26,10 +26,10 @@ let darwinSource = triliumSource "macos"; # exposed like this for update.sh - x86_64-linux.hash = "sha256-+Q0RfWa9wl0SEb5hiT9q9+careuLgZh7Bgpi8HuUFyA="; - aarch64-linux.hash = "sha256-r8CJBBiSzgNpZ5K3FKwKR84xqm90pxgBEj1NVbRfQos="; - x86_64-darwin.hash = "sha256-oprNyKQs8sPPrm67SyTxvlgGuRKJ0OcVJ4OGAsOT6rQ="; - aarch64-darwin.hash = "sha256-1VXeU+a1tw4fhlZX0r88BkIo/wXBvWEFBzloBjVvouk="; + x86_64-linux.hash = "sha256-/M7Quq7tgnrp/x7845fA041snC4ybIxculA3IXah5zs="; + aarch64-linux.hash = "sha256-9ONccvxAhPrO3Sj1wSlb93G0zrtEiD4jD0vyr3W11X0="; + x86_64-darwin.hash = "sha256-yaxv5LynfCOdNMHjmV3uFDBzlxtSZCDOFnUV577z8N8="; + aarch64-darwin.hash = "sha256-Rr3da4R/7rT5ippGE38RWOGT+W0yXp5S43Mo1nFdzMw="; sources = { x86_64-linux = linuxSource "x64" x86_64-linux.hash; @@ -111,7 +111,7 @@ let asar pack $tmp/ $out/share/trilium/resources/app.asar rm -rf $tmp - makeWrapper ${lib.getExe electron_39} $out/bin/trilium \ + makeWrapper ${lib.getExe electron_40} $out/bin/trilium \ "''${gappsWrapperArgs[@]}" \ --set-default ELECTRON_IS_DEV 0 \ --add-flags $out/share/trilium/resources/app.asar diff --git a/pkgs/by-name/tr/trilium-server/package.nix b/pkgs/by-name/tr/trilium-server/package.nix index a7b116f604ed..2ea9e4847a1e 100644 --- a/pkgs/by-name/tr/trilium-server/package.nix +++ b/pkgs/by-name/tr/trilium-server/package.nix @@ -7,12 +7,12 @@ }: let - version = "0.101.3"; + version = "0.102.0"; serverSource_x64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-x64.tar.xz"; - serverSource_x64.hash = "sha256-WbEv3B1axs8UI7uj4JRW0hQKEfkKfiLxtQWbNgiYeos="; + serverSource_x64.hash = "sha256-EC4Ige8ox2+twzpsQcT0DDjZlP74zpHSk2IAK6txcJs="; serverSource_arm64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-arm64.tar.xz"; - serverSource_arm64.hash = "sha256-k1mtBqw6BGqe7/kwoMl8N01BShVRTxMxnTxkYkwGbCc="; + serverSource_arm64.hash = "sha256-uXFm5mzkYeupSTUnBgnyBa9oEP6px0ATINEN0imQbdw="; serverSource = if stdenv.hostPlatform.isx86_64 then From 2c837c087e4acb36d1c962d6b544316877b28d1e Mon Sep 17 00:00:00 2001 From: Kumpelinus Date: Mon, 15 Sep 2025 14:04:37 +0000 Subject: [PATCH 346/429] moribito: init at 0.2.6 Terminal LDAP explorer (MIT). CGO + xorg.libX11 on Linux for clipboard. --- pkgs/by-name/mo/moribito/package.nix | 39 ++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/mo/moribito/package.nix diff --git a/pkgs/by-name/mo/moribito/package.nix b/pkgs/by-name/mo/moribito/package.nix new file mode 100644 index 000000000000..57ef085d5b89 --- /dev/null +++ b/pkgs/by-name/mo/moribito/package.nix @@ -0,0 +1,39 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + libx11, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "moribito"; + version = "0.2.6"; + + src = fetchFromGitHub { + owner = "ericschmar"; + repo = "moribito"; + tag = "v${finalAttrs.version}"; + hash = "sha256-/p7RVsz9jjPTVkEjhDsSHQmYVOsvpbb1APLGQYVjgiU="; + }; + + vendorHash = "sha256-O5OmVP5aGlc8Bz2nVAAkhCdTuonB9yXGSz5FO3FxJ1I="; + + subPackages = [ "cmd/moribito" ]; + + # Clipboard support + env.CGO_ENABLED = 1; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libx11 ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Terminal LDAP explorer"; + homepage = "https://github.com/ericschmar/moribito"; + changelog = "https://github.com/ericschmar/moribito/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kumpelinus ]; + mainProgram = "moribito"; + }; +}) From a38dad75a92884a27500bda476103fe8faf5fe0e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 2 Mar 2026 17:50:55 +0100 Subject: [PATCH 347/429] =?UTF-8?q?ocamlPackages.conan:=200.0.6=20?= =?UTF-8?q?=E2=86=92=200.0.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/conan/default.nix | 11 +++++------ pkgs/development/ocaml-modules/conan/lwt.nix | 4 ++-- pkgs/development/ocaml-modules/conan/unix.nix | 8 ++------ 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/development/ocaml-modules/conan/default.nix b/pkgs/development/ocaml-modules/conan/default.nix index 17f6b11b875a..f9a1d16b6d2e 100644 --- a/pkgs/development/ocaml-modules/conan/default.nix +++ b/pkgs/development/ocaml-modules/conan/default.nix @@ -2,7 +2,6 @@ lib, fetchurl, buildDunePackage, - version ? "0.0.6", ptime, re, uutf, @@ -12,13 +11,13 @@ rresult, }: -buildDunePackage { +buildDunePackage (finalAttrs: { pname = "conan"; - inherit version; + version = "0.0.7"; src = fetchurl { - url = "https://github.com/mirage/conan/releases/download/v${version}/conan-${version}.tbz"; - hash = "sha256-shAle4gXFf+53L+IZ4yFWewq7yZ5WlMEr9WotLvxHhY="; + url = "https://github.com/mirage/conan/releases/download/v${finalAttrs.version}/conan-${finalAttrs.version}.tbz"; + hash = "sha256-4ZbyGLnPRImRQ8vO71i+jlEWYB/FJCSelY7uBuH4dBU="; }; propagatedBuildInputs = [ @@ -44,4 +43,4 @@ buildDunePackage { license = lib.licenses.bsd2; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/conan/lwt.nix b/pkgs/development/ocaml-modules/conan/lwt.nix index d93c9393d367..1f3f0dae8dbb 100644 --- a/pkgs/development/ocaml-modules/conan/lwt.nix +++ b/pkgs/development/ocaml-modules/conan/lwt.nix @@ -2,7 +2,7 @@ buildDunePackage, conan, lwt, - bigstringaf, + bstr, alcotest, crowbar, fmt, @@ -16,7 +16,7 @@ buildDunePackage { propagatedBuildInputs = [ conan lwt - bigstringaf + bstr ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/conan/unix.nix b/pkgs/development/ocaml-modules/conan/unix.nix index 5a5825bc69bf..3f9ae29a69c4 100644 --- a/pkgs/development/ocaml-modules/conan/unix.nix +++ b/pkgs/development/ocaml-modules/conan/unix.nix @@ -1,7 +1,7 @@ { buildDunePackage, - fetchpatch, conan, + cachet, alcotest, crowbar, fmt, @@ -12,12 +12,8 @@ buildDunePackage { pname = "conan-unix"; inherit (conan) version src meta; - patches = fetchpatch { - url = "https://github.com/mirage/conan/commit/16872a71be3ef2870d32df849e7abcbaec4fe95d.patch"; - hash = "sha256-/j9nNGOklzNrdIPW7SMNhKln9EMXiXmvPmNRpXc/l/Y="; - }; - propagatedBuildInputs = [ + cachet conan ]; From a22831e033022016bdc60ac4b426fa42349cf9be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 14:32:36 +0000 Subject: [PATCH 348/429] emmylua-doc-cli: 0.20.0 -> 0.21.0 --- pkgs/by-name/em/emmylua-doc-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/em/emmylua-doc-cli/package.nix b/pkgs/by-name/em/emmylua-doc-cli/package.nix index f41baf09ac01..58984bca11bd 100644 --- a/pkgs/by-name/em/emmylua-doc-cli/package.nix +++ b/pkgs/by-name/em/emmylua-doc-cli/package.nix @@ -6,18 +6,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "emmylua_doc_cli"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "EmmyLuaLs"; repo = "emmylua-analyzer-rust"; tag = finalAttrs.version; - hash = "sha256-aC7NrmzL6Ri7oB7jW+uSzbWTXfAUrk0zXH7t6ewukLU="; + hash = "sha256-2H/8ILVk5QnLe099a25pzMEqJLRFDxMG/fQ3f5UwgmI="; }; buildAndTestSubdir = "crates/emmylua_doc_cli"; - cargoHash = "sha256-znpZt/1ss3EcimFSADQi2/14z2etKbv78QQoT823U9Y="; + cargoHash = "sha256-QdL4KtQ4sJUaviqMzxmC1KW4Qy5wO7c5koy0Pl8Eua0="; nativeInstallCheckInputs = [ versionCheckHook From b8a264a88f4986a20d8231896e08ca5adc2acadd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 14:47:29 +0000 Subject: [PATCH 349/429] python3Packages.requests-ratelimiter: 0.9.0 -> 0.9.2 --- .../python-modules/requests-ratelimiter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/requests-ratelimiter/default.nix b/pkgs/development/python-modules/requests-ratelimiter/default.nix index cecee5a35e69..6cf4ac8e62a2 100644 --- a/pkgs/development/python-modules/requests-ratelimiter/default.nix +++ b/pkgs/development/python-modules/requests-ratelimiter/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "requests-ratelimiter"; - version = "0.9.0"; + version = "0.9.2"; pyproject = true; src = fetchFromGitHub { owner = "JWCook"; repo = "requests-ratelimiter"; tag = "v${version}"; - hash = "sha256-jmHXD3UJwzZSLXS7NXvCM/+lOFreSqb1QIl/jvO8lWc="; + hash = "sha256-6Uw6JPArOzKD7va6mthumCDW/G0Yn/C1d+1VflrJ/JY="; }; build-system = [ hatchling ]; From 9e30d4a5b8d1078e3f295165725bd01572fe5e17 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 14:47:43 +0000 Subject: [PATCH 350/429] vscode-extensions.dart-code.dart-code: 3.128.0 -> 3.130.1 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 708fd4dd2927..f23b7dc062fd 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1188,8 +1188,8 @@ let mktplcRef = { name = "dart-code"; publisher = "dart-code"; - version = "3.128.0"; - hash = "sha256-wOK+oQf/GovH9+0rHt67jTtiMPGdmaBxazr1JUnDTD0="; + version = "3.130.1"; + hash = "sha256-qBCE1ior+xNKSAVWGbPGKK6pul22DUZ/movaHx0s/8c="; }; meta.license = lib.licenses.mit; From 68e1d473d1d7986c798e6083c91aba6c9b7f4c97 Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Fri, 6 Mar 2026 15:48:30 +0100 Subject: [PATCH 351/429] claude-code: 2.1.66 -> 2.1.70 https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md --- pkgs/by-name/cl/claude-code/package-lock.json | 4 ++-- pkgs/by-name/cl/claude-code/package.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index 02085a604d4a..6d91db9fafba 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -1,12 +1,12 @@ { "name": "@anthropic-ai/claude-code", - "version": "2.1.66", + "version": "2.1.70", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@anthropic-ai/claude-code", - "version": "2.1.66", + "version": "2.1.70", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index b041ff8ae94c..6454a7d13c9b 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -15,14 +15,14 @@ }: buildNpmPackage (finalAttrs: { pname = "claude-code"; - version = "2.1.66"; + version = "2.1.70"; src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz"; - hash = "sha256-bZDWmtYUKL6Yrkuz70B4CgJLGn63W68G1MQa5ggivbg="; + hash = "sha256-mxZVgsaRGVd/3VNWJqVMfRyrDid0MOuzrGIcInQHIEk="; }; - npmDepsHash = "sha256-brrbatyYO2PH4EbduuEkknql4W0MQCMMKL1LvAQnx2s="; + npmDepsHash = "sha256-k+UORB4anWeBQIr+XbkKjsw792e/viz2Ous8rXKuYJI="; strictDeps = true; From 5f860520702c7610096a85519d5db92ba981f47f Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Fri, 6 Mar 2026 15:48:34 +0100 Subject: [PATCH 352/429] claude-code-bin: 2.1.66 -> 2.1.70 https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md --- pkgs/by-name/cl/claude-code-bin/manifest.json | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/cl/claude-code-bin/manifest.json b/pkgs/by-name/cl/claude-code-bin/manifest.json index e5839ab3974f..323170678792 100644 --- a/pkgs/by-name/cl/claude-code-bin/manifest.json +++ b/pkgs/by-name/cl/claude-code-bin/manifest.json @@ -1,46 +1,46 @@ { - "version": "2.1.66", - "buildDate": "2026-03-04T00:21:37Z", + "version": "2.1.70", + "buildDate": "2026-03-06T00:12:53Z", "platforms": { "darwin-arm64": { "binary": "claude", - "checksum": "7ada6848516636e229eca0b5061585741c02b46d6b285f121c11a58c4c4875b8", - "size": 193616080 + "checksum": "6181e50bc9a4185f36e543744d256b740e0dfa3c3fdcf1d04b78387b2b466781", + "size": 197364336 }, "darwin-x64": { "binary": "claude", - "checksum": "bf072c24f815f18246b7ce492c4b0a8a5ae2c0189c20aa950d602d6fd7a51126", - "size": 199683904 + "checksum": "338755dce5a5c99419f37be8dd424410c35fc476f7d8ccacd9ed7ef33b8473ae", + "size": 203440464 }, "linux-arm64": { "binary": "claude", - "checksum": "2fcbd25c344c56efe6a3db2c19f22575a88f24e3a129ad0f1fe59e9004094528", - "size": 234065035 + "checksum": "264c669ce4740bb4896b07ac0110190bcf618eddd4fb0068b3fe2ce989734682", + "size": 237790658 }, "linux-x64": { "binary": "claude", - "checksum": "23c277040f5e5125232f8689ed2698b7a09a0cd9b2863adb49220d25ea9deea4", - "size": 237111222 + "checksum": "1e5c1011ec899ef0ca9f0811c13c3ed44437422aed85af600d5fe50746faaf1d", + "size": 240875945 }, "linux-arm64-musl": { "binary": "claude", - "checksum": "2677f8a01d29b6857e41e09476701483f35e1bc25fa4cc8fe2490b864f01d9dd", - "size": 224600507 + "checksum": "3e77f661dc5f32b37fd29598b02063ff713c7b787f9abea55585e84f548daba0", + "size": 228326130 }, "linux-x64-musl": { "binary": "claude", - "checksum": "52e7006c66553aae1fd06985a1c9c8248530adc8769ada887d40a5643fc3bd8d", - "size": 227712806 + "checksum": "7f6b5dea1e6cb12129f948ea61471230b850a32c1d81105520669b06013a7834", + "size": 231473433 }, "win32-x64": { "binary": "claude.exe", - "checksum": "fadd391dfed8e8abadb3be8f41af792a26845e5a5fc6fc0daf72282beaa6517e", - "size": 243029664 + "checksum": "ca5b3b16da96bec672f6d90d211945f4d2bb04609c35eba8f5de9c3e33d15bbe", + "size": 246684832 }, "win32-arm64": { "binary": "claude.exe", - "checksum": "6629d9bbce902bc984ab1d240c77668e40895bf61c9ae65b3595d5d071c3d649", - "size": 234732704 + "checksum": "2436d88ec2b21289c0422d377e41eed920528d78af2b9cca983168fcdf1fee1b", + "size": 238326944 } } } From 535880b948abce5aba751ebed376d831146178cf Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Fri, 6 Mar 2026 15:48:38 +0100 Subject: [PATCH 353/429] vscode-extensions.anthropic.claude-code: 2.1.66 -> 2.1.70 https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md --- .../vscode/extensions/anthropic.claude-code/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix index 52d97578a580..2c990d88dcd0 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-code"; publisher = "anthropic"; - version = "2.1.66"; - hash = "sha256-+vn4qbv3SCsq8PPv3uBsDx+XfmpbfO3HYgA8f0V1FLU="; + version = "2.1.70"; + hash = "sha256-m9xKwS2g2jwekmoIZl3asrZq+xAZUtw/ThWXLdleWrM="; }; postInstall = '' From 97baa55d70cc0c03722f3e3470d908b8ce1eb048 Mon Sep 17 00:00:00 2001 From: winston Date: Sat, 28 Feb 2026 16:22:25 +0100 Subject: [PATCH 354/429] vice: 3.9 -> 3.10, adopt --- pkgs/by-name/vi/vice/package.nix | 44 ++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/vi/vice/package.nix b/pkgs/by-name/vi/vice/package.nix index ac958fb50f26..0c33d3c89667 100644 --- a/pkgs/by-name/vi/vice/package.nix +++ b/pkgs/by-name/vi/vice/package.nix @@ -18,52 +18,55 @@ SDL, SDL_image, dos2unix, - runtimeShell, xa, file, wrapGAppsHook3, xdg-utils, libevdev, pulseaudio, + desktop-file-utils, }: stdenv.mkDerivation (finalAttrs: { pname = "vice"; - version = "3.9"; + version = "3.10"; src = fetchurl { url = "mirror://sourceforge/vice-emu/vice-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-QCArY0VeJrh+zGPrWlIyLG+j9XyrEqzwwifPn02uw3A="; + sha256 = "sha256-jlusGMvLnxkjgK0++IH4eQ9bdcQdez2mXYMZhdhk1tE="; }; + strictDeps = true; + nativeBuildInputs = [ bison + desktop-file-utils dos2unix file flex + perl pkg-config wrapGAppsHook3 + xa + xdg-utils ]; buildInputs = [ alsa-lib curl giflib - gtk3 glew + gtk3 + libevdev libGL libGLU libpng - perl + pulseaudio readline SDL SDL_image - xa - xdg-utils - libevdev - pulseaudio ]; - dontDisableStatic = true; + configureFlags = [ "--enable-sdl2ui" "--enable-gtk3ui" @@ -74,19 +77,32 @@ stdenv.mkDerivation (finalAttrs: { env.LIBS = "-lGL"; - preBuild = '' - sed -i -e 's|#!/usr/bin/env bash|${runtimeShell}/bin/bash|' src/arch/gtk3/novte/box_drawing_generate.sh + preConfigure = '' + patchShebangs . + ''; + + enableParallelBuilding = true; + + preInstall = '' + # env var for `desktop-file-install` + export DESKTOP_FILE_INSTALL_DIR=$out/share/applications + mkdir -p $DESKTOP_FILE_INSTALL_DIR ''; postInstall = '' - mkdir -p $out/share/applications - cp src/arch/gtk3/data/unix/vice-org-*.desktop $out/share/applications + for binary in vsid x128 x64 x64dtv xcbm2 xpet xplus4 xscpu64 xvic; do + for size in 16 24 32 48 64 256; do + install -D data/common/vice-''${binary}_''${size}.png $out/share/icons/hicolor/''${size}x''${size}/apps/vice-''${binary}.png + done + install -D data/common/vice-''${binary}_1024.svg $out/share/icons/hicolor/scalable/apps/vice-''${binary}.svg + done ''; meta = { description = "Emulators for a variety of 8-bit Commodore computers"; homepage = "https://vice-emu.sourceforge.io/"; license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.nekowinston ]; platforms = lib.platforms.linux; }; }) From 7a00ece2433087f015d03d6a36980ccf47dc4d2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 15:06:20 +0000 Subject: [PATCH 355/429] skim: 3.5.0 -> 3.6.2 --- pkgs/by-name/sk/skim/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix index 690a0e99ba3e..232281ce6660 100644 --- a/pkgs/by-name/sk/skim/package.nix +++ b/pkgs/by-name/sk/skim/package.nix @@ -12,7 +12,7 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "skim"; - version = "3.5.0"; + version = "3.6.2"; outputs = [ "out" @@ -24,14 +24,14 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "skim-rs"; repo = "skim"; tag = "v${finalAttrs.version}"; - hash = "sha256-Jm0mrxhjjggnfgp0mnau/LI0HwA8A9NkLIwm/ongI/s="; + hash = "sha256-f3WCOED4glzi3m7TVRgFZe51180yPPOIXlO+g5STxi0="; }; postPatch = '' sed -i -e "s|expand(':h:h')|'$out'|" plugin/skim.vim ''; - cargoHash = "sha256-AU7Mkyjq3I6RmVlYz6A/AEgEyL0q1LwmagYT9v3j60U="; + cargoHash = "sha256-2X89zUXfsy3z5fddD+9QQmJ+dsg4BShByHFsjFWOKwA="; nativeBuildInputs = [ installShellFiles ]; nativeCheckInputs = [ From 0ca3b22d314c2ccb6b325baf5534a66ad854dbea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 15:25:02 +0000 Subject: [PATCH 356/429] snx-rs: 5.1.0 -> 5.2.2 --- pkgs/by-name/sn/snx-rs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix index 61974e2758e8..3ba274d94136 100644 --- a/pkgs/by-name/sn/snx-rs/package.nix +++ b/pkgs/by-name/sn/snx-rs/package.nix @@ -15,13 +15,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "snx-rs"; - version = "5.1.0"; + version = "5.2.2"; src = fetchFromGitHub { owner = "ancwrd1"; repo = "snx-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-whmZM6OYdHtcTJzzR4aqDMBVpFuRvJKLFVGCQNDjRw8="; + hash = "sha256-MGgvpFpcAkwZlFXkz5oEYarU1/9qBuUGGvFqaGi/teU="; }; passthru.updateScript = nix-update-script { }; @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; - cargoHash = "sha256-gAOxwmsPo0XpFxNe3EObNlgiTJ0krMAlVaTDorrYUqg="; + cargoHash = "sha256-0tfNqRM6AwBokZ4rHhQmtAYggslEMqTKJitJ9qbid4Y="; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/snx-rs"; From 9f6bce3ccc57a71c504462b097b429d734b95803 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Mar 2026 16:26:03 +0100 Subject: [PATCH 357/429] python3Packages.requests-ratelimiter: migrate to finalAttrs --- .../python-modules/requests-ratelimiter/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/requests-ratelimiter/default.nix b/pkgs/development/python-modules/requests-ratelimiter/default.nix index 6cf4ac8e62a2..51936c926f3e 100644 --- a/pkgs/development/python-modules/requests-ratelimiter/default.nix +++ b/pkgs/development/python-modules/requests-ratelimiter/default.nix @@ -10,7 +10,7 @@ requests-cache, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "requests-ratelimiter"; version = "0.9.2"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "JWCook"; repo = "requests-ratelimiter"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6Uw6JPArOzKD7va6mthumCDW/G0Yn/C1d+1VflrJ/JY="; }; @@ -42,8 +42,8 @@ buildPythonPackage rec { broken = lib.versionOlder pyrate-limiter.version "4"; description = "Module for rate-limiting for requests"; homepage = "https://github.com/JWCook/requests-ratelimiter"; - changelog = "https://github.com/JWCook/requests-ratelimiter/blob/${src.tag}/HISTORY.md"; + changelog = "https://github.com/JWCook/requests-ratelimiter/blob/${finalAttrs.src.tag}/HISTORY.md"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) From 956b038dd173b111ec51b45becf16f6500c5eff2 Mon Sep 17 00:00:00 2001 From: Nick Blumenauer Date: Fri, 6 Mar 2026 16:37:17 +0100 Subject: [PATCH 358/429] gurk-rs: 0.8.1 -> 0.9.0 --- pkgs/by-name/gu/gurk-rs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gu/gurk-rs/package.nix b/pkgs/by-name/gu/gurk-rs/package.nix index 4a9318e21a8b..d3f2008b8892 100644 --- a/pkgs/by-name/gu/gurk-rs/package.nix +++ b/pkgs/by-name/gu/gurk-rs/package.nix @@ -14,20 +14,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gurk-rs"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "boxdot"; repo = "gurk-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-HBqKcKPsNJQhLGGQ4X+xGPWwSABiaqubn11yyqiL0xU="; + hash = "sha256-w9s7iZ1QPrNleVjAu7Z0ElIRJZWV8l6uCbOZsB7FL4M="; }; postPatch = '' rm .cargo/config.toml ''; - cargoHash = "sha256-oasGeNlY3c0iSxgLqPCo081g7d0fA3I+LyDJdRSiNaE="; + cargoHash = "sha256-PWeIfo5IepPr6Ug0sdXE6aFguNkBuM0/v8HkAeq8hQI="; nativeBuildInputs = [ protobuf From 9acd689bde55d34fb339c02bade35493f34856e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 15:46:49 +0000 Subject: [PATCH 359/429] python3Packages.aiomqtt: 2.5.0 -> 2.5.1 --- pkgs/development/python-modules/aiomqtt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiomqtt/default.nix b/pkgs/development/python-modules/aiomqtt/default.nix index 65fe2f03031a..efd11cf90476 100644 --- a/pkgs/development/python-modules/aiomqtt/default.nix +++ b/pkgs/development/python-modules/aiomqtt/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "aiomqtt"; - version = "2.5.0"; + version = "2.5.1"; pyproject = true; src = fetchFromGitHub { owner = "sbtinstruments"; repo = "aiomqtt"; tag = "v${version}"; - hash = "sha256-S18jHHM1r077du/EO3WvCwLaYF70tIGdHatFxuTPhBs="; + hash = "sha256-f9m+mdlSADOixsKymxsKiVxgWF7JBc3kjVU+rOkC+yM="; }; build-system = [ hatchling ]; From a5866ee666f1a21c466a9d41ca25784e9d8e0dd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 6 Mar 2026 17:10:01 +0100 Subject: [PATCH 360/429] ijq: 1.2.0 -> 1.3.0 Diff: https://codeberg.org/gpanders/ijq/compare/v1.2.0...v1.3.0 --- pkgs/by-name/ij/ijq/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ij/ijq/package.nix b/pkgs/by-name/ij/ijq/package.nix index 92397d063ba4..3e980514f433 100644 --- a/pkgs/by-name/ij/ijq/package.nix +++ b/pkgs/by-name/ij/ijq/package.nix @@ -1,5 +1,5 @@ { - buildGoModule, + buildGo126Module, fetchFromCodeberg, lib, jq, @@ -9,18 +9,18 @@ nix-update-script, }: -buildGoModule (finalAttrs: { +buildGo126Module (finalAttrs: { pname = "ijq"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromCodeberg { owner = "gpanders"; repo = "ijq"; rev = "v${finalAttrs.version}"; - hash = "sha256-PT7WnCZL4Cfo/+VW3ImOloDOI9d0GX4UTcC8Bf3OVAU="; + hash = "sha256-U4UKhWI/xd7+rLa350oIFlCqbiMSZe3ztPFR0uierOo="; }; - vendorHash = "sha256-1R3rv3FraT53dqGECRr+ulhplmmByqRW+VJ+y6nFR+Y="; + vendorHash = "sha256-aU/0CIbI49OwgY6ioT50uPxld/rHAve3+KoILgPpWSQ="; nativeBuildInputs = [ installShellFiles From 4f0dd0a7730a61c49d0c8196c562c9e45c97e60c Mon Sep 17 00:00:00 2001 From: Pascal Dietrich Date: Fri, 6 Mar 2026 17:15:59 +0100 Subject: [PATCH 361/429] andcli: 2.5.0 -> 2.6.0 --- pkgs/by-name/an/andcli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/andcli/package.nix b/pkgs/by-name/an/andcli/package.nix index c570c30b37d8..5ff60790ce76 100644 --- a/pkgs/by-name/an/andcli/package.nix +++ b/pkgs/by-name/an/andcli/package.nix @@ -8,7 +8,7 @@ buildGoModule (finalAttrs: { pname = "andcli"; - version = "2.5.0"; + version = "2.6.0"; subPackages = [ "cmd/andcli" ]; @@ -16,10 +16,10 @@ buildGoModule (finalAttrs: { owner = "tjblackheart"; repo = "andcli"; tag = "v${finalAttrs.version}"; - hash = "sha256-TrcLw5pUMzyXUuMyQljVXbprS2voqvmVk6Ktj6Zi7Xk="; + hash = "sha256-iJSeUMELbyuL8h/8dfWVA5jDW3XpXG6y1mCkWRF1Kpo="; }; - vendorHash = "sha256-jtyxzmDGm/JHTJAkCHfSfECNB5XkwEyTBWnMCbCOAvE="; + vendorHash = "sha256-ZfU8Sf9M2dz9aIhwiK58zGIrcpmaw8wMAdcpxxvkUsQ="; ldflags = [ "-s" From 85f4cce4fc05d86665ab5b9a30443b30a0c23b81 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 16:42:47 +0000 Subject: [PATCH 362/429] grafanaPlugins.grafana-metricsdrilldown-app: 1.0.32 -> 1.0.33 --- .../grafana/plugins/grafana-metricsdrilldown-app/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix index 7f29e1283054..bf891cfbe8e2 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "grafana-metricsdrilldown-app"; - version = "1.0.32"; - zipHash = "sha256-fBzvEEMVSC9jPuYUREousvfUVeTJUMq4XCmrK10L19A="; + version = "1.0.33"; + zipHash = "sha256-zQ9XwF4gUlsR5bGZVzQq/cXCLwrQ3xfYQK2jOZyrWH4="; meta = { description = "Queryless experience for browsing Prometheus-compatible metrics. Quickly find related metrics without writing PromQL queries"; license = lib.licenses.agpl3Only; From 2e845a3fddab42caabe42a09490316737e6f6ad9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 16:53:14 +0000 Subject: [PATCH 363/429] versatiles: 3.7.0 -> 3.8.0 --- pkgs/by-name/ve/versatiles/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ve/versatiles/package.nix b/pkgs/by-name/ve/versatiles/package.nix index 671f04710fd1..7e331efd225c 100644 --- a/pkgs/by-name/ve/versatiles/package.nix +++ b/pkgs/by-name/ve/versatiles/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "versatiles"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "versatiles-org"; repo = "versatiles-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-EskBVrMBn0km6oWSbgluG+4hdTek4MWDbEoEYdVj6/o="; + hash = "sha256-+NMS4sHT47E8SuFcCHnUDBBpsA+6X4zLXvzVWc7yWGI="; }; - cargoHash = "sha256-dStQIMT8+lszEmh8r/mBHgpK5kLeLWlFpkUX9Vqsn2g="; + cargoHash = "sha256-jzbaQw+Ez2PiLAYxqadvdWEGvsMlSkjECk0k3zPUni8="; __darwinAllowLocalNetworking = true; From 0cc9d39183d172abba25fce1326a45c5f73bb811 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 16:57:13 +0000 Subject: [PATCH 364/429] python3Packages.types-aiobotocore: 3.2.0 -> 3.2.1 --- pkgs/development/python-modules/types-aiobotocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix index 70f2d1ae67d7..887e1a5a602d 100644 --- a/pkgs/development/python-modules/types-aiobotocore/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore/default.nix @@ -371,13 +371,13 @@ buildPythonPackage (finalAttrs: { pname = "types-aiobotocore"; - version = "3.2.0"; + version = "3.2.1"; pyproject = true; src = fetchPypi { pname = "types_aiobotocore"; inherit (finalAttrs) version; - hash = "sha256-eRmenLVkNS3J75h/ob/3U6N1f9wcxUOatCHm217pDqY="; + hash = "sha256-jG7VRc+KHO0zveKRKXW2Bq0MojsZYN22vPyeS/fd5ic="; }; build-system = [ setuptools ]; From 9aa9290e5ee5e59a2a245df085cc73cd3c619bd3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 17:08:25 +0000 Subject: [PATCH 365/429] vscode-extensions.tuttieee.emacs-mcx: 0.107.2 -> 0.107.5 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 708fd4dd2927..ba388e710e04 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4770,8 +4770,8 @@ let mktplcRef = { name = "emacs-mcx"; publisher = "tuttieee"; - version = "0.107.2"; - hash = "sha256-Id8pKACGLtRXas1Tb2dZrw+ZrZvAQLbWcI3Q1gYpXos="; + version = "0.107.5"; + hash = "sha256-8rsj1a/Tj4QpvGN83F3aMHNQVC/9TE61AFS5KhiIpy8="; }; meta = { changelog = "https://github.com/whitphx/vscode-emacs-mcx/blob/main/CHANGELOG.md"; From 5be987cef06793505426e3e6fbdc6a278259d618 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Jan 2026 12:29:33 +0000 Subject: [PATCH 366/429] libcacard: 2.8.1 -> 2.8.2 --- pkgs/by-name/li/libcacard/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libcacard/package.nix b/pkgs/by-name/li/libcacard/package.nix index fd58f9587186..e2dbe37f7620 100644 --- a/pkgs/by-name/li/libcacard/package.nix +++ b/pkgs/by-name/li/libcacard/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libcacard"; - version = "2.8.1"; + version = "2.8.2"; src = fetchurl { url = "https://www.spice-space.org/download/libcacard/libcacard-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-+79N6Mt9tb3/XstnL/Db5pOfufNEuQDVG6YpUymjMuc="; + sha256 = "sha256-Rfwopv88ejWdREgTLKGQ8KnHYFQMRF26RZeltx3kD2g="; }; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' From 39c467c01f59fb791d78552e0a40a72f142f90ca Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Mar 2026 18:46:04 +0100 Subject: [PATCH 367/429] python3Packages.mypy-boto3-connect: 1.42.59 -> 1.42.61 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 4121ae922906..41706def2c92 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -335,8 +335,8 @@ in "sha256-HQUL0R1NWP6DXQ26iS9k6lIAVdwK899fwLGH4/Z4U8Q="; mypy-boto3-connect = - buildMypyBoto3Package "connect" "1.42.59" - "sha256-Emsl+UKfvHGf0KKvTdTIZ5gw+NJMEom5zz+AfcJZWD8="; + buildMypyBoto3Package "connect" "1.42.61" + "sha256-8e1DNRsPNsPAMWYA2wlDGyLySvX7ow5QkZu/i0F4FJk="; mypy-boto3-connect-contact-lens = buildMypyBoto3Package "connect-contact-lens" "1.42.3" From f65d05c2d42a58cdf783cdc0d93483bc33f7a77a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Mar 2026 18:46:12 +0100 Subject: [PATCH 368/429] python3Packages.mypy-boto3-ec2: 1.42.58 -> 1.42.62 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 41706def2c92..92db8891e7f5 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -443,8 +443,8 @@ in "sha256-92qhSUqTiLgbtvCdi/Mmgve18mcYR00ABL+bNy7/OnY="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.42.58" - "sha256-6UyKkBJa2ZnDaWK7u3KFrDX5hntWPlR7+L6LqZbmA7I="; + buildMypyBoto3Package "ec2" "1.42.62" + "sha256-WvlACL91YcF9F3JJhG96wSfCKCgMbv1XI3xLqATrqiQ="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.42.3" From 206c8d8ce070ba9389096cd50dd9d4a685c575a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Mar 2026 18:46:16 +0100 Subject: [PATCH 369/429] python3Packages.mypy-boto3-elasticbeanstalk: 1.42.3 -> 1.42.61 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 92db8891e7f5..dba3e5d64907 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -479,8 +479,8 @@ in "sha256-4+ujCgzi4N92QEhsBbE8RSsKA1JAu4oJtlAlQ4uwXcU="; mypy-boto3-elasticbeanstalk = - buildMypyBoto3Package "elasticbeanstalk" "1.42.3" - "sha256-bdkMl7lZNe9af/V77qmSRP9vUFq8emG/i6lfb5c/bkk="; + buildMypyBoto3Package "elasticbeanstalk" "1.42.61" + "sha256-bhwGh02NXqxOs+Pm1PtJUPZrZPM7MC9KsW0sBnx434g="; mypy-boto3-elastictranscoder = buildMypyBoto3Package "elastictranscoder" "1.42.3" From 12cafc709140c3dc075e7adf61145ce40fb45321 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Mar 2026 18:46:19 +0100 Subject: [PATCH 370/429] python3Packages.mypy-boto3-es: 1.42.56 -> 1.42.61 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index dba3e5d64907..1ae83d953348 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -511,8 +511,8 @@ in "sha256-DyAxO4HPA98ON9Q2Sp5HF1lQNp8yecGiEaV12m0E7zM="; mypy-boto3-es = - buildMypyBoto3Package "es" "1.42.56" - "sha256-52bnvdPDRbC/di9xSwDaoOqyNQIPXjqooUXVbypevaw="; + buildMypyBoto3Package "es" "1.42.61" + "sha256-bA+O4kGsDPQC+dn5+izZCKnI0mN7k5wBBC5Bs6ZGhRo="; mypy-boto3-events = buildMypyBoto3Package "events" "1.42.3" From 8522627264085a2a2c565518d62a2ab6e263aad3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Mar 2026 18:46:23 +0100 Subject: [PATCH 371/429] python3Packages.mypy-boto3-gamelift: 1.42.38 -> 1.42.61 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 1ae83d953348..fdb6492fa6f0 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -559,8 +559,8 @@ in "sha256-NqNGcL3HfJgx2ScPLKMNNwpVS3bO4Cu7JpYlenSJwJg="; mypy-boto3-gamelift = - buildMypyBoto3Package "gamelift" "1.42.38" - "sha256-z9RuMA2e/L1mGm59JhrIM+tDCQqQ7pRm2L5luhQSdoM="; + buildMypyBoto3Package "gamelift" "1.42.61" + "sha256-4xETNlpx9vi3WzW1f8F6E1KLioIpS99L1J873cRwsuc="; mypy-boto3-glacier = buildMypyBoto3Package "glacier" "1.42.30" From 721d6be3969107730af315e306ba1b80b2781461 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Mar 2026 18:46:26 +0100 Subject: [PATCH 372/429] python3Packages.mypy-boto3-guardduty: 1.42.33 -> 1.42.62 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index fdb6492fa6f0..8f5d548388b5 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -590,8 +590,8 @@ in "sha256-UIxD9R+oQjVmR90OfD8Dp7GW3E73zny6LFTkxrSdmNU="; mypy-boto3-guardduty = - buildMypyBoto3Package "guardduty" "1.42.33" - "sha256-Xo4t/M+9Kly33WHxtXSgww0cbNyF59k4LBeyyFSbSMw="; + buildMypyBoto3Package "guardduty" "1.42.62" + "sha256-0L/ftXNBYly8b13Z1OGkdqAQWkSoaKzW4sYZE+oTXJE="; mypy-boto3-health = buildMypyBoto3Package "health" "1.42.59" From 0b55ef66d27c157e36b6a197f37409c5de5b2520 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Mar 2026 18:46:52 +0100 Subject: [PATCH 373/429] python3Packages.mypy-boto3-opensearch: 1.42.56 -> 1.42.61 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 8f5d548388b5..07e7255b0f54 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -966,8 +966,8 @@ in "sha256-o2X4h4K/Cf/TnZG3P5uDjdVmYJRcwPlv6DnSwdzOgc0="; mypy-boto3-opensearch = - buildMypyBoto3Package "opensearch" "1.42.56" - "sha256-yGLOtl1C0Y4F/Q1yDUEx0nR5VcqFFpdt80Eix/DZ5ts="; + buildMypyBoto3Package "opensearch" "1.42.61" + "sha256-Nyx0ukN2bJZ78a6QdtqO42oJah9eADn0xkhSGSt+Qsk="; mypy-boto3-opensearchserverless = buildMypyBoto3Package "opensearchserverless" "1.42.29" From 38381975ed7022a08f67930de77ce5338cdb12f2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Mar 2026 18:46:59 +0100 Subject: [PATCH 374/429] python3Packages.mypy-boto3-quicksight: 1.42.55 -> 1.42.61 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 07e7255b0f54..e817909cce19 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1070,8 +1070,8 @@ in "sha256-YrrEKl3aGz//5Z5JGapHhWtk6hBXQ4cuRQmLqGYztzg="; mypy-boto3-quicksight = - buildMypyBoto3Package "quicksight" "1.42.55" - "sha256-N+w9coq6u6F/B69obbL/N/xL/qsEuSJJVd5WYrnD48Q="; + buildMypyBoto3Package "quicksight" "1.42.61" + "sha256-3ZA5BRq6lgqNM8tt02E7fXSrwf0gfF4JE6lfaw6cYWo="; mypy-boto3-ram = buildMypyBoto3Package "ram" "1.42.59" From fe05593e4c05fcd22f65802c84242032540edacf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Mar 2026 18:47:06 +0100 Subject: [PATCH 375/429] python3Packages.mypy-boto3-sagemaker: 1.42.60 -> 1.42.62 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index e817909cce19..9a5a902476be 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1170,8 +1170,8 @@ in "sha256-juVfwdjPDNPaT5tvyXpzDtomugqxeu++AERLkVtFIxw="; mypy-boto3-sagemaker = - buildMypyBoto3Package "sagemaker" "1.42.60" - "sha256-YSUncXOtyOaOCp46gXsLD8MyOm01fVjqlVZBDNthE94="; + buildMypyBoto3Package "sagemaker" "1.42.62" + "sha256-8wdpOmtLYDYQG8Ac5RA62tuEqCpNDbCzaODy1TaGSVg="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.42.3" From 4791ddfcaacf5928b28231803e62596628992d9b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Mar 2026 18:47:09 +0100 Subject: [PATCH 376/429] python3Packages.mypy-boto3-savingsplans: 1.42.3 -> 1.42.62 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 9a5a902476be..5396dfda52a3 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1198,8 +1198,8 @@ in "sha256-Y3kJS5tHq/aBkvWs3PJCuI0AcfYa8aa2hogo+CC9uPE="; mypy-boto3-savingsplans = - buildMypyBoto3Package "savingsplans" "1.42.3" - "sha256-91gIxXdxKevS9es3dQamxTCBjI3B3lJMHQUZrkrfXxQ="; + buildMypyBoto3Package "savingsplans" "1.42.62" + "sha256-ah5aNvlMpjEz/nec9LBb8eb/WVUT8hw12sQzTA/Wu0s="; mypy-boto3-scheduler = buildMypyBoto3Package "scheduler" "1.42.3" From c1a49f62c63c496e2876cba73a11001cc16211fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Mar 2026 18:47:44 +0100 Subject: [PATCH 377/429] python314Packages.boto3-stubs: 1.42.60 -> 1.42.62 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index d10ee5394815..7dd560d8bfeb 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -358,13 +358,13 @@ buildPythonPackage (finalAttrs: { pname = "boto3-stubs"; - version = "1.42.60"; + version = "1.42.62"; pyproject = true; src = fetchPypi { pname = "boto3_stubs"; inherit (finalAttrs) version; - hash = "sha256-a20mFPRNBCJ11QcLsNWQAbtmWt41OqSarbNJ94B38Ig="; + hash = "sha256-We6ip2ivdKj9li8KLDn5s6qJdTKkmiW6dHrz5Lrl+FM="; }; build-system = [ setuptools ]; From ec975ecd4f93c22be62423499e5fdb1bb570ae06 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Mar 2026 18:51:19 +0100 Subject: [PATCH 378/429] vunnel: 0.55.1 -> 0.55.2 Diff: https://github.com/anchore/vunnel/compare/v0.55.1...v0.55.2 Changelog: https://github.com/anchore/vunnel/releases/tag/v0.55.2 --- pkgs/by-name/vu/vunnel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix index 4d1fea61386c..a4e0054df158 100644 --- a/pkgs/by-name/vu/vunnel/package.nix +++ b/pkgs/by-name/vu/vunnel/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "vunnel"; - version = "0.55.1"; + version = "0.55.2"; pyproject = true; src = fetchFromGitHub { owner = "anchore"; repo = "vunnel"; tag = "v${finalAttrs.version}"; - hash = "sha256-D3f+r+FGcdetE8kwSddVRE9qQ+LiwUHaJaUqUS086cs="; + hash = "sha256-8+TVIvWqNRGWghJlY+eoE/T6frdI6IzyYhqPrOi1xlk="; leaveDotGit = true; }; From fb5fc29862bd650f1312a51b238a82f3ea15b722 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Mar 2026 06:04:59 +0000 Subject: [PATCH 379/429] vim: 9.1.2148 -> 9.2.0106 --- pkgs/applications/editors/vim/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index f5f18a30568e..afce0284b722 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: rec { - version = "9.1.2148"; + version = "9.2.0106"; outputs = [ "out" @@ -11,7 +11,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-4ZEbfpffPp6kqSQRp7NFioWGRdG+JsVf7unU0Hqn/Xk="; + hash = "sha256-byOf2Gr1vA7xQw3YHV454te1QrVxRy3sXrLdFUp2XRg="; }; enableParallelBuilding = true; From bc2f82533ba98fd63c5a9fbba96f26e2b58693dd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Mar 2026 19:00:11 +0100 Subject: [PATCH 380/429] python3Packages.aiohomeconnect: 0.28.0 -> 0.30.0 Diff: https://github.com/MartinHjelmare/aiohomeconnect/compare/v0.28.0...v0.30.0 Changelog: https://github.com/MartinHjelmare/aiohomeconnect/blob/v0.30.0/CHANGELOG.md --- pkgs/development/python-modules/aiohomeconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohomeconnect/default.nix b/pkgs/development/python-modules/aiohomeconnect/default.nix index 3456f2baa958..646f6dadc37b 100644 --- a/pkgs/development/python-modules/aiohomeconnect/default.nix +++ b/pkgs/development/python-modules/aiohomeconnect/default.nix @@ -18,14 +18,14 @@ buildPythonPackage (finalAttrs: { pname = "aiohomeconnect"; - version = "0.28.0"; + version = "0.30.0"; pyproject = true; src = fetchFromGitHub { owner = "MartinHjelmare"; repo = "aiohomeconnect"; tag = "v${finalAttrs.version}"; - hash = "sha256-0Vqzm06wiUj2nbq1ALxJm8BUiqtnaaxmxCE9v3PvZP0="; + hash = "sha256-GzVfSNHvJ5qJTnn4GtetIirLT3LApZN0QB5eg/DPyGg="; }; build-system = [ setuptools ]; From aa58b6c4d1e96b3e6fc08cd5643719131f7d9367 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Mar 2026 19:01:46 +0100 Subject: [PATCH 381/429] python3Packages.aioslimproto: 3.1.5 -> 3.1.7 Diff: https://github.com/home-assistant-libs/aioslimproto/compare/3.1.5...3.1.7 Changelog: https://github.com/home-assistant-libs/aioslimproto/releases/tag/3.1.7 --- pkgs/development/python-modules/aioslimproto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioslimproto/default.nix b/pkgs/development/python-modules/aioslimproto/default.nix index 3c8efb5eae08..4fa007c82f14 100644 --- a/pkgs/development/python-modules/aioslimproto/default.nix +++ b/pkgs/development/python-modules/aioslimproto/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "aioslimproto"; - version = "3.1.5"; + version = "3.1.7"; pyproject = true; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "aioslimproto"; tag = version; - hash = "sha256-A5BAMEtyyDoQzl+eRt4XMo1vOyyNZ2D+YLQ64xHfYkk="; + hash = "sha256-mbzc3Td9XkxDrtPeIbrZdxn8YLV6yjQ+KXgaRC1GdFc="; }; postPatch = '' From 968685449ba7a0f979abc6685e083724c510253f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Mar 2026 19:02:32 +0100 Subject: [PATCH 382/429] python3Packages.aioswitcher: 6.1.0 -> 6.1.1 Diff: https://github.com/TomerFi/aioswitcher/compare/6.1.0...6.1.1 Changelog: https://github.com/TomerFi/aioswitcher/releases/tag/6.1.1 --- pkgs/development/python-modules/aioswitcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index 59a98f431c0c..732d20dbfa25 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -18,14 +18,14 @@ buildPythonPackage (finalAttrs: { pname = "aioswitcher"; - version = "6.1.0"; + version = "6.1.1"; pyproject = true; src = fetchFromGitHub { owner = "TomerFi"; repo = "aioswitcher"; tag = finalAttrs.version; - hash = "sha256-SCJV2r6VB1Y1ceywHkoYDsO+PRnjualGdetnQrlBKDI="; + hash = "sha256-7jwrZqPRB9PLiDM3jN7VALiNtxPeTO4UQkb4LvU0BtE="; }; __darwinAllowLocalNetworking = true; From 436d498417fb57f797c1d79c298f75dd355cb1b5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Mar 2026 19:03:20 +0100 Subject: [PATCH 383/429] python3Packages.aiovodafone: 3.1.2 -> 3.1.3 Diff: https://github.com/chemelli74/aiovodafone/compare/v3.1.2...v3.1.3 Changelog: https://github.com/chemelli74/aiovodafone/blob/v3.1.3/CHANGELOG.md --- pkgs/development/python-modules/aiovodafone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiovodafone/default.nix b/pkgs/development/python-modules/aiovodafone/default.nix index ebe52010926d..bfa99bbc2a50 100644 --- a/pkgs/development/python-modules/aiovodafone/default.nix +++ b/pkgs/development/python-modules/aiovodafone/default.nix @@ -16,14 +16,14 @@ buildPythonPackage (finalAttrs: { pname = "aiovodafone"; - version = "3.1.2"; + version = "3.1.3"; pyproject = true; src = fetchFromGitHub { owner = "chemelli74"; repo = "aiovodafone"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ip3bvK8p9BUs1t2BEwNdoqcDlATu39zIxRjvJCqfNHE="; + hash = "sha256-wgoPL/G9wPshhydHSFpSAFKiiFy/UacVbQ7mdcEuit0="; }; build-system = [ poetry-core ]; From ef9b2431f52e836af24a9233592cc52324ef38ac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Mar 2026 19:03:58 +0100 Subject: [PATCH 384/429] python3Packages.apify-fingerprint-datapoints: 0.10.0 -> 0.11.0 --- .../python-modules/apify-fingerprint-datapoints/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apify-fingerprint-datapoints/default.nix b/pkgs/development/python-modules/apify-fingerprint-datapoints/default.nix index a711e100a8c0..8f2defcb177d 100644 --- a/pkgs/development/python-modules/apify-fingerprint-datapoints/default.nix +++ b/pkgs/development/python-modules/apify-fingerprint-datapoints/default.nix @@ -7,13 +7,13 @@ buildPythonPackage (finalAttrs: { pname = "apify-fingerprint-datapoints"; - version = "0.10.0"; + version = "0.11.0"; pyproject = true; src = fetchPypi { pname = "apify_fingerprint_datapoints"; inherit (finalAttrs) version; - hash = "sha256-FObB0yFu/t1RtnCYyDuzIzgm4mHu8mC+cATzciGd2VA="; + hash = "sha256-P5BcOSsRon+1nM/kCJHBZqvXN6ucYglzPxAruzswJRU="; }; build-system = [ hatchling ]; From 07c2453d41116315038edeff87f4b28d8bf82abc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Mar 2026 19:06:21 +0100 Subject: [PATCH 385/429] python3Packages.bthome-ble: 3.19.1 -> 3.20.0 Diff: https://github.com/Bluetooth-Devices/bthome-ble/compare/v3.19.1...v3.20.0 Changelog: https://github.com/bluetooth-devices/bthome-ble/blob/v3.20.0/CHANGELOG.md --- pkgs/development/python-modules/bthome-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index 593fc14383a7..b4c6f0219022 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "3.19.1"; + version = "3.20.0"; pyproject = true; src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = "bthome-ble"; tag = "v${version}"; - hash = "sha256-h1Kd2qtz9YdRf0uZC+dmvmmAkDoKYIBzyouUswnIldQ="; + hash = "sha256-xfDnjDs+2v6Up7VR5RV4A3Jbjb0evzOkaj7yIWf0Lhk="; }; build-system = [ poetry-core ]; From 258fa0f3f0718ffc7fa67edd8ff1114943c45cbf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Mar 2026 19:08:17 +0100 Subject: [PATCH 386/429] python3Packages.cyclopts: 4.5.4 -> 4.7.0 Diff: https://github.com/BrianPugh/cyclopts/compare/v4.5.4...v4.7.0 Changelog: https://github.com/BrianPugh/cyclopts/releases/tag/v4.7.0 --- pkgs/development/python-modules/cyclopts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index b1209ea81c64..e383dda3ba03 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -22,14 +22,14 @@ buildPythonPackage (finalAttrs: { pname = "cyclopts"; - version = "4.5.4"; + version = "4.7.0"; pyproject = true; src = fetchFromGitHub { owner = "BrianPugh"; repo = "cyclopts"; tag = "v${finalAttrs.version}"; - hash = "sha256-hAh45bw28NNQFl8GiL8UA+1IryxQBPdlGnBKXZih6+g="; + hash = "sha256-CsCZ32okeKA680WtOiz+I+caIEenp7ztgs9/SP6M7IE="; }; build-system = [ From 3dee50bc05e10365d5b081b6579e227d4b4f4048 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Mar 2026 19:10:04 +0100 Subject: [PATCH 387/429] python3Packages.proxmoxer: 2.2.0-unstable-2025-02-18 -> 2.3.0 Diff: https://github.com/proxmoxer/proxmoxer/compare/cf1bcde696537c74ef00d8e71fb86735fb4c2c79...cf1bcde696537c74ef00d8e71fb86735fb4c2c79 Changelog: https://github.com/proxmoxer/proxmoxer/releases/tag/2.3.0 --- pkgs/development/python-modules/proxmoxer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/proxmoxer/default.nix b/pkgs/development/python-modules/proxmoxer/default.nix index e3c4018f5561..a18670d33498 100644 --- a/pkgs/development/python-modules/proxmoxer/default.nix +++ b/pkgs/development/python-modules/proxmoxer/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "proxmoxer"; - version = "2.2.0-unstable-2025-02-18"; + version = "2.3.0"; pyproject = true; src = fetchFromGitHub { From e9da4974ce1b9214d057355e48586853076b2313 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 23 Feb 2026 23:29:30 +0000 Subject: [PATCH 388/429] python3Packages.timm: 1.0.24 -> 1.0.25 Diff: https://github.com/huggingface/pytorch-image-models/compare/v1.0.24...v1.0.25 Changelog: https://github.com/huggingface/pytorch-image-models/blob/v1.0.25/README.md#whats-new --- pkgs/development/python-modules/timm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix index a190ca413e7b..60664b4b134c 100644 --- a/pkgs/development/python-modules/timm/default.nix +++ b/pkgs/development/python-modules/timm/default.nix @@ -23,14 +23,14 @@ buildPythonPackage (finalAttrs: { pname = "timm"; - version = "1.0.24"; + version = "1.0.25"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "pytorch-image-models"; tag = "v${finalAttrs.version}"; - hash = "sha256-uimOYftxX3zRvrLlT8Y23g3LdlGUDVs3AMMyKNFbsPg="; + hash = "sha256-ulF94vSc4DQjVH6kZ+wFsrdmGRK+zpRk2ImWuF46xwE="; }; build-system = [ pdm-backend ]; From b63911f725ee3c77c3b1c29e17e977f9e290ca24 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 5 Mar 2026 22:17:31 +0000 Subject: [PATCH 389/429] python3Packages.skops: fix, cleanup --- .../python-modules/skops/default.nix | 33 ++++++++++++++----- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/skops/default.nix b/pkgs/development/python-modules/skops/default.nix index 27784318853d..c381c19c15e0 100644 --- a/pkgs/development/python-modules/skops/default.nix +++ b/pkgs/development/python-modules/skops/default.nix @@ -3,23 +3,28 @@ stdenv, buildPythonPackage, fetchFromGitHub, + + # build-system hatchling, - huggingface-hub, - matplotlib, + + # dependencies numpy, packaging, - pandas, prettytable, + scikit-learn, + tabulate, + + # tests + matplotlib, + pandas, pytest-cov-stub, pytestCheckHook, pyyaml, rich, - scikit-learn, streamlit, - tabulate, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "skops"; version = "0.13.0"; pyproject = true; @@ -27,7 +32,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "skops-dev"; repo = "skops"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-1550LIVyChqP5q4VZmflCXPyXXg4eHJU5AlVQJD2M8c="; }; @@ -59,8 +64,14 @@ buildPythonPackage rec { disabledTests = [ # flaky "test_base_case_works_as_expected" + # fairlearn is not available in nixpkgs "TestAddFairlearnMetricFrame" + + # numpy.linalg.LinAlgError: The covariance matrix of class 0 is not full rank. + # Increase the value of `reg_param` to reduce the collinearity. + "test_can_persist_fitted" + ]; disabledTestPaths = [ @@ -76,6 +87,10 @@ buildPythonPackage rec { # Warning from scipy.optimize in skops/io/tests/test_persist.py::test_dump_and_load_with_file_wrapper # https://github.com/skops-dev/skops/issues/479 "-Wignore::DeprecationWarning" + + # FutureWarning: Class PassiveAggressiveClassifier is deprecated; this is deprecated in version + # 1.8 and will be removed in 1.10. Use `SGDClassifier(...)` instead. + "-Wignore::FutureWarning" ]; pythonImportsCheck = [ "skops" ]; @@ -83,9 +98,9 @@ buildPythonPackage rec { meta = { description = "Library for saving/loading, sharing, and deploying scikit-learn based models"; homepage = "https://skops.readthedocs.io/en/stable"; - changelog = "https://github.com/skops-dev/skops/releases/tag/${src.tag}"; + changelog = "https://github.com/skops-dev/skops/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = [ lib.maintainers.bcdarwin ]; mainProgram = "skops"; }; -} +}) From 7b96c5b90017bcc8cabeb0dd1360c0f8a9ccc59a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 18:56:49 +0000 Subject: [PATCH 390/429] terraform-providers.argoproj-labs_argocd: 7.13.0 -> 7.15.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 53a386f635ed..fb442e8af523 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -63,14 +63,14 @@ "vendorHash": "sha256-AO6reoqxDcPAMXKlqjJLGmhsgFrekaQXjMPm9fxhpFA=" }, "argoproj-labs_argocd": { - "hash": "sha256-2QatWxaR5lO4+0RxUMOQjyLp8XG6O0vwCYc8jHKL+48=", + "hash": "sha256-OhuU3XGFRRn6oBiGaT4eRUB3+Lew1PonsshBXMcMA5k=", "homepage": "https://registry.terraform.io/providers/argoproj-labs/argocd", "owner": "argoproj-labs", "proxyVendor": true, "repo": "terraform-provider-argocd", - "rev": "v7.13.0", + "rev": "v7.15.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-OBXAl3MRAtnYYATHD0UWEuB1dJozG7al9csGYLClaYw=" + "vendorHash": "sha256-CO09y7rdbY27VFX85pV2ocnO0rvhGJg3hXfLWaF+HTI=" }, "auth0_auth0": { "hash": "sha256-7xAQGsDkw0JYP1Q+cEMHezNmQzccRyiwtUXKgJfnI6k=", From 9f1f164e64a737285f987b33ff5eb0b0ec46926f Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Fri, 27 Feb 2026 20:22:13 +0100 Subject: [PATCH 391/429] maintainers: remove adtya --- maintainers/maintainer-list.nix | 7 ------- pkgs/by-name/fl/flyctl/package.nix | 1 - pkgs/by-name/sm/smc-chilanka/package.nix | 2 +- pkgs/by-name/sm/smc-manjari/package.nix | 2 +- pkgs/by-name/zs/zs/package.nix | 2 +- 5 files changed, 3 insertions(+), 11 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 731e0b0c7967..f8276c1c6c19 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -703,13 +703,6 @@ githubId = 315003; name = "Adam Saponara"; }; - adtya = { - email = "adtya@adtya.xyz"; - github = "adtya"; - githubId = 22346805; - name = "Adithya Nair"; - keys = [ { fingerprint = "51E4 F5AB 1B82 BE45 B422 9CC2 43A5 E25A A5A2 7849"; } ]; - }; aduh95 = { email = "duhamelantoine1995@gmail.com"; github = "aduh95"; diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix index 6891692999e1..245e0b9aff68 100644 --- a/pkgs/by-name/fl/flyctl/package.nix +++ b/pkgs/by-name/fl/flyctl/package.nix @@ -92,7 +92,6 @@ buildGoModule rec { homepage = "https://fly.io/"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ - adtya techknowlogick RaghavSood SchahinRohani diff --git a/pkgs/by-name/sm/smc-chilanka/package.nix b/pkgs/by-name/sm/smc-chilanka/package.nix index d959b9740b55..bc25734b30f5 100644 --- a/pkgs/by-name/sm/smc-chilanka/package.nix +++ b/pkgs/by-name/sm/smc-chilanka/package.nix @@ -44,6 +44,6 @@ stdenvNoCC.mkDerivation rec { description = "Chilanka Malayalam Typeface"; license = lib.licenses.ofl; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ adtya ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/sm/smc-manjari/package.nix b/pkgs/by-name/sm/smc-manjari/package.nix index 1038167b8346..d8e88e2e24e2 100644 --- a/pkgs/by-name/sm/smc-manjari/package.nix +++ b/pkgs/by-name/sm/smc-manjari/package.nix @@ -44,6 +44,6 @@ stdenvNoCC.mkDerivation rec { description = "Manjari Malayalam Typeface"; license = lib.licenses.ofl; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ adtya ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/zs/zs/package.nix b/pkgs/by-name/zs/zs/package.nix index 5e41e7b06215..1a07ada5be0d 100644 --- a/pkgs/by-name/zs/zs/package.nix +++ b/pkgs/by-name/zs/zs/package.nix @@ -41,7 +41,7 @@ buildGoModule (finalAttrs: { homepage = "https://git.mills.io/prologic/zs"; changelog = "https://git.mills.io/prologic/zs/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ adtya ]; + maintainers = [ ]; mainProgram = "zs"; }; }) From 3238052222628d79c25479d6e0159a0881d109cf Mon Sep 17 00:00:00 2001 From: Thomas Zahner Date: Sat, 14 Feb 2026 20:33:59 +0100 Subject: [PATCH 392/429] lychee: 0.22.0 -> 0.23.0 Thank you @Scrumplex for suggesting the fix for lycheeLinkCheck Co-authored-by: Philip Taron --- pkgs/build-support/testers/lychee.nix | 6 +++++- pkgs/by-name/ly/lychee/package.nix | 15 ++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/build-support/testers/lychee.nix b/pkgs/build-support/testers/lychee.nix index ec0aa4c7f305..1cca3ead76f0 100644 --- a/pkgs/build-support/testers/lychee.nix +++ b/pkgs/build-support/testers/lychee.nix @@ -1,4 +1,5 @@ deps@{ + cacert, formats, lib, lychee, @@ -40,7 +41,10 @@ let stdenv.mkDerivation (finalAttrs: { name = "lychee-link-check"; inherit site; - nativeBuildInputs = [ finalAttrs.passthru.lychee ]; + nativeBuildInputs = [ + finalAttrs.passthru.lychee + cacert + ]; configFile = (formats.toml { }).generate "lychee.toml" finalAttrs.passthru.config; # These can be overridden with overrideAttrs if needed. diff --git a/pkgs/by-name/ly/lychee/package.nix b/pkgs/by-name/ly/lychee/package.nix index b331682bf512..a03a270d632c 100644 --- a/pkgs/by-name/ly/lychee/package.nix +++ b/pkgs/by-name/ly/lychee/package.nix @@ -6,9 +6,8 @@ fetchFromGitHub, rustPlatform, installShellFiles, - pkg-config, - openssl, testers, + cacert, }: let @@ -17,13 +16,12 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "lychee"; - version = "0.22.0-unstable-2025-12-05"; + version = "0.23.0"; src = fetchFromGitHub { owner = "lycheeverse"; repo = "lychee"; - # tag = "lychee-v${finalAttrs.version}"; # use again with next release - rev = "db0f8a842f594e0a879563caf7d183266c02ca95"; # one revision after 0.22.0 + tag = "lychee-v${finalAttrs.version}"; leaveDotGit = true; postFetch = '' GIT_DATE=$(git -C $out/.git show -s --format=%cs) @@ -33,17 +31,16 @@ rustPlatform.buildRustPackage (finalAttrs: { '("cargo:rustc-env=GIT_DATE={}", "'$GIT_DATE'")' rm -rf $out/.git ''; - hash = "sha256-l8/llYq8rwt+UQMLnsva4/2m53cwqaJXD/XvgEfxXg4="; + hash = "sha256-Rfdys16a4N6B3NsmPsB3OpKjLGElFYvd4UtiRipy8iQ="; }; - cargoHash = "sha256-03eahQ6GvOPxnvC82lfT1J/XfOg9V7gOZeOEBJx8IYY="; + cargoHash = "sha256-5KL/PmBSU8xkOE9/w7uUBkJSOBPsj3Z4o/2VmzA/f3Q="; nativeBuildInputs = [ - pkg-config installShellFiles ]; - buildInputs = [ openssl ]; + nativeCheckInputs = [ cacert ]; postFixup = lib.optionalString canRun '' ${lychee} --generate man > lychee.1 From c6a8927942bfcdec8b73e4d6c5a42ae7a622fb9c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Mar 2026 20:26:31 +0100 Subject: [PATCH 393/429] trufflehog: 3.93.4 -> 3.93.7 Diff: https://github.com/trufflesecurity/trufflehog/compare/v3.93.4...v3.93.7 Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.93.7 --- pkgs/by-name/tr/trufflehog/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tr/trufflehog/package.nix b/pkgs/by-name/tr/trufflehog/package.nix index 525af247ba67..f5e21821a1f2 100644 --- a/pkgs/by-name/tr/trufflehog/package.nix +++ b/pkgs/by-name/tr/trufflehog/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "trufflehog"; - version = "3.93.4"; + version = "3.93.7"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; tag = "v${finalAttrs.version}"; - hash = "sha256-ef6BfZKr0XtNK/vWNIzEzAUnrZX8dRxdFcrEedroZyA="; + hash = "sha256-zrQfSo/J8Jh9n8dvp6dhT4Fe6sYyZe/23oRTkKCIJhE="; }; - vendorHash = "sha256-U3pznVPh/nQ4YZ5y94VF+UeISXDaWJ/gTNrY8wqq2gQ="; + vendorHash = "sha256-h036/342gmSI7JrYX2fguCj8xRLw1t3KnunwyP2ur7g="; nativeBuildInputs = [ makeWrapper ]; From d09fd848e7363718cd4c050959ac50fc428ef355 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 19:33:43 +0000 Subject: [PATCH 394/429] terraform-providers.vancluever_acme: 2.45.0 -> 2.45.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 53a386f635ed..85fa3be5153c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1418,13 +1418,13 @@ "vendorHash": null }, "vancluever_acme": { - "hash": "sha256-uRIOLFIzT4hIXMtoyHk0UB5R5xGr0DELF5hd+E5Xx1k=", + "hash": "sha256-R0tbT4DBzRkXiJdvGL3AOY9ALXwWIH90WaWbqe8xtkk=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "repo": "terraform-provider-acme", - "rev": "v2.45.0", + "rev": "v2.45.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-S8eG43mHNyPOm2Iuww9DjU7o/x2MMSJExpmBAQ8QDGY=" + "vendorHash": "sha256-PN9r9rTJChmhZd/l5BrsEMGfhzHNbcRhjtEoYJ+Vzuc=" }, "venafi_venafi": { "hash": "sha256-wpAckNRqZjSDt7KpCRpLSYkn6Gm+QPzn5sIJ90wRXjI=", From 66b532f6ef9c79b96a0b071d7b2694b1c622baa4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 19:43:08 +0000 Subject: [PATCH 395/429] kubectl-klock: 0.8.2 -> 0.8.4 --- pkgs/by-name/ku/kubectl-klock/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kubectl-klock/package.nix b/pkgs/by-name/ku/kubectl-klock/package.nix index e64555f4f27c..213fa45cbf69 100644 --- a/pkgs/by-name/ku/kubectl-klock/package.nix +++ b/pkgs/by-name/ku/kubectl-klock/package.nix @@ -7,7 +7,7 @@ buildGoModule (finalAttrs: { pname = "kubectl-klock"; - version = "0.8.2"; + version = "0.8.4"; nativeBuildInputs = [ makeWrapper ]; @@ -15,7 +15,7 @@ buildGoModule (finalAttrs: { owner = "applejag"; repo = "kubectl-klock"; rev = "v${finalAttrs.version}"; - hash = "sha256-Ajq3/JUnaIcz6FnC2nP9H/+oKJXQSca+mRpPSkG/xY0="; + hash = "sha256-xfoYK8Ex+gdWPJVARYlGRtZl1Yi63h72bLDJgqUJe3Q="; }; ldflags = [ @@ -24,7 +24,7 @@ buildGoModule (finalAttrs: { "-X main.version=${finalAttrs.version}" ]; - vendorHash = "sha256-fuq073g1RG4cfFzs5eoMOytE9Ra32HgUFG/yQDYc2JE="; + vendorHash = "sha256-WiVwRc92xYhk8dBNmYDfrZF0bP61dJJbqWFTFQV7lwg="; postInstall = '' makeWrapper $out/bin/kubectl-klock $out/bin/kubectl_complete-klock --add-flags __complete From 2236517ed2c4e6db196866e7080a4855efa37d18 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 5 Mar 2026 22:30:21 +0000 Subject: [PATCH 396/429] python3Packages.gradio: 6.5.1 -> 6.8.0 Diff: https://github.com/gradio-app/gradio/compare/gradio@6.5.1...gradio@6.8.0 Changelog: https://github.com/gradio-app/gradio/releases/tag/gradio@6.8.0 --- .../python-modules/gradio/default.nix | 39 ++--- .../fix-transformers-pipelines-imports.patch | 162 ++++++++++++++++++ 2 files changed, 180 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/gradio/fix-transformers-pipelines-imports.patch diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index 2af440ce78f5..ad52899663d7 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -79,41 +79,33 @@ let nodejs = nodejs_24; pnpm = pnpm_10.override { inherit nodejs; }; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gradio"; - version = "6.5.1"; + version = "6.8.0"; pyproject = true; src = fetchFromGitHub { owner = "gradio-app"; repo = "gradio"; - tag = "gradio@${version}"; - hash = "sha256-pIcliKcb1eVVMk0ARzWcZGXc6pmI8mGVAvCJZ0JHXUw="; + tag = "gradio@${finalAttrs.version}"; + hash = "sha256-ZHglnRs0AXCu9HlVoSO0h5p6SE4al/OLPn0jwZgKVR8="; }; + patches = [ + ./fix-transformers-pipelines-imports.patch + ]; + pnpmDeps = fetchPnpmDeps { - inherit + inherit (finalAttrs) pname - pnpm version src ; + inherit pnpm; fetcherVersion = 3; hash = "sha256-6Cx0hdVd0srhArvck2Kn9U2fT7aKtTZjgV5b/Usrnoo="; }; - pythonRelaxDeps = [ - "aiofiles" - "gradio-client" - "markupsafe" - "pydantic" # Requests >=2.11.10,<=2.12.4. Staging has it, master doesn't. - ]; - - pythonRemoveDeps = [ - # this isn't a real runtime dependency - "ruff" - ]; - nativeBuildInputs = [ zip nodejs @@ -128,6 +120,10 @@ buildPythonPackage rec { hatch-fancy-pypi-readme ]; + pythonRelaxDeps = [ + "aiofiles" + "tomlkit" + ]; dependencies = [ aiofiles anyio @@ -191,7 +187,7 @@ buildPythonPackage rec { # mock calls to `shutil.which(...)` (writeShellScriptBin "npm" "false") ] - ++ optional-dependencies.oauth + ++ finalAttrs.passthru.optional-dependencies.oauth ++ pydantic.optional-dependencies.email; preBuild = '' @@ -216,6 +212,7 @@ buildPythonPackage rec { # requires network, it caught our xfail exception "test_error_analytics_successful" + "TestSnippetExecution" # Flaky, tries to pin dependency behaviour. Sensitive to dep versions # These error only affect downstream use of the check dependencies. @@ -441,9 +438,9 @@ buildPythonPackage rec { meta = { homepage = "https://www.gradio.app/"; - changelog = "https://github.com/gradio-app/gradio/releases/tag/gradio@${version}"; + changelog = "https://github.com/gradio-app/gradio/releases/tag/${finalAttrs.src.tag}"; description = "Python library for easily interacting with trained machine learning models"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ pbsds ]; }; -} +}) diff --git a/pkgs/development/python-modules/gradio/fix-transformers-pipelines-imports.patch b/pkgs/development/python-modules/gradio/fix-transformers-pipelines-imports.patch new file mode 100644 index 000000000000..72fc44d0d3aa --- /dev/null +++ b/pkgs/development/python-modules/gradio/fix-transformers-pipelines-imports.patch @@ -0,0 +1,162 @@ +diff --git a/test/test_pipelines.py b/test/test_pipelines.py +index 1903f758f..c40e6d3b1 100644 +--- a/test/test_pipelines.py ++++ b/test/test_pipelines.py +@@ -3,20 +3,6 @@ from unittest.mock import MagicMock + + import pytest + import transformers +-from transformers import ( +- AudioClassificationPipeline, +- AutomaticSpeechRecognitionPipeline, +- DocumentQuestionAnsweringPipeline, +- FeatureExtractionPipeline, +- FillMaskPipeline, +- ImageClassificationPipeline, +- ObjectDetectionPipeline, +- QuestionAnsweringPipeline, +- TextClassificationPipeline, +- TextGenerationPipeline, +- VisualQuestionAnsweringPipeline, +- ZeroShotClassificationPipeline, +-) + + import gradio as gr + from gradio.pipelines_utils import ( +@@ -24,6 +10,14 @@ from gradio.pipelines_utils import ( + ) + + ++def _get_pipeline_cls(name: str): ++ """Resolve a pipeline class by name from transformers, returning None if it ++ was removed in the installed version.""" ++ return getattr(transformers, name, None) or getattr( ++ transformers.pipelines, name, None ++ ) ++ ++ + @pytest.mark.flaky + def test_interface_in_blocks(): + pipe1 = transformers.pipeline(model="deepset/roberta-base-squad2") # type: ignore +@@ -50,50 +44,66 @@ def test_transformers_load_from_pipeline(): + + + class TestHandleTransformersPipelines(unittest.TestCase): ++ def _require(self, name: str): ++ """Return the pipeline class or skip the test if it was removed.""" ++ cls = _get_pipeline_cls(name) ++ if cls is None: ++ self.skipTest( ++ f"{name} not available in transformers {transformers.__version__}" ++ ) ++ return cls ++ + def test_audio_classification_pipeline(self): +- pipe = MagicMock(spec=AudioClassificationPipeline) ++ cls = self._require("AudioClassificationPipeline") ++ pipe = MagicMock(spec=cls) + pipeline_info = handle_transformers_pipeline(pipe) + assert pipeline_info is not None + assert pipeline_info["inputs"].label == "Input" + assert pipeline_info["outputs"].label == "Class" + + def test_automatic_speech_recognition_pipeline(self): +- pipe = MagicMock(spec=AutomaticSpeechRecognitionPipeline) ++ cls = self._require("AutomaticSpeechRecognitionPipeline") ++ pipe = MagicMock(spec=cls) + pipeline_info = handle_transformers_pipeline(pipe) + assert pipeline_info is not None + assert pipeline_info["inputs"].label == "Input" + assert pipeline_info["outputs"].label == "Output" + + def test_object_detection_pipeline(self): +- pipe = MagicMock(spec=ObjectDetectionPipeline) ++ cls = self._require("ObjectDetectionPipeline") ++ pipe = MagicMock(spec=cls) + pipeline_info = handle_transformers_pipeline(pipe) + assert pipeline_info is not None + assert pipeline_info["inputs"].label == "Input Image" + assert pipeline_info["outputs"].label == "Objects Detected" + + def test_feature_extraction_pipeline(self): +- pipe = MagicMock(spec=FeatureExtractionPipeline) ++ cls = self._require("FeatureExtractionPipeline") ++ pipe = MagicMock(spec=cls) + pipeline_info = handle_transformers_pipeline(pipe) + assert pipeline_info is not None + assert pipeline_info["inputs"].label == "Input" + assert pipeline_info["outputs"].label == "Output" + + def test_fill_mask_pipeline(self): +- pipe = MagicMock(spec=FillMaskPipeline) ++ cls = self._require("FillMaskPipeline") ++ pipe = MagicMock(spec=cls) + pipeline_info = handle_transformers_pipeline(pipe) + assert pipeline_info is not None + assert pipeline_info["inputs"].label == "Input" + assert pipeline_info["outputs"].label == "Classification" + + def test_image_classification_pipeline(self): +- pipe = MagicMock(spec=ImageClassificationPipeline) ++ cls = self._require("ImageClassificationPipeline") ++ pipe = MagicMock(spec=cls) + pipeline_info = handle_transformers_pipeline(pipe) + assert pipeline_info is not None + assert pipeline_info["inputs"].label == "Input Image" + assert pipeline_info["outputs"].label == "Classification" + + def test_question_answering_pipeline(self): +- pipe = MagicMock(spec=QuestionAnsweringPipeline) ++ cls = self._require("QuestionAnsweringPipeline") ++ pipe = MagicMock(spec=cls) + pipeline_info = handle_transformers_pipeline(pipe) + assert pipeline_info is not None + assert pipeline_info["inputs"][0].label == "Context" +@@ -102,21 +112,24 @@ class TestHandleTransformersPipelines(unittest.TestCase): + assert pipeline_info["outputs"][1].label == "Score" + + def test_text_classification_pipeline(self): +- pipe = MagicMock(spec=TextClassificationPipeline) ++ cls = self._require("TextClassificationPipeline") ++ pipe = MagicMock(spec=cls) + pipeline_info = handle_transformers_pipeline(pipe) + assert pipeline_info is not None + assert pipeline_info["inputs"].label == "Input" + assert pipeline_info["outputs"].label == "Classification" + + def test_text_generation_pipeline(self): +- pipe = MagicMock(spec=TextGenerationPipeline) ++ cls = self._require("TextGenerationPipeline") ++ pipe = MagicMock(spec=cls) + pipeline_info = handle_transformers_pipeline(pipe) + assert pipeline_info is not None + assert pipeline_info["inputs"].label == "Input" + assert pipeline_info["outputs"].label == "Output" + + def test_zero_shot_classification_pipeline(self): +- pipe = MagicMock(spec=ZeroShotClassificationPipeline) ++ cls = self._require("ZeroShotClassificationPipeline") ++ pipe = MagicMock(spec=cls) + pipeline_info = handle_transformers_pipeline(pipe) + assert pipeline_info is not None + assert pipeline_info["inputs"][0].label == "Input" +@@ -127,7 +140,8 @@ class TestHandleTransformersPipelines(unittest.TestCase): + assert pipeline_info["outputs"].label == "Classification" + + def test_document_question_answering_pipeline(self): +- pipe = MagicMock(spec=DocumentQuestionAnsweringPipeline) ++ cls = self._require("DocumentQuestionAnsweringPipeline") ++ pipe = MagicMock(spec=cls) + pipeline_info = handle_transformers_pipeline(pipe) + assert pipeline_info is not None + assert pipeline_info["inputs"][0].label == "Input Document" +@@ -135,7 +149,8 @@ class TestHandleTransformersPipelines(unittest.TestCase): + assert pipeline_info["outputs"].label == "Label" + + def test_visual_question_answering_pipeline(self): +- pipe = MagicMock(spec=VisualQuestionAnsweringPipeline) ++ cls = self._require("VisualQuestionAnsweringPipeline") ++ pipe = MagicMock(spec=cls) + pipeline_info = handle_transformers_pipeline(pipe) + assert pipeline_info is not None + assert pipeline_info["inputs"][0].label == "Input Image" From a9b9af1579fc6750496b2766ddb600824b45e2b4 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 6 Mar 2026 09:22:29 +0000 Subject: [PATCH 397/429] python3Packages.gradio-client: 2.0.1 -> 2.2.0 Diff: https://github.com/gradio-app/gradio/compare/7a8894d7249ee20c2f7a896237e290e99661fd43...8b03393a51e1e03fb04cb0a41b9a5dc3266a58aa --- .../python-modules/gradio/client.nix | 34 +++++++------------ 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/gradio/client.nix b/pkgs/development/python-modules/gradio/client.nix index 7c218fabfdae..d15947dc3e66 100644 --- a/pkgs/development/python-modules/gradio/client.nix +++ b/pkgs/development/python-modules/gradio/client.nix @@ -30,9 +30,9 @@ writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gradio-client"; - version = "2.0.1"; + version = "2.2.0"; pyproject = true; # no tests on pypi @@ -40,32 +40,25 @@ buildPythonPackage rec { owner = "gradio-app"; repo = "gradio"; # not to be confused with @gradio/client@${version} - # tag = "gradio_client@${version}"; + # tag = "gradio_client@${finalAttrs.version}"; # TODO: switch back to a tag next release, if they tag it. - rev = "7a8894d7249ee20c2f7a896237e290e99661fd43"; # 2.0.1 + rev = "8b03393a51e1e03fb04cb0a41b9a5dc3266a58aa"; # 2.2.0 sparseCheckout = [ "client/python" "gradio/media_assets" ]; - hash = "sha256-p3okK48DJjjyvUzedNR60r5P8aKUxjE+ocb3EplZ6Uk="; + hash = "sha256-LkTZwPyHe1w8D5unEMW7dBGKNHxM7gWJ7I+4HwiexKk="; }; - sourceRoot = "${src.name}/client/python"; + sourceRoot = "${finalAttrs.src.name}/client/python"; + # Because we set sourceRoot above, the folders "client/python" + # don't exist, as far as this is concerned. postPatch = '' - # Because we set sourceRoot above, the folders "client/python" - # don't exist, as far as this is concerned. substituteInPlace test/conftest.py \ --replace-fail 'from client.python.test import media_data' 'import media_data' ''; - # upstream adds upper constraints because they can, not because the need to - # https://github.com/gradio-app/gradio/pull/4885 - pythonRelaxDeps = [ - # only backward incompat is dropping py3.7 support - "websockets" - ]; - build-system = [ hatchling hatch-requirements-txt @@ -105,10 +98,6 @@ buildPythonPackage rec { cat ${./conftest-skip-network-errors.py} >> test/conftest.py ''; - pytestFlags = [ - #"-x" "-Wignore" # uncomment for debugging help - ]; - enabledTestPaths = [ "test/" ]; @@ -135,10 +124,11 @@ buildPythonPackage rec { }; meta = { - homepage = "https://www.gradio.app/"; - changelog = "https://github.com/gradio-app/gradio/releases/tag/gradio_client@${version}"; description = "Lightweight library to use any Gradio app as an API"; + homepage = "https://www.gradio.app/"; + downloadPage = "https://github.com/gradio-app/gradio/tree/main/client/python"; + # changelog = "https://github.com/gradio-app/gradio/releases/tag/${finalAttrs.src.tag}"; TODO: uncomment if the tag exists license = lib.licenses.asl20; maintainers = with lib.maintainers; [ pbsds ]; }; -} +}) From e83a81f33a3a4ddcab62315ea5c4b160dd1810e3 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 6 Mar 2026 18:47:31 +0000 Subject: [PATCH 398/429] python3Packages.smolagents: fix build --- .../python-modules/smolagents/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/smolagents/default.nix b/pkgs/development/python-modules/smolagents/default.nix index bdedea81f625..8eed65804fcb 100644 --- a/pkgs/development/python-modules/smolagents/default.nix +++ b/pkgs/development/python-modules/smolagents/default.nix @@ -66,6 +66,9 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; + pythonRelaxDeps = [ + "huggingface-hub" + ]; dependencies = [ huggingface-hub jinja2 @@ -146,18 +149,23 @@ buildPythonPackage (finalAttrs: { disabledTestPaths = [ # ImportError: cannot import name 'require_soundfile' from 'transformers.testing_utils' "tests/test_types.py" + + # Requires unpackaged 'helium' + "tests/test_vision_web_browser.py" ]; disabledTests = [ # Missing dependencies + "TestBlaxelExecutorUnit" + "TestModalExecutorUnit" + "mcp" "test_cleanup" "test_ddgs_with_kwargs" "test_e2b_executor_instantiation" "test_flatten_messages_as_text_for_all_models" - "mcp" "test_import_smolagents_without_extras" - "test_vision_web_browser_main" "test_multiple_servers" + "test_vision_web_browser_main" # Tests require network access "test_agent_type_output" "test_call_different_providers_without_key" @@ -184,6 +192,9 @@ buildPythonPackage (finalAttrs: { "test_multiagents_save" "test_new_instance" + # Flaky: assert 0.9858949184417725 <= 0.73 + "test_retry_on_rate_limit_error" + # Requires optional "blaxel" dependencies "test_blaxel_executor_instantiation_with_blaxel_sdk" "test_blaxel_executor_custom_parameters" @@ -192,7 +203,6 @@ buildPythonPackage (finalAttrs: { "test_sandbox_lifecycle" # TypeError: 'function' object is not subscriptable "test_stream_to_gradio_memory_step" - ]; __darwinAllowLocalNetworking = true; From 6f37b27b3b4754f8b40e86a861dbc1cb48c737af Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Fri, 6 Mar 2026 10:59:44 -0800 Subject: [PATCH 399/429] freebsd.libcam: fix build Co-Authored-By: Audrey Dutcher --- pkgs/os-specific/bsd/freebsd/pkgs/libcam.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libcam.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libcam.nix index 90341417d67f..cdd42a5cb299 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libcam.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libcam.nix @@ -7,6 +7,7 @@ mkDerivation { path = "lib/libcam"; extraPaths = [ "sys/cam" + "sys/dev/nvme" ]; buildInputs = [ libsbuf From 77d58ac0fc248f920a0d6dfb636f4b70738d69b1 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Fri, 6 Mar 2026 11:16:50 -0800 Subject: [PATCH 400/429] freebsd.zfsd: fix build Co-Authored-By: Audrey Dutcher --- .../bsd/freebsd/patches/15.0/zfsd-headers.patch | 12 ++++++++++++ pkgs/os-specific/bsd/freebsd/pkgs/libdevdctl.nix | 2 ++ pkgs/os-specific/bsd/freebsd/pkgs/zfsd.nix | 2 ++ 3 files changed, 16 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/patches/15.0/zfsd-headers.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/zfsd-headers.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/zfsd-headers.patch new file mode 100644 index 000000000000..f14faf0a9a32 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/zfsd-headers.patch @@ -0,0 +1,12 @@ +diff --git a/cddl/usr.sbin/zfsd/case_file.cc b/cddl/usr.sbin/zfsd/case_file.cc +index 852767aeb227..69086b4a7255 100644 +--- a/cddl/usr.sbin/zfsd/case_file.cc ++++ b/cddl/usr.sbin/zfsd/case_file.cc +@@ -49,6 +49,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libdevdctl.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libdevdctl.nix index 0cf5421daead..8770e1c96b0c 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libdevdctl.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libdevdctl.nix @@ -11,5 +11,7 @@ mkDerivation { "debug" ]; + env.NIX_CFLAGS_COMPILE = "-std=c++23 -Wno-nullability-completeness"; + meta.platforms = lib.platforms.freebsd; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/zfsd.nix b/pkgs/os-specific/bsd/freebsd/pkgs/zfsd.nix index c5ca7aa1211b..71a2e9746f3a 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/zfsd.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/zfsd.nix @@ -29,6 +29,8 @@ mkDerivation { MK_TESTS = "no"; + env.NIX_CFLAGS_COMPILE = "-std=c++23 -Wno-nullability-completeness"; + meta = { mainProgram = "zfsd"; platforms = lib.platforms.freebsd; From 51e5a86ee8e5562951cda19bc56071709e8ac01e Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Wed, 25 Feb 2026 15:14:06 -0700 Subject: [PATCH 401/429] freebsd.sockstat: init --- .../os-specific/bsd/freebsd/pkgs/sockstat.nix | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/sockstat.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/sockstat.nix b/pkgs/os-specific/bsd/freebsd/pkgs/sockstat.nix new file mode 100644 index 000000000000..30c85304c3dc --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/sockstat.nix @@ -0,0 +1,23 @@ +{ + mkDerivation, + libjail, + libxo, + libcasper, + libcapsicum, +}: +mkDerivation { + path = "usr.bin/sockstat"; + outputs = [ + "out" + "debug" + ]; + buildInputs = [ + libjail + libxo + libcasper + libcapsicum + ]; + MK_TESTS = "no"; + + meta.mainProgram = "sockstat"; +} From 9b1131ee607b39ba8ec51f5a9f81a7826dfab320 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Wed, 25 Feb 2026 18:26:31 -0700 Subject: [PATCH 402/429] freebsd.libc-conf: init --- .../bsd/freebsd/pkgs/libc-conf.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/libc-conf.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libc-conf.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libc-conf.nix new file mode 100644 index 000000000000..8df461f2d9ad --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libc-conf.nix @@ -0,0 +1,19 @@ +{ + mkDerivation, +}: +mkDerivation { + path = "lib/libc"; + extraPaths = [ + "lib/libc_nonshared" + "lib/libsys" + "sys/sys" + ]; + + postPatch = '' + sed -E -i -e '/afterinstallconfig/d' -e '/master.passwd/d' "lib/libc/gen/Makefile.inc" + ''; + + dontBuild = true; + installTargets = [ "installconfig" ]; + MK_TESTS = "no"; +} From 356fcd58bace7f34116a9fe7ddf67c717c5d4a01 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Fri, 6 Mar 2026 11:34:27 -0800 Subject: [PATCH 403/429] freebsd.lib80211: install configuration files Co-Authored-By: Audrey Dutcher --- pkgs/os-specific/bsd/freebsd/pkgs/lib80211.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/lib80211.nix b/pkgs/os-specific/bsd/freebsd/pkgs/lib80211.nix index 1cc8d337e057..c2f15c851f12 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/lib80211.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/lib80211.nix @@ -10,4 +10,9 @@ mkDerivation { libbsdxml ]; clangFixup = true; + + installTargets = [ + "install" + "installconfig" + ]; } From 97d5cf6833a1c8e18f8dd5e8c092654eff8eb395 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Fri, 6 Mar 2026 11:39:52 -0800 Subject: [PATCH 404/429] freebsd.pciconf: install configuration files Co-Authored-By: Audrey Dutcher --- pkgs/os-specific/bsd/freebsd/pkgs/pciconf.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/pciconf.nix b/pkgs/os-specific/bsd/freebsd/pkgs/pciconf.nix index a2e5b03d2e22..fc925e46ec09 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/pciconf.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/pciconf.nix @@ -1,6 +1,7 @@ { lib, mkDerivation, + pciutils, }: mkDerivation { path = "usr.sbin/pciconf"; @@ -11,6 +12,22 @@ mkDerivation { "debug" ]; + postPatch = '' + cat >usr.sbin/pciconf/pathnames.h < + + #define _PATH_DEVPCI "/dev/pci" + #define _PATH_PCIVDB "$out/share/pci.ids" + #define _PATH_LPCIVDB "/red/herring" + + EOF + ''; + + postInstall = '' + mkdir -p $out/share/misc + cp "${pciutils}/share/pci.ids" "$out/share/pci.ids" + ''; + meta.platorms = lib.platforms.freebsd; meta.mainProgram = "pciconf"; } From feb9df08ed12fe8472deb3ed1e68e18b36f04d4f Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sat, 28 Feb 2026 14:54:37 -0700 Subject: [PATCH 405/429] freebsd.powerd: init --- pkgs/os-specific/bsd/freebsd/pkgs/powerd.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/powerd.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/powerd.nix b/pkgs/os-specific/bsd/freebsd/pkgs/powerd.nix new file mode 100644 index 000000000000..4588ff828925 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/powerd.nix @@ -0,0 +1,11 @@ +{ + mkDerivation, +}: +mkDerivation { + path = "usr.sbin/powerd"; + outputs = [ + "out" + "debug" + ]; + meta.mainProgram = "powerd"; +} From bb621257d20430ccdbba5cf69aec56ea9d46ff30 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sun, 1 Mar 2026 17:15:51 -0700 Subject: [PATCH 406/429] freebsd.bsdfan: init --- pkgs/os-specific/bsd/freebsd/pkgs/bsdfan.nix | 39 ++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/bsdfan.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/bsdfan.nix b/pkgs/os-specific/bsd/freebsd/pkgs/bsdfan.nix new file mode 100644 index 000000000000..985638f0f40e --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/bsdfan.nix @@ -0,0 +1,39 @@ +{ + lib, + fetchFromGitHub, + fetchpatch, + mkDerivation, +}: +mkDerivation { + path = "..."; + pname = "bsdfan"; + version = "devel-2018"; + src = fetchFromGitHub { + owner = "claudiozz"; + repo = "bsdfan"; + rev = "d8428a773ec4e0dd465b145fa701097e2f93d7cc"; + hash = "sha256-y4CYDJLXVn5+eZ+5akEYQvzv+Shv7He4fYOyaQAbNyQ="; + }; + outputs = [ + "out" + "debug" + ]; + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/ca7665183b5ede6266650081b4fadfb5afa6561c/sysutils/bsdfan/files/patch-system.c"; + extraPrefix = ""; + hash = "sha256-VPO1S6KUuPOUhJ0U+MvI1Ksaa9t9aXtzrKgqfWtcHzo="; + }) + ]; + + postInstall = '' + mkdir -p $out/etc + cp bsdfan.conf $out/etc + ''; + + meta = { + description = "A simple FreeBSD fan control utility for thinkpads"; + platforms = lib.platforms.freebsd; + mainProgram = "bsdfan"; + }; +} From 18906f859805f632897c381f717ac09da1984ed5 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Mon, 2 Mar 2026 10:54:41 -0500 Subject: [PATCH 407/429] freebsd.acpi: init --- pkgs/os-specific/bsd/freebsd/pkgs/acpi.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/acpi.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/acpi.nix b/pkgs/os-specific/bsd/freebsd/pkgs/acpi.nix new file mode 100644 index 000000000000..a291d53d59f0 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/acpi.nix @@ -0,0 +1,13 @@ +{ + mkDerivation, + flex, + byacc, +}: +mkDerivation { + path = "usr.sbin/acpi"; + extraPaths = [ "sys/contrib/dev/acpica" ]; + extraNativeBuildInputs = [ + flex + byacc + ]; +} From 7cc4f7f60468239ff312d95a2974f1f37a8b98da Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Mon, 2 Mar 2026 10:55:44 -0500 Subject: [PATCH 408/429] freebsd.apm: init --- pkgs/os-specific/bsd/freebsd/pkgs/apm.nix | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/apm.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/apm.nix b/pkgs/os-specific/bsd/freebsd/pkgs/apm.nix new file mode 100644 index 000000000000..42b5fcbe7c06 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/apm.nix @@ -0,0 +1,6 @@ +{ + mkDerivation, +}: +mkDerivation { + path = "usr.sbin/apm"; +} From a60bbb52909d91fc32b9efa83dac654b49d283aa Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Mon, 2 Mar 2026 11:07:09 -0500 Subject: [PATCH 409/429] freebsd.zzz: init --- pkgs/os-specific/bsd/freebsd/pkgs/zzz.nix | 26 +++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/zzz.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/zzz.nix b/pkgs/os-specific/bsd/freebsd/pkgs/zzz.nix new file mode 100644 index 000000000000..0236ce9957b0 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/zzz.nix @@ -0,0 +1,26 @@ +{ + lib, + mkDerivation, + acpi, + apm, + bin, + gnugrep, + sysctl, +}: + +let + depsPath = lib.makeBinPath [ + acpi + apm + bin + gnugrep + sysctl + ]; +in +mkDerivation { + path = "usr.sbin/zzz"; + postPatch = '' + sed -E -i -e "s|/bin/sh|${lib.getBin bin}/bin/sh|g" $BSDSRCDIR/usr.sbin/zzz/zzz.sh + sed -E -i -e "s|PATH=.*|PATH=${depsPath}|g" $BSDSRCDIR/usr.sbin/zzz/zzz.sh + ''; +} From 4791b9919b2e47c6bc7df783b02019f3743a48da Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Mon, 2 Mar 2026 13:26:24 -0500 Subject: [PATCH 410/429] freebsd.backlight: init --- pkgs/os-specific/bsd/freebsd/pkgs/backlight.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/backlight.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/backlight.nix b/pkgs/os-specific/bsd/freebsd/pkgs/backlight.nix new file mode 100644 index 000000000000..365b47f0e767 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/backlight.nix @@ -0,0 +1,13 @@ +{ + mkDerivation, + libcapsicum, + libcasper, +}: +mkDerivation { + path = "usr.bin/backlight"; + + buildInputs = [ + libcapsicum + libcasper + ]; +} From e6a8acc239695ecd1a5caac2a75723d0f501da66 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Mar 2026 21:27:16 +0100 Subject: [PATCH 411/429] python3Packages.hcloud: 2.16.0 -> 2.17.0 Changelog: https://github.com/hetznercloud/hcloud-python/releases/tag/v2.17.0 --- pkgs/development/python-modules/hcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index 3ee62ac9dcff..1ecd22c8aa0f 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -10,12 +10,12 @@ buildPythonPackage (finalAttrs: { pname = "hcloud"; - version = "2.16.0"; + version = "2.17.0"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-6xrLMRW8CzVrRQrSMlaHO1gxGzV6SWJaj+DLq6LbUJs="; + hash = "sha256-OZat72vA9XVWULuLiwJKzrqywp4hfaxXnDA3Ivw3roU="; }; build-system = [ setuptools ]; From 61b4eeacd5de8e6004e970c9cbb8f6a58f3cad59 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Mar 2026 21:29:16 +0100 Subject: [PATCH 412/429] python3Packages.hstspreload: 2026.2.1 -> 2026.3.1 Diff: https://github.com/sethmlarson/hstspreload/compare/2026.2.1...2026.3.1 --- pkgs/development/python-modules/hstspreload/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 0b06fa5e0699..b878b614a389 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -7,14 +7,14 @@ buildPythonPackage (finalAttrs: { pname = "hstspreload"; - version = "2026.2.1"; + version = "2026.3.1"; pyproject = true; src = fetchFromGitHub { owner = "sethmlarson"; repo = "hstspreload"; tag = finalAttrs.version; - hash = "sha256-sqmzV9JJy71EF1wtLlKc98KGbe8gqsKaAq+VlqXK7kg="; + hash = "sha256-vxELSpTQMidvwDzSny1oJINE6ZxYC9H4pw3SDP44xCI="; }; build-system = [ setuptools ]; From 298175ffa322df9b8bafec101da8dd1c884234c8 Mon Sep 17 00:00:00 2001 From: Eduwardo Horibe Date: Thu, 5 Feb 2026 12:30:41 -0300 Subject: [PATCH 413/429] lunarvim: remove The last stable version was released on 2024-05-15 and relies on `neovim` 0.9.5 (released on 2023-04-7) to work properly --- .../manual/release-notes/rl-2605.section.md | 2 + pkgs/by-name/lu/lunarvim/package.nix | 150 ------------------ .../tools/parsing/tree-sitter/default.nix | 5 - pkgs/top-level/aliases.nix | 1 + 4 files changed, 3 insertions(+), 155 deletions(-) delete mode 100644 pkgs/by-name/lu/lunarvim/package.nix diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index 151f532bada9..abd96e63d81f 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -195,6 +195,8 @@ See . - SQLite paths are now relative to `service.rootpath` unless absolute. Startup now validates file storage and OAuth providers. +- `lunarvim` package has been removed, as it was abandoned upstream and relied on an old version of `neovim` to work properly. + ## Other Notable Changes {#sec-release-26.05-notable-changes} diff --git a/pkgs/by-name/lu/lunarvim/package.nix b/pkgs/by-name/lu/lunarvim/package.nix deleted file mode 100644 index a08c10c3da65..000000000000 --- a/pkgs/by-name/lu/lunarvim/package.nix +++ /dev/null @@ -1,150 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - makeWrapper, - cargo, - curl, - fd, - fzf, - git, - gnumake, - gnused, - gnutar, - gzip, - lua-language-server, - neovim, - neovim-node-client, - nodejs, - ripgrep, - tree-sitter, - unzip, - nvimAlias ? false, - viAlias ? false, - vimAlias ? false, - globalConfig ? "", -}: - -stdenv.mkDerivation (finalAttrs: { - inherit - nvimAlias - viAlias - vimAlias - globalConfig - ; - - pname = "lunarvim"; - version = "1.4.0"; - - src = fetchFromGitHub { - owner = "LunarVim"; - repo = "LunarVim"; - tag = finalAttrs.version; - hash = "sha256-uuXaDvZ9VaRJlZrdu28gawSOJFVSo5XX+JG53IB+Ijw="; - }; - - nativeBuildInputs = [ - gnused - makeWrapper - ]; - - runtimeDeps = [ - stdenv.cc - cargo - curl - fd - fzf - git - gnumake - gnutar - gzip - lua-language-server - neovim - nodejs - neovim-node-client - ripgrep - tree-sitter - unzip - ]; - - buildPhase = '' - runHook preBuild - - mkdir -p share/lvim - cp init.lua utils/installer/config.example.lua share/lvim - cp -r lua snapshots share/lvim - - mkdir bin - cp utils/bin/lvim.template bin/lvim - chmod +x bin/lvim - - # LunarVim automatically copies config.example.lua, but we need to make it writable. - sed -i "2 i\\ - if [ ! -f \$HOME/.config/lvim/config.lua ]; then \\ - cp $out/share/lvim/config.example.lua \$HOME/.config/lvim/config.lua \\ - chmod +w \$HOME/.config/lvim/config.lua \\ - fi - " bin/lvim - - substituteInPlace bin/lvim \ - --replace NVIM_APPNAME_VAR lvim \ - --replace RUNTIME_DIR_VAR \$HOME/.local/share/lvim \ - --replace CONFIG_DIR_VAR \$HOME/.config/lvim \ - --replace CACHE_DIR_VAR \$HOME/.cache/lvim \ - --replace BASE_DIR_VAR $out/share/lvim \ - --replace nvim ${neovim}/bin/nvim - - # Allow language servers to be overridden by appending instead of prepending - # the mason.nvim path. - echo "lvim.builtin.mason.PATH = \"append\"" > share/lvim/global.lua - echo ${lib.strings.escapeShellArg finalAttrs.globalConfig} >> share/lvim/global.lua - sed -i "s/add_to_path()/add_to_path(true)/" share/lvim/lua/lvim/core/mason.lua - sed -i "/Log:set_level/idofile(\"$out/share/lvim/global.lua\")" share/lvim/lua/lvim/config/init.lua - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -r bin share $out - - for iconDir in utils/desktop/*/; do - install -Dm444 $iconDir/lvim.svg -t $out/share/icons/hicolor/$(basename $iconDir)/apps - done - - install -Dm444 utils/desktop/lvim.desktop -t $out/share/applications - - wrapProgram $out/bin/lvim --prefix PATH : ${lib.makeBinPath finalAttrs.runtimeDeps} \ - --prefix LD_LIBRARY_PATH : ${lib.getLib stdenv.cc.cc} \ - --prefix CC : ${stdenv.cc.targetPrefix}cc - '' - + lib.optionalString finalAttrs.nvimAlias '' - ln -s $out/bin/lvim $out/bin/nvim - '' - + lib.optionalString finalAttrs.viAlias '' - ln -s $out/bin/lvim $out/bin/vi - '' - + lib.optionalString finalAttrs.vimAlias '' - ln -s $out/bin/lvim $out/bin/vim - '' - + '' - runHook postInstall - ''; - - meta = { - description = "IDE layer for Neovim"; - homepage = "https://www.lunarvim.org/"; - changelog = "https://github.com/LunarVim/LunarVim/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - sourceProvenance = with lib.sourceTypes; [ fromSource ]; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ - prominentretail - lebensterben - ]; - platforms = lib.platforms.unix; - mainProgram = "lvim"; - broken = true; # Incompatible with Neovim >= 0.10; upstream is unmaintained - }; -}) diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index f90d0201e766..189d8701ab41 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -20,9 +20,6 @@ enableShared ? !stdenv.hostPlatform.isStatic, enableStatic ? stdenv.hostPlatform.isStatic, webUISupport ? false, - - # tests - lunarvim, }: let @@ -204,8 +201,6 @@ rustPlatform.buildRustPackage (finalAttrs: { tests = { # make sure all grammars build builtGrammars = lib.recurseIntoAttrs builtGrammars; - - inherit lunarvim; }; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b6dcba8642a3..258a620ed634 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1236,6 +1236,7 @@ mapAliases { lowPrio = warnAlias "'lowPrio' has been removed from pkgs, use `lib.lowPrio` instead" lib.lowPrio; # Added 2025-10-30 LPCNet = throw "'LPCNet' has been renamed to/replaced by 'lpcnet'"; # Converted to throw 2025-10-27 luci-go = throw "luci-go has been removed since it was unused and failing to build for 5 months"; # Added 2025-08-27 + lunarvim = throw "'lunarvim' has been removed since it was abandoned upstream and relied on an older version of 'neovim' to work properly"; # Added 2026-02-05 lxd = throw " LXD has been removed from NixOS due to lack of Nixpkgs maintenance. Consider migrating or switching to Incus, or remove from your configuration. From abe0c1d95be064dfe81475227d133ab4b38d9ee9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Mar 2026 20:39:31 +0000 Subject: [PATCH 414/429] dnscontrol: 4.35.0 -> 4.36.0 --- pkgs/by-name/dn/dnscontrol/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dn/dnscontrol/package.nix b/pkgs/by-name/dn/dnscontrol/package.nix index 90c611f6996d..46d08ce5e056 100644 --- a/pkgs/by-name/dn/dnscontrol/package.nix +++ b/pkgs/by-name/dn/dnscontrol/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "dnscontrol"; - version = "4.35.0"; + version = "4.36.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = "dnscontrol"; tag = "v${finalAttrs.version}"; - hash = "sha256-txaPNitqRTYIuG4hU6GPcOFKmq6BBzgQDgYxsFRfK3M="; + hash = "sha256-mKeJTSNBZlEY0A4CcpROxKAI83MMcMB7HHZF567Z7U8="; }; - vendorHash = "sha256-oE1tbQ3KEqm0vub9XAqUiORJPVgIV8zNAfsfLl4aqrg="; + vendorHash = "sha256-PxDWodLz4/TpbfGFJkTJ0MLwdM2ECSzDCHZ5g+p1cAU="; nativeBuildInputs = [ installShellFiles ]; From e45eb8e26a4fd258fc145a4e5d5daa7ded11ec55 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 6 Mar 2026 21:09:32 +0000 Subject: [PATCH 415/429] Revert "ffmpeg: Add a -bare variant" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See: * * I think this variant is probably not warranted unless we have some concrete whole‐system numbers to justify the extra complexity in dependency specification, especially considering that it will likely lead to more copies of FFmpeg on many systems if used widely. This reverts commit 9ad38b5b4c530d5f9738afb0e0bc6e093b131660. --- pkgs/development/libraries/ffmpeg/default.nix | 2 -- pkgs/development/libraries/ffmpeg/generic.nix | 19 ++++++------------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 1e29fa97f2ec..0e82e63014c1 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -54,7 +54,6 @@ rec { ffmpeg_8 = mkFFmpeg v8 "small"; ffmpeg_8-headless = mkFFmpeg v8 "headless"; ffmpeg_8-full = mkFFmpeg v8 "full"; - ffmpeg_8-bare = mkFFmpeg v8 "bare"; # Please make sure this is updated to new major versions once they # build and work on all the major platforms. If absolutely necessary @@ -69,5 +68,4 @@ rec { ffmpeg = ffmpeg_8; ffmpeg-headless = ffmpeg_8-headless; ffmpeg-full = ffmpeg_8-full; - ffmpeg-bare = ffmpeg_8-bare; } diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 1658bfc931a3..d0433feaac48 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -22,11 +22,6 @@ ffmpegVariant ? "small", # Decides which dependencies are enabled by default - # Build nothing by default. Enable all features that are needed. - # To be used for purposes that don't require external dependencies, like `unpaper` - # that uses ffmpeg for image processing. - withBareDeps ? ffmpegVariant == "bare" || withHeadlessDeps, - # Build with headless deps; excludes dependencies that are only necessary for # GUI applications. To be used for purposes that don't generally need such # components and i.e. only depend on libav @@ -57,7 +52,7 @@ withAvisynth ? withFullDeps, # AviSynth script files reading withBluray ? withHeadlessDeps, # BluRay reading withBs2b ? withFullDeps, # bs2b DSP library - withBzlib ? withBareDeps, + withBzlib ? withHeadlessDeps, withCaca ? withFullDeps, # Textual display (ASCII art) withCdio ? withFullDeps && withGPL, # Audio CD grabbing withCelt ? withFullDeps, # CELT decoder @@ -174,7 +169,7 @@ withXml2 ? withHeadlessDeps, # libxml2 support, for IMF and DASH demuxers withXvid ? withHeadlessDeps && withGPL, # Xvid encoder, native encoder exists withZimg ? withHeadlessDeps, - withZlib ? withBareDeps, + withZlib ? withHeadlessDeps, withZmq ? withFullDeps, # Message passing withZvbi ? withHeadlessDeps, # Teletext support @@ -206,14 +201,14 @@ buildQtFaststart ? withFullDeps, # Build qt-faststart executable withBin ? buildFfmpeg || buildFfplay || buildFfprobe || buildQtFaststart, # Library options - buildAvcodec ? withBareDeps, # Build avcodec library + buildAvcodec ? withHeadlessDeps, # Build avcodec library buildAvdevice ? withHeadlessDeps, # Build avdevice library buildAvfilter ? withHeadlessDeps, # Build avfilter library - buildAvformat ? withBareDeps, # Build avformat library + buildAvformat ? withHeadlessDeps, # Build avformat library # Deprecated but depended upon by some packages. # https://github.com/NixOS/nixpkgs/pull/211834#issuecomment-1417435991) buildAvresample ? withHeadlessDeps && lib.versionOlder version "5", # Build avresample library - buildAvutil ? withBareDeps, # Build avutil library + buildAvutil ? withHeadlessDeps, # Build avutil library # Libpostproc is only available on versions lower than 8.0 # https://code.ffmpeg.org/FFmpeg/FFmpeg/commit/8c920c4c396163e3b9a0b428dd550d3c986236aa buildPostproc ? withHeadlessDeps && lib.versionOlder version "8.0", # Build postproc library @@ -399,7 +394,6 @@ let in assert lib.elem ffmpegVariant [ - "bare" "headless" "small" "full" @@ -998,8 +992,7 @@ stdenv.mkDerivation ( }; # tests linking broken with shaderc after https://github.com/NixOS/nixpkgs/pull/477464/changes/5a47b12dfcd1b909ba35778a866394430054319a - # tests need at least the headless deps to compile - doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform && !withShaderc && withHeadlessDeps; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform && !withShaderc; # Fails with SIGABRT otherwise FIXME: Why? checkPhase = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4a60bd37039..e3a4627bc111 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6296,11 +6296,9 @@ with pkgs; ffmpeg_8 ffmpeg_8-headless ffmpeg_8-full - ffmpeg_8-bare ffmpeg ffmpeg-headless ffmpeg-full - ffmpeg-bare ; fftwSinglePrec = fftw.override { precision = "single"; }; From 41e01ae7d55526af997bedb247f8483b67059bdb Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Fri, 6 Mar 2026 13:09:30 -0800 Subject: [PATCH 416/429] freebsd.devd: build sound and acpi Co-Authored-By: Audrey Dutcher --- pkgs/os-specific/bsd/freebsd/pkgs/devd.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/devd.nix b/pkgs/os-specific/bsd/freebsd/pkgs/devd.nix index 243a7c577748..13fe09e8a12b 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/devd.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/devd.nix @@ -28,6 +28,8 @@ mkDerivation { MK_TESTS = "no"; MK_AUTOFS = "yes"; + MK_ACPI = "yes"; + MK_SOUND = "yes"; MK_BLUETOOTH = "yes"; MK_HYPERV = "yes"; MK_USB = "yes"; From 771090934f91b84815e6169833db3176d6fb1d13 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Fri, 6 Mar 2026 13:11:59 -0800 Subject: [PATCH 417/429] freebsd.rc: support bash, fix hardcoded paths Co-Authored-By: Audrey Dutcher --- .../bsd/freebsd/patches/15.0/rc-bash.patch | 13 ++++ pkgs/os-specific/bsd/freebsd/pkgs/rc.nix | 64 +++++++++++++------ 2 files changed, 59 insertions(+), 18 deletions(-) create mode 100644 pkgs/os-specific/bsd/freebsd/patches/15.0/rc-bash.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/rc-bash.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/rc-bash.patch new file mode 100644 index 000000000000..e793f0c1ffee --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/15.0/rc-bash.patch @@ -0,0 +1,13 @@ +diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr +index 101c69e93cde..b95fc1b93285 100644 +--- a/libexec/rc/rc.subr ++++ b/libexec/rc/rc.subr +@@ -2493,7 +2493,7 @@ ltr() + fi + done + if [ -n "${_var}" ]; then +- setvar "${_var}" "${_out}" ++ printf -v "${_var}" "%s" "${_out}" + else + echo "${_out}" + fi diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/rc.nix b/pkgs/os-specific/bsd/freebsd/pkgs/rc.nix index 96aadbc618f2..6a7a04f6512e 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/rc.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/rc.nix @@ -10,6 +10,14 @@ protect, mount, fsck, + logger, + devmatch, + sort, + kldload, + kldstat, + devctl, + sed, + gnugrep, }: let rcDepsPath = lib.makeBinPath [ @@ -22,6 +30,14 @@ let mount protect fsck + logger + devmatch + sort + kldload + kldstat + devctl + sed + gnugrep ]; in mkDerivation { @@ -43,20 +59,23 @@ mkDerivation { '' + ( let - bins = [ - "/sbin/sysctl" - "/usr/bin/protect" - "/usr/bin/id" - "/bin/ps" - "/bin/cpuset" - "/usr/bin/stat" - "/bin/rm" - "/bin/chmod" - "/bin/cat" - "/bin/sync" - "/bin/sleep" - "/bin/date" - ]; + bins = { + "/sbin/sysctl" = sysctl; + "/usr/bin/protect" = protect; + "/usr/bin/id" = id; + "/bin/ps" = bin; + "/bin/cpuset" = bin; + "/usr/bin/stat" = stat; + "/bin/rm" = bin; + "/bin/chmod" = bin; + "/bin/cat" = bin; + "/bin/sync" = bin; + "/bin/sleep" = bin; + "/bin/date" = bin; + "/usr/bin/logger" = logger; + "logger" = logger; + "kenv" = bin; + }; scripts = [ "rc" "rc.initdiskless" @@ -64,17 +83,26 @@ mkDerivation { "rc.subr" "rc.suspend" "rc.resume" + "rc.conf" ]; scriptPaths = "$BSDSRCDIR/libexec/rc/{${lib.concatStringsSep "," scripts}}"; in # set PATH correctly in scripts '' sed -E -i -e "s|PATH=.*|PATH=${rcDepsPath}|g" ${scriptPaths} + sed -E -i -e "/etc\/rc.subr/i export PATH=${rcDepsPath}" $BSDSRCDIR/libexec/rc/rc.d/* '' - # replace executable absolute filepaths with PATH lookups - + lib.concatMapStringsSep "\n" (fname: '' - sed -E -i -e "s|${fname}|${lib.last (lib.splitString "/" fname)}|g" \ - ${scriptPaths}'') bins + # replace executable references with nix store filepaths + + lib.concatMapStringsSep "\n" ( + { + fname ? name, + name, + value, + }: + '' + sed -E -i -e "s|${fname}|${lib.getBin value}/bin/${lib.last (lib.splitString "/" fname)}|g" \ + ${scriptPaths}'' + ) (lib.attrsToList bins) + "\n" ); From ac26dc7385672e7d14b2f86f699e9f194e4786ba Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Fri, 6 Mar 2026 13:14:05 -0800 Subject: [PATCH 418/429] freebsd.wpa_supplicant: init Co-Authored-By: Audrey Dutcher --- .../bsd/freebsd/pkgs/wpa_supplicant.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/wpa_supplicant.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/wpa_supplicant.nix b/pkgs/os-specific/bsd/freebsd/pkgs/wpa_supplicant.nix new file mode 100644 index 000000000000..144c714e7a41 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/wpa_supplicant.nix @@ -0,0 +1,15 @@ +{ + mkDerivation, + libpcap, + openssl, +}: +mkDerivation { + path = "usr.sbin/wpa"; + extraPaths = [ + "contrib/wpa" + ]; + buildInputs = [ + libpcap + openssl + ]; +} From 17d8804ebe2c624788f4b3fccd480f785773f06f Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Fri, 6 Mar 2026 13:14:51 -0800 Subject: [PATCH 419/429] freebsd.autofs: init Co-Authored-By: Audrey Dutcher --- pkgs/os-specific/bsd/freebsd/pkgs/autofs.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/autofs.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/autofs.nix b/pkgs/os-specific/bsd/freebsd/pkgs/autofs.nix new file mode 100644 index 000000000000..a1aa1f03df5f --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/autofs.nix @@ -0,0 +1,17 @@ +{ + mkDerivation, + flex, +}: +mkDerivation { + path = "usr.sbin/autofs"; + extraPaths = [ + "sys/fs/autofs" + ]; + outputs = [ + "out" + "debug" + ]; + extraNativeBuildInputs = [ + flex + ]; +} From 78b96fe36dcc31400ae11458abaf30b754a5ac4c Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Fri, 6 Mar 2026 13:16:03 -0800 Subject: [PATCH 420/429] freebsd.devctl: init Co-Authored-By: Audrey Dutcher --- pkgs/os-specific/bsd/freebsd/pkgs/devctl.nix | 13 +++++++++++++ pkgs/os-specific/bsd/freebsd/pkgs/libdevctl.nix | 7 +++++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/devctl.nix create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/libdevctl.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/devctl.nix b/pkgs/os-specific/bsd/freebsd/pkgs/devctl.nix new file mode 100644 index 000000000000..6ca0858822b4 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/devctl.nix @@ -0,0 +1,13 @@ +{ + mkDerivation, + libdevctl, +}: +mkDerivation { + path = "usr.sbin/devctl"; + outputs = [ + "out" + "debug" + ]; + buildInputs = [ libdevctl ]; + meta.mainProgram = "devctl"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libdevctl.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libdevctl.nix new file mode 100644 index 000000000000..7c36f9a20452 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libdevctl.nix @@ -0,0 +1,7 @@ +{ + mkDerivation, +}: +mkDerivation { + path = "lib/libdevctl"; + alwaysKeepStatic = true; +} From faf6debc2c5b21c0ac92c999516d587edffb45a4 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Fri, 6 Mar 2026 13:16:39 -0800 Subject: [PATCH 421/429] freebsd.devmatch: init Co-Authored-By: Audrey Dutcher --- pkgs/os-specific/bsd/freebsd/pkgs/devmatch.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/devmatch.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/devmatch.nix b/pkgs/os-specific/bsd/freebsd/pkgs/devmatch.nix new file mode 100644 index 000000000000..2867821b25ca --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/devmatch.nix @@ -0,0 +1,14 @@ +{ + mkDerivation, + libdevinfo, +}: +mkDerivation { + path = "sbin/devmatch"; + outputs = [ + "out" + "debug" + ]; + buildInputs = [ + libdevinfo + ]; +} From 541bd9e30939cfc476963d9e9555bc05d391c868 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Fri, 6 Mar 2026 13:17:17 -0800 Subject: [PATCH 422/429] freebsd.env: init Co-Authored-By: Audrey Dutcher --- pkgs/os-specific/bsd/freebsd/pkgs/env.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/env.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/env.nix b/pkgs/os-specific/bsd/freebsd/pkgs/env.nix new file mode 100644 index 000000000000..95f71a4f4722 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/env.nix @@ -0,0 +1,12 @@ +{ + mkDerivation, +}: +mkDerivation { + path = "usr.bin/env"; + outputs = [ + "out" + "debug" + ]; + MK_TESTS = "no"; + meta.mainProgram = "env"; +} From 9d28ad840d6402b963cd946c078d24dfee55fc96 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Fri, 6 Mar 2026 13:18:16 -0800 Subject: [PATCH 423/429] freebsd.freebsd_wordexp: init wrapper script for a builtin Co-Authored-By: Audrey Dutcher --- pkgs/os-specific/bsd/freebsd/pkgs/freebsd_wordexp.nix | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/freebsd_wordexp.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/freebsd_wordexp.nix b/pkgs/os-specific/bsd/freebsd/pkgs/freebsd_wordexp.nix new file mode 100644 index 000000000000..d703b4ce3098 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/freebsd_wordexp.nix @@ -0,0 +1,9 @@ +{ + lib, + bin, + writeScriptBin, +}: +writeScriptBin "freebsd_wordexp" '' + #!${lib.getBin bin}/bin/sh + freebsd_wordexp "$@" +'' From eb0481ea02b2f73d566c593954a2ab791d48c804 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Fri, 6 Mar 2026 13:19:08 -0800 Subject: [PATCH 424/429] freebsd.libnvmf: init Co-Authored-By: Audrey Dutcher --- pkgs/os-specific/bsd/freebsd/pkgs/libnvmf.nix | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/libnvmf.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libnvmf.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libnvmf.nix new file mode 100644 index 000000000000..d52f05a5efc6 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libnvmf.nix @@ -0,0 +1,21 @@ +{ + mkDerivation, + libnv, +}: +mkDerivation { + path = "lib/libnvmf"; + extraPaths = [ + "sys/libkern" + "sys/dev/nvmf" + ]; + buildInputs = [ libnv ]; + + postPatch = '' + sed -E -i -e '/INTERNALLIB/d' lib/libnvmf/Makefile + ''; + postInstall = '' + ln -s libnvmf.a $out/lib/libnvmf_pie.a + ''; + + alwaysKeepStatic = true; +} From bbfb0d85c6c8c183b580fdc700c760914303fc06 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Fri, 6 Mar 2026 13:19:57 -0800 Subject: [PATCH 425/429] freebsd.logger: init Co-Authored-By: Audrey Dutcher --- pkgs/os-specific/bsd/freebsd/pkgs/logger.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/logger.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/logger.nix b/pkgs/os-specific/bsd/freebsd/pkgs/logger.nix new file mode 100644 index 000000000000..56e54d942724 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/logger.nix @@ -0,0 +1,16 @@ +{ + mkDerivation, + libcapsicum, + libcasper, +}: +mkDerivation { + path = "usr.bin/logger"; + outputs = [ + "out" + "debug" + ]; + buildInputs = [ + libcasper + libcapsicum + ]; +} From d3b51e50571fb3387678ce79b635bc0543007cc4 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Fri, 6 Mar 2026 13:20:46 -0800 Subject: [PATCH 426/429] freebsd.nvmecontrol: init Co-Authored-By: Audrey Dutcher --- .../bsd/freebsd/pkgs/nvmecontrol.nix | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/nvmecontrol.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/nvmecontrol.nix b/pkgs/os-specific/bsd/freebsd/pkgs/nvmecontrol.nix new file mode 100644 index 000000000000..47e9ce3c6edf --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/nvmecontrol.nix @@ -0,0 +1,23 @@ +{ + mkDerivation, + libnvmf, + libnv, + libsbuf, +}: +mkDerivation { + path = "sbin/nvmecontrol"; + extraPaths = [ + "sys/dev/nvme" + ]; + outputs = [ + "out" + "debug" + ]; + buildInputs = [ + libnvmf + libnv + libsbuf + ]; + + MK_TESTS = "no"; +} From e0935d9adca1860326a75f0a17147444dc9191a3 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Fri, 6 Mar 2026 13:21:14 -0800 Subject: [PATCH 427/429] freebsd.service: init Co-Authored-By: Audrey Dutcher --- pkgs/os-specific/bsd/freebsd/pkgs/service.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/service.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/service.nix b/pkgs/os-specific/bsd/freebsd/pkgs/service.nix new file mode 100644 index 000000000000..8524c6c40d23 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/service.nix @@ -0,0 +1,11 @@ +{ + lib, + mkDerivation, + env, +}: +mkDerivation { + path = "usr.sbin/service"; + postPatch = '' + substituteInPlace usr.sbin/service/service.sh --replace-fail /usr/bin/env ${lib.getExe env} + ''; +} From b56107b27ccfe27d0670f38efe7b3e49b5ff3111 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Fri, 6 Mar 2026 13:21:59 -0800 Subject: [PATCH 428/429] freebsd.sort: init Co-Authored-By: Audrey Dutcher --- pkgs/os-specific/bsd/freebsd/pkgs/sort.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/sort.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/sort.nix b/pkgs/os-specific/bsd/freebsd/pkgs/sort.nix new file mode 100644 index 000000000000..4eddbf9b79b0 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/sort.nix @@ -0,0 +1,12 @@ +{ + mkDerivation, +}: +mkDerivation { + path = "usr.bin/sort"; + outputs = [ + "out" + "debug" + ]; + MK_TESTS = "no"; + meta.mainProgram = "sort"; +} From b9565b5722d63e527ccf7dfd12659f06770bfe15 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Fri, 6 Mar 2026 13:22:30 -0800 Subject: [PATCH 429/429] freebsd.uathload: init Co-Authored-By: Audrey Dutcher --- .../os-specific/bsd/freebsd/pkgs/uathload.nix | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/uathload.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/uathload.nix b/pkgs/os-specific/bsd/freebsd/pkgs/uathload.nix new file mode 100644 index 000000000000..b6a9d3ed1407 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/uathload.nix @@ -0,0 +1,20 @@ +{ + mkDerivation, + bintrans, +}: +mkDerivation { + path = "usr.sbin/uathload"; + extraPaths = [ + "sys/contrib/dev/uath" + ]; + outputs = [ + "out" + "debug" + ]; + extraNativeBuildInputs = [ + bintrans + ]; + postPatch = '' + substituteInPlace usr.sbin/uathload/uathload.c --replace-fail _PATH_FIRMWARE '"${builtins.placeholder "out"}/share/firmware"' + ''; +}