diff --git a/builder/haddock-builder.nix b/builder/haddock-builder.nix
index 66f77575cf..97ffdbb607 100644
--- a/builder/haddock-builder.nix
+++ b/builder/haddock-builder.nix
@@ -121,9 +121,7 @@ let
     '';
 
     installPhase =
-      let
-        target-pkg-and-db = "${ghc.targetPrefix}ghc-pkg -v0 --package-db $out/package.conf.d";
-      in ''
+      ''
         html="dist/doc/html/${package.identifier.name}"
 
         if [ -d "$html" ]; then
diff --git a/builder/make-config-files.nix b/builder/make-config-files.nix
index 698742016c..d8f229e447 100644
--- a/builder/make-config-files.nix
+++ b/builder/make-config-files.nix
@@ -37,11 +37,7 @@ let
   #            pkg id for z-{pkg name}-z-{sublib name}.  As we do not provide the
   #            sublib name to exactDep, as we don't have access to it at the call-site,
   #            we resort to a bit of globbing, which (as pkg db's should contain only
-  #            a single package) work.
-
-  getLibComponent = dep:
-       dep.components.library # Regular package dependency
-    or dep;                   # or a sublib
+  #            a single package) work.                   # or a sublib
 
   # Work our suitable packageCfgDir subdirectory
   isGhcjs        = ghc.isGhcjs or false;
diff --git a/ci-lib.nix b/ci-lib.nix
index e526ed23d3..0b24b21de3 100644
--- a/ci-lib.nix
+++ b/ci-lib.nix
@@ -23,7 +23,7 @@
   # Keep derivations and attrsets with 'recurseForDerivations'. This ensures that we match the
   # derivations that Hercules will see, and prevents Hydra from trying to pick up all sorts of bad stuff
   # (like attrsets that contain themselves!).
-  filterDerivations = filterAttrsOnlyRecursive (n: attrs: lib.isDerivation attrs || attrs.recurseForDerivations or false);
+  filterDerivations = filterAttrsOnlyRecursive (_n: attrs: lib.isDerivation attrs || attrs.recurseForDerivations or false);
 
   # A version of 'filterAttrsRecursive' that doesn't recurse into derivations. This prevents us from going into an infinite
   # loop with the 'out' attribute on derivations.
diff --git a/ci.nix b/ci.nix
index e010963861..bbfd5fdf41 100644
--- a/ci.nix
+++ b/ci.nix
@@ -39,7 +39,7 @@
         (system != "aarch64-linux" || (
            !__elem compiler-nix-name ["ghc865" "ghc8104" "ghc810420210212" "ghc8105" "ghc8106" "ghc901" "ghc921" "ghc922"]
         )))
