Default reinstallableLibGhc to true (#1498)

It fixes more things than it breaks now.

Author: hamishmack

build.nix

@@ -31,10 +31,9 @@ in rec {
             "ghc883" = "3.3.6";
             "ghc884" = "3.3.6";
           }.compiler-nix-name or "latest";
-        modules = [{ reinstallableLibGhc = true; }];
       };
     } // pkgs.lib.optionalAttrs (!__elem compiler-nix-name ["ghc921" "ghc922" "ghc923"]) {
-      hls-latest = tool compiler-nix-name "haskell-language-server" { modules = [{ reinstallableLibGhc = true; }]; };
+      hls-latest = tool compiler-nix-name "haskell-language-server" "latest";
     })
   );
 

modules/component-driver.nix

@@ -24,7 +24,7 @@ in
 
   options.reinstallableLibGhc = lib.mkOption {
     type = lib.types.bool;
-    default = false;
+    default = true;
     description = "Is lib:ghc reinstallable?";
   };
   options.setup-depends = lib.mkOption {

overlays/bootstrap.nix

@@ -923,6 +923,7 @@ in {
                 packages.time-compat.components.library.doExactConfig = true;
                 packages.time-locale-compat.components.library.doExactConfig = true;
                 # Make Cabal reinstallable
+                reinstallableLibGhc = false;
                 nonReinstallablePkgs =
                   [ "rts" "ghc-heap" "ghc-prim" "integer-gmp" "integer-simple" "base"
                     "deepseq" "array" "ghc-boot-th" "pretty" "template-haskell"
@@ -1089,12 +1090,14 @@ in {
                 version = "3.2.4";
                 inherit ghcOverride nix-tools cabal-install index-state;
                 materialized = ../materialized/bootstrap + "/${buildBootstrapper.compilerNixName}/alex";
+                modules = [{ reinstallableLibGhc = false; }];
             } // args);
             alex = bootstrap.packages.alex-tool {};
             alex-unchecked = bootstrap.packages.alex-tool { checkMaterialization = false; };
             happy-tool = { version ? "1.19.12", ... }@args: tool buildBootstrapper.compilerNixName "happy" ({
                 inherit version ghcOverride nix-tools cabal-install index-state;
                 materialized = ../materialized/bootstrap + "/${buildBootstrapper.compilerNixName}/happy-${version}";
+                modules = [{ reinstallableLibGhc = false; }];
             } // args);
             happy = bootstrap.packages.happy-tool {};
             happy-unchecked = bootstrap.packages.happy-tool { checkMaterialization = false; };
@@ -1107,6 +1110,7 @@ in {
                 version = "1.24.4";
                 inherit ghcOverride nix-tools cabal-install index-state;
                 materialized = ../materialized/bootstrap + "/${buildBootstrapper.compilerNixName}/hscolour";
+                modules = [{ reinstallableLibGhc = false; }];
             } // args)).getComponent "exe:HsColour";
             hscolour = bootstrap.packages.hscolour-tool {};
             hscolour-unchecked = bootstrap.packages.hscolour-tool { checkMaterialization = false; };

overlays/ghc-packages.nix

@@ -222,6 +222,7 @@ in rec {
                        + "/${ghc-extra-projects-type}/${ghcName}";
       compiler-nix-name = ghcName;
       configureArgs = "--disable-tests --disable-benchmarks --allow-newer='terminfo:base'"; # avoid failures satisfying bytestring package tests dependencies
+      modules = [{ reinstallableLibGhc = false; }];
     })
     ghc-extra-pkgs-cabal-projects;
 

overlays/hackage-quirks.nix

@@ -18,18 +18,13 @@ in { haskell-nix = prev.haskell-nix // {
         allow-newer: cabal-install:base, *:base, *:template-haskell
       '';
       modules = [
-        { reinstallableLibGhc = true; }
         # Version of of cabal-install in hackage is broken for GHC 8.10.1
         (lib.optionalAttrs (version == "3.2.0.0") {
           packages.cabal-install.src = final.haskell-nix.sources.cabal-32 + "/cabal-install";
         })
       ];
     };
 
-    hpack = {
-      modules = [ { reinstallableLibGhc = true; } ];
-    };
-
     pandoc = {
       # Function that returns a sha256 string by looking up the location
       # and tag in a nested attrset

snapshots.nix

@@ -18,7 +18,6 @@ let
     pkg-def-extras = (pkg-def-extras name)
       ++ [(hackage: ghc-boot-packages.${(pkg-def hackage).compiler.nix-name})];
     modules = [
-      { reinstallableLibGhc = true; } # Allow ghc library to be installed for packages that need it
       { planned = true; } # All components in the snapshot are planned
       { packages.alex.package.setup-depends = [pkgSet.config.hsPkgs.Cabal]; }
       { packages.happy.package.setup-depends = [pkgSet.config.hsPkgs.Cabal]; }

test/cabal-22/default.nix

@@ -6,7 +6,6 @@ let
   project = cabalProject' {
     inherit compiler-nix-name;
     src = testSrc "cabal-22";
-    modules = [{ reinstallableLibGhc = true; }];
   };
 
   packages = project.hsPkgs;

test/cabal-simple-prof/default.nix

@@ -6,7 +6,6 @@ with lib;
 let
   modules = [
     {
-      reinstallableLibGhc = true;
       # Package has no exposed modules which causes
       #   haddock: No input file(s)
       packages.cabal-simple.doHaddock = false;

test/cabal-simple/default.nix

@@ -6,7 +6,6 @@ with lib;
 let
   modules = [
      {
-       reinstallableLibGhc = true;
        # Package has no exposed modules which causes
        #   haddock: No input file(s)
        packages.cabal-simple.doHaddock = false;

test/cabal-source-repo-comments/default.nix

@@ -6,7 +6,6 @@ let
   project = cabalProject' {
     inherit compiler-nix-name;
     src = testSrc "cabal-source-repo-comments";
-    modules = [{ reinstallableLibGhc = true; }];
   };
   packages = project.hsPkgs;
 in recurseIntoAttrs {

test/cabal-source-repo/default.nix

@@ -6,7 +6,6 @@ let
   project = cabalProject' {
     inherit compiler-nix-name;
     src = testSrc "cabal-source-repo";
-    modules = [{ reinstallableLibGhc = true; }];
   };
   packages = project.hsPkgs;
 in recurseIntoAttrs {

test/cabal-sublib/default.nix

@@ -6,7 +6,6 @@ with lib;
 let
   modules = [
     {
-      reinstallableLibGhc = true;
       # Package has no exposed modules which causes
       #   haddock: No input file(s)
       packages.cabal-sublib.doHaddock = false;

test/call-cabal-project-to-nix/default.nix

@@ -18,7 +18,6 @@ let
     plan-pkgs = importAndFilterProject {
       inherit (callProjectResults) projectNix sourceRepos src;
     };
-    modules = [{ reinstallableLibGhc = true; }];
   };
   packages = pkgSet.config.hsPkgs;
 

test/haskell-language-server/cabal.nix

@@ -1,6 +1,6 @@
 { stdenv, testSrc, evalPackages, haskell-nix, compiler-nix-name, recurseIntoAttrs }:
 let
-  inherit (haskell-nix.tool compiler-nix-name "haskell-language-server" { modules = [{ reinstallableLibGhc = true; }]; }) project;
+  inherit (haskell-nix.tool compiler-nix-name "haskell-language-server" {}) project;
 in recurseIntoAttrs {
   ifdInputs = {
     inherit (project) plan-nix;

test/setup-deps/default.nix

@@ -11,8 +11,7 @@ let
       # Package has no exposed modules which causes
       #   haddock: No input file(s)
       packages.bytestring-builder.doHaddock = false;
-    }
-    { reinstallableLibGhc = true; } ];
+    }];
   };
 
   meta = {

test/th-dlls/default.nix

@@ -7,7 +7,6 @@ let
   project = project' {
     inherit compiler-nix-name;
     src = testSrc "th-dlls";
-    modules = [{ reinstallableLibGhc = true; }];
   };
 
   packages = project.hsPkgs;