summary refs log tree commit diff
path: root/pkgs/misc
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2016-08-20 01:41:55 +0400
committerGitHub <noreply@github.com>2016-08-20 01:41:55 +0400
commitedb9416228a1c1087313ef52da375f8dd36c6ea4 (patch)
treeef194675d081469c1e1f842df6058c75c54d14f1 /pkgs/misc
parent57e6f19cad69ec318dd89e6f47d23ee3f91df3e3 (diff)
parentc998a769511252af5d2d17fe999c97410f73272b (diff)
downloadnixlib-edb9416228a1c1087313ef52da375f8dd36c6ea4.tar
nixlib-edb9416228a1c1087313ef52da375f8dd36c6ea4.tar.gz
nixlib-edb9416228a1c1087313ef52da375f8dd36c6ea4.tar.bz2
nixlib-edb9416228a1c1087313ef52da375f8dd36c6ea4.tar.lz
nixlib-edb9416228a1c1087313ef52da375f8dd36c6ea4.tar.xz
nixlib-edb9416228a1c1087313ef52da375f8dd36c6ea4.tar.zst
nixlib-edb9416228a1c1087313ef52da375f8dd36c6ea4.zip
Merge pull request #17819 from abbradar/printing-updates
Printing and PDF-related updates
Diffstat (limited to 'pkgs/misc')
-rw-r--r--pkgs/misc/cups/default.nix8
-rw-r--r--pkgs/misc/cups/filters.nix4
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 88c3d335f876..6c7170377777 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -5,17 +5,17 @@
 
 ### IMPORTANT: before updating cups, make sure the nixos/tests/printing.nix test
 ### works at least for your platform.
-let version = "2.1.3"; in
 
 with stdenv.lib;
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "cups-${version}";
+  version = "2.1.4";
 
   passthru = { inherit version; };
 
   src = fetchurl {
-    url = "https://www.cups.org/software/${version}/cups-${version}-source.tar.bz2";
-    sha256 = "1lyl3z01xhg9xb9c8m42398c6h9kw8qr6jwiv8bjdsjab11hv9rn";
+    url = "https://github.com/apple/cups/releases/download/release-${version}/cups-${version}-source.tar.gz";
+    sha256 = "13bjxw256wd1nff22vj2z25mdhllj2h6d9xypsg55b40661zs52b";
   };
 
   # FIXME: the cups libraries contains some $out/share strings so can't be split.
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index 7394daefb7cb..f1f597ac0a04 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -8,11 +8,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "cups-filters-${version}";
-  version = "1.5.0";
+  version = "1.11.1";
 
   src = fetchurl {
     url = "http://openprinting.org/download/cups-filters/${name}.tar.xz";
-    sha256 = "0cjrh4wpdhkvmahfkg8f2a2qzilcq12i78q5arwr7dnmx1j8hapj";
+    sha256 = "0x0jxn1hnif92m7dyqrqh015gpsf79dviarb7dfl0zya2drlk1m8";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];