public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: for substituteAll: s/version/version_/

Browse Source 
This is because it gets passed to mkDerivation through some route, this ensures
that doesn't mess with anything
This commit is contained in:
Patrick Hilhorst
2018-11-06 00:17:04 +01:00
parent d2e6608aa5
commit 1e99582eaf
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/python-modules/py3exiv2/default.nix
+1 -1
View File
@@ -19,7 +19,7 @@ buildPythonPackage rec {
patches = [ patches = [
(substituteAll { (substituteAll {
src = ./setup.patch; src = ./setup.patch;
version = "3${stdenv.lib.versions.minor python.version}"; version_ = "3${stdenv.lib.versions.minor python.version}";
}) })
]; ];
pkgs/development/python-modules/py3exiv2/setup.patch
+1 -1
View File
@@ -5,7 +5,7 @@
return l.replace('libboost', 'boost') return l.replace('libboost', 'boost')
-libboost = get_libboost_name() -libboost = get_libboost_name()
+libboost = 'boost_python@version@' +libboost = 'boost_python@version_@'
setup( setup(
name='py3exiv2', name='py3exiv2',
pkgs/misc/drivers/hplip/3.16.11.nix
+1 -1
View File
@@ -23,7 +23,7 @@ let
}; };
hplipState = substituteAll { hplipState = substituteAll {
inherit version; version_ = version;
src = ./hplip.state; src = ./hplip.state;
}; };
pkgs/misc/drivers/hplip/default.nix
+1 -1
View File
@@ -25,7 +25,7 @@ let
}; };
hplipState = substituteAll { hplipState = substituteAll {
inherit version; version_ = version;
src = ./hplip.state; src = ./hplip.state;
}; };
pkgs/misc/drivers/hplip/hplip.state
+1 -1
View File
@@ -1,4 +1,4 @@
[plugin] [plugin]
installed=1 installed=1
eula=1 eula=1
version=@version@ version=@version_@