e4e860c · haskell.nix · git.iko.soy

git.iko.soy/haskell.nix

on iko/ghcjs-patch-master help sign in

Fix AArch64 materialized nix files for bootstrap (#1210)

See #1207

commite4e860cf116f0f2af4a0cbc0b2bd51904ae4ee18 authorHamish Mackenzie <Hamish.Mackenzie@iohk.io> dateTue 24 Aug 2021, 18:36 (5 years ago) parent5a9ef26

6 files changed+107−51

compare with iko/ghcjs-patch-master

unifiedsplit

materialized/bootstrap/ghc882/alex/.plan.nix/alex.nix+1−1 materialized/bootstrap/ghc882/alex/default.nix+38−18 materialized/bootstrap/ghc882/happy-1.19.12/.plan.nix/happy.nix+1−1 materialized/bootstrap/ghc882/happy-1.19.12/default.nix+44−22 materialized/bootstrap/ghc882/hscolour/.plan.nix/hscolour.nix+1−1 materialized/bootstrap/ghc882/hscolour/default.nix+22−8

materialized/bootstrap/ghc882/alex/.plan.nix/alex.nix+1−1

@@ -150,7 +150,7 @@

150150 (hsPkgs."process" or (errorHandler.buildDepError "process"))

151151 ];

152152 build-tools = [

153− (hsPkgs.buildPackages.alex or (pkgs.buildPackages.alex or (errorHandler.buildToolDepError "alex")))

153+ (hsPkgs.buildPackages.alex.components.exes.alex or (pkgs.buildPackages.alex or (errorHandler.buildToolDepError "alex:alex")))

154154 ];

155155 buildable = true;

156156 mainPath = [ "test.hs" ];

materialized/bootstrap/ghc882/alex/default.nix+38−18

@@ -3,36 +3,36 @@

33 {

44 packages = {

55 "ghc-prim".revision = (((hackage."ghc-prim")."0.5.3").revisions).default;

6− "unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;

7− "rts".revision = (((hackage."rts")."1.0").revisions).default;

8− "deepseq".revision = (((hackage."deepseq")."1.4.4.0").revisions).default;

9− "directory".revision = (((hackage."directory")."1.3.4.0").revisions).default;

10− "containers".revision = (((hackage."containers")."0.6.2.1").revisions).default;

11− "bytestring".revision = (((hackage."bytestring")."0.10.10.0").revisions).default;

6+ "array".revision = (((hackage."array")."0.5.4.0").revisions).default;

7+ "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;

8+ "process".revision = (((hackage."process")."1.6.7.0").revisions).default;

129 "base".revision = (((hackage."base")."4.13.0.0").revisions).default;

10+ "rts".revision = (((hackage."rts")."1.0").revisions).default;

1311 "time".revision = (((hackage."time")."1.9.3").revisions).default;

12+ "unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;

13+ "bytestring".revision = (((hackage."bytestring")."0.10.10.0").revisions).default;

14+ "containers".revision = (((hackage."containers")."0.6.2.1").revisions).default;

15+ "directory".revision = (((hackage."directory")."1.3.4.0").revisions).default;

1416 "filepath".revision = (((hackage."filepath")."1.4.2.1").revisions).default;

15− "process".revision = (((hackage."process")."1.6.7.0").revisions).default;

16− "array".revision = (((hackage."array")."0.5.4.0").revisions).default;

17− "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;

17+ "deepseq".revision = (((hackage."deepseq")."1.4.4.0").revisions).default;

1818 };

1919 compiler = {

2020 version = "8.8.2";

2121 nix-name = "ghc882";

2222 packages = {

2323 "ghc-prim" = "0.5.3";

24− "unix" = "2.7.2.2";

25− "rts" = "1.0";

26− "deepseq" = "1.4.4.0";

27− "directory" = "1.3.4.0";

28− "containers" = "0.6.2.1";

29− "bytestring" = "0.10.10.0";

24+ "array" = "0.5.4.0";

25+ "integer-gmp" = "1.0.2.0";

26+ "process" = "1.6.7.0";

3027 "base" = "4.13.0.0";

28+ "rts" = "1.0";

3129 "time" = "1.9.3";

30+ "unix" = "2.7.2.2";

31+ "bytestring" = "0.10.10.0";

32+ "containers" = "0.6.2.1";

33+ "directory" = "1.3.4.0";

3234 "filepath" = "1.4.2.1";

33− "process" = "1.6.7.0";

34− "array" = "0.5.4.0";

35− "integer-gmp" = "1.0.2.0";

35+ "deepseq" = "1.4.4.0";

3636 };

3737 };

3838 };

@@ -45,5 +45,25 @@

4545 "alex" = { flags = { "small_base" = lib.mkOverride 900 true; }; };

4646 };

4747 })

