diff --git a/ci/default.nix b/ci/default.nix index 2bae87eca0587..c75de0ff2b9ad 100644 --- a/ci/default.nix +++ b/ci/default.nix @@ -17,13 +17,7 @@ let else nixpkgs; - pkgs = import nixpkgs' { - inherit system; - config = { - permittedInsecurePackages = [ "nix-2.3.18" ]; - }; - overlays = [ ]; - }; + pkgs = import nixpkgs' { inherit system; }; fmt = let @@ -128,8 +122,7 @@ rec { parse = pkgs.lib.recurseIntoAttrs { latest = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.latest; }; lix = pkgs.callPackage ./parse.nix { nix = pkgs.lix; }; - # TODO: Raise nixVersions.minimum to 2.24 and flip back to it. - minimum = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.nix_2_24; }; + nix_2_24 = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.nix_2_24; }; }; shell = import ../shell.nix { inherit nixpkgs system; }; tarball = import ../pkgs/top-level/make-tarball.nix { diff --git a/lib/tests/release.nix b/lib/tests/release.nix index 5a1752010745f..1f8c666eab01d 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -16,7 +16,7 @@ pkgsBB ? pkgs.pkgsBuildBuild, nix ? pkgs-nixVersions.stable, nixVersions ? [ - pkgs-nixVersions.minimum + pkgs-nixVersions.nix_2_24 nix pkgs-nixVersions.latest ],