072debc · haskell.nix · git.iko.soy

git.iko.soy/haskell.nix

on iko/ghcjs-patch-master help sign in

Fixup tests

commit072debc6634088b58745f5b2b108a74e1aae1500 authorMoritz Angermann <moritz.angermann@gmail.com> dateFri 17 May 2019, 13:01 (7 years ago) parent413d5c9

13 files changed+157−141

compare with iko/ghcjs-patch-master

unifiedsplit

modules/component-driver.nix+1−1 test/cabal-simple/cabal-simple.nix → test/cabal-simple/.plan.nix/cabal-simple.nix+1−1 test/cabal-simple/cabal-simple.cabal+2−2 test/cabal-simple/default.nix+8−7 test/cabal-simple/pkgs.nix+43−38 test/cabal-sublib/cabal-sublib.nix → test/cabal-sublib/.plan.nix/cabal-sublib.nix+1−1 test/cabal-sublib/cabal-sublib.cabal+2−2 test/cabal-sublib/default.nix+8−7 test/cabal-sublib/pkgs.nix+43−38 test/with-packages/test-with-packages.nix → test/with-packages/.plan.nix/test-with-packages.nix+1−1 test/with-packages/default.nix+8−6 test/with-packages/pkgs.nix+38−36 test/with-packages/test-with-packages.cabal+1−1

modules/component-driver.nix+1−1

@@ -5,7 +5,7 @@ let

55 inherit haskellLib;

66 ghc = config.ghc.package;

77 buildGHC = buildModules.config.ghc.package;

8− inherit (config) nonReinstallablePkgs hsPkgs shellHook;

8+ inherit (config) nonReinstallablePkgs hsPkgs;

99 inherit ghcForComponent;

1010 };

1111

test/cabal-simple/cabal-simple.nix → test/cabal-simple/.plan.nix/cabal-simple.nixrenamed+1−1

@@ -29,4 +29,4 @@

2929 };

3030 };

3131 };

32− } // rec { src = (pkgs.lib).mkDefault ./.; }

32+ } // rec { src = (pkgs.lib).mkDefault ../.; }

test/cabal-simple/cabal-simple.cabal+2−2

@@ -18,7 +18,7 @@ library

1818 -- exposed-modules:

1919 -- other-modules:

2020 -- other-extensions:

21− build-depends: base >=4.11 && <4.12

21+ build-depends: base

2222 , extra

2323 , safe

2424 , aeson

@@ -29,7 +29,7 @@ executable cabal-simple

2929 main-is: Main.hs

3030 -- other-modules:

3131 -- other-extensions:

32− build-depends: base >=4.11 && <4.12

32+ build-depends: base

3333 , cabal-simple

3434 , extra

3535 , optparse-applicative

test/cabal-simple/default.nix+8−7

@@ -1,15 +1,16 @@

11# Test a package set

2−{ stdenv, util, mkCabalProjectPkgSet }:

2+{ stdenv, util, mkPkgSet }:

44with stdenv.lib;

66let

