about summary refs log tree commit diff
path: root/pkgs/misc
diff options
context:
space:
mode:
authorFrederik Rietdijk <freddyrietdijk@fridh.nl>2019-04-18 14:03:51 +0200
committerGitHub <noreply@github.com>2019-04-18 14:03:51 +0200
commit256e34b89d8cdc67e19f0f960450919b0c6c3737 (patch)
treec4a4ef2e2731f4ab2bf9e959a00bc8bc5743971e /pkgs/misc
parent99930cadb46c5256a90dd50a050a3f40f1c35663 (diff)
parenta6a88bffd58ca40ac528dd4886110a20acae3967 (diff)
downloadnixlib-256e34b89d8cdc67e19f0f960450919b0c6c3737.tar
nixlib-256e34b89d8cdc67e19f0f960450919b0c6c3737.tar.gz
nixlib-256e34b89d8cdc67e19f0f960450919b0c6c3737.tar.bz2
nixlib-256e34b89d8cdc67e19f0f960450919b0c6c3737.tar.lz
nixlib-256e34b89d8cdc67e19f0f960450919b0c6c3737.tar.xz
nixlib-256e34b89d8cdc67e19f0f960450919b0c6c3737.tar.zst
nixlib-256e34b89d8cdc67e19f0f960450919b0c6c3737.zip
Merge staging-next into master (#59733)
Diffstat (limited to 'pkgs/misc')
-rw-r--r--pkgs/misc/cups/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 3089fe93deaf..ef39e9f2fb55 100644
--- a/pkgs/misc/cups/default.nix
+++ b/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" ];