diff options
author | Artturin <Artturin@artturin.com> | 2024-06-27 21:12:40 +0300 |
---|---|---|
committer | Artturin <Artturin@artturin.com> | 2024-06-27 21:25:48 +0300 |
commit | 5963e3123853906a143efa29a10fd0eb0802b225 (patch) | |
tree | 55483d9682a45622911e737f36f8b682151e443b | |
parent | 5488a687a55b1138619223386bd0d56b0c37eb95 (diff) |
nixVersions.git: 2.23.0 -> 2.23.1 (hashes)
`suffix`,`rev`, and `hash` weren't updated in the `version` update
-rw-r--r-- | pkgs/tools/package-management/nix/common.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 22b1cb817b691..f7b0dff33472d 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -19,6 +19,7 @@ let atLeast219 = lib.versionAtLeast version "2.19pre"; atLeast220 = lib.versionAtLeast version "2.20pre"; atLeast221 = lib.versionAtLeast version "2.21pre"; + atLeast224 = lib.versionAtLeast version "2.24pre"; # Major.minor versions unaffected by CVE-2024-27297 unaffectedByFodSandboxEscape = [ "2.3" @@ -58,6 +59,7 @@ in , libxml2 , libxslt , lowdown +, toml11 , man , mdbook , mdbook-linkcheck @@ -136,6 +138,8 @@ self = stdenv.mkDerivation { lowdown ] ++ lib.optionals atLeast220 [ libgit2 + ] ++ lib.optionals (atLeast224 || lib.versionAtLeast version "pre20240626") [ + toml11 ] ++ lib.optionals stdenv.isDarwin [ Security ] ++ lib.optionals (stdenv.isx86_64) [ diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 559d5e876e6a9..3290b0e71b61a 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -184,12 +184,12 @@ in lib.makeExtensible (self: ({ git = common rec { version = "2.23.1"; - suffix = "pre20240526_${lib.substring 0 8 src.rev}"; + suffix = "pre20240627_${lib.substring 0 8 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "7de033d63fbcf97aad164e131ae3a85e5dcebce7"; - hash = "sha256-LtsyUsVpr9sM0n1L7MeTw8/6wGtGeXFvKAbPR5lqN8Q="; + rev = "b44909ac2244bda4c387b9a17748e8a94ada9e78"; + hash = "sha256-tS8i/fyi2DO5GM103b+G7K/XwFWhWvb2VDjqpLH5Kxc="; }; self_attribute_name = "git"; }; |