diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-03-08 09:57:58 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-03-08 09:58:19 +0100 |
| commit | 09af15654f0c8091f1b9e0bbb2e523cdee194442 (patch) | |
| tree | e648edef1ce4c64c533f2593aa22b8015cf0e506 /pkgs/misc/cups | |
| parent | f306e67e15bdbe9a8358c9f81319fc4fcbadc2eb (diff) | |
| parent | 0ee75214f336474e127c2e3546c0406a0c4d5fa7 (diff) | |
| download | nixlib-09af15654f0c8091f1b9e0bbb2e523cdee194442.tar nixlib-09af15654f0c8091f1b9e0bbb2e523cdee194442.tar.gz nixlib-09af15654f0c8091f1b9e0bbb2e523cdee194442.tar.bz2 nixlib-09af15654f0c8091f1b9e0bbb2e523cdee194442.tar.lz nixlib-09af15654f0c8091f1b9e0bbb2e523cdee194442.tar.xz nixlib-09af15654f0c8091f1b9e0bbb2e523cdee194442.tar.zst nixlib-09af15654f0c8091f1b9e0bbb2e523cdee194442.zip | |
Merge master into closure-size
The kde-5 stuff still didn't merge well. I hand-fixed what I saw, but there may be more problems.
Diffstat (limited to 'pkgs/misc/cups')
| -rw-r--r-- | pkgs/misc/cups/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 43c2d63bddb7..ff8a0ec417bc 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -3,7 +3,9 @@ , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null }: -let version = "2.1.2"; in +### 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 { @@ -13,7 +15,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.cups.org/software/${version}/cups-${version}-source.tar.bz2"; - sha256 = "1bc1y8fjgh54ryh520gk63i5rbagn6jijsrskcqlibhfm0xwmc5s"; + sha256 = "1lyl3z01xhg9xb9c8m42398c6h9kw8qr6jwiv8bjdsjab11hv9rn"; }; # FIXME: the cups libraries contains some $out/share strings so can't be split. |