git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #157387 from Mic92/nix-unstable
commita40948ee530c47f46c25a581b24dbd414c67c54e authorBernardo Meurer <bernardo@meurer.org> dateSun 30 Jan 2022, 09:07 (5 years ago) parent264390b6b3a2e6
2 files changed+6−3
compare with master
unifiedsplit
pkgs/tools/package-management/nix/common.nix+3 pkgs/tools/package-management/nix/default.nix+3−3
pkgs/tools/package-management/nix/common.nix+3
@@ -9,6 +9,7 @@ assert (sha256 == null) -> (src != null);
99let
1010 atLeast24 = lib.versionAtLeast version "2.4pre";
1111 atLeast25 = lib.versionAtLeast version "2.5pre";
12+ atLeast27 = lib.versionAtLeast version "2.7pre";
1213in
1314{ stdenv
1415, autoconf-archive
@@ -100,6 +101,8 @@ stdenv.mkDerivation {
100101 lowdown
101102 ] ++ lib.optionals (atLeast24 && stdenv.isx86_64) [
102103 libcpuid
104+ ] ++ lib.optional (atLeast27) [
105+ nlohmann_json
103106 ] ++ lib.optionals withLibseccomp [
104107 libseccomp
105108 ] ++ lib.optionals withAWS [
pkgs/tools/package-management/nix/default.nix+3−3
@@ -67,12 +67,12 @@ in lib.makeExtensible (self: {
6767
6868 unstable = lib.lowPrio (common rec {
6969 version = "2.7";
70− suffix = "pre20220124_${lib.substring 0 7 src.rev}";
70+ suffix = "pre20220127_${lib.substring 0 7 src.rev}";
7171 src = fetchFromGitHub {
7272 owner = "NixOS";
7373 repo = "nix";
74− rev = "0a70b37b5694c769fb855c1afe7642407d1db64f";
75− sha256 = "sha256-aOM9MPNlnWNMobx4CuD4JIXH2poRlG8AKkuxY7FysWg=";
74+ rev = "558c4ee3e370c9f9a6ea293df54ed6914a999f1c";
75+ sha256 = "sha256-hMzKQflpgf3P7OdYKSnD1VMBSnF48XSRjaNX3bUJct4=";
7676 };
7777 });
7878})