JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #157387 from Mic92/nix-unstable

Browse Source
This commit is contained in:
Bernardo Meurer 2022-01-30 09:07:47 -08:00 committed by GitHub
commit a40948ee53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/tools/package-management/nix/common.nix
View File

@ -9,6 +9,7 @@ assert (sha256 == null) -> (src != null);
let
atLeast24 = lib.versionAtLeast version "2.4pre";
atLeast25 = lib.versionAtLeast version "2.5pre";
atLeast27 = lib.versionAtLeast version "2.7pre";
in
{ stdenv
, autoconf-archive
@ -100,6 +101,8 @@ stdenv.mkDerivation {
lowdown
] ++ lib.optionals (atLeast24 && stdenv.isx86_64) [
libcpuid
] ++ lib.optional (atLeast27) [
nlohmann_json
] ++ lib.optionals withLibseccomp [
libseccomp
] ++ lib.optionals withAWS [

6
pkgs/tools/package-management/nix/default.nix
View File

@ -67,12 +67,12 @@ in lib.makeExtensible (self: {
unstable = lib.lowPrio (common rec {
version = "2.7";
suffix = "pre20220124_${lib.substring 0 7 src.rev}";
suffix = "pre20220127_${lib.substring 0 7 src.rev}";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "0a70b37b5694c769fb855c1afe7642407d1db64f";
sha256 = "sha256-aOM9MPNlnWNMobx4CuD4JIXH2poRlG8AKkuxY7FysWg=";
rev = "558c4ee3e370c9f9a6ea293df54ed6914a999f1c";
sha256 = "sha256-hMzKQflpgf3P7OdYKSnD1VMBSnF48XSRjaNX3bUJct4=";
};
});
})