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

Commits on Nov 12, 2020

  1. diffoscope: 160 -> 161 

    https://diffoscope.org/news/diffoscope-161-released/
    @Ma27
    Ma27 committed Nov 12, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    5b44f46 View commit details

  2. EmptyEpsilon: 2020.08.07 -> 2020.08.25 

    https://github.com/daid/EmptyEpsilon/releases/tag/EE-2020.08.25
    @Ma27
    Ma27 committed Nov 12, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    02a1379 View commit details

  3. evcxr: 0.5.3 -> 0.6.0 

    Since version `0.6.0` the `rust-src` component (or declaring
`RUST_SRC_PATH`) is needed. Just like in `rust-analyzer`, this is solved by
setting `RUST_SRC_PATH` to `rustPlatform.rustLibSrc` for tests and
wrapped executables.

ChangeLog: https://github.com/google/evcxr/blob/v0.6.0/RELEASE_NOTES.md#version-060
    @Ma27
    Ma27 committed Nov 12, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    e7053a8 View commit details

  4. epson-escpr2: 1.1.23 -> 1.1.24

    @Ma27
    Ma27 committed Nov 12, 2020
    Copy the full SHA
    f94859f View commit details
20 changes: 14 additions & 6 deletions pkgs/development/interpreters/evcxr/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,22 +2,30 @@

rustPlatform.buildRustPackage rec {
pname = "evcxr";
version = "0.5.3";
version = "0.6.0";

src = fetchFromGitHub {
owner = "google";
repo = "evcxr";
rev = "v${version}";
sha256 = "144xqi19d2nj9qgmhpx6d1kfhx9vfkmk7rnq6nzybpx4mbbl3ki2";
sha256 = "sha256-QpUhUE65/IuT/VenziPX6z+CbJswbPPIv/ZnTthZpEU=";
};

cargoSha256 = "07lzxh0wh6azrlzfaacg29zmkn8jdnkdqbwgd5ajy79y8nii3c7z";
cargoSha256 = "sha256-iUzVd4XtD+41yTV/BmqWLenzAUNPfS7vIHm1KfuPe9A=";

RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";

nativeBuildInputs = [ pkgconfig makeWrapper cmake ];
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
postInstall = ''
wrapProgram $out/bin/evcxr --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]}
wrapProgram $out/bin/evcxr_jupyter --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]}
postInstall = let
wrap = exe: ''
wrapProgram $out/bin/${exe} \
--prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]} \
--set-default RUST_SRC_PATH "$RUST_SRC_PATH"
'';
in ''
${wrap "evcxr"}
${wrap "evcxr_jupyter"}
rm $out/bin/testing_runtime
'';

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 ];
4 changes: 2 additions & 2 deletions pkgs/tools/misc/diffoscope/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,11 +16,11 @@ let
in
python3Packages.buildPythonApplication rec {
pname = "diffoscope";
version = "160";
version = "161";

src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
sha256 = "1nshcgq31nrbh4r70i5azs7s0wfc4llb60ka1w8rncy22rg8rabc";
sha256 = "sha256-Frk+aVUQhWn/TvlG4zy5+R2z92rFIwO4NPRXYkS0rN4=";
};

outputs = [ "out" "man" ];