diff options
| author | Robin Gloster <mail@glob.in> | 2016-03-03 16:11:55 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-03-03 16:11:55 +0000 |
| commit | fed49425c51e66d0278f376eb2e2aa67843269d5 (patch) | |
| tree | 3149d7484ff8a1e48359c801753f13afbf22157a /pkgs/misc | |
| parent | 4c9c4c4dcdf406adb235682ab4d50985513f92e3 (diff) | |
| parent | 7a360b13a0ac35c0f6109d251880ae698c13b221 (diff) | |
| download | nixlib-fed49425c51e66d0278f376eb2e2aa67843269d5.tar nixlib-fed49425c51e66d0278f376eb2e2aa67843269d5.tar.gz nixlib-fed49425c51e66d0278f376eb2e2aa67843269d5.tar.bz2 nixlib-fed49425c51e66d0278f376eb2e2aa67843269d5.tar.lz nixlib-fed49425c51e66d0278f376eb2e2aa67843269d5.tar.xz nixlib-fed49425c51e66d0278f376eb2e2aa67843269d5.tar.zst nixlib-fed49425c51e66d0278f376eb2e2aa67843269d5.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch | 2 | ||||
| -rw-r--r-- | pkgs/misc/drivers/epson-escpr/default.nix | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch b/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch index 3065ed1a10f5..78d278f186b5 100644 --- a/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch +++ b/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch @@ -1,5 +1,5 @@ diff --git a/configure b/configure_new -index c3e7199..ccbf290 100755 +index 3d6f68c..c2b10ff 100755 --- a/configure +++ b/configure_new @@ -11585,55 +11585,8 @@ else diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix index 1f403947acb5..faf13d4bcc32 100644 --- a/pkgs/misc/drivers/epson-escpr/default.nix +++ b/pkgs/misc/drivers/epson-escpr/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchurl, cups }: let - version = "1.6.3"; + version = "1.6.4"; in stdenv.mkDerivation { name = "epson-escpr-${version}"; src = fetchurl { - url = "https://download3.ebz.epson.net/dsc/f/03/00/04/33/53/0177a44361d3dfeacf7f15ff4a347cef373688da/epson-inkjet-printer-escpr-1.6.3-1lsb3.2.tar.gz"; - sha256 = "4988479ce7dd5513bfa1cce4a83f82348572d8d69d6aa3b2c6e154a58a04ad86"; + url = "https://download3.ebz.epson.net/dsc/f/03/00/04/37/97/88177bc0dc7025905eae4a0da1e841408f82e33c/epson-inkjet-printer-escpr-1.6.4-1lsb3.2.tar.gz"; + sha256 = "76c66461a30be82b9cc37d663147a72f488fe060ef54578120602bb87a3f7754"; }; patches = [ ./cups-filter-ppd-dirs.patch ]; buildInputs = [ cups ]; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/artuuge/NixOS-files/; description = "ESC/P-R Driver (generic driver)"; longDescription = '' @@ -30,7 +30,9 @@ in drivers = [ pkgs.epson-escpr ]; }; ''; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ artuuge ]; + platforms = platforms.linux; }; } |