about summary refs log tree commit diff
path: root/nixpkgs/pkgs/misc/cups
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-04-27 17:06:57 +0000
committerAlyssa Ross <hi@alyssa.is>2019-04-27 17:06:57 +0000
commit373507e28edeacd168b5c240840db2dac854882a (patch)
treec73c8912afbd1a533dbc0d27da25dcd7f0d13d58 /nixpkgs/pkgs/misc/cups
parentb2ac96a35da6f6b95c7197811e421270319e8d50 (diff)
parentdfd8f84aef129f1978e446b5d45ef05cd4421821 (diff)
downloadnixlib-373507e28edeacd168b5c240840db2dac854882a.tar
nixlib-373507e28edeacd168b5c240840db2dac854882a.tar.gz
nixlib-373507e28edeacd168b5c240840db2dac854882a.tar.bz2
nixlib-373507e28edeacd168b5c240840db2dac854882a.tar.lz
nixlib-373507e28edeacd168b5c240840db2dac854882a.tar.xz
nixlib-373507e28edeacd168b5c240840db2dac854882a.tar.zst
nixlib-373507e28edeacd168b5c240840db2dac854882a.zip
Merge commit 'dfd8f84aef129f1978e446b5d45ef05cd4421821'
Diffstat (limited to 'nixpkgs/pkgs/misc/cups')
-rw-r--r--nixpkgs/pkgs/misc/cups/default.nix4
-rw-r--r--nixpkgs/pkgs/misc/cups/filters.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/misc/cups/default.nix b/nixpkgs/pkgs/misc/cups/default.nix
index 3089fe93deaf..ef39e9f2fb55 100644
--- a/nixpkgs/pkgs/misc/cups/default.nix
+++ b/nixpkgs/pkgs/misc/cups/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   name = "cups-${version}";
 
   # After 2.2.6, CUPS requires headers only available in macOS 10.12+
-  version = if stdenv.isDarwin then "2.2.6" else "2.2.10";
+  version = if stdenv.isDarwin then "2.2.6" else "2.2.11";
 
   passthru = { inherit version; };
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     url = "https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz";
     sha256 = if version == "2.2.6"
              then "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20"
-             else "1fq52aw1mini3ld2czv5gg37wbbvh4n7yc7wzzxvbs3zpfrv5j3p";
+             else "0v5p10lyv8wv48s8ghkhjmdrxg6iwj8hn36v1ilkz46n7y0i107m";
   };
 
   outputs = [ "out" "lib" "dev" "man" ];
diff --git a/nixpkgs/pkgs/misc/cups/filters.nix b/nixpkgs/pkgs/misc/cups/filters.nix
index d063ec912b97..40e6f907bf05 100644
--- a/nixpkgs/pkgs/misc/cups/filters.nix
+++ b/nixpkgs/pkgs/misc/cups/filters.nix
@@ -9,11 +9,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "cups-filters-${version}";
-  version = "1.22.2";
+  version = "1.22.5";
 
   src = fetchurl {
     url = "https://openprinting.org/download/cups-filters/${name}.tar.xz";
-    sha256 = "06gy3wv6p7kswz3mjn17f17mqpadvqj2riwc42kksnvp8x0h08cw";
+    sha256 = "19h7yy92wjfs401jzwyr03f3lp2xwg7sw83728r302rg2ni57m1h";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];