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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát
2016-01-29 10:19:48 +01:00
parent 2ecb6b4574 4f8f5732fc
commit de0af30716
312 changed files with 14247 additions and 2595 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/drivers/hplip/3.15.9.nix
+2 -4
View File
@@ -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
pkgs/misc/drivers/hplip/default.nix
+1 -3
View File
@@ -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