From 3cec8c7fd583228877080ec7a015e100e48a4001 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 18 Jan 2023 07:12:50 +1000 Subject: [PATCH] nixVersions.nix_2_13: init at 2.13.1 https://github.com/NixOS/nix/releases/tag/2.13.0 https://github.com/NixOS/nix/releases/tag/2.13.1 --- pkgs/tools/package-management/nix/common.nix | 4 ++++ pkgs/tools/package-management/nix/default.nix | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 95fbd0782b79..72978db577a6 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -11,6 +11,7 @@ let atLeast25 = lib.versionAtLeast version "2.5pre"; atLeast27 = lib.versionAtLeast version "2.7pre"; atLeast210 = lib.versionAtLeast version "2.10pre"; + atLeast213 = lib.versionAtLeast version "2.13pre"; in { stdenv , autoconf-archive @@ -37,6 +38,7 @@ in , libsodium , lowdown , mdbook +, mdbook-linkcheck , nlohmann_json , openssl , perl @@ -83,6 +85,8 @@ self = stdenv.mkDerivation { ] ++ lib.optionals (atLeast24 && enableDocumentation) [ (lib.getBin lowdown) mdbook + ] ++ lib.optionals (atLeast213 && enableDocumentation) [ + mdbook-linkcheck ] ++ lib.optionals stdenv.isLinux [ util-linuxMinimal ]; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index d0bff934ee61..d8dba67d39b0 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -106,6 +106,11 @@ in lib.makeExtensible (self: { ]; }; + nix_2_13 = common { + version = "2.13.1"; + sha256 = "sha256-uXh4+xjJUHQSCg+LHh6+SSYtMdjKQiTXMZ4uZFwzdq4="; + }; + stable = self.nix_2_12; unstable = self.stable;