95faec6 · haskell.nix · git.iko.soy

build.nix+1−2

compare with iko/ghcjs-patch-master

unifiedsplit

@@ -31,10 +31,9 @@ in rec {

31 "ghc883" = "3.3.6";

32 "ghc884" = "3.3.6";

33 }.compiler-nix-name or "latest";

34− modules = [{ reinstallableLibGhc = true; }];

35 };

34 };

36 } // pkgs.lib.optionalAttrs (!__elem compiler-nix-name ["ghc921" "ghc922" "ghc923"]) {

35 } // pkgs.lib.optionalAttrs (!__elem compiler-nix-name ["ghc921" "ghc922" "ghc923"]) {

37− hls-latest = tool compiler-nix-name "haskell-language-server" { modules = [{ reinstallableLibGhc = true; }]; };

36+ hls-latest = tool compiler-nix-name "haskell-language-server" "latest";

38 })

37 })

39 );

38 );

40

39

modules/component-driver.nix+1−1

@@ -24,7 +24,7 @@ in

24

25 options.reinstallableLibGhc = lib.mkOption {

26 type = lib.types.bool;

27− default = false;

27+ default = true;

28 description = "Is lib:ghc reinstallable?";

29 };

30 options.setup-depends = lib.mkOption {

overlays/bootstrap.nix+4

@@ -923,6 +923,7 @@ in {

923 packages.time-compat.components.library.doExactConfig = true;

924 packages.time-locale-compat.components.library.doExactConfig = true;

925 # Make Cabal reinstallable

926+ reinstallableLibGhc = false;

926 nonReinstallablePkgs =

927 nonReinstallablePkgs =

927 [ "rts" "ghc-heap" "ghc-prim" "integer-gmp" "integer-simple" "base"

928 [ "rts" "ghc-heap" "ghc-prim" "integer-gmp" "integer-simple" "base"

928 "deepseq" "array" "ghc-boot-th" "pretty" "template-haskell"

929 "deepseq" "array" "ghc-boot-th" "pretty" "template-haskell"

@@ -1089,12 +1090,14 @@ in {

1089 version = "3.2.4";

1090 version = "3.2.4";

1090 inherit ghcOverride nix-tools cabal-install index-state;

1091 inherit ghcOverride nix-tools cabal-install index-state;

1091 materialized = ../materialized/bootstrap + "/${buildBootstrapper.compilerNixName}/alex";

1092 materialized = ../materialized/bootstrap + "/${buildBootstrapper.compilerNixName}/alex";

1093+ modules = [{ reinstallableLibGhc = false; }];

1092 } // args);

1094 } // args);

1093 alex = bootstrap.packages.alex-tool {};

1095 alex = bootstrap.packages.alex-tool {};

1094 alex-unchecked = bootstrap.packages.alex-tool { checkMaterialization = false; };

1096 alex-unchecked = bootstrap.packages.alex-tool { checkMaterialization = false; };

1095 happy-tool = { version ? "1.19.12", ... }@args: tool buildBootstrapper.compilerNixName "happy" ({

1097 happy-tool = { version ? "1.19.12", ... }@args: tool buildBootstrapper.compilerNixName "happy" ({

1096 inherit version ghcOverride nix-tools cabal-install index-state;

1098 inherit version ghcOverride nix-tools cabal-install index-state;

1097 materialized = ../materialized/bootstrap + "/${buildBootstrapper.compilerNixName}/happy-${version}";

1099 materialized = ../materialized/bootstrap + "/${buildBootstrapper.compilerNixName}/happy-${version}";

1100+ modules = [{ reinstallableLibGhc = false; }];

1098 } // args);

1101 } // args);

1099 happy = bootstrap.packages.happy-tool {};

1102 happy = bootstrap.packages.happy-tool {};

1100 happy-unchecked = bootstrap.packages.happy-tool { checkMaterialization = false; };

1103 happy-unchecked = bootstrap.packages.happy-tool { checkMaterialization = false; };

@@ -1107,6 +1110,7 @@ in {

1107 version = "1.24.4";

1110 version = "1.24.4";

1108 inherit ghcOverride nix-tools cabal-install index-state;

1111 inherit ghcOverride nix-tools cabal-install index-state;

1109 materialized = ../materialized/bootstrap + "/${buildBootstrapper.compilerNixName}/hscolour";

1112 materialized = ../materialized/bootstrap + "/${buildBootstrapper.compilerNixName}/hscolour";

1113+ modules = [{ reinstallableLibGhc = false; }];

1110 } // args)).getComponent "exe:HsColour";

1114 } // args)).getComponent "exe:HsColour";

1111 hscolour = bootstrap.packages.hscolour-tool {};

1115 hscolour = bootstrap.packages.hscolour-tool {};

1112 hscolour-unchecked = bootstrap.packages.hscolour-tool { checkMaterialization = false; };

1116 hscolour-unchecked = bootstrap.packages.hscolour-tool { checkMaterialization = false; };

overlays/ghc-packages.nix+1

@@ -222,6 +222,7 @@ in rec {

222 + "/${ghc-extra-projects-type}/${ghcName}";

223 compiler-nix-name = ghcName;

224 configureArgs = "--disable-tests --disable-benchmarks --allow-newer='terminfo:base'"; # avoid failures satisfying bytestring package tests dependencies

225+ modules = [{ reinstallableLibGhc = false; }];

225 })

226 })

226 ghc-extra-pkgs-cabal-projects;

227 ghc-extra-pkgs-cabal-projects;

227

228

overlays/hackage-quirks.nix−5

@@ -18,7 +18,6 @@ in { haskell-nix = prev.haskell-nix // {

18 allow-newer: cabal-install:base, *:base, *:template-haskell

19 '';

20 modules = [

21− { reinstallableLibGhc = true; }

22 # Version of of cabal-install in hackage is broken for GHC 8.10.1

21 # Version of of cabal-install in hackage is broken for GHC 8.10.1

23 (lib.optionalAttrs (version == "3.2.0.0") {

22 (lib.optionalAttrs (version == "3.2.0.0") {

24 packages.cabal-install.src = final.haskell-nix.sources.cabal-32 + "/cabal-install";

23 packages.cabal-install.src = final.haskell-nix.sources.cabal-32 + "/cabal-install";

@@ -26,10 +25,6 @@ in { haskell-nix = prev.haskell-nix // {

26 ];

25 ];

27 };

26 };

28

27

29− hpack = {

30− modules = [ { reinstallableLibGhc = true; } ];

31− };

32−

33 pandoc = {

28 pandoc = {

34 # Function that returns a sha256 string by looking up the location

29 # Function that returns a sha256 string by looking up the location

35 # and tag in a nested attrset

30 # and tag in a nested attrset

snapshots.nix−1

@@ -18,7 +18,6 @@ let

18 pkg-def-extras = (pkg-def-extras name)

19 ++ [(hackage: ghc-boot-packages.${(pkg-def hackage).compiler.nix-name})];

20 modules = [

21− { reinstallableLibGhc = true; } # Allow ghc library to be installed for packages that need it

22 { planned = true; } # All components in the snapshot are planned

21 { planned = true; } # All components in the snapshot are planned

23 { packages.alex.package.setup-depends = [pkgSet.config.hsPkgs.Cabal]; }

22 { packages.alex.package.setup-depends = [pkgSet.config.hsPkgs.Cabal]; }

24 { packages.happy.package.setup-depends = [pkgSet.config.hsPkgs.Cabal]; }

23 { packages.happy.package.setup-depends = [pkgSet.config.hsPkgs.Cabal]; }

test/cabal-22/default.nix−1

@@ -6,7 +6,6 @@ let

6 project = cabalProject' {

7 inherit compiler-nix-name;

8 src = testSrc "cabal-22";

9− modules = [{ reinstallableLibGhc = true; }];

10 };

9 };

11

10

12 packages = project.hsPkgs;

11 packages = project.hsPkgs;

test/cabal-simple-prof/default.nix−1

@@ -6,7 +6,6 @@ with lib;

6let

7 modules = [

8 {

9− reinstallableLibGhc = true;

10 # Package has no exposed modules which causes

9 # Package has no exposed modules which causes

11 # haddock: No input file(s)

10 # haddock: No input file(s)

12 packages.cabal-simple.doHaddock = false;

11 packages.cabal-simple.doHaddock = false;

test/cabal-simple/default.nix−1

@@ -6,7 +6,6 @@ with lib;

6let

7 modules = [

8 {

9− reinstallableLibGhc = true;

10 # Package has no exposed modules which causes

9 # Package has no exposed modules which causes

11 # haddock: No input file(s)

10 # haddock: No input file(s)

12 packages.cabal-simple.doHaddock = false;

11 packages.cabal-simple.doHaddock = false;

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

@@ -6,7 +6,6 @@ let

6 project = cabalProject' {

7 inherit compiler-nix-name;

8 src = testSrc "cabal-source-repo-comments";

9− modules = [{ reinstallableLibGhc = true; }];

10 };

9 };

11 packages = project.hsPkgs;

10 packages = project.hsPkgs;

12in recurseIntoAttrs {

11in recurseIntoAttrs {

test/cabal-source-repo/default.nix−1

@@ -6,7 +6,6 @@ let

6 project = cabalProject' {

7 inherit compiler-nix-name;

8 src = testSrc "cabal-source-repo";

9− modules = [{ reinstallableLibGhc = true; }];

10 };

9 };

11 packages = project.hsPkgs;

10 packages = project.hsPkgs;

12in recurseIntoAttrs {

11in recurseIntoAttrs {

test/cabal-sublib/default.nix−1

@@ -6,7 +6,6 @@ with lib;

6let

7 modules = [

8 {

9− reinstallableLibGhc = true;

10 # Package has no exposed modules which causes

9 # Package has no exposed modules which causes

11 # haddock: No input file(s)

10 # haddock: No input file(s)

12 packages.cabal-sublib.doHaddock = false;

11 packages.cabal-sublib.doHaddock = false;

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

@@ -18,7 +18,6 @@ let

18 plan-pkgs = importAndFilterProject {

19 inherit (callProjectResults) projectNix sourceRepos src;

20 };

21− modules = [{ reinstallableLibGhc = true; }];

22 };

21 };

23 packages = pkgSet.config.hsPkgs;

22 packages = pkgSet.config.hsPkgs;

24

23

test/haskell-language-server/cabal.nix+1−1

@@ -1,6 +1,6 @@

1{ stdenv, testSrc, evalPackages, haskell-nix, compiler-nix-name, recurseIntoAttrs }:

2let

3− inherit (haskell-nix.tool compiler-nix-name "haskell-language-server" { modules = [{ reinstallableLibGhc = true; }]; }) project;

3+ inherit (haskell-nix.tool compiler-nix-name "haskell-language-server" {}) project;

4in recurseIntoAttrs {

5 ifdInputs = {

6 inherit (project) plan-nix;

test/setup-deps/default.nix+1−2

@@ -11,8 +11,7 @@ let

11 # Package has no exposed modules which causes

12 # haddock: No input file(s)

13 packages.bytestring-builder.doHaddock = false;

14− }

14+ }];

15− { reinstallableLibGhc = true; } ];

16 };

15 };

17

16

18 meta = {

17 meta = {

test/th-dlls/default.nix−1

@@ -7,7 +7,6 @@ let

7 project = project' {

8 inherit compiler-nix-name;

9 src = testSrc "th-dlls";

10− modules = [{ reinstallableLibGhc = true; }];

11 };

10 };

12

11

13 packages = project.hsPkgs;

12 packages = project.hsPkgs;