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

Commits on May 12, 2020

  1. nixUnstable: pre7346_5e7ccdc9 -> pre7534_b92f58f6

    @nlewo
    nlewo committed May 12, 2020
    Copy the full SHA
    15d1011 View commit details

  2. Merge pull request #87663 from nlewo/nixUnstable 

    nixUnstable: pre7346_5e7ccdc9 -> pre7534_b92f58f6
    @edolstra
    edolstra authored May 12, 2020
    Copy the full SHA
    77d40b2 View commit details
Showing with 9 additions and 6 deletions.
  1. +9 −6 pkgs/tools/package-management/nix/default.nix
15 changes: 9 additions & 6 deletions pkgs/tools/package-management/nix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,8 @@ common =
, pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json
, autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns
, jq, libarchive, rustc, cargo
# Used by tests
, gmock
, busybox-sandbox-shell
, storeDir
, stateDir
@@ -39,7 +41,8 @@ common =

nativeBuildInputs =
[ pkgconfig ]
++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook_xsl_ns jq ];
++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex libxml2 libxslt
docbook5 docbook_xsl_ns jq gmock ];

buildInputs =
[ curl openssl sqlite xz bzip2 nlohmann_json
@@ -188,18 +191,18 @@ in rec {

nixUnstable = lib.lowPrio (callPackage common rec {
name = "nix-2.4${suffix}";
suffix = "pre7346_5e7ccdc9";
suffix = "pre7534_b92f58f6";

src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "5e7ccdc9e3ddd61dc85e20c898001345bfb497a5";
sha256 = "10jg0rq92xbigbbri7harn4b75blqaf6rjgq4hhvlnggf2w9iprg";
rev = "b92f58f6d9e44f97002d1722bd77bad939824c1c";
sha256 = "1p791961y5v04kpz37g6hm98f1ig7i34inxl9dcj3pbqhf5kicxg";
};

crates = fetchurl {
url = "https://hydra.nixos.org/build/115942497/download/1/nix-vendored-crates-2.4pre20200403_3473b19.tar.xz";
sha256 = "a83785553bb4bc5b28220562153e201ec555a00171466ac08b716f0c97aee45a";
url = "https://hydra.nixos.org/build/118797694/download/1/nix-vendored-crates-2.4pre7534_b92f58f6.tar.xz";
sha256 = "a4c2612bbd81732bbb899bc0c230e07b16f6b6150ffbb19c4907dedbbc2bf9fc";
};

inherit storeDir stateDir confDir boehmgc;