mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-14 06:00:33 +03:00
nixVersions.stable: 2.24 -> 2.28 (#396442)
This commit is contained in:
commit
6a39c6e495
8 changed files with 27 additions and 21 deletions
|
@ -2,7 +2,7 @@
|
|||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nixForLinking,
|
||||
nixVersions,
|
||||
nixosTests,
|
||||
boost,
|
||||
pkg-config,
|
||||
|
@ -29,7 +29,7 @@ rustPlatform.buildRustPackage {
|
|||
|
||||
buildInputs =
|
||||
[
|
||||
nixForLinking
|
||||
nixVersions.nix_2_24
|
||||
boost
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin (
|
||||
|
@ -44,7 +44,7 @@ rustPlatform.buildRustPackage {
|
|||
useFetchCargoVendor = true;
|
||||
|
||||
ATTIC_DISTRIBUTOR = "nixpkgs";
|
||||
NIX_INCLUDE_PATH = "${lib.getDev nixForLinking}/include";
|
||||
NIX_INCLUDE_PATH = "${lib.getDev nixVersions.nix_2_24}/include";
|
||||
|
||||
# Attic interacts with Nix directly and its tests require trusted-user access
|
||||
# to nix-daemon to import NARs, which is not possible in the build sandbox.
|
||||
|
|
|
@ -4,7 +4,13 @@
|
|||
cmake,
|
||||
fetchFromGitHub,
|
||||
tbb_2021_11,
|
||||
useTBB ? true,
|
||||
|
||||
# Until we have a release with
|
||||
# https://github.com/BLAKE3-team/BLAKE3/pull/461 and similar, or those
|
||||
# PRs are patched onto this current release. Even then, I think we
|
||||
# still need to disable for MinGW build because
|
||||
# https://github.com/BLAKE3-team/BLAKE3/issues/467
|
||||
useTBB ? false,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
python3,
|
||||
versionCheckHook,
|
||||
pkg-config,
|
||||
nix,
|
||||
nixVersions,
|
||||
nix-update-script,
|
||||
enableNixImport ? true,
|
||||
}:
|
||||
|
@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
];
|
||||
|
||||
buildInputs = lib.optionals enableNixImport [
|
||||
nix
|
||||
nixVersions.nix_2_24
|
||||
boost
|
||||
];
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
nix,
|
||||
nixVersions,
|
||||
boost,
|
||||
python3Packages,
|
||||
}:
|
||||
|
@ -19,12 +19,12 @@ python3Packages.buildPythonPackage rec {
|
|||
|
||||
# NIX_SYSTEM suggested at
|
||||
# https://github.com/NixOS/nixpkgs/issues/386184#issuecomment-2692433531
|
||||
NIX_SYSTEM = nix.stdenv.hostPlatform.system;
|
||||
NIX_CFLAGS_COMPILE = [ "-I${lib.getDev nix}/include/nix" ];
|
||||
NIX_SYSTEM = nixVersions.nix_2_24.stdenv.hostPlatform.system;
|
||||
NIX_CFLAGS_COMPILE = [ "-I${lib.getDev nixVersions.nix_2_24}/include/nix" ];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
nix
|
||||
nixVersions.nix_2_24
|
||||
python3Packages.pybind11
|
||||
python3Packages.setuptools
|
||||
];
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
nix,
|
||||
nixVersions,
|
||||
cmake,
|
||||
pkg-config,
|
||||
boost,
|
||||
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
nix
|
||||
nixVersions.nix_2_24
|
||||
boost
|
||||
];
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
llvmPackages,
|
||||
meson,
|
||||
ninja,
|
||||
nixForLinking,
|
||||
nixVersions,
|
||||
nix-update-script,
|
||||
nixd,
|
||||
nixf,
|
||||
|
@ -101,12 +101,12 @@ in
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
nixForLinking
|
||||
nixVersions.nix_2_24
|
||||
gtest
|
||||
boost
|
||||
];
|
||||
|
||||
env.CXXFLAGS = "-include ${nixForLinking.dev}/include/nix/config.h";
|
||||
env.CXXFLAGS = "-include ${nixVersions.nix_2_24.dev}/include/nix/config.h";
|
||||
|
||||
passthru.tests.pkg-config = testers.hasPkgConfigModules {
|
||||
package = nixt;
|
||||
|
@ -127,7 +127,7 @@ in
|
|||
sourceRoot = "${common.src.name}/nixd";
|
||||
|
||||
buildInputs = [
|
||||
nixForLinking
|
||||
nixVersions.nix_2_24
|
||||
nixf
|
||||
nixt
|
||||
llvmPackages.llvm
|
||||
|
@ -137,7 +137,7 @@ in
|
|||
|
||||
nativeBuildInputs = common.nativeBuildInputs ++ [ cmake ];
|
||||
|
||||
env.CXXFLAGS = "-include ${nixForLinking.dev}/include/nix/config.h";
|
||||
env.CXXFLAGS = "-include ${nixVersions.nix_2_24.dev}/include/nix/config.h";
|
||||
|
||||
# See https://github.com/nix-community/nixd/issues/519
|
||||
doCheck = false;
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
stdenv,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
nixForLinking,
|
||||
nixVersions,
|
||||
nlohmann_json,
|
||||
boost,
|
||||
graphviz,
|
||||
|
@ -27,13 +27,13 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
doCheck = true;
|
||||
nativeCheckInputs = [
|
||||
nixForLinking
|
||||
nixVersions.nix_2_24
|
||||
graphviz
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
nixForLinking
|
||||
nixVersions.nix_2_24
|
||||
nlohmann_json
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
|
||||
|
||||
|
|
|
@ -228,7 +228,7 @@ lib.makeExtensible (
|
|||
nix;
|
||||
|
||||
# Read ./README.md before bumping a major release
|
||||
stable = addFallbackPathsCheck self.nix_2_24;
|
||||
stable = addFallbackPathsCheck self.nix_2_28;
|
||||
}
|
||||
// lib.optionalAttrs config.allowAliases (
|
||||
lib.listToAttrs (
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue