Fix nixpkgs warnings

Author: hamishmack

build.nix

@@ -20,7 +20,7 @@ in rec {
   tests = import ./test/default.nix { inherit pkgs evalPackages ifdLevel compiler-nix-name; };
 
   tools = pkgs.lib.optionalAttrs (ifdLevel >= 3) (
-    pkgs.recurseIntoAttrs ({
+    pkgs.lib.recurseIntoAttrs ({
       cabal-latest = tool compiler-nix-name "cabal" ({
         inherit evalPackages;
       } // pkgs.lib.optionalAttrs (ghcFromTo "9.13" "9.14") {
@@ -100,8 +100,8 @@ in rec {
 
   # These are pure parts of maintainer-script so they can be built by hydra
   # and added to the cache to speed up buildkite.
-  maintainer-script-cache = pkgs.recurseIntoAttrs (
-      (pkgs.lib.optionalAttrs (pkgs.system == "x86_64-linux") {
+  maintainer-script-cache = pkgs.lib.recurseIntoAttrs (
+      (pkgs.lib.optionalAttrs (pkgs.stdenv.hostPlatform.system == "x86_64-linux") {
         inherit (maintainer-scripts) check-hydra;
       })
     // (pkgs.lib.optionalAttrs (ifdLevel > 2) {

builder/hspkg-builder.nix

@@ -62,7 +62,7 @@ let
 
 in rec {
   components = haskellLib.applyComponents (buildComp pkg.allComponent) pkg;
-  checks = pkgs.recurseIntoAttrs (builtins.mapAttrs
+  checks = pkgs.lib.recurseIntoAttrs (builtins.mapAttrs
     (_: d: haskellLib.check d)
       (lib.filterAttrs (_: d: d.config.doCheck) components.tests));
   inherit (package) identifier detailLevel isLocal isProject buildType;

ci.nix

@@ -134,7 +134,7 @@ dimension "Nixpkgs version" nixpkgsVersions (nixpkgsName: pinnedNixpkgsSrc:
       in filterAttrsOnlyRecursive (_: v: platformFilter v && !(isDisabled v)) ({
         # Native builds
         # TODO: can we merge this into the general case by picking an appropriate "cross system" to mean native?
-        native = pkgs.recurseIntoAttrs ({
+        native = pkgs.lib.recurseIntoAttrs ({
           roots = pkgs.haskell-nix.roots' { inherit compiler-nix-name evalPackages; } ifdLevel;
         } // pkgs.lib.optionalAttrs runTests {
           inherit (build) tests tools maintainer-scripts maintainer-script-cache;
@@ -156,7 +156,7 @@ dimension "Nixpkgs version" nixpkgsVersions (nixpkgsName: pinnedNixpkgsSrc:
                 then import pinnedNixpkgsSrc (nixpkgsArgs // { inherit system crossSystem; })
                 else crossSystem (import pinnedNixpkgsSrc (nixpkgsArgs // { inherit system; }));
             build = import ./build.nix { inherit pkgs evalPackages ifdLevel compiler-nix-name haskellNix; };
-        in pkgs.recurseIntoAttrs (pkgs.lib.optionalAttrs (ifdLevel >= 1) ({
+        in pkgs.lib.recurseIntoAttrs (pkgs.lib.optionalAttrs (ifdLevel >= 1) ({
             roots = pkgs.haskell-nix.roots' { inherit compiler-nix-name evalPackages; } ifdLevel // {
               ghc = pkgs.buildPackages.haskell-nix.compiler.${compiler-nix-name}.override { ghcEvalPackages = evalPackages; };
             };

lib/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, stdenv, lib, haskellLib, recurseIntoAttrs, srcOnly }:
+{ pkgs, stdenv, lib, haskellLib, srcOnly }:
 
 
 with haskellLib;
@@ -166,7 +166,7 @@ in {
             components =
               if lib.isDerivation components || components == {}
                 then components
-                else recurseIntoAttrs components;
+                else lib.recurseIntoAttrs components;
           };
         packageFilter = _name: package: (package.isHaskell or false) && packageSel package;
         filteredPkgs = lib.filterAttrs packageFilter haskellPackages;
@@ -177,7 +177,7 @@ in {
           lib.filterAttrs (_: components: components != {}) (
             builtins.mapAttrs (_name: packages:
               builtins.foldl' (a: b: a // b) {} (map (x: x.components) packages)) packagesGroupedByName);
-    in recurseIntoAttrs combined;
+    in lib.recurseIntoAttrs combined;
 
   # Equivalent to collectComponents with (_: true) as selection function.
   # Useful for pre-filtered package-set.
@@ -193,7 +193,7 @@ in {
   # This can be used to collect all the test runs in your project, so that can be run in CI.
   collectChecks = packageSel: haskellPackages:
     let packageFilter = _name: package: (package.isHaskell or false) && packageSel package;
-    in recurseIntoAttrs (lib.filterAttrs (_: x: x != {} && x != recurseIntoAttrs {}) (lib.mapAttrs (_: p: p.checks) (lib.filterAttrs packageFilter haskellPackages)));
+    in lib.recurseIntoAttrs (lib.filterAttrs (_: x: x != {} && x != lib.recurseIntoAttrs {}) (lib.mapAttrs (_: p: p.checks) (lib.filterAttrs packageFilter haskellPackages)));
 
   # Equivalent to collectChecks with (_: true) as selection function.
   # Useful for pre-filtered package-set.

modules/install-plan/redirect.nix

@@ -39,7 +39,7 @@ let
         // lib.optionalAttrs (componentsByName ? lib) {
           library = lookupComponent "" "" componentsByName.lib;
         };
-      checks = pkgs.recurseIntoAttrs (
+      checks = pkgs.lib.recurseIntoAttrs (
         lib.filterAttrs (_: x: x != {}) (
           builtins.mapAttrs
             (_: d: pkgs.haskell-nix.haskellLib.check d)

modules/project-common.nix

@@ -43,7 +43,7 @@ with lib.types;
     };
     evalSystem = mkOption {
       type = str;
-      default = pkgs.pkgsBuildBuild.stdenv.system;
+      default = pkgs.pkgsBuildBuild.stdenv.hostPlatform.system;
       description = ''
         Specifies the system on which `cabal` and `nix-tools` should run.
         If not specified the `pkgsBuildBuild` system will be used.
@@ -55,7 +55,7 @@ with lib.types;
     evalPackages = mkOption {
       type = attrs;
       default =
-        if pkgs.pkgsBuildBuild.stdenv.system == config.evalSystem
+        if pkgs.pkgsBuildBuild.stdenv.hostPlatform.system == config.evalSystem
         then pkgs.pkgsBuildBuild
         else
           import pkgs.path {

nix-tools/flake.nix

@@ -29,7 +29,7 @@
             pkgs'.nix-tools-set { compilerSelection = lib.mkForce (p: p.haskell-nix.compiler); };
 
           # tarball filename e.g. nix-tools-0.1.0.0-x86_64-unknown-linux-musl.tar.gz
-          tarball-filename = "${toolset.name}-${pkgs.hostPlatform.config}.tar.gz";
+          tarball-filename = "${toolset.name}-${pkgs.stdenv.hostPlatform.config}.tar.gz";
         in
         pkgs.runCommand tarball-filename
           { preferLocalBuild = true; }
@@ -80,13 +80,13 @@
           # project's hydraJobs
           pkgs.nix-tools-eval-on-linux.project.flake'.hydraJobs
           # tarballs with static builds.
-          // lib.optionalAttrs (pkgs.buildPlatform.system == "x86_64-linux")
+          // lib.optionalAttrs (pkgs.stdenv.buildPlatform.system == "x86_64-linux")
             { binary-tarball = mkTarball pkgs.pkgsCross.musl64; }
           # aarch64-multiplatform-musl cross compile is currently broken
-          # // lib.optionalAttrs (pkgs.buildPlatform.system == "aarch64-linux")
+          # // lib.optionalAttrs (pkgs.stdenv.buildPlatform.system == "aarch64-linux")
           #   { binary-tarball = mkTarball pkgs.pkgsCross.aarch64-multiplatform-musl; }
           // {
-            static = static-nix-tools-outputs.hydraJobs.${pkgs.system};
+            static = static-nix-tools-outputs.hydraJobs.${pkgs.stdenv.hostPlatform.system};
           }
         );
     };

nix-tools/static/project.nix

@@ -46,7 +46,7 @@ let
   };
 
 
-  add-static-libs-to-darwin = pkgs.lib.mkIf pkgs.hostPlatform.isDarwin {
+  add-static-libs-to-darwin = pkgs.lib.mkIf pkgs.stdenv.hostPlatform.isDarwin {
     packages.cabal-install.ghcOptions = [
       "-L${pkgs.lib.getLib pkgs.static-gmp}/lib"
     ];

nix-tools/static/zipped.nix

@@ -31,7 +31,7 @@ let
       ];
     in 
       customPkgs.packaging.asZip {
-        name = "${customPkgs.hostPlatform.system}-nix-tools-static";
+        name = "${customPkgs.stdenv.hostPlatform.system}-nix-tools-static";
         drvs' = [ 
           hsPkgs.cabal-install.components.exes.cabal 
           hsPkgs.hpack.components.exes.hpack 
@@ -45,12 +45,12 @@ let
       stringifyInputs = inputs: pkgs.lib.mapAttrsToList (name: value: pkgs.lib.trace "${name}=${value}" "${value}") inputs;
       # stringifyInputs = inputs: map (x: "${x}") (builtins.attrValues inputs);
 
-      fragment-drv = "static-nix-tools-outputs.hydraJobs.${pkgs.hostPlatform.system}.zipped.${fragment-name}";
+      fragment-drv = "static-nix-tools-outputs.hydraJobs.${pkgs.stdenv.hostPlatform.system}.zipped.${fragment-name}";
     in
-      pkgs.runCommand "${pkgs.hostPlatform.system}-all-nix-tools" {
+      pkgs.runCommand "${pkgs.stdenv.hostPlatform.system}-all-nix-tools" {
         requiredSystemFeatures = [ "recursive-nix" ];
         nativeBuildInputs = 
-          # [ inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.nix pkgs.gitMinimal ]
+          # [ inputs.nixpkgs-unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system}.nix pkgs.gitMinimal ]
           [ (pkgs.lib.trace pkgs.nix.version pkgs.nix) pkgs.gitMinimal ]
           ++ stringifyInputs inputs
           ++ stringifyInputs inputs.haskellNix.inputs;
@@ -59,7 +59,7 @@ let
         mkdir $out
         cp $(nix --offline --extra-experimental-features "flakes nix-command" \
           build --accept-flake-config --no-link --print-out-paths --no-allow-import-from-derivation \
-          --system ${pkgs.hostPlatform.system} \
+          --system ${pkgs.stdenv.hostPlatform.system} \
           ${../.}#${fragment-drv})/*.zip $out/
       '';
 
@@ -81,12 +81,12 @@ let
 
 
   allZippedTools = 
-    pkgs.lib.optionalAttrs (pkgs.system == "x86_64-darwin" || pkgs.system == "aarch64-darwin") { 
+    pkgs.lib.optionalAttrs (pkgs.stdenv.hostPlatform.system == "x86_64-darwin" || pkgs.stdenv.hostPlatform.system == "aarch64-darwin") {
       "nix-tools-static" = zippedToolsForDarwin;
       "nix-tools-static-no-ifd" = zippedToolsNoIfdFor "nix-tools-static";
     } 
     // 
-    pkgs.lib.optionalAttrs (pkgs.system == "x86_64-linux") {
+    pkgs.lib.optionalAttrs (pkgs.stdenv.hostPlatform.system == "x86_64-linux") {
       "nix-tools-static" = zippedToolsForLinux;
       "nix-tools-static-arm64" = zippedToolsForLinuxArm64;
 

overlays/armv6l-linux.nix

@@ -2,10 +2,10 @@ final: prev:
 let
   isLinuxCross =
        prev.haskell-nix.haskellLib.isCrossHost
-    && prev.hostPlatform.isLinux
-    && (prev.hostPlatform.isAarch32
-     || prev.hostPlatform.isAarch64
-     || prev.hostPlatform.isi686);
+    && prev.stdenv.hostPlatform.isLinux
+    && (prev.stdenv.hostPlatform.isAarch32
+     || prev.stdenv.hostPlatform.isAarch64
+     || prev.stdenv.hostPlatform.isi686);
 
 in
 {