Unverified Commit 0cb51d57 authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

nixVersions.nix_2_25: init at 2.25.2 (#355350)

parents d8ddabfa 10a35620

pkgs/tools/package-management/nix/common.nix

+10 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ in 
, coreutils

, curl

, darwin

, darwinMinVersionHook

, docbook_xsl_ns

, docbook5

, editline
@@ -162,6 +163,15 @@ self = stdenv.mkDerivation { 
    aws-sdk-cpp

  ] ++ lib.optional (atLeast218 && stdenv.hostPlatform.isDarwin) [

    darwin.apple_sdk.libs.sandbox

  ] ++ lib.optional (atLeast224 && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [

    # Fix the following error with the default x86_64-darwin SDK:

    #

    #     error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer

    #

    # Despite the use of the 10.13 deployment target here, the aligned

    # allocation function Clang uses with this setting actually works

    # all the way back to 10.6.

    (darwinMinVersionHook "10.13")

  ];

pkgs/tools/package-management/nix/default.nix

+10 −23
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
, fetchpatch

, fetchpatch2

, runCommand

, overrideSDK

, buildPackages

, Security
@@ -210,22 +209,19 @@ in lib.makeExtensible (self: ({ 
    self_attribute_name = "nix_2_23";

  };



  nix_2_24 = (common {

  nix_2_24 = common {

    version = "2.24.10";

    hash = "sha256-XdeVy1/d6DEIYb3nOA6JIYF4fwMKNxtwJMgT3pHi+ko=";

    self_attribute_name = "nix_2_24";

  }).override (lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) {

    # Fix the following error with the default x86_64-darwin SDK:

    #

    #     error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer

    #

    # Despite the use of the 10.13 deployment target here, the aligned

    # allocation function Clang uses with this setting actually works

    # all the way back to 10.6.

    stdenv = overrideSDK stdenv { darwinMinVersion = "10.13"; };

  });

  };



  nix_2_25 = common {

    version = "2.25.2";

    hash = "sha256-MZNpb4awWHXU+kGmH58VUB7M9l6UVo33riuQLTbMh4E=";

    self_attribute_name = "nix_2_25";

  };



  git = (common rec {

  git = common rec {

    version = "2.25.0";

    suffix = "pre20241101_${lib.substring 0 8 src.rev}";

    src = fetchFromGitHub {
@@ -235,16 +231,7 @@ in lib.makeExtensible (self: ({ 
      hash = "sha256-E1Sp0JHtbD1CaGO3UbBH6QajCtOGqcrVfPSKL0n63yo=";

    };

    self_attribute_name = "git";

  }).override (lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) {

    # Fix the following error with the default x86_64-darwin SDK:

    #

    #     error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer

    #

    # Despite the use of the 10.13 deployment target here, the aligned

    # allocation function Clang uses with this setting actually works

    # all the way back to 10.6.

    stdenv = overrideSDK stdenv { darwinMinVersion = "10.13"; };

  });

  };



  latest = self.nix_2_24;