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

Revert "treewide: for substituteAll: s/version/version_/"

Browse Source 
This reverts commit 1e99582eaff5605947b8e9cdef7d440df8cf7ba3.
This commit is contained in:
Matthew Bauer 2018-11-28 12:30:24 -06:00
parent d64f288154
commit a9b7fa7634
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/python-modules/py3exiv2/default.nix
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}";
}) })
]; ];

6
pkgs/development/python-modules/py3exiv2/setup.patch
View File

@ -3,9 +3,9 @@
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
if '3' in l[2:]: if '3' in l[2:]:
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',

2
pkgs/misc/drivers/hplip/3.16.11.nix
View File

@ -23,7 +23,7 @@ let
}; };
hplipState = substituteAll { hplipState = substituteAll {
version_ = version; inherit version;
src = ./hplip.state; src = ./hplip.state;
}; };

2
pkgs/misc/drivers/hplip/default.nix
View File

@ -25,7 +25,7 @@ let
}; };
hplipState = substituteAll { hplipState = substituteAll {
version_ = version; inherit version;
src = ./hplip.state; src = ./hplip.state;
}; };

2
pkgs/misc/drivers/hplip/hplip.state
View File

@ -1,4 +1,4 @@
[plugin] [plugin]
installed=1 installed=1
eula=1 eula=1
version=@version_@ version=@version@