about summary refs log tree commit diff
path: root/pkgs/misc
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2018-11-29 19:35:55 -0600
committerGitHub <noreply@github.com>2018-11-29 19:35:55 -0600
commite6834171b930f6db3796a16785d7cbb3173541b1 (patch)
tree05aec16ed4888bf40b0a98092c3d09d8dff8e1ec /pkgs/misc
parentfe6a9a37b99a89288db055ddda1916ec83ec0d31 (diff)
parenta56fe056ece1d7c0b384a08467408ded507573c7 (diff)
downloadnixlib-e6834171b930f6db3796a16785d7cbb3173541b1.tar
nixlib-e6834171b930f6db3796a16785d7cbb3173541b1.tar.gz
nixlib-e6834171b930f6db3796a16785d7cbb3173541b1.tar.bz2
nixlib-e6834171b930f6db3796a16785d7cbb3173541b1.tar.lz
nixlib-e6834171b930f6db3796a16785d7cbb3173541b1.tar.xz
nixlib-e6834171b930f6db3796a16785d7cbb3173541b1.tar.zst
nixlib-e6834171b930f6db3796a16785d7cbb3173541b1.zip
Merge pull request #51183 from matthewbauer/make-derivation-no-assertions
Fix breaking changes to make-derivation
Diffstat (limited to 'pkgs/misc')
-rw-r--r--pkgs/misc/drivers/hplip/3.16.11.nix2
-rw-r--r--pkgs/misc/drivers/hplip/default.nix2
-rw-r--r--pkgs/misc/drivers/hplip/hplip.state2
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix
index 0c6ff464a622..8982834d9a99 100644
--- a/pkgs/misc/drivers/hplip/3.16.11.nix
+++ b/pkgs/misc/drivers/hplip/3.16.11.nix
@@ -23,7 +23,7 @@ let
   };
 
   hplipState = substituteAll {
-    version_ = version;
+    inherit version;
     src = ./hplip.state;
   };
 
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index e2c34473e544..f03d75dfa02d 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -25,7 +25,7 @@ let
   };
 
   hplipState = substituteAll {
-    version_ = version;
+    inherit version;
     src = ./hplip.state;
   };
 
diff --git a/pkgs/misc/drivers/hplip/hplip.state b/pkgs/misc/drivers/hplip/hplip.state
index 3c7c2eb2df7b..9d19a93f3644 100644
--- a/pkgs/misc/drivers/hplip/hplip.state
+++ b/pkgs/misc/drivers/hplip/hplip.state
@@ -1,4 +1,4 @@
 [plugin]
 installed=1
 eula=1
-version=@version_@
+version=@version@