Unverified Commit 6a39c6e4 authored by Robert Hensing's avatar Robert Hensing Committed by GitHub
Browse files

nixVersions.stable: 2.24 -> 2.28 (#396442)

parents 58a2a2f1 f81520f8

pkgs/by-name/at/attic-client/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -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.

pkgs/by-name/li/libblake3/package.nix

+7 −1
Original line number Diff line number Diff line
@@ -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: {

pkgs/by-name/ni/nickel/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -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

  ];

pkgs/by-name/ni/nix-heuristic-gc/package.nix

+4 −4
Original line number Diff line number Diff line
@@ -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

  ];

pkgs/by-name/ni/nix-plugins/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -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

  ];