Merge pull request #256563 from SuperSandro2000/nix_2_18

nixVersions.nix_2_18: init

authored by

Weijia Wang and committed by
GitHub
06ce92cd 16016e7c

+7 -4
+6 -1
pkgs/tools/package-management/nix/default.nix
··· 191 hash = "sha256-QMYAkdtU+g9HlZKtoJ+AI6TbWzzovKGnPZJHfZdclc8="; 192 }; 193 194 # The minimum Nix version supported by Nixpkgs 195 # Note that some functionality *might* have been backported into this Nix version, 196 # making this package an inaccurate representation of what features are available ··· 210 211 stable = self.nix_2_17; 212 213 - unstable = self.stable; 214 } // lib.optionalAttrs config.allowAliases { 215 nix_2_4 = throw "nixVersions.nix_2_4 has been removed"; 216
··· 191 hash = "sha256-QMYAkdtU+g9HlZKtoJ+AI6TbWzzovKGnPZJHfZdclc8="; 192 }; 193 194 + nix_2_18 = common { 195 + version = "2.18.0"; 196 + hash = "sha256-ggISAuGpTkKp6JXt1BbcLtLDYOPECWqrVnPVgQEFHYc="; 197 + }; 198 + 199 # The minimum Nix version supported by Nixpkgs 200 # Note that some functionality *might* have been backported into this Nix version, 201 # making this package an inaccurate representation of what features are available ··· 215 216 stable = self.nix_2_17; 217 218 + unstable = self.nix_2_18; 219 } // lib.optionalAttrs config.allowAliases { 220 nix_2_4 = throw "nixVersions.nix_2_4 has been removed"; 221
+1 -3
pkgs/top-level/all-packages.nix
··· 9093 9094 hardinfo = callPackage ../tools/system/hardinfo { }; 9095 9096 - harmonia = callPackage ../tools/package-management/harmonia { 9097 - nix = nixVersions.unstable; 9098 - }; 9099 9100 hayagriva = callPackage ../tools/typesetting/hayagriva { }; 9101
··· 9093 9094 hardinfo = callPackage ../tools/system/hardinfo { }; 9095 9096 + harmonia = callPackage ../tools/package-management/harmonia { }; 9097 9098 hayagriva = callPackage ../tools/typesetting/hayagriva { }; 9099