From f5a73cb5089392a676547dc0acf202c037812cad Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Tue, 9 Jul 2024 20:14:17 +0200 Subject: [PATCH 1/2] epson-escpr2: format with nixfmt-rfc-style (cherry picked from commit 3996f01a89f48c9ff739f21e129cbf455bb5be43) --- pkgs/misc/drivers/epson-escpr2/default.nix | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index e84cc3b0e3f88..3828a5a658d44 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchurl, cups, rpm, cpio }: +{ + lib, + stdenv, + fetchurl, + cups, + rpm, + cpio, +}: stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; @@ -26,7 +33,10 @@ stdenv.mkDerivation rec { patches = [ ./cups-filter-ppd-dirs.patch ]; buildInputs = [ cups ]; - nativeBuildInputs = [ rpm cpio ]; + nativeBuildInputs = [ + rpm + cpio + ]; meta = with lib; { homepage = "http://download.ebz.epson.net/dsc/search/01/search/"; @@ -37,8 +47,12 @@ stdenv.mkDerivation rec { Refer to the description of epson-escpr for usage. ''; - license = licenses.gpl2; - maintainers = with maintainers; [ ma9e ma27 shawn8901 ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ + ma9e + ma27 + shawn8901 + ]; platforms = platforms.linux; }; } From 8ca91f3adbcb84e58a4174c5a188d4f8f131eeb8 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Tue, 9 Jul 2024 20:17:13 +0200 Subject: [PATCH 2/2] epson-escpr2: 1.2.11 -> 1.2.12 (cherry picked from commit b64581addf79987b3e94e2d20dd74a90540047bd) --- pkgs/misc/drivers/epson-escpr2/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 3828a5a658d44..2037b311639b9 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -9,15 +9,14 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.2.11"; + version = "1.2.12"; src = fetchurl { - # To find new versions, visit - # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for - # some printer like for instance "WF-7210" to get to the most recent - # version. - url = "https://download3.ebz.epson.net/dsc/f/03/00/15/93/07/6926ce2857b2e0f563eecfd6a877b7b71898ad46/epson-inkjet-printer-escpr2-1.2.11-1.src.rpm"; - sha256 = "sha256-WMjtYYuMGMPf6222rvrP5Ep6fMRwebPTUXeQ6CbwEt4="; + # To find the most recent version go to + # https://support.epson.net/linux/Printer/LSB_distribution_pages/en/escpr2.php + # and retreive the download link for source package for x86 CPU + url = "https://download3.ebz.epson.net/dsc/f/03/00/15/98/70/f6a682eeeba1fd8bdf2ac112d5e1111d951c64a6/epson-inkjet-printer-escpr2-1.2.12-1.src.rpm"; + sha256 = "sha256-7OkDlYhfQ/S3OD5QeN7DgNK0+LHabIm8zErtUDYcqwo="; }; unpackPhase = ''