treewide: replace substituteAll with replaceVars (#1) (#365440)

NixOS · Dec 16, 2024 · 66cdf59 · 66cdf59
2 parents 06a16e1 + ebd18cf
commit 66cdf59
Show file tree

Hide file tree

Showing 97 changed files with 209 additions and 303 deletions.
diff --git a/pkgs/applications/audio/easyabc/default.nix b/pkgs/applications/audio/easyabc/default.nix
@@ -2,7 +2,7 @@
   lib,
   fetchFromGitHub,
   fetchPypi,
-  substituteAll,
+  replaceVars,
   python39,
   fluidsynth,
   soundfont-fluid,
@@ -58,8 +58,7 @@ python.pkgs.buildPythonApplication {
   strictDeps = false;
 
   patches = [
-    (substituteAll {
-      src = ./hardcoded-paths.patch;
+    (replaceVars ./hardcoded-paths.patch {
       fluidsynth = "${fluidsynth}/lib/libfluidsynth.so";
       soundfont = "${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2";
       ghostscript = "${ghostscript}/bin/gs";

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
@@ -3,7 +3,7 @@
   python3,
   melpaBuild,
   fetchFromGitHub,
-  substituteAll,
+  replaceVars,
   acm,
   markdown-mode,
   basedpyright,
@@ -42,8 +42,7 @@ melpaBuild {
   patches = [
     # Hardcode the python dependencies needed for lsp-bridge, so users
     # don't have to modify their global environment
-    (substituteAll {
-      src = ./hardcode-dependencies.patch;
+    (replaceVars ./hardcode-dependencies.patch {
       python = python.interpreter;
     })
   ];

diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
@@ -3,7 +3,7 @@
   fetchFromGitHub,
   makeWrapper,
   mkDerivation,
-  substituteAll,
+  replaceVars,
   wrapGAppsHook3,
   wrapQtAppsHook,
 
@@ -145,8 +145,7 @@ mkDerivation rec {
     ++ pythonBuildInputs;
 
   patches = [
-    (substituteAll {
-      src = ./set-pyqt-package-dirs-ltr.patch;
+    (replaceVars ./set-pyqt-package-dirs-ltr.patch {
       pyQt5PackageDir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}";
       qsciPackageDir = "${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}";
     })

diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix
@@ -2,7 +2,7 @@
 , fetchFromGitHub
 , makeWrapper
 , mkDerivation
-, substituteAll
+, replaceVars
 , wrapGAppsHook3
 , wrapQtAppsHook
 
@@ -141,8 +141,7 @@ in mkDerivation rec {
     ++ pythonBuildInputs;
 
   patches = [
-    (substituteAll {
-      src = ./set-pyqt-package-dirs.patch;
+    (replaceVars ./set-pyqt-package-dirs.patch {
       pyQt5PackageDir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}";
       qsciPackageDir = "${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}";
     })

diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix
@@ -6,7 +6,7 @@
   povray,
   qmake,
   qttools,
-  substituteAll,
+  replaceVars,
   zlib,
 }:
 
@@ -43,8 +43,7 @@ mkDerivation rec {
   propagatedBuildInputs = [ povray ];
 
   patches = [
-    (substituteAll {
-      src = ./povray.patch;
+    (replaceVars ./povray.patch {
       inherit povray;
     })
   ];

diff --git a/pkgs/applications/graphics/qvge/default.nix b/pkgs/applications/graphics/qvge/default.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  substituteAll,
+  replaceVars,
   wrapQtAppsHook,
   qmake,
   qtsvg,
@@ -24,8 +24,7 @@ stdenv.mkDerivation rec {
   sourceRoot = "${src.name}/src";
 
   patches = (
-    substituteAll {
-      src = ./set-graphviz-path.patch;
+    replaceVars ./set-graphviz-path.patch {
       inherit graphviz;
     }
   );

diff --git a/pkgs/applications/kde/kdenlive/default.nix b/pkgs/applications/kde/kdenlive/default.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation,
-  substituteAll,
+  replaceVars,
   lib,
   extra-cmake-modules,
   breeze-icons,
@@ -89,8 +89,7 @@ mkDerivation {
   # doesn't find them. See:
   # https://github.com/NixOS/nixpkgs/issues/83885
   patches = [
-    (substituteAll {
-      src = ./dependency-paths.patch;
+    (replaceVars ./dependency-paths.patch {
       inherit mediainfo glaxnimate;
       ffmpeg = ffmpeg-full;
       mlt = mlt-full;

diff --git a/pkgs/applications/misc/dmensamenu/default.nix b/pkgs/applications/misc/dmensamenu/default.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonApplication,
   fetchFromGitHub,
-  substituteAll,
+  replaceVars,
   requests,
   dmenu,
 }:
@@ -19,8 +19,7 @@ buildPythonApplication rec {
   };
 
   patches = [
-    (substituteAll {
-      src = ./dmenu-path.patch;
+    (replaceVars ./dmenu-path.patch {
       inherit dmenu;
     })
   ];

diff --git a/pkgs/applications/misc/inochi2d/default.nix b/pkgs/applications/misc/inochi2d/default.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  substituteAll,
+  replaceVars,
   callPackage,
 }:
 
@@ -35,8 +35,7 @@ in
 
     patches = [
       # Upstream asks that we change the bug tracker URL to not point to the upsteam bug tracker
-      (substituteAll {
-        src = ./support-url.patch;
+      (replaceVars ./support-url.patch {
         assignees = "TomaSajt"; # should be a comma separated list of the github usernames of the maintainers
       })
       # Change how duplicate locales differentiate themselves (the store paths were too long)

diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  substituteAll,
+  replaceVars,
   cmake,
   ninja,
   pkg-config,
@@ -57,8 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   patches = [
-    (substituteAll {
-      src = ./hardcode-paths.patch;
+    (replaceVars ./hardcode-paths.patch {
       catchsegv = "${glibc.bin}/bin/catchsegv";
       bash = "${bash}/bin/bash";
       cp = "${coreutils}/bin/cp";
@@ -74,8 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     # Fix swig not being able to find headers
     # https://github.com/NixOS/nixpkgs/pull/82362#issuecomment-597948461
-    (substituteAll {
-      src = ./fix-swig-build.patch;
+    (replaceVars ./fix-swig-build.patch {
       cairoDev = "${cairo.dev}";
     })
 

diff --git a/pkgs/applications/networking/irc/weechat/scripts/multiline/default.nix b/pkgs/applications/networking/irc/weechat/scripts/multiline/default.nix
@@ -2,7 +2,7 @@
   stdenv,
   lib,
   fetchurl,
-  substituteAll,
+  replaceVars,
   PodParser,
 }:
 
@@ -22,8 +22,7 @@ stdenv.mkDerivation {
 
   patches = [
     # The script requires a special Perl environment.
-    (substituteAll {
-      src = ./libpath.patch;
+    (replaceVars ./libpath.patch {
       env = PodParser;
     })
   ];

diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchpatch,
-  substituteAll,
+  replaceVars,
   buildEnv,
   fetchFromGitHub,
   python3Packages,
@@ -20,8 +20,7 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
-    (substituteAll {
-      src = ./libpath.patch;
+    (replaceVars ./libpath.patch {
       env = "${
         buildEnv {
           name = "wee-slack-env";

diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  substituteAll,
+  replaceVars,
   buildEnv,
   fetchgit,
   fetchFromGitHub,
@@ -58,8 +58,7 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
-    (substituteAll {
-      src = ./libpath.patch;
+    (replaceVars ./libpath.patch {
       env = "${
         buildEnv {
           name = "weechat-otr-env";

diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
@@ -15,7 +15,7 @@
   json-glib,
   libmspack,
   webkitgtk_4_1,
-  substituteAll,
+  replaceVars,
   _experimental-update-script-combinators,
   glib,
   makeHardcodeGsettingsPatch,
@@ -35,8 +35,7 @@ stdenv.mkDerivation rec {
     # schemas from evolution. evolution-data-server is not wrapped with
     # evolution's schemas because it would be a circular dependency with
     # evolution.
-    (substituteAll {
-      src = ./hardcode-gsettings.patch;
+    (replaceVars ./hardcode-gsettings.patch {
       evo = glib.makeSchemaPath evolution evolution.name;
     })
   ];

diff --git a/pkgs/applications/office/activitywatch/default.nix b/pkgs/applications/office/activitywatch/default.nix
@@ -15,7 +15,7 @@
   qtbase,
   qtsvg,
   xdg-utils,
-  substituteAll,
+  replaceVars,
   buildNpmPackage,
 }:
 
@@ -188,8 +188,7 @@ rec {
 
     patches = [
       # Override version string with hardcoded value as it may be outdated upstream.
-      (substituteAll {
-        src = ./override-version.patch;
+      (replaceVars ./override-version.patch {
         version = sources.rev;
       })
     ];
@@ -234,8 +233,7 @@ rec {
 
     patches = [
       # Hardcode version to avoid the need to have the Git repo available at build time.
-      (substituteAll {
-        src = ./commit-hash.patch;
+      (replaceVars ./commit-hash.patch {
         commit_hash = sources.rev;
       })
     ];

diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix
@@ -25,7 +25,7 @@
   pythonSupport ? false,
   python ? null,
   numpy ? null,
-  substituteAll,
+  replaceVars,
 }:
 
 let
@@ -130,10 +130,11 @@ stdenv.mkDerivation rec {
         hash = "sha256-ZegTvp0tTHlopQv+UzHDigs6XLkP2VfqLCWXl6aKJSI=";
       })
     ]
-    ++ lib.optional pythonSupport (substituteAll {
-      src = ./python.patch;
-      inherit (python.sourceVersion) major minor; # Should be changed in case of PyPy
-    });
+    ++ lib.optional pythonSupport (
+      replaceVars ./python.patch {
+        inherit (python.sourceVersion) major minor; # Should be changed in case of PyPy
+      }
+    );
 
   postPatch = ''
     substituteInPlace src/caffe/util/io.cpp --replace \

diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix
@@ -4,7 +4,7 @@
   fetchurl,
   jre,
   makeWrapper,
-  substituteAll,
+  replaceVars,
   coreutils,
 }:
 
@@ -20,8 +20,7 @@ stdenv.mkDerivation rec {
   patches = [
     # By default, gen_vmoptions.sh tries to store custom options in $out/share
     # at run time. This patch makes sure $HOME is used instead.
-    (substituteAll {
-      src = ./gen_vmoptions_to_homedir.patch;
+    (replaceVars ./gen_vmoptions_to_homedir.patch {
       inherit coreutils;
     })
   ];

diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix
@@ -25,7 +25,7 @@ in
   lib,
   buildGoModule,
   runCommandLocal,
-  substituteAll,
+  replaceVars,
   # Native build inputs
   addDriverRunpath,
   makeWrapper,
@@ -109,8 +109,7 @@ in
   inherit pname version src;
 
   patches = lib.optionals (projectName == "apptainer") [
-    (substituteAll {
-      src = ./apptainer/0001-ldCache-patch-for-driverLink.patch;
+    (replaceVars ./apptainer/0001-ldCache-patch-for-driverLink.patch {
       inherit (addDriverRunpath) driverLink;
     })
   ];

diff --git a/pkgs/by-name/an/ansible-cmdb/package.nix b/pkgs/by-name/an/ansible-cmdb/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   fetchFromGitHub,
-  substituteAll,
+  replaceVars,
   python3Packages,
   testers,
   ansible-cmdb,
@@ -31,8 +31,7 @@ buildPythonApplication {
   };
 
   patches = [
-    (substituteAll {
-      src = ./setup.patch;
+    (replaceVars ./setup.patch {
       inherit version;
     })
   ];