-    (builtins.mapAttrs (compiler-nix-name: runTests: {
+    (builtins.mapAttrs (_compiler-nix-name: runTests: {
       inherit runTests;
     }) (
       # GHC version to cache and whether to run the tests against them.
diff --git a/compiler/ghc/default.nix b/compiler/ghc/default.nix
index f6247598e2..0655949be3 100644
--- a/compiler/ghc/default.nix
+++ b/compiler/ghc/default.nix
@@ -112,7 +112,7 @@ let
     let targetLibffi = targetPackages.libffi or libffi; in
     # we need to set `dontDisableStatic` for musl for libffi to work.
     if stdenv.targetPlatform.isMusl
-    then targetLibffi.overrideAttrs (old: { dontDisableStatic = true; })
+    then targetLibffi.overrideAttrs (_old: { dontDisableStatic = true; })
     else targetLibffi;
 
   targetGmp = targetPackages.gmp or gmp;
diff --git a/docs/tutorials/getting-started-flakes/flake.nix b/docs/tutorials/getting-started-flakes/flake.nix
index 4307f15170..aae79d393d 100644
--- a/docs/tutorials/getting-started-flakes/flake.nix
+++ b/docs/tutorials/getting-started-flakes/flake.nix
@@ -7,7 +7,7 @@
     flake-utils.lib.eachSystem [ "x86_64-linux" "x86_64-darwin" ] (system:
     let
       overlays = [ haskellNix.overlay
-        (final: prev: {
+        (final: _prev: {
           # This overlay adds our project to pkgs
           helloProject =
             final.haskell-nix.project' {
diff --git a/flake.nix b/flake.nix
index ee8aac6b0f..b7dbe18814 100644
--- a/flake.nix
+++ b/flake.nix
@@ -105,7 +105,7 @@
             overlays = [ allOverlays.combined ]
               ++ (if checkMaterialization then
                 [
-                  (final: prev: {
+                  (_final: prev: {
                     haskell-nix = prev.haskell-nix // {
                       checkMaterialization = true;
                     };
diff --git a/hix/init/flake.nix b/hix/init/flake.nix
index 0ff50743ec..3c90338bd5 100644
--- a/hix/init/flake.nix
+++ b/hix/init/flake.nix
@@ -15,7 +15,7 @@
       flake-utils.lib.eachSystem supportedSystems (system:
       let
         overlays = [ haskellNix.overlay
-          (final: prev: {
+          (final: _prev: {
             hixProject =
               final.haskell-nix.hix.project {
                 src = ./.;
diff --git a/hix/project/flake.nix b/hix/project/flake.nix
index 72caaba440..4600394dbd 100644
--- a/hix/project/flake.nix
+++ b/hix/project/flake.nix
@@ -10,7 +10,7 @@
     flake-utils.lib.eachSystem [ "EVAL_SYSTEM" ] (system:
     let
       overlays = [ haskellNix.overlay
-        (final: prev: {
+        (final: _prev: {
           hixProject =
             final.haskell-nix.hix.project {
               inherit src;
diff --git a/lib/cabal-project-parser.nix b/lib/cabal-project-parser.nix
index 57cc60a6e0..25a97b4e4e 100644
--- a/lib/cabal-project-parser.nix
+++ b/lib/cabal-project-parser.nix
@@ -74,7 +74,7 @@ let
   #   --shar256: 003lm3pm0000hbfmii7xcdd9v20000flxf7gdl2pyxia7p014i8z
   # will be trated like a field and returned here
   # (used in call-cabal-project-to-nix.nix to create a fixed-output derivation)
-  extractSourceRepoPackageData = cabalProjectFileName: sha256map: repo:
+  extractSourceRepoPackageData = _cabalProjectFileName: sha256map: repo:
     let
       refOrRev =
         if builtins.match "[0-9a-f]{40}" repo.tag != null
@@ -128,7 +128,7 @@ let
   # This works because `cabal configure` does not include any of the `/nix/sore/`
   # paths in the `plan.json` (so materialized plan-nix will still work as expeced).
   # See tests/unit.nix for examples of input and output.
-  parseRepositoryBlock = evalPackages: cabalProjectFileName: sha256map: inputMap: cabal-install: nix-tools: block:
+  parseRepositoryBlock = evalPackages: _cabalProjectFileName: sha256map: inputMap: cabal-install: nix-tools: block:
     let
       lines = pkgs.lib.splitString "\n" block;
       # The first line will contain the repository name.
diff --git a/lib/call-cabal-project-to-nix.nix b/lib/call-cabal-project-to-nix.nix
index 6af16d0831..0d7ff5d579 100644
--- a/lib/call-cabal-project-to-nix.nix
+++ b/lib/call-cabal-project-to-nix.nix
@@ -1,4 +1,4 @@
-{ pkgs, runCommand, cacert, index-state-hashes, haskellLib }@defaults:
+{ pkgs, runCommand, cacert, index-state-hashes, haskellLib }:
 { name          ? src.name or null # optional name for better error messages
 , src
 , materialized-dir ? ../materialized
@@ -148,8 +148,6 @@ in let
     then index-state
     else pkgs.lib.last (builtins.attrNames index-state-hashes);
 
-  pkgconfPkgs = import ./pkgconf-nixpkgs-map.nix pkgs;
-
   # If a hash was not specified find a suitable cached index state to
   # use that will contain all the packages we need.  By using the
   # first one after the desired index-state we can avoid recalculating
diff --git a/lib/call-stack-to-nix.nix b/lib/call-stack-to-nix.nix
index dacd8ec082..608204da8b 100644
--- a/lib/call-stack-to-nix.nix
+++ b/lib/call-stack-to-nix.nix
@@ -16,7 +16,7 @@
 , checkMaterialization ? null # If true the nix files will be generated used to check plan-sha256 and material
 , nix-tools
 , evalPackages
-, ... }@args:
+, ... }:
 let
   inherit (evalPackages) runCommand;
   inherit (evalPackages.haskell-nix) mkCacheFile materialize haskellLib;
diff --git a/lib/clean-cabal-component.nix b/lib/clean-cabal-component.nix
index d905a9d6fe..28b79d4d88 100644
--- a/lib/clean-cabal-component.nix
+++ b/lib/clean-cabal-component.nix
@@ -31,7 +31,6 @@ let
       # Keep the trailing slash if there was one.
       + (if lib.hasSuffix "/" path then "/" else "");
   isAbsolutePath = path: lib.hasPrefix "/" path;
-  isRelativePath = path: !(isAbsolutePath path);
   normalizePath = path:
     (if isAbsolutePath path
       then "/"
@@ -48,13 +47,6 @@ let
       else a + "/" + b
     );
   # Like normalizePath but with a trailing / when needed
-  normalizeDir = dir:
-    let p = normalizePath dir;
-    in if p == "" || p == "/"
-      then ""
-      else if lib.hasSuffix "/" p
-        then p
-        else p + "/";
 in
   if srcStr' == null || package.detailLevel != "FullDetails"
     then src
@@ -117,7 +109,7 @@ in
               rPath = lib.strings.substring (srcStrLen + 1) (lib.strings.stringLength path - srcStrLen - 1) path;
               # This is a handy way to find out why different files are included
               # traceReason = reason: v: if v then builtins.trace (rPath + " : " + reason) true else false;
-              traceReason = reason: v: v;
+              traceReason = _reason: v: v;
             in
               traceReason "directory is needed" (
                 lib.any (d: lib.strings.hasPrefix (rPath + "/") d) dirsNeeded)
diff --git a/lib/clean-git.nix b/lib/clean-git.nix
index 2cbb84dbb6..341b4c5ca5 100644
--- a/lib/clean-git.nix
+++ b/lib/clean-git.nix
@@ -99,7 +99,7 @@ then
         caller = "cleanGit";
         name = (if name == null then "" else name + "-") + "gitSubmoduleFiles";
         inherit src;
-        filter = path: type:
+        filter = path: _type:
             elem path pathsNeeded
           ||
             lib.any (i: (lib.hasSuffix i path)) [
@@ -184,7 +184,7 @@ then
           path == origSrcSubDir + "/.git"
         || lib.hasPrefix (origSrcSubDir + "/.git/") path;
 
-    filter = path: type:
+    filter = path: _type:
          hasAttr (toString path) whitelist_set
       || (keepGitDir && isGitDirPath path);
   in
diff --git a/lib/clean-source-haskell.nix b/lib/clean-source-haskell.nix
index 75f7af70b5..45cdd2b6b6 100644
--- a/lib/clean-source-haskell.nix
+++ b/lib/clean-source-haskell.nix
@@ -9,7 +9,7 @@
 { lib }:
 
 rec {
-  haskellSourceFilter = name: type:
+  haskellSourceFilter = name: _type:
     let baseName = baseNameOf (toString name);
     in ! (
       # Filter out cabal build products.
diff --git a/lib/clean-source-with.nix b/lib/clean-source-with.nix
index 635aade381..2610447dc1 100644
--- a/lib/clean-source-with.nix
+++ b/lib/clean-source-with.nix
@@ -90,7 +90,7 @@
       origSrcSubDir = toString origSrc + origSubDir;
       parentFilter = if isFiltered || isFilteredEx
         then path: type: src.filter path type
-        else path: type: true;
+        else _path: _type: true;
       filter' = path: type:
         # Respect the parent filter
         parentFilter path type && (
diff --git a/lib/cover-project.nix b/lib/cover-project.nix
index c357799f53..68a4625fac 100644
--- a/lib/cover-project.nix
+++ b/lib/cover-project.nix
@@ -47,19 +47,6 @@ let
 
   ghc = project.pkg-set.config.ghc.package;
 
-  libs = lib.unique (lib.concatMap (r: r.mixLibraries) coverageReports);
-
-  writeArr = name: arr: pkgs.writeText name (lib.concatStringsSep "\n" arr);
-
-  mixDirs =
-    map
-      (l: "${l}/share/hpc/vanilla/mix/${l.identifier.name}-${l.identifier.version}")
-      libs;
-  mixDirsFile = writeArr "mixdirs" mixDirs;
-
-  srcDirs = map (l: l.srcSubDirPath) libs;
-  srcDirsFile = writeArr "srcdirs" srcDirs;
-
   allCoverageReport = haskellLib.coverageReport {
     name = "all";
     checks = lib.flatten (lib.concatMap
diff --git a/lib/default.nix b/lib/default.nix
index 5d491e5c82..5a37e758ea 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -76,7 +76,7 @@ in {
         config.package.buildable # Set manually in a module (allows whole packages to be disabled)
         && comp.buildable        # Set based on `buildable` in `.cabal` files
         && comp.planned;         # Set if the component was in the `plan.json`
-      buildableAttrs = lib.filterAttrs (n: isBuildable);
+      buildableAttrs = lib.filterAttrs (_n: isBuildable);
       libComp = if comps.library == null || !(isBuildable comps.library)
         then {}
         else lib.mapAttrs applyLibrary (removeAttrs comps (subComponentTypes ++ [ "setup" ]));
@@ -98,12 +98,12 @@ in {
   # Was there a reference to the package source in the `cabal.project` or `stack.yaml` file.
   # This is used to make the default `packages` list for `shellFor`.
   isLocalPackage = p: p.isLocal or false;
-  selectLocalPackages = lib.filterAttrs (n: p: p != null && isLocalPackage p);
+  selectLocalPackages = lib.filterAttrs (_n: p: p != null && isLocalPackage p);
 
   # if it's a project package it has a src attribute set with an origSubDir attribute.
   # project packages are a subset of localPackages
   isProjectPackage = p: p.isProject or false;
-  selectProjectPackages = lib.filterAttrs (n: p: p != null && isLocalPackage p && isProjectPackage p);
+  selectProjectPackages = lib.filterAttrs (_n: p: p != null && isLocalPackage p && isProjectPackage p);
 
   # Format a componentId as it should appear as a target on the
   # command line of the setup script.
@@ -156,14 +156,14 @@ in {
   #     to: tests.mypackage.unit-tests
   #
   collectComponents = group: packageSel: haskellPackages:
-    let packageToComponents = name: package:
+    let packageToComponents = _name: package:
           # look for the components with this group if there are any
           let components = package.components.${group} or {};
           # set recurseForDerivations unless it's a derivation itself (e.g. the "library" component) or an empty set
           in if lib.isDerivation components || components == {}
              then components
              else recurseIntoAttrs components;
-        packageFilter = name: package: (package.isHaskell or false) && packageSel package;
+        packageFilter = _name: package: (package.isHaskell or false) && packageSel package;
         filteredPkgs = lib.filterAttrs packageFilter haskellPackages;
         # at this point we can filter out packages that don't have any of the given kind of component
         packagesByComponent = lib.filterAttrs (_: components: components != {}) (lib.mapAttrs packageToComponents filteredPkgs);
@@ -182,7 +182,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;
+    let packageFilter = _name: package: (package.isHaskell or false) && packageSel package;
     in recurseIntoAttrs (lib.mapAttrs (_: p: p.checks) (lib.filterAttrs packageFilter haskellPackages));
 
   # Equivalent to collectChecks with (_: true) as selection function.
diff --git a/lib/import-and-filter-project.nix b/lib/import-and-filter-project.nix
index dcc29cacdc..afaa8339af 100644
--- a/lib/import-and-filter-project.nix
+++ b/lib/import-and-filter-project.nix
@@ -12,13 +12,11 @@ let
     filter = src.filter or (_: _: true);
   };
   # The sub directory containing the cabal.project or stack.yaml file
-  projectSubDir' = src.origSubDir or "";                                     # With leading /
-  projectSubDir = pkgs.lib.strings.removePrefix "/" projectSubDir';          # Without /
-  projectSubDir'' = if projectSubDir == "" then "" else projectSubDir + "/"; # With trailing /
+  projectSubDir' = src.origSubDir or "";                                     # With leading /          # Without / # With trailing /
   project = import "${projectNix}${projectSubDir'}";
 in project // {
     extras = hackage: let old = (project.extras hackage).packages; in {
-      packages = pkgs.lib.attrsets.mapAttrs (name: value:
+      packages = pkgs.lib.attrsets.mapAttrs (_name: value:
         if builtins.isFunction value
           then value
           else {...}@args: with pkgs.lib.strings;
diff --git a/lib/pkgconf-nixpkgs-map.nix b/lib/pkgconf-nixpkgs-map.nix
index 8c6668611b..14c0a2e84f 100644
--- a/lib/pkgconf-nixpkgs-map.nix
+++ b/lib/pkgconf-nixpkgs-map.nix
@@ -5,7 +5,7 @@ pkgs:
     # Only include derivations that exist in the current pkgs.
     # This allows us to use this mapping to be used in allPkgConfigWrapper.
     # See ./overlas
-    lookupAttrsIn = x: __mapAttrs (pname: names:
+    lookupAttrsIn = x: __mapAttrs (_pname: names:
         # The first entry is should be used for the version by allPkgConfigWrapper
         # so we need it to be present.
         if __length names != 0 && x ? ${__head names}
diff --git a/lib/project-overlays.nix b/lib/project-overlays.nix
index fdd190882d..89743ef40f 100644
--- a/lib/project-overlays.nix
+++ b/lib/project-overlays.nix
@@ -4,14 +4,14 @@
 }: {
 
   # TODO: remove by end of 2022.
-  devshell = final: prev: {
+  devshell = final: _prev: {
     devshell = builtins.trace "WARNING: `projectOverlays.devshell` is deprecated in favor of `haskellLib.devshellFor`"
       (haskellLib.devshellFor final.shell);
   };
 
   # Provides easily accessible attrset for each type of
   # components belonging to the project packages.
-  projectComponents = final: prev: {
+  projectComponents = final: _prev: {
     # local project packages:
     packages = haskellLib.selectProjectPackages final.hsPkgs;
     # set of all exes (as first level entries):
diff --git a/lib/stack-cache-generator.nix b/lib/stack-cache-generator.nix
index dd538acf0d..890cdc7952 100644
--- a/lib/stack-cache-generator.nix
+++ b/lib/stack-cache-generator.nix
@@ -19,7 +19,7 @@
 , nix-tools
 , evalPackages
 , ...
-}@args:
+}:
 let
     inherit (evalPackages) runCommand;
     inherit (evalPackages.haskell-nix) haskellLib;
@@ -35,7 +35,7 @@ let
     # Filter just the stack yaml file and any resolver yaml file it points to.
     maybeCleanedSource = haskellLib.cleanSourceWith {
       inherit src;
-      filter = path: type:
+      filter = path: _type:
         let
           origSrc = if src ? _isLibCleanSourceWith then src.origSrc else src;
           origSubDir = if src ? _isLibCleanSourceWithEx then src.origSubDir else "";
diff --git a/materialized/alex-3.2.7.1/default.nix b/materialized/alex-3.2.7.1/default.nix
index 280a1688a2..9d5849ce8c 100644
--- a/materialized/alex-3.2.7.1/default.nix
+++ b/materialized/alex-3.2.7.1/default.nix
@@ -34,7 +34,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { alex = ./.plan.nix/alex.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/bootstrap/ghc8107/alex/default.nix b/materialized/bootstrap/ghc8107/alex/default.nix
index af9ebc4515..28905110aa 100644
--- a/materialized/bootstrap/ghc8107/alex/default.nix
+++ b/materialized/bootstrap/ghc8107/alex/default.nix
@@ -36,7 +36,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { alex = ./.plan.nix/alex.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/bootstrap/ghc8107/happy-1.19.12/default.nix b/materialized/bootstrap/ghc8107/happy-1.19.12/default.nix
index 73e76139a6..d35ea8d56f 100644
--- a/materialized/bootstrap/ghc8107/happy-1.19.12/default.nix
+++ b/materialized/bootstrap/ghc8107/happy-1.19.12/default.nix
@@ -40,7 +40,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { happy = ./.plan.nix/happy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/bootstrap/ghc8107/hscolour/default.nix b/materialized/bootstrap/ghc8107/hscolour/default.nix
index cf299d5c2c..719558876c 100644
--- a/materialized/bootstrap/ghc8107/hscolour/default.nix
+++ b/materialized/bootstrap/ghc8107/hscolour/default.nix
@@ -24,7 +24,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { hscolour = ./.plan.nix/hscolour.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/bootstrap/ghc844/alex/default.nix b/materialized/bootstrap/ghc844/alex/default.nix
index 1a0e511426..d7bd47e292 100644
--- a/materialized/bootstrap/ghc844/alex/default.nix
+++ b/materialized/bootstrap/ghc844/alex/default.nix
@@ -34,7 +34,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { alex = ./.plan.nix/alex.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/bootstrap/ghc844/happy-1.19.11/default.nix b/materialized/bootstrap/ghc844/happy-1.19.11/default.nix
index 2c525801f4..53cd95416b 100644
--- a/materialized/bootstrap/ghc844/happy-1.19.11/default.nix
+++ b/materialized/bootstrap/ghc844/happy-1.19.11/default.nix
@@ -50,7 +50,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { happy = ./.plan.nix/happy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/bootstrap/ghc844/happy-1.19.12/default.nix b/materialized/bootstrap/ghc844/happy-1.19.12/default.nix
index d8aa30b61c..c14f22078e 100644
--- a/materialized/bootstrap/ghc844/happy-1.19.12/default.nix
+++ b/materialized/bootstrap/ghc844/happy-1.19.12/default.nix
@@ -28,7 +28,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { happy = ./.plan.nix/happy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/bootstrap/ghc844/hscolour/default.nix b/materialized/bootstrap/ghc844/hscolour/default.nix
index c6853dc8fb..5789fa3774 100644
--- a/materialized/bootstrap/ghc844/hscolour/default.nix
+++ b/materialized/bootstrap/ghc844/hscolour/default.nix
@@ -24,7 +24,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { hscolour = ./.plan.nix/hscolour.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/bootstrap/ghc882/alex/default.nix b/materialized/bootstrap/ghc882/alex/default.nix
index 2537ea5aa6..629cf38860 100644
--- a/materialized/bootstrap/ghc882/alex/default.nix
+++ b/materialized/bootstrap/ghc882/alex/default.nix
@@ -36,7 +36,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { alex = ./.plan.nix/alex.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/bootstrap/ghc882/happy-1.19.12/default.nix b/materialized/bootstrap/ghc882/happy-1.19.12/default.nix
index b2c778f778..eb3006ecd1 100644
--- a/materialized/bootstrap/ghc882/happy-1.19.12/default.nix
+++ b/materialized/bootstrap/ghc882/happy-1.19.12/default.nix
@@ -40,7 +40,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { happy = ./.plan.nix/happy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/bootstrap/ghc882/hscolour/default.nix b/materialized/bootstrap/ghc882/hscolour/default.nix
index afa45d399d..93b433d077 100644
--- a/materialized/bootstrap/ghc882/hscolour/default.nix
+++ b/materialized/bootstrap/ghc882/hscolour/default.nix
@@ -24,7 +24,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { hscolour = ./.plan.nix/hscolour.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/bootstrap/ghc883/alex/default.nix b/materialized/bootstrap/ghc883/alex/default.nix
index 642bff635f..286bddf16f 100644
--- a/materialized/bootstrap/ghc883/alex/default.nix
+++ b/materialized/bootstrap/ghc883/alex/default.nix
@@ -34,7 +34,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { alex = ./.plan.nix/alex.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/bootstrap/ghc883/happy-1.19.12/default.nix b/materialized/bootstrap/ghc883/happy-1.19.12/default.nix
index f71d38eb82..b29c87983c 100644
--- a/materialized/bootstrap/ghc883/happy-1.19.12/default.nix
+++ b/materialized/bootstrap/ghc883/happy-1.19.12/default.nix
@@ -28,7 +28,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { happy = ./.plan.nix/happy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/bootstrap/ghc883/hscolour/default.nix b/materialized/bootstrap/ghc883/hscolour/default.nix
index 1781401251..00aa0d064a 100644
--- a/materialized/bootstrap/ghc883/hscolour/default.nix
+++ b/materialized/bootstrap/ghc883/hscolour/default.nix
@@ -24,7 +24,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { hscolour = ./.plan.nix/hscolour.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/bootstrap/ghc884/alex/default.nix b/materialized/bootstrap/ghc884/alex/default.nix
index fc0c034912..c2a4312725 100644
--- a/materialized/bootstrap/ghc884/alex/default.nix
+++ b/materialized/bootstrap/ghc884/alex/default.nix
@@ -34,7 +34,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { alex = ./.plan.nix/alex.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/bootstrap/ghc884/happy-1.19.12/default.nix b/materialized/bootstrap/ghc884/happy-1.19.12/default.nix
index c818984180..3d0e15920b 100644
--- a/materialized/bootstrap/ghc884/happy-1.19.12/default.nix
+++ b/materialized/bootstrap/ghc884/happy-1.19.12/default.nix
@@ -28,7 +28,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { happy = ./.plan.nix/happy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/bootstrap/ghc884/hscolour/default.nix b/materialized/bootstrap/ghc884/hscolour/default.nix
index c2b240758a..d60fb1182a 100644
--- a/materialized/bootstrap/ghc884/hscolour/default.nix
+++ b/materialized/bootstrap/ghc884/hscolour/default.nix
@@ -24,7 +24,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { hscolour = ./.plan.nix/hscolour.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc-extra-projects/cross/ghc8101/default.nix b/materialized/ghc-extra-projects/cross/ghc8101/default.nix
index 6337f4c133..bd215e1d5a 100644
--- a/materialized/ghc-extra-projects/cross/ghc8101/default.nix
+++ b/materialized/ghc-extra-projects/cross/ghc8101/default.nix
@@ -50,7 +50,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         remote-iserv = ./.plan.nix/remote-iserv.nix;
diff --git a/materialized/ghc-extra-projects/cross/ghc8102/default.nix b/materialized/ghc-extra-projects/cross/ghc8102/default.nix
index 11b3541113..f6709d1a96 100644
--- a/materialized/ghc-extra-projects/cross/ghc8102/default.nix
+++ b/materialized/ghc-extra-projects/cross/ghc8102/default.nix
@@ -50,7 +50,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/cross/ghc8103/default.nix b/materialized/ghc-extra-projects/cross/ghc8103/default.nix
index 2949995e15..38818839d9 100644
--- a/materialized/ghc-extra-projects/cross/ghc8103/default.nix
+++ b/materialized/ghc-extra-projects/cross/ghc8103/default.nix
@@ -50,7 +50,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/cross/ghc8104/default.nix b/materialized/ghc-extra-projects/cross/ghc8104/default.nix
index 1869ff3aaa..76f9c7de76 100644
--- a/materialized/ghc-extra-projects/cross/ghc8104/default.nix
+++ b/materialized/ghc-extra-projects/cross/ghc8104/default.nix
@@ -50,7 +50,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/cross/ghc810420210212/default.nix b/materialized/ghc-extra-projects/cross/ghc810420210212/default.nix
index 2b66de40a9..59ab77ac97 100644
--- a/materialized/ghc-extra-projects/cross/ghc810420210212/default.nix
+++ b/materialized/ghc-extra-projects/cross/ghc810420210212/default.nix
@@ -50,7 +50,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/cross/ghc8105/default.nix b/materialized/ghc-extra-projects/cross/ghc8105/default.nix
index b671d67fd1..6f84b65f93 100644
--- a/materialized/ghc-extra-projects/cross/ghc8105/default.nix
+++ b/materialized/ghc-extra-projects/cross/ghc8105/default.nix
@@ -50,7 +50,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/cross/ghc8106/default.nix b/materialized/ghc-extra-projects/cross/ghc8106/default.nix
index 672a40b632..f5d9a02570 100644
--- a/materialized/ghc-extra-projects/cross/ghc8106/default.nix
+++ b/materialized/ghc-extra-projects/cross/ghc8106/default.nix
@@ -50,7 +50,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/cross/ghc8107/default.nix b/materialized/ghc-extra-projects/cross/ghc8107/default.nix
index 307f7507d0..43dfefa857 100644
--- a/materialized/ghc-extra-projects/cross/ghc8107/default.nix
+++ b/materialized/ghc-extra-projects/cross/ghc8107/default.nix
@@ -50,7 +50,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/cross/ghc865/default.nix b/materialized/ghc-extra-projects/cross/ghc865/default.nix
index 6a5837f264..6ee0f36b04 100644
--- a/materialized/ghc-extra-projects/cross/ghc865/default.nix
+++ b/materialized/ghc-extra-projects/cross/ghc865/default.nix
@@ -51,7 +51,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/cross/ghc882/default.nix b/materialized/ghc-extra-projects/cross/ghc882/default.nix
index 5617428a23..a1c4471c6b 100644
--- a/materialized/ghc-extra-projects/cross/ghc882/default.nix
+++ b/materialized/ghc-extra-projects/cross/ghc882/default.nix
@@ -50,7 +50,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/cross/ghc883/default.nix b/materialized/ghc-extra-projects/cross/ghc883/default.nix
index d8c3b7b80b..ce60f0a823 100644
--- a/materialized/ghc-extra-projects/cross/ghc883/default.nix
+++ b/materialized/ghc-extra-projects/cross/ghc883/default.nix
@@ -50,7 +50,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/cross/ghc884/default.nix b/materialized/ghc-extra-projects/cross/ghc884/default.nix
index cabaa5733c..c536fa2eba 100644
--- a/materialized/ghc-extra-projects/cross/ghc884/default.nix
+++ b/materialized/ghc-extra-projects/cross/ghc884/default.nix
@@ -50,7 +50,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/cross/ghc901/default.nix b/materialized/ghc-extra-projects/cross/ghc901/default.nix
index 06c1e4629f..253386a976 100644
--- a/materialized/ghc-extra-projects/cross/ghc901/default.nix
+++ b/materialized/ghc-extra-projects/cross/ghc901/default.nix
@@ -56,7 +56,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/cross/ghc902/default.nix b/materialized/ghc-extra-projects/cross/ghc902/default.nix
index 3d91cd973a..4edf5d202f 100644
--- a/materialized/ghc-extra-projects/cross/ghc902/default.nix
+++ b/materialized/ghc-extra-projects/cross/ghc902/default.nix
@@ -56,7 +56,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/cross/ghc921/default.nix b/materialized/ghc-extra-projects/cross/ghc921/default.nix
index 3967e0b700..c55e2fd9c7 100644
--- a/materialized/ghc-extra-projects/cross/ghc921/default.nix
+++ b/materialized/ghc-extra-projects/cross/ghc921/default.nix
@@ -60,7 +60,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/cross/ghc922/default.nix b/materialized/ghc-extra-projects/cross/ghc922/default.nix
index 145319255c..bb1bd97443 100644
--- a/materialized/ghc-extra-projects/cross/ghc922/default.nix
+++ b/materialized/ghc-extra-projects/cross/ghc922/default.nix
@@ -56,7 +56,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/cross/ghc923/default.nix b/materialized/ghc-extra-projects/cross/ghc923/default.nix
index 4c3212e263..bfe53e0cbf 100644
--- a/materialized/ghc-extra-projects/cross/ghc923/default.nix
+++ b/materialized/ghc-extra-projects/cross/ghc923/default.nix
@@ -56,7 +56,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/cross/ghc924/default.nix b/materialized/ghc-extra-projects/cross/ghc924/default.nix
index 7d05c49e68..7a43c4a2d3 100644
--- a/materialized/ghc-extra-projects/cross/ghc924/default.nix
+++ b/materialized/ghc-extra-projects/cross/ghc924/default.nix
@@ -56,7 +56,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/cross/ghc925/default.nix b/materialized/ghc-extra-projects/cross/ghc925/default.nix
index 539b8b6213..135d5f2c6c 100644
--- a/materialized/ghc-extra-projects/cross/ghc925/default.nix
+++ b/materialized/ghc-extra-projects/cross/ghc925/default.nix
@@ -56,7 +56,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/cross/ghc926/default.nix b/materialized/ghc-extra-projects/cross/ghc926/default.nix
index abafbf1bc0..8b4bdf4dde 100644
--- a/materialized/ghc-extra-projects/cross/ghc926/default.nix
+++ b/materialized/ghc-extra-projects/cross/ghc926/default.nix
@@ -56,7 +56,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/cross/ghc927/default.nix b/materialized/ghc-extra-projects/cross/ghc927/default.nix
index a65040b25a..7b0f4f409a 100644
--- a/materialized/ghc-extra-projects/cross/ghc927/default.nix
+++ b/materialized/ghc-extra-projects/cross/ghc927/default.nix
@@ -56,7 +56,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/cross/ghc928/default.nix b/materialized/ghc-extra-projects/cross/ghc928/default.nix
index dda162ef37..de39c6670a 100644
--- a/materialized/ghc-extra-projects/cross/ghc928/default.nix
+++ b/materialized/ghc-extra-projects/cross/ghc928/default.nix
@@ -56,7 +56,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/cross/ghc941/default.nix b/materialized/ghc-extra-projects/cross/ghc941/default.nix
index 234b8cf29c..576e15464d 100644
--- a/materialized/ghc-extra-projects/cross/ghc941/default.nix
+++ b/materialized/ghc-extra-projects/cross/ghc941/default.nix
@@ -63,7 +63,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         ghc = ./.plan.nix/ghc.nix;
diff --git a/materialized/ghc-extra-projects/cross/ghc942/default.nix b/materialized/ghc-extra-projects/cross/ghc942/default.nix
index 497531f674..9c0b3076ce 100644
--- a/materialized/ghc-extra-projects/cross/ghc942/default.nix
+++ b/materialized/ghc-extra-projects/cross/ghc942/default.nix
@@ -63,7 +63,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         ghc = ./.plan.nix/ghc.nix;
diff --git a/materialized/ghc-extra-projects/cross/ghc943/default.nix b/materialized/ghc-extra-projects/cross/ghc943/default.nix
index f0b5421580..02e71721ba 100644
--- a/materialized/ghc-extra-projects/cross/ghc943/default.nix
+++ b/materialized/ghc-extra-projects/cross/ghc943/default.nix
@@ -63,7 +63,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         ghc = ./.plan.nix/ghc.nix;
diff --git a/materialized/ghc-extra-projects/cross/ghc944/default.nix b/materialized/ghc-extra-projects/cross/ghc944/default.nix
index 35b5eaad0a..d52ef975c3 100644
--- a/materialized/ghc-extra-projects/cross/ghc944/default.nix
+++ b/materialized/ghc-extra-projects/cross/ghc944/default.nix
@@ -65,7 +65,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         ghc = ./.plan.nix/ghc.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc8101/default.nix b/materialized/ghc-extra-projects/default/ghc8101/default.nix
index b1d29e99a2..6032fbd32f 100644
--- a/materialized/ghc-extra-projects/default/ghc8101/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc8101/default.nix
@@ -51,7 +51,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         remote-iserv = ./.plan.nix/remote-iserv.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc8102/default.nix b/materialized/ghc-extra-projects/default/ghc8102/default.nix
index 07da983ce9..97e82da549 100644
--- a/materialized/ghc-extra-projects/default/ghc8102/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc8102/default.nix
@@ -51,7 +51,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc8103/default.nix b/materialized/ghc-extra-projects/default/ghc8103/default.nix
index 56d22e7a8a..0bac213f64 100644
--- a/materialized/ghc-extra-projects/default/ghc8103/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc8103/default.nix
@@ -51,7 +51,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc8104/default.nix b/materialized/ghc-extra-projects/default/ghc8104/default.nix
index eb21bb91ae..f42a90252b 100644
--- a/materialized/ghc-extra-projects/default/ghc8104/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc8104/default.nix
@@ -51,7 +51,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc810420210212/default.nix b/materialized/ghc-extra-projects/default/ghc810420210212/default.nix
index 615a42e9be..2a6014e917 100644
--- a/materialized/ghc-extra-projects/default/ghc810420210212/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc810420210212/default.nix
@@ -51,7 +51,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc8105/default.nix b/materialized/ghc-extra-projects/default/ghc8105/default.nix
index 84ffa9445e..70048c4d75 100644
--- a/materialized/ghc-extra-projects/default/ghc8105/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc8105/default.nix
@@ -51,7 +51,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc8106/default.nix b/materialized/ghc-extra-projects/default/ghc8106/default.nix
index 9b93b58390..e51798c6ae 100644
--- a/materialized/ghc-extra-projects/default/ghc8106/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc8106/default.nix
@@ -51,7 +51,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc8107/default.nix b/materialized/ghc-extra-projects/default/ghc8107/default.nix
index 4f4b5a5d5b..b5de520d50 100644
--- a/materialized/ghc-extra-projects/default/ghc8107/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc8107/default.nix
@@ -51,7 +51,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc844/default.nix b/materialized/ghc-extra-projects/default/ghc844/default.nix
index bcae80b457..ecb1da634d 100644
--- a/materialized/ghc-extra-projects/default/ghc844/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc844/default.nix
@@ -49,7 +49,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         ghc = ./.plan.nix/ghc.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc863/default.nix b/materialized/ghc-extra-projects/default/ghc863/default.nix
index 3eda883b65..8021c68630 100644
--- a/materialized/ghc-extra-projects/default/ghc863/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc863/default.nix
@@ -51,7 +51,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc864/default.nix b/materialized/ghc-extra-projects/default/ghc864/default.nix
index 4d07e23f76..354a2b8941 100644
--- a/materialized/ghc-extra-projects/default/ghc864/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc864/default.nix
@@ -51,7 +51,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc865/default.nix b/materialized/ghc-extra-projects/default/ghc865/default.nix
index eefa5fd4d6..6e69d78e9e 100644
--- a/materialized/ghc-extra-projects/default/ghc865/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc865/default.nix
@@ -51,7 +51,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc881/default.nix b/materialized/ghc-extra-projects/default/ghc881/default.nix
index 986ae13da3..68c3dda29a 100644
--- a/materialized/ghc-extra-projects/default/ghc881/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc881/default.nix
@@ -51,7 +51,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc882/default.nix b/materialized/ghc-extra-projects/default/ghc882/default.nix
index ea5acb1447..6cbcb6918c 100644
--- a/materialized/ghc-extra-projects/default/ghc882/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc882/default.nix
@@ -51,7 +51,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc883/default.nix b/materialized/ghc-extra-projects/default/ghc883/default.nix
index efb2d2d2bd..5ac0b2b961 100644
--- a/materialized/ghc-extra-projects/default/ghc883/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc883/default.nix
@@ -51,7 +51,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc884/default.nix b/materialized/ghc-extra-projects/default/ghc884/default.nix
index e44babe859..c23b9b961f 100644
--- a/materialized/ghc-extra-projects/default/ghc884/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc884/default.nix
@@ -51,7 +51,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc901/default.nix b/materialized/ghc-extra-projects/default/ghc901/default.nix
index 8029d9577d..c098ff4edf 100644
--- a/materialized/ghc-extra-projects/default/ghc901/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc901/default.nix
@@ -57,7 +57,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc902/default.nix b/materialized/ghc-extra-projects/default/ghc902/default.nix
index 9a3303beb5..f86f6892e0 100644
--- a/materialized/ghc-extra-projects/default/ghc902/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc902/default.nix
@@ -57,7 +57,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc921/default.nix b/materialized/ghc-extra-projects/default/ghc921/default.nix
index e9e4f20bb2..c3a23bd996 100644
--- a/materialized/ghc-extra-projects/default/ghc921/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc921/default.nix
@@ -61,7 +61,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc922/default.nix b/materialized/ghc-extra-projects/default/ghc922/default.nix
index 91dccd2b20..26a7e674cb 100644
--- a/materialized/ghc-extra-projects/default/ghc922/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc922/default.nix
@@ -57,7 +57,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc923/default.nix b/materialized/ghc-extra-projects/default/ghc923/default.nix
index 0a7ebfaca0..6a08169033 100644
--- a/materialized/ghc-extra-projects/default/ghc923/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc923/default.nix
@@ -57,7 +57,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc924/default.nix b/materialized/ghc-extra-projects/default/ghc924/default.nix
index 0b0f8cff5e..5c7366937d 100644
--- a/materialized/ghc-extra-projects/default/ghc924/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc924/default.nix
@@ -57,7 +57,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc925/default.nix b/materialized/ghc-extra-projects/default/ghc925/default.nix
index f792ba63cf..167bc8dc65 100644
--- a/materialized/ghc-extra-projects/default/ghc925/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc925/default.nix
@@ -57,7 +57,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc926/default.nix b/materialized/ghc-extra-projects/default/ghc926/default.nix
index 9bf787221c..4bd7fdc642 100644
--- a/materialized/ghc-extra-projects/default/ghc926/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc926/default.nix
@@ -57,7 +57,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc927/default.nix b/materialized/ghc-extra-projects/default/ghc927/default.nix
index cb78ab17fc..77e0cd754c 100644
--- a/materialized/ghc-extra-projects/default/ghc927/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc927/default.nix
@@ -57,7 +57,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc928/default.nix b/materialized/ghc-extra-projects/default/ghc928/default.nix
index e9b767c218..40d64cb910 100644
--- a/materialized/ghc-extra-projects/default/ghc928/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc928/default.nix
@@ -57,7 +57,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc941/default.nix b/materialized/ghc-extra-projects/default/ghc941/default.nix
index b40808ffc4..f7e5dca16e 100644
--- a/materialized/ghc-extra-projects/default/ghc941/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc941/default.nix
@@ -66,7 +66,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         ghc = ./.plan.nix/ghc.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc942/default.nix b/materialized/ghc-extra-projects/default/ghc942/default.nix
index 4e4773efb2..90a99b3317 100644
--- a/materialized/ghc-extra-projects/default/ghc942/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc942/default.nix
@@ -66,7 +66,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         ghc = ./.plan.nix/ghc.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc943/default.nix b/materialized/ghc-extra-projects/default/ghc943/default.nix
index 6232c370df..ab5718210c 100644
--- a/materialized/ghc-extra-projects/default/ghc943/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc943/default.nix
@@ -66,7 +66,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         ghc = ./.plan.nix/ghc.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc944/default.nix b/materialized/ghc-extra-projects/default/ghc944/default.nix
index 06e5c97609..dbf70d2ea4 100644
--- a/materialized/ghc-extra-projects/default/ghc944/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc944/default.nix
@@ -66,7 +66,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         ghc = ./.plan.nix/ghc.nix;
diff --git a/materialized/ghc-extra-projects/default/ghc96020230302/default.nix b/materialized/ghc-extra-projects/default/ghc96020230302/default.nix
index 762daed1d1..be32d05f9e 100644
--- a/materialized/ghc-extra-projects/default/ghc96020230302/default.nix
+++ b/materialized/ghc-extra-projects/default/ghc96020230302/default.nix
@@ -64,7 +64,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         ghc = ./.plan.nix/ghc.nix;
diff --git a/materialized/ghc-extra-projects/ghcjs/ghc8105/default.nix b/materialized/ghc-extra-projects/ghcjs/ghc8105/default.nix
index f4a74706ae..a5691ecc6a 100644
--- a/materialized/ghc-extra-projects/ghcjs/ghc8105/default.nix
+++ b/materialized/ghc-extra-projects/ghcjs/ghc8105/default.nix
@@ -51,7 +51,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/ghcjs/ghc8106/default.nix b/materialized/ghc-extra-projects/ghcjs/ghc8106/default.nix
index 91c0dedb0c..a45bd41596 100644
--- a/materialized/ghc-extra-projects/ghcjs/ghc8106/default.nix
+++ b/materialized/ghc-extra-projects/ghcjs/ghc8106/default.nix
@@ -51,7 +51,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/ghcjs/ghc8107/default.nix b/materialized/ghc-extra-projects/ghcjs/ghc8107/default.nix
index 61bdc42d62..5a33ea370e 100644
--- a/materialized/ghc-extra-projects/ghcjs/ghc8107/default.nix
+++ b/materialized/ghc-extra-projects/ghcjs/ghc8107/default.nix
@@ -51,7 +51,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/ghcjs/ghc865/default.nix b/materialized/ghc-extra-projects/ghcjs/ghc865/default.nix
index c35e18f006..3b574bf3bd 100644
--- a/materialized/ghc-extra-projects/ghcjs/ghc865/default.nix
+++ b/materialized/ghc-extra-projects/ghcjs/ghc865/default.nix
@@ -51,7 +51,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/ghcjs/ghc884/default.nix b/materialized/ghc-extra-projects/ghcjs/ghc884/default.nix
index 1c096f5d2b..a6d76558f7 100644
--- a/materialized/ghc-extra-projects/ghcjs/ghc884/default.nix
+++ b/materialized/ghc-extra-projects/ghcjs/ghc884/default.nix
@@ -51,7 +51,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc8101/default.nix b/materialized/ghc-extra-projects/windows/ghc8101/default.nix
index 659b988831..601de00010 100644
--- a/materialized/ghc-extra-projects/windows/ghc8101/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc8101/default.nix
@@ -44,7 +44,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         remote-iserv = ./.plan.nix/remote-iserv.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc8102/default.nix b/materialized/ghc-extra-projects/windows/ghc8102/default.nix
index b8d22f3d78..0c3dd48c3c 100644
--- a/materialized/ghc-extra-projects/windows/ghc8102/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc8102/default.nix
@@ -44,7 +44,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc8103/default.nix b/materialized/ghc-extra-projects/windows/ghc8103/default.nix
index 43526fbda4..b030107bcb 100644
--- a/materialized/ghc-extra-projects/windows/ghc8103/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc8103/default.nix
@@ -44,7 +44,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc8104/default.nix b/materialized/ghc-extra-projects/windows/ghc8104/default.nix
index 8ec3ac6f6f..8ab2ba654f 100644
--- a/materialized/ghc-extra-projects/windows/ghc8104/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc8104/default.nix
@@ -44,7 +44,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc810420210212/default.nix b/materialized/ghc-extra-projects/windows/ghc810420210212/default.nix
index 824f996997..bcbcb90e7c 100644
--- a/materialized/ghc-extra-projects/windows/ghc810420210212/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc810420210212/default.nix
@@ -44,7 +44,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc8105/default.nix b/materialized/ghc-extra-projects/windows/ghc8105/default.nix
index ed94ca15d3..343ff2ff62 100644
--- a/materialized/ghc-extra-projects/windows/ghc8105/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc8105/default.nix
@@ -44,7 +44,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc8106/default.nix b/materialized/ghc-extra-projects/windows/ghc8106/default.nix
index 394929f68e..2e9dfe9d2c 100644
--- a/materialized/ghc-extra-projects/windows/ghc8106/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc8106/default.nix
@@ -44,7 +44,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc8107/default.nix b/materialized/ghc-extra-projects/windows/ghc8107/default.nix
index 655080228a..d3623fa6d4 100644
--- a/materialized/ghc-extra-projects/windows/ghc8107/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc8107/default.nix
@@ -44,7 +44,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc863/default.nix b/materialized/ghc-extra-projects/windows/ghc863/default.nix
index 6ef464d8c4..ac6462b707 100644
--- a/materialized/ghc-extra-projects/windows/ghc863/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc863/default.nix
@@ -44,7 +44,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc864/default.nix b/materialized/ghc-extra-projects/windows/ghc864/default.nix
index 247b6b1b1f..4540eda9af 100644
--- a/materialized/ghc-extra-projects/windows/ghc864/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc864/default.nix
@@ -44,7 +44,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc865/default.nix b/materialized/ghc-extra-projects/windows/ghc865/default.nix
index 49d8acfb64..850f3fd7ea 100644
--- a/materialized/ghc-extra-projects/windows/ghc865/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc865/default.nix
@@ -44,7 +44,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc882/default.nix b/materialized/ghc-extra-projects/windows/ghc882/default.nix
index d0111e9ba7..4abac95a7f 100644
--- a/materialized/ghc-extra-projects/windows/ghc882/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc882/default.nix
@@ -44,7 +44,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc883/default.nix b/materialized/ghc-extra-projects/windows/ghc883/default.nix
index 7df121e1c2..e070768ff7 100644
--- a/materialized/ghc-extra-projects/windows/ghc883/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc883/default.nix
@@ -44,7 +44,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc884/default.nix b/materialized/ghc-extra-projects/windows/ghc884/default.nix
index 41877eab97..e9c4abc946 100644
--- a/materialized/ghc-extra-projects/windows/ghc884/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc884/default.nix
@@ -44,7 +44,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc901/default.nix b/materialized/ghc-extra-projects/windows/ghc901/default.nix
index 5ed92e473d..c72b06e6e6 100644
--- a/materialized/ghc-extra-projects/windows/ghc901/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc901/default.nix
@@ -53,7 +53,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc902/default.nix b/materialized/ghc-extra-projects/windows/ghc902/default.nix
index d7490f6d90..b63e87a4d4 100644
--- a/materialized/ghc-extra-projects/windows/ghc902/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc902/default.nix
@@ -53,7 +53,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc921/default.nix b/materialized/ghc-extra-projects/windows/ghc921/default.nix
index febd0a75eb..ae139591cb 100644
--- a/materialized/ghc-extra-projects/windows/ghc921/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc921/default.nix
@@ -57,7 +57,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc922/default.nix b/materialized/ghc-extra-projects/windows/ghc922/default.nix
index 18a4da293c..1b3921e9b7 100644
--- a/materialized/ghc-extra-projects/windows/ghc922/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc922/default.nix
@@ -53,7 +53,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc923/default.nix b/materialized/ghc-extra-projects/windows/ghc923/default.nix
index 805ec124bb..2498a235fa 100644
--- a/materialized/ghc-extra-projects/windows/ghc923/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc923/default.nix
@@ -53,7 +53,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc924/default.nix b/materialized/ghc-extra-projects/windows/ghc924/default.nix
index fc78c42d7d..e58a388525 100644
--- a/materialized/ghc-extra-projects/windows/ghc924/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc924/default.nix
@@ -53,7 +53,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc925/default.nix b/materialized/ghc-extra-projects/windows/ghc925/default.nix
index d81e48b898..c0f2396795 100644
--- a/materialized/ghc-extra-projects/windows/ghc925/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc925/default.nix
@@ -53,7 +53,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc926/default.nix b/materialized/ghc-extra-projects/windows/ghc926/default.nix
index 488d962810..2a53419b9d 100644
--- a/materialized/ghc-extra-projects/windows/ghc926/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc926/default.nix
@@ -53,7 +53,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc927/default.nix b/materialized/ghc-extra-projects/windows/ghc927/default.nix
index 00c754b0b1..05605d3128 100644
--- a/materialized/ghc-extra-projects/windows/ghc927/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc927/default.nix
@@ -53,7 +53,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc928/default.nix b/materialized/ghc-extra-projects/windows/ghc928/default.nix
index 1f39b4b83b..cc1cbe0ab6 100644
--- a/materialized/ghc-extra-projects/windows/ghc928/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc928/default.nix
@@ -53,7 +53,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         iserv-proxy = ./.plan.nix/iserv-proxy.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc941/default.nix b/materialized/ghc-extra-projects/windows/ghc941/default.nix
index 5f2fb1a5db..f536b8a275 100644
--- a/materialized/ghc-extra-projects/windows/ghc941/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc941/default.nix
@@ -64,7 +64,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         ghc = ./.plan.nix/ghc.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc942/default.nix b/materialized/ghc-extra-projects/windows/ghc942/default.nix
index bda73d08dc..de18241c87 100644
--- a/materialized/ghc-extra-projects/windows/ghc942/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc942/default.nix
@@ -64,7 +64,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         ghc = ./.plan.nix/ghc.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc943/default.nix b/materialized/ghc-extra-projects/windows/ghc943/default.nix
index 25430158e7..69b3db5926 100644
--- a/materialized/ghc-extra-projects/windows/ghc943/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc943/default.nix
@@ -64,7 +64,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         ghc = ./.plan.nix/ghc.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc944/default.nix b/materialized/ghc-extra-projects/windows/ghc944/default.nix
index 66a1301ccc..ba9de52f49 100644
--- a/materialized/ghc-extra-projects/windows/ghc944/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc944/default.nix
@@ -64,7 +64,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         ghc = ./.plan.nix/ghc.nix;
diff --git a/materialized/ghc-extra-projects/windows/ghc96020230302/default.nix b/materialized/ghc-extra-projects/windows/ghc96020230302/default.nix
index 25f16d9a1e..111c70d2c6 100644
--- a/materialized/ghc-extra-projects/windows/ghc96020230302/default.nix
+++ b/materialized/ghc-extra-projects/windows/ghc96020230302/default.nix
@@ -64,7 +64,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         ghc = ./.plan.nix/ghc.nix;
diff --git a/materialized/ghc8101/cabal-install/default.nix b/materialized/ghc8101/cabal-install/default.nix
index 8e6e64766c..115f288e0a 100644
--- a/materialized/ghc8101/cabal-install/default.nix
+++ b/materialized/ghc8101/cabal-install/default.nix
@@ -116,7 +116,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc8102/cabal-install/default.nix b/materialized/ghc8102/cabal-install/default.nix
index 49330d919c..36962a1bf9 100644
--- a/materialized/ghc8102/cabal-install/default.nix
+++ b/materialized/ghc8102/cabal-install/default.nix
@@ -116,7 +116,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc8103/cabal-install/default.nix b/materialized/ghc8103/cabal-install/default.nix
index 3ee34f8300..e320a7bcc7 100644
--- a/materialized/ghc8103/cabal-install/default.nix
+++ b/materialized/ghc8103/cabal-install/default.nix
@@ -116,7 +116,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc8104/cabal-install/default.nix b/materialized/ghc8104/cabal-install/default.nix
index b184714b4a..a20ad088e5 100644
--- a/materialized/ghc8104/cabal-install/default.nix
+++ b/materialized/ghc8104/cabal-install/default.nix
@@ -116,7 +116,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc810420210212/cabal-install/default.nix b/materialized/ghc810420210212/cabal-install/default.nix
index 40ea45743c..fce9052e68 100644
--- a/materialized/ghc810420210212/cabal-install/default.nix
+++ b/materialized/ghc810420210212/cabal-install/default.nix
@@ -116,7 +116,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc8105/cabal-install/default.nix b/materialized/ghc8105/cabal-install/default.nix
index 91dcc80bc3..98bd5cd1e5 100644
--- a/materialized/ghc8105/cabal-install/default.nix
+++ b/materialized/ghc8105/cabal-install/default.nix
@@ -116,7 +116,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc8106/cabal-install/default.nix b/materialized/ghc8106/cabal-install/default.nix
index b662da0716..ff2fd68230 100644
--- a/materialized/ghc8106/cabal-install/default.nix
+++ b/materialized/ghc8106/cabal-install/default.nix
@@ -116,7 +116,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc8107/cabal-install/default.nix b/materialized/ghc8107/cabal-install/default.nix
index 0bd45c277b..e99617c56d 100644
--- a/materialized/ghc8107/cabal-install/default.nix
+++ b/materialized/ghc8107/cabal-install/default.nix
@@ -116,7 +116,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc8107/hadrian-ghc92/hadrian/default.nix b/materialized/ghc8107/hadrian-ghc92/hadrian/default.nix
index 36af357640..8438734e51 100644
--- a/materialized/ghc8107/hadrian-ghc92/hadrian/default.nix
+++ b/materialized/ghc8107/hadrian-ghc92/hadrian/default.nix
@@ -81,7 +81,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { hadrian = ./.plan.nix/hadrian.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc8107/hadrian-ghc94/hadrian/default.nix b/materialized/ghc8107/hadrian-ghc94/hadrian/default.nix
index fc0b310b4e..15a16d07f7 100644
--- a/materialized/ghc8107/hadrian-ghc94/hadrian/default.nix
+++ b/materialized/ghc8107/hadrian-ghc94/hadrian/default.nix
@@ -81,7 +81,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { hadrian = ./.plan.nix/hadrian.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc8107/hadrian-ghc96/hadrian/default.nix b/materialized/ghc8107/hadrian-ghc96/hadrian/default.nix
index fc0b310b4e..15a16d07f7 100644
--- a/materialized/ghc8107/hadrian-ghc96/hadrian/default.nix
+++ b/materialized/ghc8107/hadrian-ghc96/hadrian/default.nix
@@ -81,7 +81,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { hadrian = ./.plan.nix/hadrian.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc8107/nix-tools/default.nix b/materialized/ghc8107/nix-tools/default.nix
index fc5366122f..159c2cf05c 100644
--- a/materialized/ghc8107/nix-tools/default.nix
+++ b/materialized/ghc8107/nix-tools/default.nix
@@ -362,7 +362,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         nix-tools = ./.plan.nix/nix-tools.nix;
diff --git a/materialized/ghc864/cabal-install/default.nix b/materialized/ghc864/cabal-install/default.nix
index da191c8c24..c7cf8089ee 100644
--- a/materialized/ghc864/cabal-install/default.nix
+++ b/materialized/ghc864/cabal-install/default.nix
@@ -116,7 +116,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc865/cabal-install/default.nix b/materialized/ghc865/cabal-install/default.nix
index ad4d2a8b17..2182e0f286 100644
--- a/materialized/ghc865/cabal-install/default.nix
+++ b/materialized/ghc865/cabal-install/default.nix
@@ -116,7 +116,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc881/cabal-install/default.nix b/materialized/ghc881/cabal-install/default.nix
index db8bcd6a7b..aa9651d7ad 100644
--- a/materialized/ghc881/cabal-install/default.nix
+++ b/materialized/ghc881/cabal-install/default.nix
@@ -116,7 +116,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc882/cabal-install/default.nix b/materialized/ghc882/cabal-install/default.nix
index 278a81e77a..5af8f3a271 100644
--- a/materialized/ghc882/cabal-install/default.nix
+++ b/materialized/ghc882/cabal-install/default.nix
@@ -116,7 +116,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc883/cabal-install/default.nix b/materialized/ghc883/cabal-install/default.nix
index 474620587b..c75861c76c 100644
--- a/materialized/ghc883/cabal-install/default.nix
+++ b/materialized/ghc883/cabal-install/default.nix
@@ -116,7 +116,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc884/cabal-install/default.nix b/materialized/ghc884/cabal-install/default.nix
index eb3a24db0e..0cc4a35a27 100644
--- a/materialized/ghc884/cabal-install/default.nix
+++ b/materialized/ghc884/cabal-install/default.nix
@@ -116,7 +116,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc901/cabal-install/default.nix b/materialized/ghc901/cabal-install/default.nix
index e4da886048..7f63fb6621 100644
--- a/materialized/ghc901/cabal-install/default.nix
+++ b/materialized/ghc901/cabal-install/default.nix
@@ -117,7 +117,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc902/cabal-install/default.nix b/materialized/ghc902/cabal-install/default.nix
index 08dbd0e6f5..2d67c21e8f 100644
--- a/materialized/ghc902/cabal-install/default.nix
+++ b/materialized/ghc902/cabal-install/default.nix
@@ -116,7 +116,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc902/nix-tools/default.nix b/materialized/ghc902/nix-tools/default.nix
index 25976734b5..a3f7b14ae8 100644
--- a/materialized/ghc902/nix-tools/default.nix
+++ b/materialized/ghc902/nix-tools/default.nix
@@ -364,7 +364,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         nix-tools = ./.plan.nix/nix-tools.nix;
diff --git a/materialized/ghc921/cabal-install/default.nix b/materialized/ghc921/cabal-install/default.nix
index 3a199877e2..9588d2cff4 100644
--- a/materialized/ghc921/cabal-install/default.nix
+++ b/materialized/ghc921/cabal-install/default.nix
@@ -115,7 +115,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc922/cabal-install/default.nix b/materialized/ghc922/cabal-install/default.nix
index 6823ce627c..096aa48574 100644
--- a/materialized/ghc922/cabal-install/default.nix
+++ b/materialized/ghc922/cabal-install/default.nix
@@ -115,7 +115,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc923/cabal-install/default.nix b/materialized/ghc923/cabal-install/default.nix
index 96d76bfcb5..3e4885c90d 100644
--- a/materialized/ghc923/cabal-install/default.nix
+++ b/materialized/ghc923/cabal-install/default.nix
@@ -115,7 +115,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc924/cabal-install/default.nix b/materialized/ghc924/cabal-install/default.nix
index c397d39207..151639d05a 100644
--- a/materialized/ghc924/cabal-install/default.nix
+++ b/materialized/ghc924/cabal-install/default.nix
@@ -115,7 +115,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc925/cabal-install/default.nix b/materialized/ghc925/cabal-install/default.nix
index 0955d8db7c..20a28f27f4 100644
--- a/materialized/ghc925/cabal-install/default.nix
+++ b/materialized/ghc925/cabal-install/default.nix
@@ -116,7 +116,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc926/cabal-install/default.nix b/materialized/ghc926/cabal-install/default.nix
index 7fd254aaf4..764d064336 100644
--- a/materialized/ghc926/cabal-install/default.nix
+++ b/materialized/ghc926/cabal-install/default.nix
@@ -116,7 +116,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc927/cabal-install/default.nix b/materialized/ghc927/cabal-install/default.nix
index 3485413750..3549a21d73 100644
--- a/materialized/ghc927/cabal-install/default.nix
+++ b/materialized/ghc927/cabal-install/default.nix
@@ -116,7 +116,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc928/cabal-install/default.nix b/materialized/ghc928/cabal-install/default.nix
index b0d28e762f..d2ac7de53b 100644
--- a/materialized/ghc928/cabal-install/default.nix
+++ b/materialized/ghc928/cabal-install/default.nix
@@ -116,7 +116,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc928/nix-tools/default.nix b/materialized/ghc928/nix-tools/default.nix
index 50def58078..7a655b80e1 100644
--- a/materialized/ghc928/nix-tools/default.nix
+++ b/materialized/ghc928/nix-tools/default.nix
@@ -362,7 +362,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         nix-tools = ./.plan.nix/nix-tools.nix;
diff --git a/materialized/ghc941/cabal-install/default.nix b/materialized/ghc941/cabal-install/default.nix
index 8e16e3b8f5..9f5187ab0d 100644
--- a/materialized/ghc941/cabal-install/default.nix
+++ b/materialized/ghc941/cabal-install/default.nix
@@ -118,7 +118,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc942/cabal-install/default.nix b/materialized/ghc942/cabal-install/default.nix
index cff3475e72..9f548da495 100644
--- a/materialized/ghc942/cabal-install/default.nix
+++ b/materialized/ghc942/cabal-install/default.nix
@@ -117,7 +117,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc943/cabal-install/default.nix b/materialized/ghc943/cabal-install/default.nix
index b1dea10294..09f1aae456 100644
--- a/materialized/ghc943/cabal-install/default.nix
+++ b/materialized/ghc943/cabal-install/default.nix
@@ -117,7 +117,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc943/iserv-proxy/default.nix b/materialized/ghc943/iserv-proxy/default.nix
index 7026cc2bed..65361fc052 100644
--- a/materialized/ghc943/iserv-proxy/default.nix
+++ b/materialized/ghc943/iserv-proxy/default.nix
@@ -58,7 +58,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { iserv-proxy = ./.plan.nix/iserv-proxy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc944/cabal-install/default.nix b/materialized/ghc944/cabal-install/default.nix
index 52d193d2f0..d407adb22f 100644
--- a/materialized/ghc944/cabal-install/default.nix
+++ b/materialized/ghc944/cabal-install/default.nix
@@ -117,7 +117,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc945/cabal-install/default.nix b/materialized/ghc945/cabal-install/default.nix
index 60338084ca..629a4ba658 100644
--- a/materialized/ghc945/cabal-install/default.nix
+++ b/materialized/ghc945/cabal-install/default.nix
@@ -117,7 +117,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc96020230302/cabal-install/default.nix b/materialized/ghc96020230302/cabal-install/default.nix
index 53958c8eac..ff10663865 100644
--- a/materialized/ghc96020230302/cabal-install/default.nix
+++ b/materialized/ghc96020230302/cabal-install/default.nix
@@ -107,7 +107,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc961/cabal-install/default.nix b/materialized/ghc961/cabal-install/default.nix
index 0d226179d2..9693f7657e 100644
--- a/materialized/ghc961/cabal-install/default.nix
+++ b/materialized/ghc961/cabal-install/default.nix
@@ -107,7 +107,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghc962/cabal-install/default.nix b/materialized/ghc962/cabal-install/default.nix
index 98f3d7e312..ab1b91e601 100644
--- a/materialized/ghc962/cabal-install/default.nix
+++ b/materialized/ghc962/cabal-install/default.nix
@@ -107,7 +107,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghcjs/alex/ghc8105/default.nix b/materialized/ghcjs/alex/ghc8105/default.nix
index c602eba191..8e390473d2 100644
--- a/materialized/ghcjs/alex/ghc8105/default.nix
+++ b/materialized/ghcjs/alex/ghc8105/default.nix
@@ -34,7 +34,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { alex = ./.plan.nix/alex.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghcjs/alex/ghc8106/default.nix b/materialized/ghcjs/alex/ghc8106/default.nix
index 13d93006a1..a486d38ed1 100644
--- a/materialized/ghcjs/alex/ghc8106/default.nix
+++ b/materialized/ghcjs/alex/ghc8106/default.nix
@@ -34,7 +34,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { alex = ./.plan.nix/alex.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghcjs/alex/ghc8107/default.nix b/materialized/ghcjs/alex/ghc8107/default.nix
index ce1fa60e06..d97b5690e3 100644
--- a/materialized/ghcjs/alex/ghc8107/default.nix
+++ b/materialized/ghcjs/alex/ghc8107/default.nix
@@ -34,7 +34,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { alex = ./.plan.nix/alex.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghcjs/alex/ghc865/default.nix b/materialized/ghcjs/alex/ghc865/default.nix
index 9560616692..d972115b2a 100644
--- a/materialized/ghcjs/alex/ghc865/default.nix
+++ b/materialized/ghcjs/alex/ghc865/default.nix
@@ -34,7 +34,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { alex = ./.plan.nix/alex.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghcjs/alex/ghc884/default.nix b/materialized/ghcjs/alex/ghc884/default.nix
index 364bc3ef06..6167272bb2 100644
--- a/materialized/ghcjs/alex/ghc884/default.nix
+++ b/materialized/ghcjs/alex/ghc884/default.nix
@@ -34,7 +34,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { alex = ./.plan.nix/alex.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghcjs/cabal/ghc8105/default.nix b/materialized/ghcjs/cabal/ghc8105/default.nix
index 7ab7b074ab..abd8ae1eff 100644
--- a/materialized/ghcjs/cabal/ghc8105/default.nix
+++ b/materialized/ghcjs/cabal/ghc8105/default.nix
@@ -116,7 +116,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghcjs/cabal/ghc8106/default.nix b/materialized/ghcjs/cabal/ghc8106/default.nix
index aade9e6743..ef0c547dfc 100644
--- a/materialized/ghcjs/cabal/ghc8106/default.nix
+++ b/materialized/ghcjs/cabal/ghc8106/default.nix
@@ -116,7 +116,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghcjs/cabal/ghc8107/default.nix b/materialized/ghcjs/cabal/ghc8107/default.nix
index 0bd45c277b..e99617c56d 100644
--- a/materialized/ghcjs/cabal/ghc8107/default.nix
+++ b/materialized/ghcjs/cabal/ghc8107/default.nix
@@ -116,7 +116,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghcjs/cabal/ghc865/default.nix b/materialized/ghcjs/cabal/ghc865/default.nix
index 06d77c15b8..ae5fb85324 100644
--- a/materialized/ghcjs/cabal/ghc865/default.nix
+++ b/materialized/ghcjs/cabal/ghc865/default.nix
@@ -103,7 +103,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghcjs/cabal/ghc884/default.nix b/materialized/ghcjs/cabal/ghc884/default.nix
index 316815efa7..8aea32f9a3 100644
--- a/materialized/ghcjs/cabal/ghc884/default.nix
+++ b/materialized/ghcjs/cabal/ghc884/default.nix
@@ -103,7 +103,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { cabal-install = ./.plan.nix/cabal-install.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghcjs/ghc8105/default.nix b/materialized/ghcjs/ghc8105/default.nix
index 65531b4658..6bba5ef117 100644
--- a/materialized/ghcjs/ghc8105/default.nix
+++ b/materialized/ghcjs/ghc8105/default.nix
@@ -345,7 +345,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         ghcjs-th = ./.plan.nix/ghcjs-th.nix;
diff --git a/materialized/ghcjs/ghc8106/default.nix b/materialized/ghcjs/ghc8106/default.nix
index 3a5492cc2e..1fb821a8ff 100644
--- a/materialized/ghcjs/ghc8106/default.nix
+++ b/materialized/ghcjs/ghc8106/default.nix
@@ -345,7 +345,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         ghcjs-th = ./.plan.nix/ghcjs-th.nix;
diff --git a/materialized/ghcjs/ghc8107/default.nix b/materialized/ghcjs/ghc8107/default.nix
index d7a2554e86..87447baf34 100644
--- a/materialized/ghcjs/ghc8107/default.nix
+++ b/materialized/ghcjs/ghc8107/default.nix
@@ -345,7 +345,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         ghcjs-th = ./.plan.nix/ghcjs-th.nix;
diff --git a/materialized/ghcjs/ghc865/default.nix b/materialized/ghcjs/ghc865/default.nix
index 08eba135b4..7956626a6d 100644
--- a/materialized/ghcjs/ghc865/default.nix
+++ b/materialized/ghcjs/ghc865/default.nix
@@ -370,7 +370,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         ghcjs-th = ./.plan.nix/ghcjs-th.nix;
diff --git a/materialized/ghcjs/ghc884/default.nix b/materialized/ghcjs/ghc884/default.nix
index c9bd8c711d..714dd74cf6 100644
--- a/materialized/ghcjs/ghc884/default.nix
+++ b/materialized/ghcjs/ghc884/default.nix
@@ -348,7 +348,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = {
         ghcjs-th = ./.plan.nix/ghcjs-th.nix;
diff --git a/materialized/ghcjs/happy/ghc8105/default.nix b/materialized/ghcjs/happy/ghc8105/default.nix
index 1b0a6d75eb..2abb4b4e82 100644
--- a/materialized/ghcjs/happy/ghc8105/default.nix
+++ b/materialized/ghcjs/happy/ghc8105/default.nix
@@ -28,7 +28,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { happy = ./.plan.nix/happy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghcjs/happy/ghc8106/default.nix b/materialized/ghcjs/happy/ghc8106/default.nix
index e20aa0bf9b..f409fe4fb2 100644
--- a/materialized/ghcjs/happy/ghc8106/default.nix
+++ b/materialized/ghcjs/happy/ghc8106/default.nix
@@ -28,7 +28,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { happy = ./.plan.nix/happy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghcjs/happy/ghc8107/default.nix b/materialized/ghcjs/happy/ghc8107/default.nix
index eececd8d38..689fac4db7 100644
--- a/materialized/ghcjs/happy/ghc8107/default.nix
+++ b/materialized/ghcjs/happy/ghc8107/default.nix
@@ -28,7 +28,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { happy = ./.plan.nix/happy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghcjs/happy/ghc865/default.nix b/materialized/ghcjs/happy/ghc865/default.nix
index ff3aeb261d..34cefda0f5 100644
--- a/materialized/ghcjs/happy/ghc865/default.nix
+++ b/materialized/ghcjs/happy/ghc865/default.nix
@@ -28,7 +28,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { happy = ./.plan.nix/happy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/ghcjs/happy/ghc884/default.nix b/materialized/ghcjs/happy/ghc884/default.nix
index e068f26e27..d0393f7177 100644
--- a/materialized/ghcjs/happy/ghc884/default.nix
+++ b/materialized/ghcjs/happy/ghc884/default.nix
@@ -28,7 +28,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { happy = ./.plan.nix/happy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/happy-1.20.0/default.nix b/materialized/happy-1.20.0/default.nix
index 531a34b385..21a202b4ff 100644
--- a/materialized/happy-1.20.0/default.nix
+++ b/materialized/happy-1.20.0/default.nix
@@ -28,7 +28,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { happy = ./.plan.nix/happy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/iserv-proxy/cross/ghc944/default.nix b/materialized/iserv-proxy/cross/ghc944/default.nix
index 02b1b6d6ac..2e4a27b4dc 100644
--- a/materialized/iserv-proxy/cross/ghc944/default.nix
+++ b/materialized/iserv-proxy/cross/ghc944/default.nix
@@ -58,7 +58,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { iserv-proxy = ./.plan.nix/iserv-proxy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/iserv-proxy/cross/ghc945/default.nix b/materialized/iserv-proxy/cross/ghc945/default.nix
index 865cc0568e..fcca817606 100644
--- a/materialized/iserv-proxy/cross/ghc945/default.nix
+++ b/materialized/iserv-proxy/cross/ghc945/default.nix
@@ -58,7 +58,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { iserv-proxy = ./.plan.nix/iserv-proxy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/iserv-proxy/cross/ghc961/default.nix b/materialized/iserv-proxy/cross/ghc961/default.nix
index 1a8df8f51d..e152dee131 100644
--- a/materialized/iserv-proxy/cross/ghc961/default.nix
+++ b/materialized/iserv-proxy/cross/ghc961/default.nix
@@ -64,7 +64,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { iserv-proxy = ./.plan.nix/iserv-proxy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/iserv-proxy/cross/ghc962/default.nix b/materialized/iserv-proxy/cross/ghc962/default.nix
index 651137b2cb..6150964e3d 100644
--- a/materialized/iserv-proxy/cross/ghc962/default.nix
+++ b/materialized/iserv-proxy/cross/ghc962/default.nix
@@ -64,7 +64,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { iserv-proxy = ./.plan.nix/iserv-proxy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/iserv-proxy/default/ghc941/default.nix b/materialized/iserv-proxy/default/ghc941/default.nix
index 11a7753d95..f4f25e9524 100644
--- a/materialized/iserv-proxy/default/ghc941/default.nix
+++ b/materialized/iserv-proxy/default/ghc941/default.nix
@@ -58,7 +58,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { iserv-proxy = ./.plan.nix/iserv-proxy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/iserv-proxy/default/ghc942/default.nix b/materialized/iserv-proxy/default/ghc942/default.nix
index 54cee38fb2..94e0a2216c 100644
--- a/materialized/iserv-proxy/default/ghc942/default.nix
+++ b/materialized/iserv-proxy/default/ghc942/default.nix
@@ -58,7 +58,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { iserv-proxy = ./.plan.nix/iserv-proxy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/iserv-proxy/default/ghc943/default.nix b/materialized/iserv-proxy/default/ghc943/default.nix
index 7026cc2bed..65361fc052 100644
--- a/materialized/iserv-proxy/default/ghc943/default.nix
+++ b/materialized/iserv-proxy/default/ghc943/default.nix
@@ -58,7 +58,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { iserv-proxy = ./.plan.nix/iserv-proxy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/iserv-proxy/default/ghc944/default.nix b/materialized/iserv-proxy/default/ghc944/default.nix
index 02b1b6d6ac..2e4a27b4dc 100644
--- a/materialized/iserv-proxy/default/ghc944/default.nix
+++ b/materialized/iserv-proxy/default/ghc944/default.nix
@@ -58,7 +58,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { iserv-proxy = ./.plan.nix/iserv-proxy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/iserv-proxy/default/ghc945/default.nix b/materialized/iserv-proxy/default/ghc945/default.nix
index 865cc0568e..fcca817606 100644
--- a/materialized/iserv-proxy/default/ghc945/default.nix
+++ b/materialized/iserv-proxy/default/ghc945/default.nix
@@ -58,7 +58,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { iserv-proxy = ./.plan.nix/iserv-proxy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/iserv-proxy/default/ghc96020230302/default.nix b/materialized/iserv-proxy/default/ghc96020230302/default.nix
index f7b4872ac2..54641b3077 100644
--- a/materialized/iserv-proxy/default/ghc96020230302/default.nix
+++ b/materialized/iserv-proxy/default/ghc96020230302/default.nix
@@ -64,7 +64,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { iserv-proxy = ./.plan.nix/iserv-proxy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/iserv-proxy/default/ghc961/default.nix b/materialized/iserv-proxy/default/ghc961/default.nix
index 1a8df8f51d..e152dee131 100644
--- a/materialized/iserv-proxy/default/ghc961/default.nix
+++ b/materialized/iserv-proxy/default/ghc961/default.nix
@@ -64,7 +64,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { iserv-proxy = ./.plan.nix/iserv-proxy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/iserv-proxy/default/ghc962/default.nix b/materialized/iserv-proxy/default/ghc962/default.nix
index 651137b2cb..6150964e3d 100644
--- a/materialized/iserv-proxy/default/ghc962/default.nix
+++ b/materialized/iserv-proxy/default/ghc962/default.nix
@@ -64,7 +64,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { iserv-proxy = ./.plan.nix/iserv-proxy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/iserv-proxy/windows/ghc941/default.nix b/materialized/iserv-proxy/windows/ghc941/default.nix
index 7c0850aa93..dad8cbfcb2 100644
--- a/materialized/iserv-proxy/windows/ghc941/default.nix
+++ b/materialized/iserv-proxy/windows/ghc941/default.nix
@@ -58,7 +58,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { iserv-proxy = ./.plan.nix/iserv-proxy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/iserv-proxy/windows/ghc942/default.nix b/materialized/iserv-proxy/windows/ghc942/default.nix
index d667a0af9e..fcae64f7e7 100644
--- a/materialized/iserv-proxy/windows/ghc942/default.nix
+++ b/materialized/iserv-proxy/windows/ghc942/default.nix
@@ -58,7 +58,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { iserv-proxy = ./.plan.nix/iserv-proxy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/iserv-proxy/windows/ghc943/default.nix b/materialized/iserv-proxy/windows/ghc943/default.nix
index 853609c5a9..6e52fce66b 100644
--- a/materialized/iserv-proxy/windows/ghc943/default.nix
+++ b/materialized/iserv-proxy/windows/ghc943/default.nix
@@ -58,7 +58,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { iserv-proxy = ./.plan.nix/iserv-proxy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/iserv-proxy/windows/ghc944/default.nix b/materialized/iserv-proxy/windows/ghc944/default.nix
index d56d511f0a..05012dcdf5 100644
--- a/materialized/iserv-proxy/windows/ghc944/default.nix
+++ b/materialized/iserv-proxy/windows/ghc944/default.nix
@@ -58,7 +58,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { iserv-proxy = ./.plan.nix/iserv-proxy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/iserv-proxy/windows/ghc945/default.nix b/materialized/iserv-proxy/windows/ghc945/default.nix
index 4897024975..c5c091f686 100644
--- a/materialized/iserv-proxy/windows/ghc945/default.nix
+++ b/materialized/iserv-proxy/windows/ghc945/default.nix
@@ -58,7 +58,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { iserv-proxy = ./.plan.nix/iserv-proxy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/iserv-proxy/windows/ghc96020230302/default.nix b/materialized/iserv-proxy/windows/ghc96020230302/default.nix
index 5f9089c54c..2e16d4a87d 100644
--- a/materialized/iserv-proxy/windows/ghc96020230302/default.nix
+++ b/materialized/iserv-proxy/windows/ghc96020230302/default.nix
@@ -64,7 +64,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { iserv-proxy = ./.plan.nix/iserv-proxy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/iserv-proxy/windows/ghc961/default.nix b/materialized/iserv-proxy/windows/ghc961/default.nix
index bcd1d05813..f8f0c8bea1 100644
--- a/materialized/iserv-proxy/windows/ghc961/default.nix
+++ b/materialized/iserv-proxy/windows/ghc961/default.nix
@@ -64,7 +64,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { iserv-proxy = ./.plan.nix/iserv-proxy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/materialized/iserv-proxy/windows/ghc962/default.nix b/materialized/iserv-proxy/windows/ghc962/default.nix
index 89d80d19e9..d81a157b47 100644
--- a/materialized/iserv-proxy/windows/ghc962/default.nix
+++ b/materialized/iserv-proxy/windows/ghc962/default.nix
@@ -64,7 +64,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { iserv-proxy = ./.plan.nix/iserv-proxy.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/modules/compat-driver.nix b/modules/compat-driver.nix
index a17d46976d..94da335009 100644
--- a/modules/compat-driver.nix
+++ b/modules/compat-driver.nix
@@ -10,7 +10,7 @@
     ghc = config.ghc.package;
     buildHaskellPackages = config.hsPkgs;
     compilerConfig = _: _: lib.mapAttrs (_: _: null) (builtins.removeAttrs config.compiler.packages ["ghc"]);
-    initialPackages = args: self:
+    initialPackages = _args: self:
       lib.mapAttrs
         (_: pkg: self.callPackage ../compat/driver.nix { expr = pkg; inherit lib; })
         config.packages;
diff --git a/modules/component-driver.nix b/modules/component-driver.nix
index 275051cbf1..002230f22a 100644
--- a/modules/component-driver.nix
+++ b/modules/component-driver.nix
@@ -18,7 +18,7 @@ in
   # This seems ugly.
   options.nonReinstallablePkgs = lib.mkOption {
     type = (lib.types.listOf lib.types.str) // {
-      merge = loc: defs: lib.last (lib.getValues defs);
+      merge = _loc: defs: lib.last (lib.getValues defs);
     };
   };
 
@@ -106,6 +106,6 @@ in
       buildPackages = buildModules.config.hsPkgs;
     } //
     lib.mapAttrs
-      (name: pkg: if pkg == null then null else builder.build-package config pkg)
+      (_name: pkg: if pkg == null then null else builder.build-package config pkg)
       (config.packages // lib.genAttrs (config.nonReinstallablePkgs ++ config.bootPkgs) (_: null));
 }
diff --git a/modules/plan.nix b/modules/plan.nix
index 9dcfd1d436..3b84bacfbd 100644
--- a/modules/plan.nix
+++ b/modules/plan.nix
@@ -340,6 +340,6 @@ in {
       in
         m // { flags = lib.mapAttrs (_: lib.mkDefault) (m.flags // revArgs.flags or {});
              }
-    ) (lib.filterAttrs (n: v: v == null || v.revision != null ) module.packages);
+    ) (lib.filterAttrs (_n: v: v == null || v.revision != null ) module.packages);
   };
 }
diff --git a/modules/project-common.nix b/modules/project-common.nix
index ce06ec2777..71cad363f9 100644
--- a/modules/project-common.nix
+++ b/modules/project-common.nix
@@ -15,7 +15,7 @@ with lib.types;
     };
     crossPlatforms = mkOption {
       type = unspecified;
-      default = p: [ ];
+      default = _p: [ ];
     };
     # Default shell arguments
     shell = mkOption {
diff --git a/nix-tools/flake.nix b/nix-tools/flake.nix
index a6fc7f75a7..799649840b 100644
--- a/nix-tools/flake.nix
+++ b/nix-tools/flake.nix
@@ -13,7 +13,7 @@
           (x: !__elem "${system}.${x}" ci.disable)
           (ci.compiler);
         overlays = [ haskellNix.overlay
-          (final: prev: {
+          (final: _prev: {
             hixProject =
               final.haskell-nix.hix.project {
                 src = ./.;
diff --git a/nix-tools/nix/hix.nix b/nix-tools/nix/hix.nix
index 131b995049..aa7bac41a2 100644
--- a/nix-tools/nix/hix.nix
+++ b/nix-tools/nix/hix.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}@projectArgs: {
+{pkgs, config, ...}: {
   name = "nix-tools";
   materialized = ../../materialized + "/${config.compiler-nix-name}/nix-tools";
 
diff --git a/overlays/android.nix b/overlays/android.nix
index 036c7dcaff..3d2568d80d 100644
--- a/overlays/android.nix
+++ b/overlays/android.nix
@@ -1,4 +1,4 @@
-final: prev: prev.lib.optionalAttrs prev.stdenv.hostPlatform.isAndroid ({
+_final: prev: prev.lib.optionalAttrs prev.stdenv.hostPlatform.isAndroid ({
   # we really only want the static one.
   libiconv = (prev.libiconv.override { enableStatic = true; enableShared = false; }).overrideAttrs(_: {
     hardeningDisable = [ "fortify" "stackprotector" "format" ];
diff --git a/overlays/bootstrap.nix b/overlays/bootstrap.nix
index 3077285e5a..9aab5027a3 100644
--- a/overlays/bootstrap.nix
+++ b/overlays/bootstrap.nix
@@ -58,12 +58,6 @@ in {
                 };
             };
             sphinx = with final.buildPackages; (python3Packages.sphinx_1_7_9 or python3Packages.sphinx);
-            hsc2hs-align-conditionals-patch = final.fetchpatch {
-                url = "https://git.haskell.org/hsc2hs.git/patch/738f3666c878ee9e79c3d5e819ef8b3460288edf";
-                sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3";
-                extraPrefix = "utils/hsc2hs/";
-                stripLen = 1;
-            };
             D5123-patch = final.fetchpatch rec { # https://phabricator.haskell.org/D5123
                 url = "http://tarballs.nixos.org/sha256/${sha256}";
                 name = "D5123.diff";
@@ -81,7 +75,6 @@ in {
                 versionLessThan = ver: builtins.compareVersions ver version == 1;
                 # Returns true iff this derivation's version is greater than or equal to ver.
                 versionAtLeast = ver: !versionLessThan ver;
-                from = start: final.lib.optional (versionAtLeast start);
                 fromUntil = start: end: final.lib.optional (versionAtLeast start && versionLessThan end);
                 until = end: final.lib.optional (versionLessThan end);
                 always = final.lib.optional true;
diff --git a/overlays/cabal-pkg-config.nix b/overlays/cabal-pkg-config.nix
index 4620c5c712..188da2bcbc 100644
--- a/overlays/cabal-pkg-config.nix
+++ b/overlays/cabal-pkg-config.nix
@@ -34,7 +34,7 @@ final: prev:
       # `.name` but no `.version`.
       getVersion = p: p.version or (builtins.parseDrvName (p.name or "")).version;
       pkgconfigPkgs =
-        final.lib.filterAttrs (name: p: __length p > 0 && getVersion (__head p) != "")
+        final.lib.filterAttrs (_name: p: __length p > 0 && getVersion (__head p) != "")
           (import ../lib/pkgconf-nixpkgs-map.nix final);
     in prev.pkg-config.overrideAttrs (attrs:
       let
diff --git a/overlays/darwin.nix b/overlays/darwin.nix
index 12a1582f37..13dd6d7194 100644
--- a/overlays/darwin.nix
+++ b/overlays/darwin.nix
@@ -1,4 +1,4 @@
-final: prev:
+_final: prev:
 {
   haskell-nix = prev.haskell-nix // ({
     defaultModules = prev.haskell-nix.defaultModules ++ [
diff --git a/overlays/dummy-ghc-data.nix b/overlays/dummy-ghc-data.nix
index 8e02b04723..e727c1993b 100644
--- a/overlays/dummy-ghc-data.nix
+++ b/overlays/dummy-ghc-data.nix
@@ -1,10 +1,10 @@
 final: prev: {
   haskell-nix = prev.haskell-nix // {
-      compiler = __mapAttrs (name:
+      compiler = __mapAttrs (_name:
         final.haskell-nix.haskellLib.makeDummyGhcData ../materialized) prev.haskell-nix.compiler;
   };
   haskell = prev.haskell // {
-      compiler = __mapAttrs (name:
+      compiler = __mapAttrs (_name:
         final.haskell-nix.haskellLib.makeDummyGhcData ../materialized/nixpkgs) prev.haskell.compiler;
   };
 }
diff --git a/overlays/emscripten.nix b/overlays/emscripten.nix
index 65e7c31706..fbf2c39dc0 100644
--- a/overlays/emscripten.nix
+++ b/overlays/emscripten.nix
@@ -1,4 +1,4 @@
-final: prev: {
+final: _prev: {
     emsdk = final.linkFarm "emsdk" [
       { name = "upstream/bin"; path = final.clang + "/bin"; }
       { name = "upstream/emscripten"; path = final.emscripten + "/bin"; }
diff --git a/overlays/ghc-packages.nix b/overlays/ghc-packages.nix
index fbcfafbf6c..2e11dc475a 100644
--- a/overlays/ghc-packages.nix
+++ b/overlays/ghc-packages.nix
@@ -1,4 +1,4 @@
-final: prev:
+final: _prev:
 let
   callCabal2Nix = compiler-nix-name: name: src: final.buildPackages.stdenv.mkDerivation {
     name = "${name}-package.nix";
@@ -104,7 +104,7 @@ let
 
   # The nix produced by `cabalProject` differs slightly depending on
   # what the platforms are.  There are currently 3 possible outputs.
-  ghc-extra-projects-type = ghc:
+  ghc-extra-projects-type = _ghc:
     if final.stdenv.hostPlatform.isWindows
       then "windows"
       else if final.stdenv.hostPlatform.isGhcjs
diff --git a/overlays/ghc.nix b/overlays/ghc.nix
index eaf8893198..ec2d1b3028 100644
--- a/overlays/ghc.nix
+++ b/overlays/ghc.nix
@@ -1,4 +1,4 @@
-final: prev: with prev;
+_final: prev: with prev;
   # sadly we need to patch GHC a bit.
   let
     ghcDrvOverrides = drv: {
diff --git a/overlays/haskell.nix b/overlays/haskell.nix
index b8d7833b47..04b444db00 100644
--- a/overlays/haskell.nix
+++ b/overlays/haskell.nix
@@ -105,7 +105,7 @@ final: prev: {
             { stack-pkgs  # Path to the output of stack-to-nix
             , pkg-def-extras ? []
             , modules ? []
-            }@args:
+            }:
             let
                 # The Stackage release referenced in the stack config
                 pkg-def = stackage.${stack-pkgs.resolver} or (throw ''
@@ -238,7 +238,7 @@ final: prev: {
           })
         ];
 
-        dotCabal = { index-state, sha256, cabal-install, extra-hackage-tarballs ? {}, extra-hackage-repos ? {}, nix-tools, ... }@args:
+        dotCabal = { index-state, sha256, cabal-install, extra-hackage-tarballs ? {}, extra-hackage-repos ? {}, nix-tools, ... }:
             let
               # NOTE: root-keys: aaa is because key-threshold: 0 does not seem to be enough by itself
               bootstrapIndexTarball = name: index: final.runCommand "cabal-bootstrap-index-tarball-${name}" {
@@ -432,7 +432,7 @@ final: prev: {
                 repository hackage.haskell.org
                   url: http://hackage.haskell.org/
                   secure: True
-                ${final.lib.concatStrings (final.lib.mapAttrsToList (name: repo: ''
+                ${final.lib.concatStrings (final.lib.mapAttrsToList (name: _repo: ''
                   repository ${name}
                     url: http://${name}/
                     secure: True
@@ -712,7 +712,7 @@ final: prev: {
             appendOverlays = extraOverlays: self.extend (final.lib.composeManyExtensions ([self.__overlay__] ++ extraOverlays));
           }));
          in rawProject:
-          makeExtensible (final: prev: {}) (project':
+          makeExtensible (_final: _prev: {}) (project':
             let project = project' // { recurseForDerivations = false; };
             in rawProject // rec {
               # It is often handy to be able to get nix pkgs from the project.
@@ -1027,7 +1027,7 @@ final: prev: {
         #   testProjectPlan = withInputs project.plan-nix;
         withInputs = final.recurseIntoAttrs;
 
-        iserv-proxy-exes = __mapAttrs (compiler-nix-name: ghc:
+        iserv-proxy-exes = __mapAttrs (compiler-nix-name: _ghc:
           if __compareVersions final.buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.4" <0
             then {
               inherit (final.buildPackages.ghc-extra-packages.${compiler-nix-name}.iserv-proxy.components.exes) iserv-proxy;
diff --git a/overlays/hydra.nix b/overlays/hydra.nix
index 4fd22044c3..5370b356d9 100644
--- a/overlays/hydra.nix
+++ b/overlays/hydra.nix
@@ -4,6 +4,6 @@
 # This can be removed once hydra in nixpkgs is based on a recent enough nix,
 # which contains this fix: https://github.com/NixOS/nix/pull/5163
 
-final: prev: {
+_final: prev: {
   hydra-unstable = sources.hydra.defaultPackage.${prev.system};
 }
diff --git a/overlays/musl.nix b/overlays/musl.nix
index 62ff0e92c2..e9ea523b00 100644
--- a/overlays/musl.nix
+++ b/overlays/musl.nix
@@ -23,7 +23,7 @@ final: prev: prev.lib.optionalAttrs prev.stdenv.hostPlatform.isMusl ({
   numactl = prev.numactl.overrideAttrs (_: { configureFlags = ["--enable-static"];});
 
   # See https://github.com/input-output-hk/haskell.nix/issues/948
-  postgresql = (prev.postgresql.overrideAttrs (old: {
+  postgresql = (prev.postgresql.overrideAttrs (_old: {
       dontDisableStatic = true;
       # the following is needed becuase libicu links against stdc++
       NIX_LDFLAGS = "--push-state --as-needed -lstdc++ --pop-state";
diff --git a/overlays/nix-prefetch-git-minimal.nix b/overlays/nix-prefetch-git-minimal.nix
index a0c3d3df79..8d599e4de0 100644
--- a/overlays/nix-prefetch-git-minimal.nix
+++ b/overlays/nix-prefetch-git-minimal.nix
@@ -31,7 +31,7 @@ final: prev: {
   # like that might be because the dependency on libredirect
   # was changed.
   # See https://github.com/NixOS/nixpkgs/pull/182143
-  libredirect = prev.libredirect.overrideAttrs (attrs: {
+  libredirect = prev.libredirect.overrideAttrs (_attrs: {
     libName = "libredirect" + final.stdenv.hostPlatform.extensions.sharedLibrary;
   });
 
diff --git a/overlays/python.nix b/overlays/python.nix
index 1308207d46..e8be2d0e6b 100644
--- a/overlays/python.nix
+++ b/overlays/python.nix
@@ -1,8 +1,8 @@
-(final: prev: {
+(_final: prev: {
     # See nixpkgs#51135
     python37 = prev.python37.override {
-        packageOverrides = python-final: python-prev: {
-            docutils = python-prev.docutils.overrideAttrs (oldAttrs: {
+        packageOverrides = _python-final: python-prev: {
+            docutils = python-prev.docutils.overrideAttrs (_oldAttrs: {
                 LC_CTYPE = "en_US.UTF-8";
                 LANG = "en_US.UTF-8";
             });
diff --git a/overlays/wine.nix b/overlays/wine.nix
index 3420bec771..72dd794573 100644
--- a/overlays/wine.nix
+++ b/overlays/wine.nix
@@ -2,7 +2,7 @@
 # files from TH code) for GHC built with msvcrt (ghc<9.6).
 # This will inevitably replace *any* wine version. Thus this might not really be what we ultimately want.
 # Wine 5.4 does not build on macOS so that is not pinned and TH code will probably break.
-final: prev:
+_final: prev:
 prev.lib.optionalAttrs (!prev.stdenv.hostPlatform.isDarwin) {
     winePackages = prev.winePackages // {
         minimal = prev.winePackages.minimal.overrideAttrs (oldAttrs: {
diff --git a/release.nix b/release.nix
index c85c94d0ff..90a7708906 100644
--- a/release.nix
+++ b/release.nix
@@ -2,7 +2,7 @@
 # non flake hydra configuration.
 {
   supportedSystems ? ["x86_64-linux" "x86_64-darwin"]
-, include ? (compiler-nix-name: true)
+, include ? (_compiler-nix-name: true)
 }:
 let
   traceNames = prefix: builtins.mapAttrs (n: v:
diff --git a/scripts/options-doc.nix b/scripts/options-doc.nix
index dbd19ce8dd..12478ebda1 100644
--- a/scripts/options-doc.nix
+++ b/scripts/options-doc.nix
@@ -3,7 +3,7 @@
 }:
 let
   # Provide a dummy pkg-def for the package set function
-  pkg-def = hackage: {
+  pkg-def = _hackage: {
     packages = {};
     compiler = {
       version = "";
diff --git a/scripts/update-external.nix b/scripts/update-external.nix
index 18bf984961..f31ee365b8 100644
--- a/scripts/update-external.nix
+++ b/scripts/update-external.nix
@@ -7,7 +7,6 @@
 with lib;
 
 let
-  repoHTTPS = "https://github.com/input-output-hk/${name}.nix";
   repoSSH = "git@github.com:input-output-hk/${name}.nix.git";
   sshKey = "/run/keys/buildkite-${name}-ssh-private";
 in
diff --git a/scripts/update-pins.nix b/scripts/update-pins.nix
index c972b5df6e..020c7f4e88 100644
--- a/scripts/update-pins.nix
+++ b/scripts/update-pins.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, writeScript, coreutils, glibc, git, openssh }@args:
+{ stdenv, lib, writeScript, coreutils, glibc, git, openssh }:
 
 with lib;
 
diff --git a/test/buildable/default.nix b/test/buildable/default.nix
index a42274ff39..eb1bde535c 100644
--- a/test/buildable/default.nix
+++ b/test/buildable/default.nix
@@ -18,7 +18,7 @@ in recurseIntoAttrs {
     name = "buildable-test";
 
     buildCommand =
-      (concatStrings (mapAttrsToList (name: value: ''
+      (concatStrings (mapAttrsToList (_name: value: ''
         printf "checking whether executable runs... " >& 2
         cat ${haskellLib.check value}/test-stdout
       '') packages.buildable-test.components.exes)) + ''
diff --git a/test/builder-haddock/pkgs.nix b/test/builder-haddock/pkgs.nix
index 140bdf5508..3720124142 100644
--- a/test/builder-haddock/pkgs.nix
+++ b/test/builder-haddock/pkgs.nix
@@ -22,7 +22,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     { packages = { test-haddock = ./.plan.nix/test-haddock.nix; }; };
   modules = [
     ({ lib, ... }:
diff --git a/test/builder-haddock/test-haddock.nix b/test/builder-haddock/test-haddock.nix
index 86a15c07fa..9eebab6edb 100644
--- a/test/builder-haddock/test-haddock.nix
+++ b/test/builder-haddock/test-haddock.nix
@@ -3,38 +3,6 @@ let
     builtins.throw ''
       The Haskell package set does not contain the package: ${pkg} (build dependency).
 
-      If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix.
-      '';
-  sysDepError = pkg:
-    builtins.throw ''
-      The Nixpkgs package set does not contain the package: ${pkg} (system dependency).
-
-      You may need to augment the system package mapping in haskell.nix so that it can be found.
-      '';
-  pkgConfDepError = pkg:
-    builtins.throw ''
-      The pkg-conf packages does not contain the package: ${pkg} (pkg-conf dependency).
-
-      You may need to augment the pkg-conf package mapping in haskell.nix so that it can be found.
-      '';
-  exeDepError = pkg:
-    builtins.throw ''
-      The local executable components do not include the component: ${pkg} (executable dependency).
-      '';
-  legacyExeDepError = pkg:
-    builtins.throw ''
-      The Haskell package set does not contain the package: ${pkg} (executable dependency).
-
-      If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix.
-      '';
-  buildToolDepError = pkg:
-    builtins.throw ''
-      Neither the Haskell package set or the Nixpkgs package set contain the package: ${pkg} (build tool dependency).
-
-      If this is a system dependency:
-      You may need to augment the system package mapping in haskell.nix so that it can be found.
-
-      If this is a Haskell dependency:
       If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix.
       '';
 in { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }:
diff --git a/test/coverage-no-libs/default.nix b/test/coverage-no-libs/default.nix
index bc8d754efd..338fb3a5c0 100644
--- a/test/coverage-no-libs/default.nix
+++ b/test/coverage-no-libs/default.nix
@@ -18,8 +18,6 @@ let
   cabalProj = (cabalProject' (projectArgs // { inherit compiler-nix-name; }));
   stackProj = (stackProject' projectArgs);
 
-  exeExt = stdenv.hostPlatform.extensions.executable;
-
 in recurseIntoAttrs ({
   # Does not work on ghcjs because it needs zlib.
   meta.disabled = stdenv.hostPlatform.isGhcjs;
diff --git a/test/extra-hackage/hackage/default.nix b/test/extra-hackage/hackage/default.nix
index 483a407783..152f43be4e 100644
--- a/test/extra-hackage/hackage/default.nix
+++ b/test/extra-hackage/hackage/default.nix
@@ -1,6 +1,6 @@
 with builtins; mapAttrs (_: mapAttrs (_: data: rec {
  inherit (data) sha256;
- revisions = (mapAttrs (rev: rdata: {
+ revisions = (mapAttrs (_rev: rdata: {
   inherit (rdata) revNum sha256;
   outPath = ./. + "/hackage/${rdata.outPath}";
  }) data.revisions) // {
diff --git a/test/extra-hackage/hackage/hackage/external-package-demo-0.1.0.0-r0-3230db0813f2b468afb3ff7d8bbfcf570019a7faa4a0f59b2ea96743932105e7.nix b/test/extra-hackage/hackage/hackage/external-package-demo-0.1.0.0-r0-3230db0813f2b468afb3ff7d8bbfcf570019a7faa4a0f59b2ea96743932105e7.nix
index a063e4911f..5d6b1b0baf 100644
--- a/test/extra-hackage/hackage/hackage/external-package-demo-0.1.0.0-r0-3230db0813f2b468afb3ff7d8bbfcf570019a7faa4a0f59b2ea96743932105e7.nix
+++ b/test/extra-hackage/hackage/hackage/external-package-demo-0.1.0.0-r0-3230db0813f2b468afb3ff7d8bbfcf570019a7faa4a0f59b2ea96743932105e7.nix
@@ -3,38 +3,6 @@ let
     builtins.throw ''
       The Haskell package set does not contain the package: ${pkg} (build dependency).
 
-      If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix.
-      '';
-  sysDepError = pkg:
-    builtins.throw ''
-      The Nixpkgs package set does not contain the package: ${pkg} (system dependency).
-
-      You may need to augment the system package mapping in haskell.nix so that it can be found.
-      '';
-  pkgConfDepError = pkg:
-    builtins.throw ''
-      The pkg-conf packages does not contain the package: ${pkg} (pkg-conf dependency).
-
-      You may need to augment the pkg-conf package mapping in haskell.nix so that it can be found.
-      '';
-  exeDepError = pkg:
-    builtins.throw ''
-      The local executable components do not include the component: ${pkg} (executable dependency).
-      '';
-  legacyExeDepError = pkg:
-    builtins.throw ''
-      The Haskell package set does not contain the package: ${pkg} (executable dependency).
-
-      If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix.
-      '';
-  buildToolDepError = pkg:
-    builtins.throw ''
-      Neither the Haskell package set or the Nixpkgs package set contain the package: ${pkg} (build tool dependency).
-
-      If this is a system dependency:
-      You may need to augment the system package mapping in haskell.nix so that it can be found.
-
-      If this is a Haskell dependency:
       If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix.
       '';
 in { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, config, ... }:
diff --git a/test/ghc-options/stack.nix b/test/ghc-options/stack.nix
index a8c4718307..620809240e 100644
--- a/test/ghc-options/stack.nix
+++ b/test/ghc-options/stack.nix
@@ -16,7 +16,7 @@ let
     # TODO work out why these are `ghcide` and `hnix` are here in the first place
     # it might be because we have patches in `modules/configuration.nix`
     lib.optionalString (!__elem name ["ghcide" "hnix"]) p.identifier.name)
-      (filterAttrs (name: hasIdentifier) packages);
+      (filterAttrs (_name: hasIdentifier) packages);
 
 in recurseIntoAttrs {
   # This test is somehow broken for ghcjs
diff --git a/test/shell-for/pkgs.nix b/test/shell-for/pkgs.nix
index 93f5dd096a..c89a6253bf 100644
--- a/test/shell-for/pkgs.nix
+++ b/test/shell-for/pkgs.nix
@@ -186,7 +186,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = { pkgb = ./.plan.nix/pkgb.nix; pkga = ./.plan.nix/pkga.nix; };
       };
diff --git a/test/unit.nix b/test/unit.nix
index aa988772d0..24864dc313 100644
--- a/test/unit.nix
+++ b/test/unit.nix
@@ -36,18 +36,18 @@ in
 lib.runTests {
   # identity function for applyComponents
   test-applyComponents-id = {
-    expr = haskellLib.applyComponents (componentId: component: component) emptyConfig;
+    expr = haskellLib.applyComponents (_componentId: component: component) emptyConfig;
     expected = emptyConfig.components;
   };
 
   # map a component to its component name and check these are correct
   test-applyComponents-library = {
-    expr = haskellLib.applyComponents (componentId: component: componentId.cname) emptyConfig;
+    expr = haskellLib.applyComponents (componentId: _component: componentId.cname) emptyConfig;
     expected = emptyConfig.components // { library = "empty"; };
   };
 
   test-applyComponents-components = {
-    expr = haskellLib.applyComponents (componentId: component: component) componentsConfig;
+    expr = haskellLib.applyComponents (_componentId: component: component) componentsConfig;
     expected = componentsConfig.components;
   };
 
@@ -124,10 +124,10 @@ lib.runTests {
       # and connot be easily compared.
       removeNix = x: x // {
         hackage =
-          lib.mapAttrs (packageName: vers:
-            lib.mapAttrs (ver: data: data // {
+          lib.mapAttrs (_packageName: vers:
+            lib.mapAttrs (_ver: data: data // {
               revisions =
-                lib.mapAttrs (rev: x: x // { nix = __typeOf x.nix; }) data.revisions;
+                lib.mapAttrs (_rev: x: x // { nix = __typeOf x.nix; }) data.revisions;
             }) vers
           ) x.hackage;
       };
diff --git a/test/with-packages/pkgs.nix/default.nix b/test/with-packages/pkgs.nix/default.nix
index b5be0303ad..ed08d743b3 100644
--- a/test/with-packages/pkgs.nix/default.nix
+++ b/test/with-packages/pkgs.nix/default.nix
@@ -137,7 +137,7 @@
           };
         };
       };
-  extras = hackage:
+  extras = _hackage:
     {
       packages = { test-with-packages = ./.plan.nix/test-with-packages.nix; };
       };