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: 4289d0f3591a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 26187cb4d3b6
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 12, 2020

  1. EmptyEpsilon: 2020.08.07 -> 2020.08.25 

    https://github.com/daid/EmptyEpsilon/releases/tag/EE-2020.08.25
(cherry picked from commit 02a1379)
    @Ma27
    Ma27 committed Nov 12, 2020
    Copy the full SHA
    45ab1bf View commit details

  2. epson-escpr2: 1.1.23 -> 1.1.24 

    (cherry picked from commit f94859f)
    @Ma27
    Ma27 committed Nov 12, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    26187cb View commit details
Showing with 7 additions and 7 deletions.
  1. +3 −3 pkgs/games/empty-epsilon/default.nix
  2. +4 −4 pkgs/misc/drivers/epson-escpr2/default.nix
6 changes: 3 additions & 3 deletions pkgs/games/empty-epsilon/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ let

major = "2020";
minor = "08";
patch = "07";
patch = "25";

version = "${major}.${minor}.${patch}";

@@ -16,7 +16,7 @@ let
owner = "daid";
repo = "SeriousProton";
rev = "EE-${version}";
sha256 = "1mfizhmwh6xgb5n34l3wrbxm21f7gsvsyacsmnxw9rkz0ya7ch30";
sha256 = "sha256-LiMEgsUpNBtduFO85ct6NYr/Smbzd8yE8Vce3voErLY=";
};

nativeBuildInputs = [ cmake ];
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
owner = "daid";
repo = "EmptyEpsilon";
rev = "EE-${version}";
sha256 = "0p41wx9yk09xjmfkjpdgi3b2999ps2am3xqwd866q11f6ci7viv5";
sha256 = "sha256-3QREWTq1Jq9T/FtGFVU4MidZeUQvRSVChn9JKxv2SiQ=";
};

nativeBuildInputs = [ cmake ];
8 changes: 4 additions & 4 deletions pkgs/misc/drivers/epson-escpr2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

stdenv.mkDerivation rec {
pname = "epson-inkjet-printer-escpr2";
version = "1.1.23";
version = "1.1.24";

src = fetchurl {
# To find new versions, visit
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
# version.
# NOTE: Don't forget to update the webarchive link too!
urls = [
"https://download3.ebz.epson.net/dsc/f/03/00/12/04/34/22448566e405c21c3f4436dfd8927176add3e680/epson-inkjet-printer-escpr2-1.1.23-1lsb3.2.src.rpm"
"https://web.archive.org/web/20201019154323if_/https://download3.ebz.epson.net/dsc/f/03/00/12/04/34/22448566e405c21c3f4436dfd8927176add3e680/epson-inkjet-printer-escpr2-1.1.23-1lsb3.2.src.rpm"
"https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/epson-inkjet-printer-escpr2-1.1.24-1lsb3.2.src.rpm"
"https://web.archive.org/web/20201112163802if_/https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/epson-inkjet-printer-escpr2-1.1.24-1lsb3.2.src.rpm"
];
sha256 = "1d5zd8cwgp3n25ramdqwqb770iim7kh4l7hmhf6a6ivpy0cxpwx6";
sha256 = "sha256-DPzjKKsTWbfDk1MsVPXNsO5D7C/RiNegmwq2sEMx2co=";
};

patches = [ ./cups-filter-ppd-dirs.patch ];