7− pkgSet = mkCabalProjectPkgSet {

8− plan-pkgs = import ./pkgs.nix;

9− pkg-def-extras = [

10− { cabal-simple = ./cabal-simple.nix;

11− }

12− ];

7+ ## steps to generate local files

8+ # 1. cabal new-build

9+ # 2. plan-to-nix -o .

10+ pkgs = import ./pkgs.nix;

11+ pkgSet = mkPkgSet {

12+ pkg-def = pkgs.pkgs;

13+ pkg-def-extras = [ pkgs.extras ];

1314 modules = [

1415 {

1516 # Package has no exposed modules which causes

test/cabal-simple/pkgs.nix+43−38

@@ -2,23 +2,33 @@

22 pkgs = hackage:

33 {

44 packages = {

5− "binary".revision = (((hackage."binary")."0.8.5.1").revisions).default;

6− "ghc-prim".revision = (((hackage."ghc-prim")."0.5.2.0").revisions).default;

7− "extra".revision = (((hackage."extra")."1.6.14").revisions).default;

8− "stm".revision = (((hackage."stm")."2.4.5.1").revisions).default;

5+ "binary".revision = (((hackage."binary")."0.8.6.0").revisions).default;

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

7+ "extra".revision = (((hackage."extra")."1.6.15").revisions).default;

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

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

11− "clock".revision = (((hackage."clock")."0.7.2").revisions).default;

10+ "clock".revision = (((hackage."clock")."0.8").revisions).default;

1211 "clock".flags.llvm = false;

1312 "scientific".revision = (((hackage."scientific")."0.3.6.2").revisions).default;

1413 "scientific".flags.integer-simple = false;

1514 "scientific".flags.bytestring-builder = false;

16− "deepseq".revision = (((hackage."deepseq")."1.4.3.0").revisions).default;

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

1716 "random".revision = (((hackage."random")."1.1").revisions).default;

1817 "uuid-types".revision = (((hackage."uuid-types")."1.0.3").revisions).default;

1918 "optparse-applicative".revision = (((hackage."optparse-applicative")."0.14.3.0").revisions).default;

2019 "dlist".revision = (((hackage."dlist")."0.8.0.6").revisions).default;

21− "directory".revision = (((hackage."directory")."1.3.1.5").revisions).default;

20+ "semigroups".revision = (((hackage."semigroups")."0.18.5").revisions).default;

21+ "semigroups".flags.bytestring = true;

22+ "semigroups".flags.unordered-containers = true;

23+ "semigroups".flags.text = true;

24+ "semigroups".flags.tagged = true;

25+ "semigroups".flags.containers = true;

26+ "semigroups".flags.binary = true;

27+ "semigroups".flags.hashable = true;

28+ "semigroups".flags.transformers = true;

29+ "semigroups".flags.deepseq = true;

30+ "semigroups".flags.bytestring-builder = false;

31+ "directory".revision = (((hackage."directory")."1.3.3.0").revisions).default;

2232 "transformers-compat".revision = (((hackage."transformers-compat")."0.6.4").revisions).default;

2333 "transformers-compat".flags.five = false;

2434 "transformers-compat".flags.generic-deriving = true;

@@ -27,8 +37,8 @@

2737 "transformers-compat".flags.mtl = true;

2838 "transformers-compat".flags.four = false;

2939 "transformers-compat".flags.three = false;

30− "template-haskell".revision = (((hackage."template-haskell")."2.13.0.0").revisions).default;

31− "vector".revision = (((hackage."vector")."0.12.0.2").revisions).default;

40+ "template-haskell".revision = (((hackage."template-haskell")."2.14.0.0").revisions).default;

41+ "vector".revision = (((hackage."vector")."0.12.0.3").revisions).default;

3242 "vector".flags.unsafechecks = false;

3343 "vector".flags.internalchecks = false;

3444 "vector".flags.wall = false;

@@ -43,23 +53,17 @@

4353 "tagged".revision = (((hackage."tagged")."0.8.6").revisions).default;

4454 "tagged".flags.transformers = true;

4555 "tagged".flags.deepseq = true;

46− "containers".revision = (((hackage."containers")."0.5.11.0").revisions).default;

47− "integer-logarithms".revision = (((hackage."integer-logarithms")."1.0.2.2").revisions).default;

56+ "containers".revision = (((hackage."containers")."0.6.0.1").revisions).default;

57+ "integer-logarithms".revision = (((hackage."integer-logarithms")."1.0.3").revisions).default;

4858 "integer-logarithms".flags.check-bounds = false;

4959 "integer-logarithms".flags.integer-gmp = true;

5060 "bytestring".revision = (((hackage."bytestring")."0.10.8.2").revisions).default;

5161 "ansi-wl-pprint".revision = (((hackage."ansi-wl-pprint")."0.6.8.2").revisions).default;

5262 "ansi-wl-pprint".flags.example = false;

53− "StateVar".revision = (((hackage."StateVar")."1.1.1.1").revisions).default;

54− "contravariant".revision = (((hackage."contravariant")."1.5").revisions).default;

55− "contravariant".flags.semigroups = true;

56− "contravariant".flags.tagged = true;

57− "contravariant".flags.statevar = true;

58− "contravariant".flags.safe = false;

5963 "text".revision = (((hackage."text")."1.2.3.1").revisions).default;

6064 "unordered-containers".revision = (((hackage."unordered-containers")."0.2.10.0").revisions).default;

6165 "unordered-containers".flags.debug = false;

62− "base".revision = (((hackage."base")."4.11.1.0").revisions).default;

66+ "base".revision = (((hackage."base")."4.12.0.0").revisions).default;

6367 "time".revision = (((hackage."time")."1.8.0.2").revisions).default;

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

6569 "hashable".revision = (((hackage."hashable")."1.2.7.0").revisions).default;

@@ -70,44 +74,45 @@

7074 "attoparsec".revision = (((hackage."attoparsec")."0.13.2.2").revisions).default;

7175 "attoparsec".flags.developer = false;

7276 "colour".revision = (((hackage."colour")."2.3.4").revisions).default;

73− "filepath".revision = (((hackage."filepath")."1.4.2").revisions).default;

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

7478 "process".revision = (((hackage."process")."1.6.5.0").revisions).default;

7579 "pretty".revision = (((hackage."pretty")."1.1.3.6").revisions).default;

76− "aeson".revision = (((hackage."aeson")."1.4.2.0").revisions).default;

80+ "aeson".revision = (((hackage."aeson")."1.4.3.0").revisions).default;

7781 "aeson".flags.cffi = false;

7882 "aeson".flags.fast = false;

7983 "aeson".flags.bytestring-builder = false;

8084 "aeson".flags.developer = false;

81− "ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.4.4").revisions).default;

82− "th-abstraction".revision = (((hackage."th-abstraction")."0.2.11.0").revisions).default;

83− "array".revision = (((hackage."array")."0.5.2.0").revisions).default;

85+ "ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.6.4").revisions).default;

86+ "th-abstraction".revision = (((hackage."th-abstraction")."0.3.1.0").revisions).default;

87+ "array".revision = (((hackage."array")."0.5.3.0").revisions).default;

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

8589 };

8690 compiler = {

87− version = "8.4.4";

88− nix-name = "ghc844";

91+ version = "8.6.4";

92+ nix-name = "ghc864";

8993 packages = {

90− "binary" = "0.8.5.1";

91− "ghc-prim" = "0.5.2.0";

92− "stm" = "2.4.5.1";

94+ "binary" = "0.8.6.0";

95+ "ghc-prim" = "0.5.3";

9396 "unix" = "2.7.2.2";

9497 "rts" = "1.0";

95− "deepseq" = "1.4.3.0";

96− "directory" = "1.3.1.5";

97− "template-haskell" = "2.13.0.0";

98− "containers" = "0.5.11.0";

98+ "deepseq" = "1.4.4.0";

99+ "directory" = "1.3.3.0";

100+ "template-haskell" = "2.14.0.0";

101+ "containers" = "0.6.0.1";

99102 "bytestring" = "0.10.8.2";

100103 "text" = "1.2.3.1";

101− "base" = "4.11.1.0";

104+ "base" = "4.12.0.0";

102105 "time" = "1.8.0.2";

103− "filepath" = "1.4.2";

106+ "transformers" = "0.5.6.2";

107+ "filepath" = "1.4.2.1";

108+ "process" = "1.6.5.0";

104109 "pretty" = "1.1.3.6";

105− "ghc-boot-th" = "8.4.4";

106− "array" = "0.5.2.0";

110+ "ghc-boot-th" = "8.6.4";

111+ "array" = "0.5.3.0";

107112 "integer-gmp" = "1.0.2.0";

108113 };

109114 };

110115 };

111116 extras = hackage:

112− { packages = {}; };

113− }

117+ { packages = { cabal-simple = ./.plan.nix/cabal-simple.nix; }; };

118+ }

test/cabal-sublib/cabal-sublib.nix → test/cabal-sublib/.plan.nix/cabal-sublib.nixrenamed+1−1

@@ -30,4 +30,4 @@

3030 };

3131 };

3232 };

33− } // rec { src = (pkgs.lib).mkDefault ./.; }

33+ } // rec { src = (pkgs.lib).mkDefault ../.; }

test/cabal-sublib/cabal-sublib.cabal+2−2

@@ -18,7 +18,7 @@ library

1818 -- exposed-modules:

1919 -- other-modules:

2020 -- other-extensions:

21− build-depends: base >=4.11 && <4.12

21+ build-depends: base

2222 , slib

2323 -- hs-source-dirs:

2424 default-language: Haskell2010

@@ -33,7 +33,7 @@ executable cabal-sublib

3333 main-is: Main.hs

3434 -- other-modules:

3535 -- other-extensions:

36− build-depends: base >=4.11 && <4.12

36+ build-depends: base

3737 , cabal-sublib

3838 , extra

3939 , optparse-applicative

test/cabal-sublib/default.nix+8−7