Unverified Commit 06ce92cd authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #256563 from SuperSandro2000/nix_2_18 

nixVersions.nix_2_18: init
parents 16016e7c 00a343b1

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

+6 −1
Original line number Diff line number Diff line
@@ -191,6 +191,11 @@ in lib.makeExtensible (self: ({ 
    hash = "sha256-QMYAkdtU+g9HlZKtoJ+AI6TbWzzovKGnPZJHfZdclc8=";

  };



  nix_2_18 = common {

    version = "2.18.0";

    hash = "sha256-ggISAuGpTkKp6JXt1BbcLtLDYOPECWqrVnPVgQEFHYc=";

  };



  # The minimum Nix version supported by Nixpkgs

  # Note that some functionality *might* have been backported into this Nix version,

  # making this package an inaccurate representation of what features are available
@@ -210,7 +215,7 @@ in lib.makeExtensible (self: ({ 


  stable = self.nix_2_17;



  unstable = self.stable;

  unstable = self.nix_2_18;

} // lib.optionalAttrs config.allowAliases {

  nix_2_4 = throw "nixVersions.nix_2_4 has been removed";

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -9093,9 +9093,7 @@ with pkgs; 














  hardinfo = callPackage ../tools/system/hardinfo { };



























  harmonia = callPackage ../tools/package-management/harmonia {













    nix = nixVersions.unstable;













  };













  harmonia = callPackage ../tools/package-management/harmonia { };





























  hayagriva = callPackage ../tools/typesetting/hayagriva { };