Merge master into staging

This commit is contained in:
Frederik Rietdijk
2018-04-04 19:36:39 +02:00
121 changed files with 2824 additions and 3507 deletions

View File

@@ -9,11 +9,11 @@ let
in stdenv.mkDerivation rec {
name = "cups-filters-${version}";
version = "1.20.1";
version = "1.20.2";
src = fetchurl {
url = "http://openprinting.org/download/cups-filters/${name}.tar.xz";
sha256 = "0qix1whz5n4ijnl6d44f1v8nzkpv99wqjyrby8vx6xnpskw5hsxk";
sha256 = "1f6dw476m9gc94jy38f79a5aa40mk91yc81cdwrsz42wlz3nbdq2";
};
nativeBuildInputs = [ pkgconfig makeWrapper ];
@@ -62,6 +62,5 @@ in stdenv.mkDerivation rec {
description = "Backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ layus ];
};
}