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: 46f46a0fa84d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 683c55328d3f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 28, 2021

  1. nixUnstable: patch #4470 (ETag) (#111005) 

    Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
(cherry picked from commit 1d41739)
    @roberth @Mic92
    roberth and Mic92 committed Jan 28, 2021
    2

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Moredread André-Patrick Bubel
    GPG key ID: 28925CBA8869FF29
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c560b41 View commit details

Commits on Jan 29, 2021

  1. Merge pull request #111035 from Mic92/nix-backport 

    [20.09] nixUnstable: patch #4470 (ETag) (#111005)
    @roberth
    roberth authored Jan 29, 2021

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Moredread André-Patrick Bubel
    GPG key ID: 28925CBA8869FF29
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    683c553 View commit details
Showing with 11 additions and 2 deletions.
  1. +11 −2 pkgs/tools/package-management/nix/default.nix
13 changes: 11 additions & 2 deletions pkgs/tools/package-management/nix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, fetchurl, fetchFromGitHub, callPackage
{ lib, fetchurl, fetchFromGitHub, fetchpatch, callPackage
, storeDir ? "/nix/store"
, stateDir ? "/nix/var"
, confDir ? "/etc"
@@ -25,7 +25,7 @@ common =
, withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp
, enableStatic ? false
, name, suffix ? "", src

, patches ? []
}:
let
sh = busybox-sandbox-shell;
@@ -216,6 +216,15 @@ in rec {
sha256 = "0qhd3nxvqzszzsfvh89xhd239ycqb0kq2n0bzh9br78pcb60vj3g";
};

patches = [
# Fix the ETag bug. PR merged. Remove when updating to >= 20210125
# https://github.com/NixOS/nixpkgs/pull/109309#issuecomment-768331750
(fetchpatch {
url = "https://github.com/NixOS/nix/commit/c5b42c5a42138329c6d02da0d8a53cb59c6077f4.patch";
sha256 = "sha256-d4RNOKMxa4NMbFgYcqWRv2ByHt8F/XUWV+6P9qHz7S4=";
})
];

inherit storeDir stateDir confDir boehmgc;
});