From 89ec1b315ac98577a0086d99854de91c6eba3182 Mon Sep 17 00:00:00 2001
From: Max <max@privatevoid.net>
Date: Fri, 2 Aug 2024 12:54:35 +0200
Subject: [PATCH 01/29] nixos-rebuild: ignore SUDO_USER

---
 pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
index 03b2dbfbeb66..57a647e0fa58 100755
--- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
+++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
@@ -181,10 +181,6 @@ while [ "$#" -gt 0 ]; do
     esac
 done
 
-if [[ -n "$SUDO_USER" ]]; then
-    useSudo=1
-fi
-
 # log the given argument to stderr if verbose mode is on
 logVerbose() {
     if [ -n "$verboseScript" ]; then

From 35d1305130ff2904099cbd338f36865f5a333c9f Mon Sep 17 00:00:00 2001
From: redyf <mateusalvespereira7@gmail.com>
Date: Wed, 7 Aug 2024 10:32:42 -0300
Subject: [PATCH 02/29] nixd: 2.3.0 -> 2.3.1

---
 pkgs/development/tools/language-servers/nixd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix
index 71e9133fcea0..504eabcda0c9 100644
--- a/pkgs/development/tools/language-servers/nixd/default.nix
+++ b/pkgs/development/tools/language-servers/nixd/default.nix
@@ -21,13 +21,13 @@
 
 let
   common = rec {
-    version = "2.3.0";
+    version = "2.3.1";
 
     src = fetchFromGitHub {
       owner = "nix-community";
       repo = "nixd";
       rev = version;
-      hash = "sha256-iB6Hc3kgtsZ360JlAhPqCRWFTf3tawHEKYAeYt7DM4E=";
+      hash = "sha256-JmDMcxIQ0220O/vWw/9SyB1dH7MSJaPK/CKY44ViVjM=";
     };
 
     nativeBuildInputs = [

From 96eb942c2a62de7e04ec42112c788ee4f5fda226 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Aug 2024 07:20:02 +0300
Subject: [PATCH 03/29] pmix: use finalAttrs: pattern

---
 pkgs/development/libraries/pmix/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix
index 31325bd4ba0a..3f12be268c5e 100644
--- a/pkgs/development/libraries/pmix/default.nix
+++ b/pkgs/development/libraries/pmix/default.nix
@@ -4,14 +4,14 @@
 , hwloc, munge, zlib, pandoc, gitMinimal
 } :
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pmix";
   version = "5.0.3";
 
   src = fetchFromGitHub {
     repo = "openpmix";
     owner = "openpmix";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-5qBZj4L0Qu/RvNj8meL0OlLCdfGvBP0D916Mr+0XOCQ=";
     fetchSubmodules = true;
   };
@@ -85,5 +85,5 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.markuskowa ];
     platforms = platforms.linux;
   };
-}
+})
 

From 9c6f3ae8ae1a8f0bf4fd8df5fb5c9c85460dd7a1 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Aug 2024 07:20:40 +0300
Subject: [PATCH 04/29] pmix: don't use with lib; in meta

---
 pkgs/development/libraries/pmix/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix
index 3f12be268c5e..b3b761b2ff5d 100644
--- a/pkgs/development/libraries/pmix/default.nix
+++ b/pkgs/development/libraries/pmix/default.nix
@@ -78,12 +78,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     description = "Process Management Interface for HPC environments";
     homepage = "https://openpmix.github.io/";
-    license = licenses.bsd3;
-    maintainers = [ maintainers.markuskowa ];
-    platforms = platforms.linux;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ markuskowa ];
+    platforms = lib.platforms.linux;
   };
 })
 

From 4a17df26e4f24130b31b63eef1c2ab1a65a2bdfd Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Aug 2024 07:21:05 +0300
Subject: [PATCH 05/29] pmix: add doronbehar to maintainers

---
 pkgs/development/libraries/pmix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix
index b3b761b2ff5d..5ce6dfd7cba5 100644
--- a/pkgs/development/libraries/pmix/default.nix
+++ b/pkgs/development/libraries/pmix/default.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Process Management Interface for HPC environments";
     homepage = "https://openpmix.github.io/";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ markuskowa ];
+    maintainers = with lib.maintainers; [ markuskowa doronbehar ];
     platforms = lib.platforms.linux;
   };
 })

From 85e1c49cdbe21472cbadfb81cb55938f19fce243 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Aug 2024 07:21:40 +0300
Subject: [PATCH 06/29] pmix: nixfmt

