Merge staging-next into staging

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
         );
 

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 =

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 ];
   };
 }

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;
   };
 }

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 ];
   };
 }

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 ];
   };
 }

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";
   };

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;
 

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

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 ];
   };
 }

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 = [

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; [ ];
   };
 }

pkgs/servers/monitoring/prometheus/domain-exporter.nix

@@ -29,7 +29,6 @@ buildGoModule rec {
     license = licenses.mit;
     maintainers = with maintainers; [
       mmilata
-      prusnak
       peterhoeg
       caarlos0
     ];

pkgs/top-level/all-packages.nix

@@ -10042,7 +10042,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;
   };