48+ ({ lib, ... }:

49+ {

50+ packages = {

51+ "containers".components.library.planned = lib.mkOverride 900 true;

52+ "ghc-prim".components.library.planned = lib.mkOverride 900 true;

53+ "process".components.library.planned = lib.mkOverride 900 true;

54+ "integer-gmp".components.library.planned = lib.mkOverride 900 true;

55+ "array".components.library.planned = lib.mkOverride 900 true;

56+ "bytestring".components.library.planned = lib.mkOverride 900 true;

57+ "unix".components.library.planned = lib.mkOverride 900 true;

58+ "alex".components.exes."alex".planned = lib.mkOverride 900 true;

59+ "base".components.library.planned = lib.mkOverride 900 true;

60+ "rts".components.library.planned = lib.mkOverride 900 true;

61+ "time".components.library.planned = lib.mkOverride 900 true;

62+ "deepseq".components.library.planned = lib.mkOverride 900 true;

63+ "filepath".components.library.planned = lib.mkOverride 900 true;

64+ "directory".components.library.planned = lib.mkOverride 900 true;

65+ "alex".components.tests."tests".planned = lib.mkOverride 900 true;

66+ };

67+ })

4868 ];

4969 }

materialized/bootstrap/ghc882/happy-1.19.12/.plan.nix/happy.nix+1−1

@@ -190,7 +190,7 @@

190190 (hsPkgs."process" or (errorHandler.buildDepError "process"))

191191 ];

192192 build-tools = [

193− (hsPkgs.buildPackages.happy or (pkgs.buildPackages.happy or (errorHandler.buildToolDepError "happy")))

193+ (hsPkgs.buildPackages.happy.components.exes.happy or (pkgs.buildPackages.happy or (errorHandler.buildToolDepError "happy:happy")))

194194 ];

195195 buildable = true;

196196 mainPath = [ "test.hs" ];

materialized/bootstrap/ghc882/happy-1.19.12/default.nix+44−22

@@ -3,40 +3,40 @@

33 {

44 packages = {

55 "ghc-prim".revision = (((hackage."ghc-prim")."0.5.3").revisions).default;

6− "unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;

7− "mtl".revision = (((hackage."mtl")."2.2.2").revisions).default;

8− "rts".revision = (((hackage."rts")."1.0").revisions).default;

9− "deepseq".revision = (((hackage."deepseq")."1.4.4.0").revisions).default;

10− "directory".revision = (((hackage."directory")."1.3.4.0").revisions).default;

11− "containers".revision = (((hackage."containers")."0.6.2.1").revisions).default;

12− "bytestring".revision = (((hackage."bytestring")."0.10.10.0").revisions).default;

6+ "array".revision = (((hackage."array")."0.5.4.0").revisions).default;

7+ "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;

8+ "process".revision = (((hackage."process")."1.6.7.0").revisions).default;

139 "base".revision = (((hackage."base")."4.13.0.0").revisions).default;

10+ "rts".revision = (((hackage."rts")."1.0").revisions).default;

11+ "mtl".revision = (((hackage."mtl")."2.2.2").revisions).default;

1412 "time".revision = (((hackage."time")."1.9.3").revisions).default;

15− "transformers".revision = (((hackage."transformers")."0.5.6.2").revisions).default;

13+ "unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;

14+ "bytestring".revision = (((hackage."bytestring")."0.10.10.0").revisions).default;

15+ "containers".revision = (((hackage."containers")."0.6.2.1").revisions).default;

16+ "directory".revision = (((hackage."directory")."1.3.4.0").revisions).default;

1617 "filepath".revision = (((hackage."filepath")."1.4.2.1").revisions).default;

17− "process".revision = (((hackage."process")."1.6.7.0").revisions).default;

18− "array".revision = (((hackage."array")."0.5.4.0").revisions).default;

19− "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;

18+ "deepseq".revision = (((hackage."deepseq")."1.4.4.0").revisions).default;

19+ "transformers".revision = (((hackage."transformers")."0.5.6.2").revisions).default;

2020 };

2121 compiler = {

2222 version = "8.8.2";

2323 nix-name = "ghc882";

2424 packages = {

2525 "ghc-prim" = "0.5.3";

26− "unix" = "2.7.2.2";

27− "mtl" = "2.2.2";

28− "rts" = "1.0";

29− "deepseq" = "1.4.4.0";

30− "directory" = "1.3.4.0";

31− "containers" = "0.6.2.1";

32− "bytestring" = "0.10.10.0";

26+ "array" = "0.5.4.0";

27+ "integer-gmp" = "1.0.2.0";

28+ "process" = "1.6.7.0";

3329 "base" = "4.13.0.0";

30+ "rts" = "1.0";

31+ "mtl" = "2.2.2";

3432 "time" = "1.9.3";

35− "transformers" = "0.5.6.2";

33+ "unix" = "2.7.2.2";

34+ "bytestring" = "0.10.10.0";

35+ "containers" = "0.6.2.1";

36+ "directory" = "1.3.4.0";

3637 "filepath" = "1.4.2.1";

37− "process" = "1.6.7.0";

38− "array" = "0.5.4.0";

39− "integer-gmp" = "1.0.2.0";

38+ "deepseq" = "1.4.4.0";

39+ "transformers" = "0.5.6.2";

4040 };

4141 };

4242 };