---
 pkgs/development/libraries/pmix/default.nix | 43 ++++++++++++++++-----
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix
index 5ce6dfd7cba5..0f51b96d5609 100644
--- a/pkgs/development/libraries/pmix/default.nix
+++ b/pkgs/development/libraries/pmix/default.nix
@@ -1,8 +1,23 @@
-{ lib, stdenv, fetchFromGitHub, perl, autoconf, automake
-, removeReferencesTo, libtool, python3, flex, libevent
-, targetPackages, makeWrapper
-, hwloc, munge, zlib, pandoc, gitMinimal
-} :
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  perl,
+  autoconf,
+  automake,
+  removeReferencesTo,
+  libtool,
+  python3,
+  flex,
+  libevent,
+  targetPackages,
+  makeWrapper,
+  hwloc,
+  munge,
+  zlib,
+  pandoc,
+  gitMinimal,
+}:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pmix";
@@ -16,7 +31,10 @@ stdenv.mkDerivation (finalAttrs: {
     fetchSubmodules = true;
   };
 
-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+  ];
 
   postPatch = ''
     patchShebangs ./autogen.pl
@@ -36,7 +54,12 @@ stdenv.mkDerivation (finalAttrs: {
     makeWrapper
   ];
 
-  buildInputs = [ libevent hwloc munge zlib ];
+  buildInputs = [
+    libevent
+    hwloc
+    munge
+    zlib
+  ];
 
   configureFlags = [
     "--with-libevent=${lib.getDev libevent}"
@@ -82,8 +105,10 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Process Management Interface for HPC environments";
     homepage = "https://openpmix.github.io/";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ markuskowa doronbehar ];
+    maintainers = with lib.maintainers; [
+      markuskowa
+      doronbehar
+    ];
     platforms = lib.platforms.linux;
   };
 })
-

From 97a89f6d197f233115831ea1fe08894ffd55c8d9 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Aug 2024 07:23:47 +0300
Subject: [PATCH 07/29] pmix: use "''${!outputDev}" instead of $dev

This allows disabling multiple outputs more easily, as the first will
evaluate to $out if a "dev" output is not enabled.
---
 pkgs/development/libraries/pmix/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix
