Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 496bdc7e3340
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 436cf05dd7a9
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Oct 13, 2019

  1. epson-escpr: 1.6.16 -> 1.7.3 

    + added webarchive source for reliable builds in the future

(cherry picked from commit bbb71bf)
    @wucke13
    wucke13 committed Oct 13, 2019
    Copy the full SHA
    9fae551 View commit details

  2. epson-escpr2: added mirror url for src 

    + added webarchive source for reliable builds in the future
+ removed `${version}` from url, as it actually adds more hassle to
  have it in there and no benefits whatsoever, since the url keeps
  changing other parts too

(cherry picked from commit 4db7494)
    @wucke13
    wucke13 committed Oct 13, 2019
    Copy the full SHA
    1e51fec View commit details

Commits on Oct 15, 2019

  1. Merge pull request #71098 from wucke13/reliable-epson 

    [19.09] Reliable epson
    @Lassulus
    Lassulus authored Oct 15, 2019
    Copy the full SHA
    436cf05 View commit details
Showing with 25 additions and 12 deletions.
  1. +5 −5 pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch
  2. +11 −3 pkgs/misc/drivers/epson-escpr/default.nix
  3. +9 −4 pkgs/misc/drivers/epson-escpr2/default.nix
10 changes: 5 additions & 5 deletions pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/configure b/configure_new
index 699bcb5..89a1832 100755
index 12b4662..6ec641c 100755
--- a/configure
+++ b/configure_new
@@ -11585,55 +11585,8 @@ else
@@ -12162,55 +12162,8 @@ else
$as_echo "no" >&6; }
fi

@@ -44,7 +44,7 @@ index 699bcb5..89a1832 100755
- if test -d "${cups_default_prefix}/share/ppd" ; then
- CUPS_PPD_DIR="${cups_default_prefix}/share/ppd"
- elif test "xyes" = "x$have_cups_config" ; then
- CUPS_PPD_DIR="${cups_default_prefix}/`cups-config --datadir | sed -e 's,^/[^/][^/]*,,'`/model"
- CUPS_PPD_DIR="${cups_default_prefix}`cups-config --datadir | sed -e 's,^/[^/][^/]*,,'`/model"
- else
- CUPS_PPD_DIR="${cups_default_prefix}/share/cups/model"
- fi
@@ -58,5 +58,5 @@ index 699bcb5..89a1832 100755
+CUPS_FILTER_DIR="${prefix}/lib/cups/filter"
+CUPS_PPD_DIR="${prefix}/share/cups/model"

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
# Check whether --enable-lsb was given.
if test "${enable_lsb+set}" = set; then :
14 changes: 11 additions & 3 deletions pkgs/misc/drivers/epson-escpr/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,19 @@

stdenv.mkDerivation {
pname = "epson-escpr";
version = "1.6.16";
version = "1.7.3";

src = fetchurl {
url = "https://download3.ebz.epson.net/dsc/f/03/00/06/41/54/29588ed107f800e5bc3f91706661567efb369c1c/epson-inkjet-printer-escpr-1.6.16-1lsb3.2.tar.gz";
sha256 = "0v9mcih3dg3ws18hdcgm014k97hv6imga39hy2a84gnc6badp6n6";
# 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-7110" to get to the most recent
# version.
# NOTE: Don't forget to update the webarchive link too!
urls = [
"https://download3.ebz.epson.net/dsc/f/03/00/09/83/26/f90d0f70b33a9d7d77a2408364c47fba1ccbf943/epson-inkjet-printer-escpr-1.7.3-1lsb3.2.tar.gz"
"https://web.archive.org/web/https://download3.ebz.epson.net/dsc/f/03/00/09/83/26/f90d0f70b33a9d7d77a2408364c47fba1ccbf943/epson-inkjet-printer-escpr-1.7.3-1lsb3.2.tar.gz"
];
sha256 = "0r3jkdfk33irha9gpyvhha056ans59p7dq9i153i292ifjsd8458";
};

patches = [ ./cups-filter-ppd-dirs.patch ];
13 changes: 9 additions & 4 deletions pkgs/misc/drivers/epson-escpr2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,10 +5,15 @@ stdenv.mkDerivation rec {
version = "1.1.1";

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.
# NOTE: keep in mind that many parts of the URL change and not just version.
url = "https://download3.ebz.epson.net/dsc/f/03/00/09/72/04/c6d928e83e558c4ba1e7e8bcb5c1fe080b8095eb/${pname}-${version}-1lsb3.2.src.rpm";
# 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.
# NOTE: Don't forget to update the webarchive link too!
urls = [
"https://download3.ebz.epson.net/dsc/f/03/00/09/72/04/c6d928e83e558c4ba1e7e8bcb5c1fe080b8095eb/epson-inkjet-printer-escpr2-1.1.1-1lsb3.2.src.rpm"
"https://web.archive.org/web/https://download3.ebz.epson.net/dsc/f/03/00/09/72/04/c6d928e83e558c4ba1e7e8bcb5c1fe080b8095eb/epson-inkjet-printer-escpr2-1.1.1-1lsb3.2.src.rpm"
];
sha256 = "02vdlhvinsx6vsjq172b2c1vrfzkg0w9j5lbsnjvj6yq3yqz5b5q";
};