@@ -49,5 +49,27 @@

4949 "happy" = { flags = { "small_base" = lib.mkOverride 900 true; }; };

5050 };

5151 })

52+ ({ lib, ... }:

53+ {

54+ packages = {

55+ "containers".components.library.planned = lib.mkOverride 900 true;

56+ "ghc-prim".components.library.planned = lib.mkOverride 900 true;

57+ "happy".components.exes."happy".planned = lib.mkOverride 900 true;

58+ "transformers".components.library.planned = lib.mkOverride 900 true;

59+ "process".components.library.planned = lib.mkOverride 900 true;

60+ "integer-gmp".components.library.planned = lib.mkOverride 900 true;

61+ "array".components.library.planned = lib.mkOverride 900 true;

62+ "bytestring".components.library.planned = lib.mkOverride 900 true;

63+ "unix".components.library.planned = lib.mkOverride 900 true;

64+ "base".components.library.planned = lib.mkOverride 900 true;

65+ "rts".components.library.planned = lib.mkOverride 900 true;

66+ "mtl".components.library.planned = lib.mkOverride 900 true;

67+ "time".components.library.planned = lib.mkOverride 900 true;

68+ "deepseq".components.library.planned = lib.mkOverride 900 true;

69+ "filepath".components.library.planned = lib.mkOverride 900 true;

70+ "happy".components.tests."tests".planned = lib.mkOverride 900 true;

71+ "directory".components.library.planned = lib.mkOverride 900 true;

72+ };

73+ })

5274 ];

5375 }

materialized/bootstrap/ghc882/hscolour/.plan.nix/hscolour.nix+1−1

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

2424 isLocal = true;

2525 detailLevel = "FullDetails";

2626 licenseFiles = [ "LICENCE-LGPL" ];

27− dataDir = "";

27+ dataDir = ".";

2828 dataFiles = [ "hscolour.css" "data/rgb24-example-.hscolour" ];

2929 extraSrcFiles = [];

3030 extraTmpFiles = [];

materialized/bootstrap/ghc882/hscolour/default.nix+22−8

@@ -3,24 +3,24 @@

33 {

44 packages = {

55 "ghc-prim".revision = (((hackage."ghc-prim")."0.5.3").revisions).default;

6− "rts".revision = (((hackage."rts")."1.0").revisions).default;

7− "deepseq".revision = (((hackage."deepseq")."1.4.4.0").revisions).default;

8− "containers".revision = (((hackage."containers")."0.6.2.1").revisions).default;

9− "base".revision = (((hackage."base")."4.13.0.0").revisions).default;

106 "array".revision = (((hackage."array")."0.5.4.0").revisions).default;

117 "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;

8+ "base".revision = (((hackage."base")."4.13.0.0").revisions).default;

9+ "rts".revision = (((hackage."rts")."1.0").revisions).default;

10+ "containers".revision = (((hackage."containers")."0.6.2.1").revisions).default;

11+ "deepseq".revision = (((hackage."deepseq")."1.4.4.0").revisions).default;

1212 };

1313 compiler = {

1414 version = "8.8.2";

1515 nix-name = "ghc882";

1616 packages = {

1717 "ghc-prim" = "0.5.3";

18− "rts" = "1.0";

19− "deepseq" = "1.4.4.0";

20− "containers" = "0.6.2.1";

21− "base" = "4.13.0.0";

2218 "array" = "0.5.4.0";

2319 "integer-gmp" = "1.0.2.0";

20+ "base" = "4.13.0.0";

21+ "rts" = "1.0";

22+ "containers" = "0.6.2.1";

23+ "deepseq" = "1.4.4.0";

2424 };

2525 };

2626 };

@@ -29,5 +29,19 @@

2929 modules = [

3030 ({ lib, ... }:

3131 { packages = { "hscolour" = { flags = {}; }; }; })

32+ ({ lib, ... }:

33+ {

34+ packages = {

35+ "containers".components.library.planned = lib.mkOverride 900 true;

36+ "ghc-prim".components.library.planned = lib.mkOverride 900 true;

37+ "hscolour".components.exes."HsColour".planned = lib.mkOverride 900 true;

38+ "hscolour".components.library.planned = lib.mkOverride 900 true;

39+ "integer-gmp".components.library.planned = lib.mkOverride 900 true;

40+ "array".components.library.planned = lib.mkOverride 900 true;

41+ "base".components.library.planned = lib.mkOverride 900 true;

42+ "rts".components.library.planned = lib.mkOverride 900 true;

43+ "deepseq".components.library.planned = lib.mkOverride 900 true;

44+ };

45+ })

3246 ];

3347 }