index 0f51b96d5609..95ef2610841a 100644
--- a/pkgs/development/libraries/pmix/default.nix
+++ b/pkgs/development/libraries/pmix/default.nix
@@ -82,19 +82,19 @@ stdenv.mkDerivation (finalAttrs: {
 
     # The path to the pmixcc-wrapper-data.txt is hard coded and
     # points to $out instead of dev. Use wrapper to fix paths.
-    wrapProgram $dev/bin/pmixcc \
-      --set PMIX_INCLUDEDIR $dev/include \
-      --set PMIX_PKGDATADIR $dev/share/pmix
+    wrapProgram "''${!outputDev}"/bin/pmixcc \
+      --set PMIX_INCLUDEDIR "''${!outputDev}"/include \
+      --set PMIX_PKGDATADIR "''${!outputDev}"/share/pmix
   '';
 
   postFixup = ''
     # The build info (parameters to ./configure) are hardcoded
     # into the library. This clears all references to $dev/include.
-    remove-references-to -t $dev $(readlink -f $out/lib/libpmix.so)
+    remove-references-to -t "''${!outputDev}" $(readlink -f $out/lib/libpmix.so)
 
     # Pin the compiler to the current version in a cross compiler friendly way.
     # Same pattern as for openmpi (see https://github.com/NixOS/nixpkgs/pull/58964#discussion_r275059427).
-    substituteInPlace $dev/share/pmix/pmixcc-wrapper-data.txt \
+    substituteInPlace "''${!outputDev}"/share/pmix/pmixcc-wrapper-data.txt \
       --replace-fail compiler=gcc \
         compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc
   '';

From 7c189828223f55f7fc07a01bc6d860e44918f690 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Aug 2024 07:28:04 +0300
Subject: [PATCH 08/29] pmix: put substitution & wrapping in install & fixup
 respectively

Make it match the same pattern as in openmpi.
---
 pkgs/development/libraries/pmix/default.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix
index 95ef2610841a..2f4a616f76e3 100644
--- a/pkgs/development/libraries/pmix/default.nix
+++ b/pkgs/development/libraries/pmix/default.nix
@@ -80,11 +80,11 @@ stdenv.mkDerivation (finalAttrs: {
     moveToOutput "bin/pmixcc" "''${!outputDev}"
     moveToOutput "share/pmix/pmixcc-wrapper-data.txt" "''${!outputDev}"
 
-    # The path to the pmixcc-wrapper-data.txt is hard coded and
-    # points to $out instead of dev. Use wrapper to fix paths.
-    wrapProgram "''${!outputDev}"/bin/pmixcc \
-      --set PMIX_INCLUDEDIR "''${!outputDev}"/include \
-      --set PMIX_PKGDATADIR "''${!outputDev}"/share/pmix
+    # Pin the compiler to the current version in a cross compiler friendly way.
+    # Same pattern as for openmpi (see https://github.com/NixOS/nixpkgs/pull/58964#discussion_r275059427).
+    substituteInPlace "''${!outputDev}"/share/pmix/pmixcc-wrapper-data.txt \
+      --replace-fail compiler=gcc \
+        compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc
   '';
 
   postFixup = ''
@@ -92,11 +92,11 @@ stdenv.mkDerivation (finalAttrs: {
     # into the library. This clears all references to $dev/include.
     remove-references-to -t "''${!outputDev}" $(readlink -f $out/lib/libpmix.so)
 
-    # Pin the compiler to the current version in a cross compiler friendly way.
-    # Same pattern as for openmpi (see https://github.com/NixOS/nixpkgs/pull/58964#discussion_r275059427).
-    substituteInPlace "''${!outputDev}"/share/pmix/pmixcc-wrapper-data.txt \
-      --replace-fail compiler=gcc \
-        compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc
+    # The path to the pmixcc-wrapper-data.txt is hard coded and
+    # points to $out instead of dev. Use wrapper to fix paths.
+    wrapProgram "''${!outputDev}"/bin/pmixcc \
+      --set PMIX_INCLUDEDIR "''${!outputDev}"/include \
+      --set PMIX_PKGDATADIR "''${!outputDev}"/share/pmix
   '';
 
   enableParallelBuilding = true;

From 3019956f12fd4c2936e8e33ceb203909d52aa9b1 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Aug 2024 07:22:09 +0300
Subject: [PATCH 09/29] pmix: enable on all platforms

Disable multiple outputs on non Linux platforms, and don't perform
wrapper-data substitution on non-Linux platforms.
---
 pkgs/development/libraries/pmix/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix
index 2f4a616f76e3..ed3496b45852 100644
--- a/pkgs/development/libraries/pmix/default.nix
+++ b/pkgs/development/libraries/pmix/default.nix
@@ -33,6 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   outputs = [
     "out"
+  ] ++ lib.optionals stdenv.isLinux [
     "dev"
   ];
 
@@ -80,6 +81,11 @@ stdenv.mkDerivation (finalAttrs: {
     moveToOutput "bin/pmixcc" "''${!outputDev}"
     moveToOutput "share/pmix/pmixcc-wrapper-data.txt" "''${!outputDev}"
 
+    ''
+    # From some reason the Darwin build doesn't include this file, so we
+    # currently disable this substitution for any non-Linux platform, until a
+    # Darwin user will care enough about this cross platform fix.
+    + lib.optionalString stdenv.isLinux ''
     # Pin the compiler to the current version in a cross compiler friendly way.
     # Same pattern as for openmpi (see https://github.com/NixOS/nixpkgs/pull/58964#discussion_r275059427).
     substituteInPlace "''${!outputDev}"/share/pmix/pmixcc-wrapper-data.txt \
@@ -88,6 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   postFixup = ''
+  '' + lib.optionalString (lib.elem "dev" finalAttrs.outputs) ''
     # The build info (parameters to ./configure) are hardcoded
     # into the library. This clears all references to $dev/include.
     remove-references-to -t "''${!outputDev}" $(readlink -f $out/lib/libpmix.so)
@@ -109,6 +116,5 @@ stdenv.mkDerivation (finalAttrs: {
       markuskowa
       doronbehar
     ];
-    platforms = lib.platforms.linux;
   };
 })

From 511be509f295ab4d409e4b42478eb0ddcd6f9fb7 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Aug 2024 17:21:01 +0300
Subject: [PATCH 10/29] pmix: nixfmt

---
 pkgs/development/libraries/pmix/default.nix | 32 +++++++++------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix
index ed3496b45852..69e86acfef23 100644
--- a/pkgs/development/libraries/pmix/default.nix
+++ b/pkgs/development/libraries/pmix/default.nix
@@ -31,11 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
     fetchSubmodules = true;
   };
 
-  outputs = [
-    "out"
-  ] ++ lib.optionals stdenv.isLinux [
-    "dev"
-  ];
+  outputs = [ "out" ] ++ lib.optionals stdenv.isLinux [ "dev" ];
 
   postPatch = ''
     patchShebangs ./autogen.pl
@@ -74,27 +70,27 @@ stdenv.mkDerivation (finalAttrs: {
     ./autogen.pl
   '';
 
-  postInstall = ''
-    find $out/lib/ -name "*.la" -exec rm -f \{} \;
+  postInstall =
+    ''
+      find $out/lib/ -name "*.la" -exec rm -f \{} \;
 
-    moveToOutput "bin/pmix_info" "''${!outputDev}"
-    moveToOutput "bin/pmixcc" "''${!outputDev}"
-    moveToOutput "share/pmix/pmixcc-wrapper-data.txt" "''${!outputDev}"
+      moveToOutput "bin/pmix_info" "''${!outputDev}"
+      moveToOutput "bin/pmixcc" "''${!outputDev}"
+      moveToOutput "share/pmix/pmixcc-wrapper-data.txt" "''${!outputDev}"
 
     ''
     # From some reason the Darwin build doesn't include this file, so we
     # currently disable this substitution for any non-Linux platform, until a
     # Darwin user will care enough about this cross platform fix.
     + lib.optionalString stdenv.isLinux ''
-    # Pin the compiler to the current version in a cross compiler friendly way.
-    # Same pattern as for openmpi (see https://github.com/NixOS/nixpkgs/pull/58964#discussion_r275059427).
-    substituteInPlace "''${!outputDev}"/share/pmix/pmixcc-wrapper-data.txt \
-      --replace-fail compiler=gcc \
-        compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc
-  '';
+      # Pin the compiler to the current version in a cross compiler friendly way.
+      # Same pattern as for openmpi (see https://github.com/NixOS/nixpkgs/pull/58964#discussion_r275059427).
+      substituteInPlace "''${!outputDev}"/share/pmix/pmixcc-wrapper-data.txt \
+        --replace-fail compiler=gcc \
+          compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc
+    '';
 
-  postFixup = ''
-  '' + lib.optionalString (lib.elem "dev" finalAttrs.outputs) ''
+  postFixup = lib.optionalString (lib.elem "dev" finalAttrs.outputs) ''
     # The build info (parameters to ./configure) are hardcoded
     # into the library. This clears all references to $dev/include.
     remove-references-to -t "''${!outputDev}" $(readlink -f $out/lib/libpmix.so)

From 06d68ea13a421d5ebd9da352d40846d0875b3858 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Aug 2024 15:28:18 +0300
Subject: [PATCH 11/29] openmpi: add doronbehar to maintainers

---
 pkgs/development/libraries/openmpi/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index c695571ff1f8..4681504397c3 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -263,7 +263,10 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.open-mpi.org/";
     description = "Open source MPI-3 implementation";
     longDescription = "The Open MPI Project is an open source MPI-3 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.";
-    maintainers = with lib.maintainers; [ markuskowa ];
+    maintainers = with lib.maintainers; [
+      markuskowa
+      doronbehar
+    ];
     license = lib.licenses.bsd3;
     platforms = lib.platforms.unix;
   };

From 908ec599a34b1f8c98717b67d38582f33384d876 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Aug 2024 08:02:24 +0300
Subject: [PATCH 12/29] openmpi: 5.0.3 -> 5.0.5

---
 pkgs/development/libraries/openmpi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 4681504397c3..992a16426363 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -40,11 +40,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "openmpi";
-  version = "5.0.3";
+  version = "5.0.5";
 
   src = fetchurl {
     url = "https://www.open-mpi.org/software/ompi/v${lib.versions.majorMinor finalAttrs.version}/downloads/openmpi-${finalAttrs.version}.tar.bz2";
-    sha256 = "sha256-mQWC8gazqzLpOKoxu/B8Y5No5EBdyhlvq+fw927tqQs=";
+    sha256 = "sha256-ZYjVfApL0pmiQQP04ZYFGynotV+9pJ4R1bPTIDCjJ3Y=";
   };
 
   postPatch = ''

From af0df905e6ca24d7bcc0dd2618e23e2eed7164e7 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 7 Aug 2024 18:48:33 +0300
Subject: [PATCH 13/29] openmpi: fix configurePhase on darwin by always using
 our pmix

---
 pkgs/development/libraries/openmpi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 992a16426363..a70e3ce787d7 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -116,8 +116,8 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.enableFeature cudaSupport "mca-dso")
     (lib.enableFeature fortranSupport "mpi-fortran")
     (lib.withFeatureAs stdenv.isLinux "libnl" (lib.getDev libnl))
-    "--with-pmix=${if stdenv.isLinux then (lib.getDev pmix) else "internal"}"
-    (lib.withFeatureAs stdenv.isLinux "pmix-libdir" "${lib.getLib pmix}/lib")
+    "--with-pmix=${lib.getDev pmix}"
+    "--with-pmix-libdir=${lib.getLib pmix}/lib"
     # Puts a "default OMPI_PRTERUN" value to mpirun / mpiexec executables
     (lib.withFeatureAs stdenv.isLinux "prrte" (lib.getBin prrte))
     (lib.withFeature enableSGE "sge")

From 8db6dc53b0b03c7b6addea4cfd89b591678caa8d Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 7 Aug 2024 18:57:20 +0300
Subject: [PATCH 14/29] openmpi: fix postInstall hook on Darwin

---
 pkgs/development/libraries/openmpi/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index a70e3ce787d7..79afcbff17c4 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -212,7 +212,12 @@ stdenv.mkDerivation (finalAttrs: {
       ${lib.pipe wrapperDataFileNames [
         (lib.mapCartesianProduct (
           { part1, part2 }:
-          ''
+          # From some reason the Darwin build doesn't include some of these
+          # wrapperDataSubstitutions strings and even some of the files. Hence
+          # we currently don't perform these substitutions on other platforms,
+          # until a Darwin user will care enough about this cross platform
+          # related substitution.
+          lib.optionalString stdenv.isLinux ''
             substituteInPlace "''${!outputDev}/share/openmpi/${part1}${part2}-wrapper-data.txt" \
               --replace-fail \
                 compiler=${lib.elemAt wrapperDataSubstitutions.${part2} 0} \

From effee014bb0f8472d80199343989e1aca7bcaa68 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 Aug 2024 05:38:37 +0000
Subject: [PATCH 15/29] protoc-gen-es: 1.10.0 -> 2.0.0

---
 pkgs/by-name/pr/protoc-gen-es/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/protoc-gen-es/package.nix b/pkgs/by-name/pr/protoc-gen-es/package.nix
index 4b357e470550..fe36c239a8a7 100644
--- a/pkgs/by-name/pr/protoc-gen-es/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-es/package.nix
@@ -7,20 +7,20 @@
 
 buildNpmPackage rec {
   pname = "protoc-gen-es";
-  version = "1.10.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "bufbuild";
     repo = "protobuf-es";
     rev = "refs/tags/v${version}";
-    hash = "sha256-bHl8gqNrTm1+Cnj43RWmrLDUz+G11C4gprEiNOpyOdQ=";
+    hash = "sha256-foPt++AZjBfqKepzi2mKXB7zbpCqjmPftN9wyk5Yk8g=";
 
     postFetch = ''
       ${lib.getExe npm-lockfile-fix} $out/package-lock.json
     '';
   };
 
-  npmDepsHash = "sha256-ozkkakfSBycu83gTs8Orhm5Tg8kRSrF/vMJxVnPjhIw=";
+  npmDepsHash = "sha256-4m3xeiid+Ag9l1qNoBH08hu3wawWfNw1aqeniFK0Byc=";
 
   npmWorkspace = "packages/protoc-gen-es";
 

From debd515edb8a7c156e2b1118d44b516fadec40c3 Mon Sep 17 00:00:00 2001
From: thenhnn <162156666+thenhnn@users.noreply.github.com>
Date: Sat, 10 Aug 2024 19:12:33 +0300
Subject: [PATCH 16/29] ivpn: change obfs4 executable name to lyrebird

---
 pkgs/tools/networking/ivpn/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/ivpn/default.nix b/pkgs/tools/networking/ivpn/default.nix
index 62ac14812aad..cdc3035e57a6 100644
--- a/pkgs/tools/networking/ivpn/default.nix
+++ b/pkgs/tools/networking/ivpn/default.nix
@@ -69,7 +69,7 @@ builtins.mapAttrs (pname: attrs: buildGoModule (attrs // rec {
       substituteInPlace daemon/service/platform/platform_linux_release.go \
         --replace 'installDir := "/opt/ivpn"' "installDir := \"$out\"" \
         --replace 'obfsproxyStartScript = path.Join(installDir, "obfsproxy/obfs4proxy")' \
-        'obfsproxyStartScript = "${obfs4}/bin/obfs4proxy"' \
+        'obfsproxyStartScript = "${lib.getExe obfs4}"' \
         --replace 'wgBinaryPath = path.Join(installDir, "wireguard-tools/wg-quick")' \
         'wgBinaryPath = "${wireguard-tools}/bin/wg-quick"' \
         --replace 'wgToolBinaryPath = path.Join(installDir, "wireguard-tools/wg")' \

From 01bf973fc47209ab32f32a9b8b9e8c394c1f8990 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Sun, 4 Aug 2024 10:58:03 +0200
Subject: [PATCH 17/29] castor: fix build

This fixes the generation of bash completion by patching the shebang of
the castor script before the generation is excuted.
---
 pkgs/development/php-packages/castor/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/php-packages/castor/default.nix b/pkgs/development/php-packages/castor/default.nix
index c191d7978cd7..cd17a7474283 100644
--- a/pkgs/development/php-packages/castor/default.nix
+++ b/pkgs/development/php-packages/castor/default.nix
@@ -35,9 +35,9 @@ php.buildComposerProject (finalAttrs: {
   # install shell completions
   postInstall = ''
     installShellCompletion --cmd castor \
-      --bash <($out/bin/castor completion bash) \
-      --fish <($out/bin/castor completion fish) \
-      --zsh <($out/bin/castor completion zsh)
+      --bash <(php $out/bin/castor completion bash) \
+      --fish <(php $out/bin/castor completion fish) \
+      --zsh <(php $out/bin/castor completion zsh)
   '';
 
   passthru = {

From ed0930b7b039b8c103060c3adee3910ff4b26f60 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Sun, 4 Aug 2024 11:01:50 +0200
Subject: [PATCH 18/29] castor: 0.14.0 -> 0.17.1

---
 pkgs/development/php-packages/castor/default.nix | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/php-packages/castor/default.nix b/pkgs/development/php-packages/castor/default.nix
index cd17a7474283..04b45a5961de 100644
--- a/pkgs/development/php-packages/castor/default.nix
+++ b/pkgs/development/php-packages/castor/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   fetchFromGitHub,
-  fetchpatch,
   installShellFiles,
   php,
   nix-update-script,
@@ -10,25 +9,16 @@
 
 php.buildComposerProject (finalAttrs: {
   pname = "castor";
-  version = "0.14.0";
+  version = "0.17.1";
 
   src = fetchFromGitHub {
     owner = "jolicode";
     repo = "castor";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-sSIkXNW6RR1mx15dKouQLMaHBr5FEkTTc/0QIkWV8sg=";
+    hash = "sha256-ng32vuGlGffpkzf3hXu0sNbj0PCDu4DpZnMnbDV9pZk=";
   };
 
-  patches = [
-    # Upstream lock is invalid. https://github.com/jolicode/castor/issues/319
-    (fetchpatch {
-      name = "fix-invalid-lock.patch";
-      url = "https://github.com/jolicode/castor/commit/5ff0c3ecbdddad20146adbc2f055b83f5aadba0f.patch";
-      hash = "sha256-1a3Dpk/UXp92Ugw9zSoLPsbWOJEuP2FBWc/pQ/EKwaM=";
-    })
-  ];
-
-  vendorHash = "sha256-HfEjwlkozeuT4LDnYwiCu7T0spcf4GLhkd7Kc1VRnro=";
+  vendorHash = "sha256-E2NMWuUQXQ96NbKrcFnFGlxWR0tkd56MXk1bCL0N/sE=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 92e6575c9a810392043984116384a1b6012b62a0 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 11 Aug 2024 22:45:21 +0200
Subject: [PATCH 19/29] recyclarr: fix passthru.tests

---
 pkgs/tools/video/recyclarr/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/video/recyclarr/default.nix b/pkgs/tools/video/recyclarr/default.nix
index aef05e2a731f..532a59a65667 100644
--- a/pkgs/tools/video/recyclarr/default.nix
+++ b/pkgs/tools/video/recyclarr/default.nix
@@ -74,6 +74,7 @@ stdenv.mkDerivation rec {
     updateScript = ./update.sh;
     tests.version = testers.testVersion {
       package = recyclarr;
+      version = "v${version}";
     };
   };
 

From 88396a022b91ff694df311361a6dd480d457059c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 Aug 2024 23:05:18 +0000
Subject: [PATCH 20/29] sunpaper: 2.0 -> 2.1

Co-authored-by: eclairevoyant <contactmeongithubinstead@proton.me>
---
 pkgs/by-name/su/sunpaper/package.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/su/sunpaper/package.nix b/pkgs/by-name/su/sunpaper/package.nix
index e704cb87f1c6..8aa569922bf9 100644
--- a/pkgs/by-name/su/sunpaper/package.nix
+++ b/pkgs/by-name/su/sunpaper/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sunpaper";
-  version = "2.0";
+  version = "2.1";
 
   src = fetchFromGitHub {
     owner = "hexive";
     repo = "sunpaper";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-8s7SS79wCS0nRR7IpkshP5QWJqqKEeBu6EtFPDM+2cM=";
+    hash = "sha256-koCK0ntzRf8OXoUj5DJdPWsFDD8EAMjnGdM1B5oeBBc=";
   };
 
   buildInputs = [
@@ -23,9 +23,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   postPatch = ''
     substituteInPlace sunpaper.sh \
-      --replace "sunwait" "${lib.getExe sunwait}" \
-      --replace "setwallpaper" "${lib.getExe' wallutils "setwallpaper"}" \
-      --replace '$HOME/sunpaper/images/' "$out/share/sunpaper/images/"
+      --replace-fail "sunwait" "${lib.getExe sunwait}" \
+      --replace-fail "setwallpaper" "${lib.getExe' wallutils "setwallpaper"}" \
+      --replace-fail '$HOME/sunpaper/images/' "$out/share/sunpaper/images/" \
+      --replace-fail '/usr/share' '/etc'
   '';
 
   installPhase = ''

From 6f4222161156c89eb3bafc3cde32ea577fcafb72 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Mon, 12 Aug 2024 02:11:07 +0200
Subject: [PATCH 21/29] tautulli: 2.14.3 -> 2.14.4

---
 pkgs/servers/tautulli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix
index 198dc671d078..191a8a0bc23b 100644
--- a/pkgs/servers/tautulli/default.nix
+++ b/pkgs/servers/tautulli/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonApplication rec {
   pname = "Tautulli";
-  version = "2.14.3";
+  version = "2.14.4";
   format = "other";
 
   pythonPath = [ setuptools ];
@@ -12,7 +12,7 @@ buildPythonApplication rec {
     owner = "Tautulli";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-9/KtlthI71qrf1QlJ0/WI+H401U+6bnrO1qfQO5TTUU=";
+    sha256 = "sha256-IV5ZyVuZvr09wQ8SgcHiTBp916B2ZPQvrg9+O8H3xsk=";
   };
 
   installPhase = ''

From 71540d08d89762964df199d3dbc9c560ac77f970 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 12 Aug 2024 00:24:20 +0000
Subject: [PATCH 22/29] asciigraph: 0.7.1 -> 0.7.2

---
 pkgs/tools/text/asciigraph/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/asciigraph/default.nix b/pkgs/tools/text/asciigraph/default.nix
index 0da6b7e87297..46166d8c6370 100644
--- a/pkgs/tools/text/asciigraph/default.nix
+++ b/pkgs/tools/text/asciigraph/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "asciigraph";
-  version = "0.7.1";
+  version = "0.7.2";
 
   src = fetchFromGitHub {
     owner = "guptarohit";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-pCfjk8ViMY2iAus2/hibSZXgKY9YBFRH3vsD19MTJ+8=";
+    sha256 = "sha256-Y+RRFFCeuDjzTznpfC7Wn3j96ZCFSOzvb8ND/ATW+JI=";
   };
 
   vendorHash = null;

From e5b3756f87b4d4cba438de5e27a115230077a625 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 12 Aug 2024 01:34:16 +0000
Subject: [PATCH 23/29] percollate: 4.2.2 -> 4.2.3

---
 pkgs/tools/text/percollate/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/text/percollate/default.nix b/pkgs/tools/text/percollate/default.nix
index 3d4e8f4b5bd6..1b9923acc39c 100644
--- a/pkgs/tools/text/percollate/default.nix
+++ b/pkgs/tools/text/percollate/default.nix
@@ -2,21 +2,21 @@
 
 buildNpmPackage rec {
   pname = "percollate";
-  version = "4.2.2";
+  version = "4.2.3";
 
   src = fetchFromGitHub {
     owner = "danburzo";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-zvvgK0LJ8EK6ANqRmJI96RgMkRAlSD7yIAoe0kxG5gU=";
+    hash = "sha256-JpdSEockALXtuuMMi5mgD5AXcayojyK0qMMWF+XFfZE=";
   };
 
-  npmDepsHash = "sha256-xvck+IEWaPOuXU4k8keCPHiWfylAffe1eDgN/GpxW7g=";
+  npmDepsHash = "sha256-qWu1YYi4ddpAUtbDxF4YA8OO6BLZ6gfeb4pw0n9BaZw=";
 
   dontNpmBuild = true;
 
   # Dev dependencies include an unnecessary Java dependency (epubchecker)
-  # https://github.com/danburzo/percollate/blob/v4.2.2/package.json#L40
+  # https://github.com/danburzo/percollate/blob/v4.2.3/package.json#L40
   npmInstallFlags = [ "--omit=dev" ];
 
   nativeBuildInputs = [ makeWrapper ];

From 93a75fa93cefd3eea9f1c7c275853df6aadcfd0a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 12 Aug 2024 01:43:51 +0000
Subject: [PATCH 24/29] pragtical: 3.4.1 -> 3.4.2

---
 pkgs/by-name/pr/pragtical/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/pragtical/package.nix b/pkgs/by-name/pr/pragtical/package.nix
index fa673b20f2fe..5b5ee466a16c 100644
--- a/pkgs/by-name/pr/pragtical/package.nix
+++ b/pkgs/by-name/pr/pragtical/package.nix
@@ -20,7 +20,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pragtical";
-  version = "3.4.1";
+  version = "3.4.2";
   pluginManagerVersion = "1.2.9";
 
   src = fetchFromGitHub {
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
       find subprojects -type d -name .git -prune -execdir rm -r {} +
     '';
 
-    hash = "sha256-JlVNcNPsn4trO0w5NDtWvZhxgY2jXqVzFaXfjxGg6+s=";
+    hash = "sha256-mYLYRyyKfjTCD8mi1KrQNLqwd8QX1wgpJtpWASQCLQU=";
   };
 
   nativeBuildInputs = [

From fe954cfbd07d38f568123fac76417b8485f7e9c4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 12 Aug 2024 02:07:02 +0000
Subject: [PATCH 25/29] pack: 0.35.0 -> 0.35.1

---
 pkgs/by-name/pa/pack/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pa/pack/package.nix b/pkgs/by-name/pa/pack/package.nix
index 01703d5b1289..8a608af06b42 100644
--- a/pkgs/by-name/pa/pack/package.nix
+++ b/pkgs/by-name/pa/pack/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "pack";
-  version = "0.35.0";
+  version = "0.35.1";
 
   src = fetchFromGitHub {
     owner = "buildpacks";
     repo = "pack";
     rev = "v${version}";
-    hash = "sha256-Y6weRD3MrWEL/KYBMb/bJd6NKfcRELG+RQAhmh/gsuo=";
+    hash = "sha256-iQkYtnobhAt73JMRrejk0DkOH1ZW2bqfZx05ZrDG5bA=";
   };
 
   vendorHash = "sha256-gp6Hd0MZxtUX0yYshFIGwrm6yY2pdSOtUs6xmzXBqc4=";

From 56a428d5fbd6e6f7602bbf9e577b11c22816e565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Sun, 11 Aug 2024 22:33:27 -0400
Subject: [PATCH 26/29] wrapNeovimUnstable: fix meta.position

---
 pkgs/applications/editors/neovim/wrapper.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix
index 98e6c9c76039..61f0230724cd 100644
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@@ -201,7 +201,16 @@ let
       };
     };
 
-    meta = (builtins.removeAttrs neovim-unwrapped.meta ["position" "outputsToInstall"]) // {
+    meta = {
+      inherit (neovim-unwrapped.meta)
+        description
+        longDescription
+        homepage
+        mainProgram
+        license
+        maintainers
+        platforms;
+
       # To prevent builds on hydra
       hydraPlatforms = [];
       # prefer wrapper over the package

From 240e987a1ac0864d69d7713b85fe0ffcc9f8c0ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 12 Aug 2024 03:33:14 +0000
Subject: [PATCH 27/29] python312Packages.glean-parser: 14.5.0 -> 14.5.1

---
 pkgs/development/python-modules/glean-parser/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix
index 9fc995c3270a..e23299a769df 100644
--- a/pkgs/development/python-modules/glean-parser/default.nix
+++ b/pkgs/development/python-modules/glean-parser/default.nix
@@ -15,13 +15,13 @@
 
 buildPythonPackage rec {
   pname = "glean-parser";
-  version = "14.5.0";
+  version = "14.5.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "glean_parser";
     inherit version;
-    hash = "sha256-/j96nM3vW1HpfaxFMyumIj1IccjUcK6lySuTiKf5kLA=";
+    hash = "sha256-G01gBwBN3oQ5yvobaLiJYrhjjLfninVjSYuXLsJg1DU=";
   };
 
   postPatch = ''

From 1a1c8d5ac7d1e1af9c8e46591a0c1a5c41a7ee5d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 12 Aug 2024 04:05:48 +0000
Subject: [PATCH 28/29] protonmail-desktop: 1.0.5 -> 1.0.6

---
 pkgs/by-name/pr/protonmail-desktop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/protonmail-desktop/package.nix b/pkgs/by-name/pr/protonmail-desktop/package.nix
index 815b0dc8fe8e..2d937677045d 100644
--- a/pkgs/by-name/pr/protonmail-desktop/package.nix
+++ b/pkgs/by-name/pr/protonmail-desktop/package.nix
@@ -13,15 +13,15 @@ let
   srcHashes = {
     # Upstream info: It's intended to stay like this in further releases
     # https://github.com/NixOS/nixpkgs/pull/326152#discussion_r1679558135
-    universal-darwin = "sha256-JfZwHFp0aZtHcbP7tyG7uqFs2w+LWKfnfyuxxpxDJZ8=";
-    x86_64-linux = "sha256-En5vkTHYtwN6GMgbtyhzsPqknOPRO9KlTqZfbBFaIFQ=";
+    universal-darwin = "sha256-6b+CNCvrkIA1CvSohSJZq/veZZNsA3lyhVv5SsBlJlw=";
+    x86_64-linux = "sha256-v8ufnQQEqTT5cr7fq8Fozje/NDlBzaCeKIzE6yU/biE=";
   };
 
 in
 stdenv.mkDerivation rec {
   pname = "protonmail-desktop";
   # Upstream info: "v"-prefix got dropped
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchurl {
     url =

From 7811e65c62769d09a170f0a7b20dcd6b48655548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com>
Date: Mon, 12 Aug 2024 07:22:53 +0200
Subject: [PATCH 29/29] extism-cli: fix build (#333638)

---
 pkgs/development/tools/extism-cli/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/extism-cli/default.nix b/pkgs/development/tools/extism-cli/default.nix
index d499083b523a..ac577f16a970 100644
--- a/pkgs/development/tools/extism-cli/default.nix
+++ b/pkgs/development/tools/extism-cli/default.nix
@@ -27,9 +27,9 @@ buildGoModule rec {
   postInstall = ''
     local INSTALL="$out/bin/extism"
     installShellCompletion --cmd extism \
-      --bash <($out/bin/containerlab completion bash) \
-      --fish <($out/bin/containerlab completion fish) \
-      --zsh <($out/bin/containerlab completion zsh)
+      --bash <($out/bin/extism completion bash) \
+      --fish <($out/bin/extism completion fish) \
+      --zsh <($out/bin/extism completion zsh)
   '';
 
   meta = with lib; {