Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 56a49d0aea5a
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8667719f3040
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 11, 2018

  1. nixUnstable: Reinit at 2.0pre6137_e3cdcf89 

    (cherry picked from commit 0a9f34a)
    @shlevy
    shlevy committed Apr 11, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    erictapen Kerstin
    GPG key ID: 5F24E3BD56617EB2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8667719 View commit details
Showing with 6 additions and 8 deletions.
  1. +6 −8 pkgs/tools/package-management/nix/default.nix
14 changes: 6 additions & 8 deletions pkgs/tools/package-management/nix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz
, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli
, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, boost
, autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl
, libseccomp, busybox-sandbox-shell
, hostPlatform, buildPlatform
@@ -35,7 +35,8 @@ let
(aws-sdk-cpp.override {
apis = ["s3"];
customMemoryManagement = false;
});
})
++ lib.optional fromGit boost;

propagatedBuildInputs = [ boehmgc ];

@@ -135,19 +136,16 @@ in rec {
};
}) // { perl-bindings = perl-bindings { nix = nixStable; }; };

nixUnstable = nix;
/*
nixUnstable = (lib.lowPrio (common rec {
name = "nix-2.0${suffix}";
suffix = "pre5968_a6c0b773";
suffix = "pre6137_e3cdcf89";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "a6c0b773b72d4e30690e01f1f1dcffc28f2d9ea1";
sha256 = "0i8wcblcjw3291ba6ki4llw3fgm8ylp9q52kajkyr58dih537346";
rev = "e3cdcf89b0ef42f81c9df5899776ea225f1ecae0";
sha256 = "1s9w7ixc2qra3x9545f9a634654rvdqsf38jp9b7wr6xx6qqx60s";
};
fromGit = true;
})) // { perl-bindings = perl-bindings { nix = nixUnstable; }; };
*/

}