From db05d3b4a2774764fcede7c6648376802c8fed0c Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 11 Aug 2025 11:04:05 -0300 Subject: [PATCH 1/8] etcd_3_4: 3.4.28 -> 3.4.37 Release: https://github.com/etcd-io/etcd/releases/tag/v3.4.37 Changelog: https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.4.md --- .../servers/etcd/{3.4.nix => 3_4/default.nix} | 22 +++++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 16 insertions(+), 8 deletions(-) rename pkgs/servers/etcd/{3.4.nix => 3_4/default.nix} (53%) diff --git a/pkgs/servers/etcd/3.4.nix b/pkgs/servers/etcd/3_4/default.nix similarity index 53% rename from pkgs/servers/etcd/3.4.nix rename to pkgs/servers/etcd/3_4/default.nix index ee7b4919f194..a3fe8a2e6d65 100644 --- a/pkgs/servers/etcd/3.4.nix +++ b/pkgs/servers/etcd/3_4/default.nix @@ -6,33 +6,41 @@ buildGoModule rec { pname = "etcd"; - version = "3.4.28"; + version = "3.4.37"; src = fetchFromGitHub { owner = "etcd-io"; repo = "etcd"; rev = "v${version}"; - hash = "sha256-M0iD05Wk3pC56kGKeIb0bfMUpy9idMKin0+DYhBo/cw="; + hash = "sha256-PZ+8hlxSwayR1yvjHmStMDur9e1uc2s+YB8qdz+42mA="; }; - vendorHash = "sha256-DbDIz/cbXqYHaGqNqP+wYpuiaFiZYElRXmQwBXnCbMk="; + proxyVendor = true; + vendorHash = "sha256-VeB0A+freNwgETQMIokiOPWovGq1FANUexnzxVg2aRA="; + + preBuild = '' + go mod tidy + ''; buildPhase = '' + runHook preBuild patchShebangs . ./build ./functional/build + runHook postBuild ''; doCheck = false; - installPhase = '' + postInstall = '' install -Dm755 bin/* bin/functional/cmd/* -t $out/bin ''; - meta = with lib; { + meta = { description = "Distributed reliable key-value store for the most critical data of a distributed system"; - license = licenses.asl20; + downloadPage = "https://github.com/etcd-io/etcd/"; + license = lib.licenses.asl20; homepage = "https://etcd.io/"; - maintainers = with maintainers; [ offline ]; + maintainers = with lib.maintainers; [ offline ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ac586e25d62..d3e48c9e3ac6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10043,7 +10043,7 @@ with pkgs; }; etcd = etcd_3_5; - etcd_3_4 = callPackage ../servers/etcd/3.4.nix { }; + etcd_3_4 = callPackage ../servers/etcd/3_4 { }; etcd_3_5 = callPackage ../servers/etcd/3_5 { buildGoModule = buildGo123Module; }; From 4201d698d30f58cd4051bfce11f17db5309bf7fc Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 2 Aug 2025 17:57:26 -0300 Subject: [PATCH 2/8] etcd_3_4: remove offline from maintainers for inactivity --- pkgs/servers/etcd/3_4/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/etcd/3_4/default.nix b/pkgs/servers/etcd/3_4/default.nix index a3fe8a2e6d65..aa2e14127c0d 100644 --- a/pkgs/servers/etcd/3_4/default.nix +++ b/pkgs/servers/etcd/3_4/default.nix @@ -41,6 +41,6 @@ buildGoModule rec { downloadPage = "https://github.com/etcd-io/etcd/"; license = lib.licenses.asl20; homepage = "https://etcd.io/"; - maintainers = with lib.maintainers; [ offline ]; + maintainers = with lib.maintainers; [ ]; }; } From 7addc15397389c3ed102e7a9ab3fa85c829ed600 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Aug 2025 15:56:36 +0000 Subject: [PATCH 3/8] python3Packages.faster-whisper: 1.1.1 -> 1.2.0 --- pkgs/development/python-modules/faster-whisper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/faster-whisper/default.nix b/pkgs/development/python-modules/faster-whisper/default.nix index eda6b677fd3b..86fd907cc6c8 100644 --- a/pkgs/development/python-modules/faster-whisper/default.nix +++ b/pkgs/development/python-modules/faster-whisper/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "faster-whisper"; - version = "1.1.1"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "SYSTRAN"; repo = "faster-whisper"; tag = "v${version}"; - hash = "sha256-1j0ZNQY+P7ZflFCxKkFncJl7Rwuf3AMhzsS6CO9uLD0="; + hash = "sha256-kv2pLszImGzrPI0q2eglX//BMrj2pF0oMHnZ+7VKrHI="; }; build-system = [ From 00b4af6afd2897e4c949ca8642c48a9de867f12e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Aug 2025 16:56:30 +0000 Subject: [PATCH 4/8] vault: 1.20.1 -> 1.20.2 --- pkgs/by-name/va/vault/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/va/vault/package.nix b/pkgs/by-name/va/vault/package.nix index be78843bb61f..b393fff93c77 100644 --- a/pkgs/by-name/va/vault/package.nix +++ b/pkgs/by-name/va/vault/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "vault"; - version = "1.20.1"; + version = "1.20.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - hash = "sha256-tTlfTd96+WiTk5HmtHws/zU3jrFfBnce6Wrtr7XsENY="; + hash = "sha256-QkBSHkXP67khJa/Ju7yx97ibOU3BcBt6tOHnS0rYvZM="; }; - vendorHash = "sha256-kdtWmRrzvHXPh/DIYkeGS7oSKB+lKiBdglld13av9FY="; + vendorHash = "sha256-O7T7DO3RCQVBBDvFSLAgoD8tJRMJpb4/3ch7OYk4bIk="; proxyVendor = true; From 6e6efe1dbba003465879beda2bbc1e8a22490e98 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 11 Aug 2025 20:22:58 +0200 Subject: [PATCH 5/8] treewide: remove prusnak from maintainers for packages i don't use --- pkgs/by-name/fa/faraday/package.nix | 5 +---- pkgs/by-name/li/libsurvive/package.nix | 2 +- pkgs/by-name/li/lightning-loop/package.nix | 5 +---- pkgs/by-name/li/lightning-pool/package.nix | 5 +---- pkgs/by-name/mo/monado/package.nix | 5 +---- pkgs/development/compilers/ghc/8.10.7-binary.nix | 4 +--- pkgs/servers/monitoring/prometheus/domain-exporter.nix | 1 - 7 files changed, 6 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/fa/faraday/package.nix b/pkgs/by-name/fa/faraday/package.nix index cf34ae4dd277..dd7ad765badb 100644 --- a/pkgs/by-name/fa/faraday/package.nix +++ b/pkgs/by-name/fa/faraday/package.nix @@ -37,9 +37,6 @@ buildGoModule rec { description = "LND Channel Management Tools"; homepage = "https://github.com/lightninglabs/faraday"; license = licenses.mit; - maintainers = with maintainers; [ - proofofkeags - prusnak - ]; + maintainers = with maintainers; [ proofofkeags ]; }; } diff --git a/pkgs/by-name/li/libsurvive/package.nix b/pkgs/by-name/li/libsurvive/package.nix index 0e2de3df085d..d9c1ce51ba81 100644 --- a/pkgs/by-name/li/libsurvive/package.nix +++ b/pkgs/by-name/li/libsurvive/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { description = "Open Source Lighthouse Tracking System"; homepage = "https://github.com/cntools/libsurvive"; license = licenses.mit; - maintainers = with maintainers; [ prusnak ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/li/lightning-loop/package.nix b/pkgs/by-name/li/lightning-loop/package.nix index c5ce2a061b23..df3ad835f178 100644 --- a/pkgs/by-name/li/lightning-loop/package.nix +++ b/pkgs/by-name/li/lightning-loop/package.nix @@ -31,9 +31,6 @@ buildGoModule rec { description = "Lightning Loop Client"; homepage = "https://github.com/lightninglabs/loop"; license = licenses.mit; - maintainers = with maintainers; [ - proofofkeags - prusnak - ]; + maintainers = with maintainers; [ proofofkeags ]; }; } diff --git a/pkgs/by-name/li/lightning-pool/package.nix b/pkgs/by-name/li/lightning-pool/package.nix index af93ba7c1e83..145455a4ea75 100644 --- a/pkgs/by-name/li/lightning-pool/package.nix +++ b/pkgs/by-name/li/lightning-pool/package.nix @@ -31,9 +31,6 @@ buildGoModule rec { description = "Lightning Pool Client"; homepage = "https://github.com/lightninglabs/pool"; license = licenses.mit; - maintainers = with maintainers; [ - proofofkeags - prusnak - ]; + maintainers = with maintainers; [ proofofkeags ]; }; } diff --git a/pkgs/by-name/mo/monado/package.nix b/pkgs/by-name/mo/monado/package.nix index d6d1cfff8c0f..aff6ab89d4c5 100644 --- a/pkgs/by-name/mo/monado/package.nix +++ b/pkgs/by-name/mo/monado/package.nix @@ -168,10 +168,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Open source XR runtime"; homepage = "https://monado.freedesktop.org/"; license = lib.licenses.boost; - maintainers = with lib.maintainers; [ - Scrumplex - prusnak - ]; + maintainers = with lib.maintainers; [ Scrumplex ]; platforms = lib.platforms.linux; mainProgram = "monado-cli"; }; diff --git a/pkgs/development/compilers/ghc/8.10.7-binary.nix b/pkgs/development/compilers/ghc/8.10.7-binary.nix index f863573b2d5a..72beccc6ee3b 100644 --- a/pkgs/development/compilers/ghc/8.10.7-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.7-binary.nix @@ -540,9 +540,7 @@ stdenv.mkDerivation { # long as the evaluator runs on a platform that supports # `pkgsMusl`. platforms = builtins.attrNames ghcBinDists.${distSetName}; - maintainers = with lib.maintainers; [ - prusnak - ]; + maintainers = with lib.maintainers; [ ]; teams = [ lib.teams.haskell ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/domain-exporter.nix b/pkgs/servers/monitoring/prometheus/domain-exporter.nix index 3ab4e9795df9..4e796e5852dc 100644 --- a/pkgs/servers/monitoring/prometheus/domain-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/domain-exporter.nix @@ -29,7 +29,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ mmilata - prusnak peterhoeg caarlos0 ]; From e1e49992a90651e041d5ea767b8536b75ec6715f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Aug 2025 16:49:37 +0000 Subject: [PATCH 6/8] easycrypt: 2025.03 -> 2025.08 --- pkgs/applications/science/logic/easycrypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/easycrypt/default.nix b/pkgs/applications/science/logic/easycrypt/default.nix index 8f349b5dd174..629d5faea395 100644 --- a/pkgs/applications/science/logic/easycrypt/default.nix +++ b/pkgs/applications/science/logic/easycrypt/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "easycrypt"; - version = "2025.03"; + version = "2025.08"; src = fetchFromGitHub { owner = pname; repo = pname; tag = "r${version}"; - hash = "sha256-Z6JaqR0BocEhDuof929HOvzWu6C77CAqeuYYY2PXvrs="; + hash = "sha256-WUms6hh7T5/gxRLFvbJQiT1ErLr8KFilFNOMTT/fIyY="; }; nativeBuildInputs = From 8fb58c5db64e4452e0b83f1843ad5c8b205c2f2c Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Mon, 11 Aug 2025 14:34:47 -0400 Subject: [PATCH 7/8] warp-terminal: remove emilytrau as maintainer --- pkgs/by-name/wa/warp-terminal/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/wa/warp-terminal/package.nix b/pkgs/by-name/wa/warp-terminal/package.nix index 4af5fe0bfdd9..eb285201edef 100644 --- a/pkgs/by-name/wa/warp-terminal/package.nix +++ b/pkgs/by-name/wa/warp-terminal/package.nix @@ -112,7 +112,6 @@ let license = licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ - emilytrau imadnyc donteatoreo johnrtitor From d56d26bf30359f889d974aee3da463094e8c04f6 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 11 Aug 2025 21:56:05 +0300 Subject: [PATCH 8/8] nixos/pcscd: fix eval --- nixos/modules/services/hardware/pcscd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/pcscd.nix b/nixos/modules/services/hardware/pcscd.nix index 451952070b72..10229c468740 100644 --- a/nixos/modules/services/hardware/pcscd.nix +++ b/nixos/modules/services/hardware/pcscd.nix @@ -112,7 +112,7 @@ in environment = { PCSCLITE_HP_DROPDIR = pluginEnv; - PCSCLITE_FILTER_IGNORE_READER_NAMES = lib.mkIf (cfg.ignoreReaderNames) ( + PCSCLITE_FILTER_IGNORE_READER_NAMES = lib.mkIf (cfg.ignoreReaderNames != [ ]) ( lib.concatStringsSep ":" cfg.ignoreReaderNames );