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)

e4e860cHamish Mackenzie5 years ago

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

compare with iko/ghcjs-patch-master

unifiedsplit

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

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

151 ];

152 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")))

154 ];

155 buildable = true;

156 mainPath = [ "test.hs" ];

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

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

3 {

4 packages = {

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

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

6+ "array".revision = (((hackage."array")."0.5.4.0").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;

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

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

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

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

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

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

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

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

11 "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;

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

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

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

17+ "deepseq".revision = (((hackage."deepseq")."1.4.4.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;

18 };

19 compiler = {

20 version = "8.8.2";

21 nix-name = "ghc882";

22 packages = {

23 "ghc-prim" = "0.5.3";

24− "unix" = "2.7.2.2";

24+ "array" = "0.5.4.0";

25− "rts" = "1.0";

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

26− "deepseq" = "1.4.4.0";

26+ "process" = "1.6.7.0";

27− "directory" = "1.3.4.0";

28− "containers" = "0.6.2.1";

29− "bytestring" = "0.10.10.0";

30 "base" = "4.13.0.0";

27 "base" = "4.13.0.0";

28+ "rts" = "1.0";

31 "time" = "1.9.3";

29 "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";

32 "filepath" = "1.4.2.1";

34 "filepath" = "1.4.2.1";

33− "process" = "1.6.7.0";

35+ "deepseq" = "1.4.4.0";

34− "array" = "0.5.4.0";

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

36 };

37 };

38 };

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

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

46 };

47 })

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+ })

48 ];

68 ];

49 }

69 }

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

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

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

191 ];

192 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")))

194 ];

195 buildable = true;

196 mainPath = [ "test.hs" ];

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

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

3 {

4 packages = {

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

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

6+ "array".revision = (((hackage."array")."0.5.4.0").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;

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

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

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

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

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

9 "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;

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

12 "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;

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

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

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

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

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

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

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

20 };

21 compiler = {

22 version = "8.8.2";

23 nix-name = "ghc882";

24 packages = {

25 "ghc-prim" = "0.5.3";

26− "unix" = "2.7.2.2";

26+ "array" = "0.5.4.0";

27− "mtl" = "2.2.2";

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

28− "rts" = "1.0";

28+ "process" = "1.6.7.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";

33 "base" = "4.13.0.0";

29 "base" = "4.13.0.0";

30+ "rts" = "1.0";

31+ "mtl" = "2.2.2";

34 "time" = "1.9.3";

32 "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";

36 "filepath" = "1.4.2.1";

37 "filepath" = "1.4.2.1";

37− "process" = "1.6.7.0";

38+ "deepseq" = "1.4.4.0";

38− "array" = "0.5.4.0";

39+ "transformers" = "0.5.6.2";

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

40 };

41 };

42 };

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

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

50 };

51 })

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+ })

52 ];

74 ];

53 }

75 }

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

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

24 isLocal = true;

25 detailLevel = "FullDetails";

26 licenseFiles = [ "LICENCE-LGPL" ];

27− dataDir = "";

27+ dataDir = ".";

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

29 extraSrcFiles = [];

30 extraTmpFiles = [];

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

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

3 {

4 packages = {

5 "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;

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

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

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

7 "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;

12 };

13 compiler = {

14 version = "8.8.2";

15 nix-name = "ghc882";

16 packages = {

17 "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";

22 "array" = "0.5.4.0";

18 "array" = "0.5.4.0";

23 "integer-gmp" = "1.0.2.0";

19 "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";

24 };

25 };

26 };

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

29 modules = [

30 ({ lib, ... }:

31 { 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+ })

32 ];

46 ];

33 }

47 }