Merge master into staging-next

2019-10-08 11:56:52 +02:00
parent 0913e30c85 60b2fe660e
commit a0c34f54cc
366 changed files with 7208 additions and 3820 deletions
@@ -9,11 +9,11 @@ let

 in stdenv.mkDerivation rec {
  pname = "cups-filters";
-  version = "1.25.0";
+  version = "1.25.6";

  src = fetchurl {
    url = "https://openprinting.org/download/cups-filters/${pname}-${version}.tar.xz";
-    sha256 = "1laiscq8yvynw862calkgbz9irrdkmd5l821q6a6wik1ifd186c1";
+    sha256 = "1pgjk7j2p8m17pwynqd86hxgvz9lyb09ivx18lv6inmygij0pm4j";
  };

  nativeBuildInputs = [ pkgconfig makeWrapper ];