nur-packages

commit 416a109592f7bf416e65cf2b6147d816d17474fc
parent d36382012928c5e71da989c1cc046ef2fcb44c7b
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Tue, 27 May 2025 20:27:50 +0400

Use replaceVars instead of substituteAll

Diffstat:
M
pkgs/development/python-modules/click/default.nix
 | 
11
++++++-----
M
pkgs/garmin/openmtbmap/default.nix
 | 
11
+++++------
M
pkgs/geospatial/mapsoft/2.nix
 | 
1
-
M
pkgs/misc/diagon/default.nix
 | 
5
++---
M
pkgs/mqtt/mqttwarn/default.nix
 | 
5
++---

5 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   python3Packages,
-  substituteAll,
+  replaceVars,
   locale,
 }:
 
@@ -14,10 +14,11 @@ python3Packages.buildPythonPackage rec {
     hash = "sha256-8VUW30eNWlYYD7+A5o8gYBDm0WD8OfpQi2XgNf11Ews=";
   };
 
-  patches = lib.optional (lib.versionAtLeast version "6.7") (substituteAll {
-    src = ./fix-paths.patch;
-    locale = "${locale}/bin/locale";
-  });
+  patches = lib.optionals (lib.versionAtLeast version "6.7") [
+    (replaceVars ./fix-paths.patch {
+      locale = "${locale}/bin/locale";
+    })
+  ];
 
   nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
 
diff --git a/pkgs/garmin/openmtbmap/default.nix b/pkgs/garmin/openmtbmap/default.nix
@@ -6,7 +6,7 @@
   mkgmap,
   p7zip,
   zsh,
-  substituteAll,
+  replaceVars,
 }:
 
 stdenv.mkDerivation {
@@ -20,12 +20,11 @@ stdenv.mkDerivation {
     hash = "sha256-J09SYLk869pQYeoGfuY9PFIOU+/W9w22kKwAkVpvkNI=";
   };
 
-  patches = (
-    substituteAll {
-      src = ./0001-fix-path.patch;
+  patches = [
+    (replaceVars ./0001-fix-path.patch {
       inherit gmaptool mkgmap p7zip;
-    }
-  );
+    })
+  ];
 
   buildInputs = [ zsh ];
 
diff --git a/pkgs/geospatial/mapsoft/2.nix b/pkgs/geospatial/mapsoft/2.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchFromGitHub,
   fetchpatch,
-  substituteAll,
   desktopToDarwinBundle,
   db,
   fig2dev,
diff --git a/pkgs/misc/diagon/default.nix b/pkgs/misc/diagon/default.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   fetchurl,
-  substituteAll,
+  replaceVars,
   cmake,
   boost,
   jre,
@@ -46,8 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     # Prevent CMake from trying to fetch libraries from GitHub
-    (substituteAll {
-      src = ./deps.patch;
+    (replaceVars ./deps.patch {
       inherit
         antlr_src
         antlr_jar
diff --git a/pkgs/mqtt/mqttwarn/default.nix b/pkgs/mqtt/mqttwarn/default.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   python3Packages,
-  substituteAll,
+  replaceVars,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -23,8 +23,7 @@ python3Packages.buildPythonApplication rec {
   };
 
   patches = [
-    (substituteAll {
-      src = ./version.patch;
+    (replaceVars ./version.patch {
       inherit version;
     })
   ];