diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-29 10:19:48 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-29 10:19:48 +0100 |
| commit | de0af30716493d647e369f434008a67999ed9e28 (patch) | |
| tree | 2fda05ead70be669e4325e0d661aaafd5d04d3c0 /pkgs/misc/drivers | |
| parent | 2ecb6b4574399cf710f09061357ae59526743a05 (diff) | |
| parent | 4f8f5732fc1a24329cbe5f7eb9dcb7599e282a0c (diff) | |
| download | nixlib-de0af30716493d647e369f434008a67999ed9e28.tar nixlib-de0af30716493d647e369f434008a67999ed9e28.tar.gz nixlib-de0af30716493d647e369f434008a67999ed9e28.tar.bz2 nixlib-de0af30716493d647e369f434008a67999ed9e28.tar.lz nixlib-de0af30716493d647e369f434008a67999ed9e28.tar.xz nixlib-de0af30716493d647e369f434008a67999ed9e28.tar.zst nixlib-de0af30716493d647e369f434008a67999ed9e28.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/misc/drivers')
| -rw-r--r-- | pkgs/misc/drivers/hplip/3.15.9.nix | 6 | ||||
| -rw-r--r-- | pkgs/misc/drivers/hplip/default.nix | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/misc/drivers/hplip/3.15.9.nix b/pkgs/misc/drivers/hplip/3.15.9.nix index 722615be46e7..9cd5a7894646 100644 --- a/pkgs/misc/drivers/hplip/3.15.9.nix +++ b/pkgs/misc/drivers/hplip/3.15.9.nix @@ -8,9 +8,8 @@ let - version = "3.15.9"; - name = "hplip-${version}"; + version = "3.15.9"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; @@ -48,7 +47,7 @@ assert withPlugin -> builtins.elem hplipArch pluginArches || throw "HPLIP plugin not supported on ${stdenv.system}"; stdenv.mkDerivation { - inherit name src; + inherit name src version; buildInputs = [ libjpeg @@ -179,7 +178,6 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - inherit version; description = "Print, scan and fax HP drivers for Linux"; homepage = http://hplipopensource.com/; license = if withPlugin diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 071ffe8c1001..ebe8a4d19abf 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -8,9 +8,8 @@ let - version = "3.15.11"; - name = "hplip-${version}"; + version = "3.15.11"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; @@ -179,7 +178,6 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - inherit version; description = "Print, scan and fax HP drivers for Linux"; homepage = http://hplipopensource.com/; license = if withPlugin |