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

Merge pull request #218889 from qowoz/nix214

Browse Source 
nixVersions.nix_2_14: init at 2.14.1
This commit is contained in:
Jörg Thalheim 2023-03-03 09:14:48 +01:00 committed by GitHub
commit f055ce8af7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,7 @@ let
atLeast27 = lib.versionAtLeast version "2.7pre";
atLeast210 = lib.versionAtLeast version "2.10pre";
atLeast213 = lib.versionAtLeast version "2.13pre";
atLeast214 = lib.versionAtLeast version "2.14pre";
in
{ stdenv
, autoconf-archive
@ -43,6 +44,7 @@ in
, openssl
, perl
, pkg-config
, rapidcheck
, Security
, sqlite
, util-linuxMinimal
@ -109,6 +111,8 @@ self = stdenv.mkDerivation {
lowdown
] ++ lib.optionals (atLeast24 && stdenv.isx86_64) [
libcpuid
] ++ lib.optionals atLeast214 [
rapidcheck
] ++ lib.optionals withLibseccomp [
libseccomp
] ++ lib.optionals withAWS [
@ -167,6 +171,8 @@ self = stdenv.mkDerivation {
] ++ lib.optionals (!atLeast24) [
# option was removed in 2.4
"--disable-init-state"
] ++ lib.optionals atLeast214 [
"CXXFLAGS=-I${lib.getDev rapidcheck}/extras/gtest/include"
] ++ lib.optionals stdenv.isLinux [
"--with-sandbox-shell=${busybox-sandbox-shell}/bin/busybox"
] ++ lib.optionals (atLeast210 && stdenv.isLinux && stdenv.hostPlatform.isStatic) [

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

@ -124,7 +124,12 @@ in lib.makeExtensible (self: {
sha256 = "sha256-jUc2ccTR8f6MGY2pUKgujm+lxSPNGm/ZAP+toX+nMNc=";
};
nix_2_14 = common {
version = "2.14.1";
sha256 = "sha256-5aCmGZbsFcLIckCDfvnPD4clGPQI7qYAqHYlttN/Wkg=";
};
stable = self.nix_2_13;
unstable = self.stable;
unstable = self.nix_2_14;
})