git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Fixup tests
072debcMoritz Angermann
modules/component-driver.nix+1−1
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -5,7 +5,7 @@ let
5 inherit haskellLib;
5 inherit haskellLib;
6 ghc = config.ghc.package;
6 ghc = config.ghc.package;
7 buildGHC = buildModules.config.ghc.package;
7 buildGHC = buildModules.config.ghc.package;
8− inherit (config) nonReinstallablePkgs hsPkgs shellHook;
8+ inherit (config) nonReinstallablePkgs hsPkgs;
9 inherit ghcForComponent;
9 inherit ghcForComponent;
10 };
10 };
11
11
test/cabal-simple/cabal-simple.nix → test/cabal-simple/.plan.nix/cabal-simple.nixrenamed+1−1
@@ -29,4 +29,4 @@
29 };
29 };
30 };
30 };
31 };
31 };
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
18 -- exposed-modules:
18 -- exposed-modules:
19 -- other-modules:
19 -- other-modules:
20 -- other-extensions:
20 -- other-extensions:
21− build-depends: base >=4.11 && <4.12
21+ build-depends: base
22 , extra
22 , extra
23 , safe
23 , safe
24 , aeson
24 , aeson
@@ -29,7 +29,7 @@ executable cabal-simple
29 main-is: Main.hs
29 main-is: Main.hs
30 -- other-modules:
30 -- other-modules:
31 -- other-extensions:
31 -- other-extensions:
32− build-depends: base >=4.11 && <4.12
32+ build-depends: base
33 , cabal-simple
33 , cabal-simple
34 , extra
34 , extra
35 , optparse-applicative
35 , optparse-applicative
test/cabal-simple/default.nix+8−7
@@ -1,15 +1,16 @@
1# Test a package set
1# Test a package set
2−{ stdenv, util, mkCabalProjectPkgSet }:
2+{ stdenv, util, mkPkgSet }:
3
3
4with stdenv.lib;
4with stdenv.lib;
5
5
6let
6let
7− pkgSet = mkCabalProjectPkgSet {
7+ ## steps to generate local files
8+ # 1. cabal new-build
9+ # 2. plan-to-nix -o .
8− plan-pkgs = import ./pkgs.nix;
10+ pkgs = import ./pkgs.nix;
11+ pkgSet = mkPkgSet {
12+ pkg-def = pkgs.pkgs;
9− pkg-def-extras = [
13+ pkg-def-extras = [ pkgs.extras ];
10− { cabal-simple = ./cabal-simple.nix;
11− }
12− ];
13 modules = [
14 modules = [
14 {
15 {
15 # Package has no exposed modules which causes
16 # Package has no exposed modules which causes
test/cabal-simple/pkgs.nix+43−38
@@ -2,23 +2,33 @@
2 pkgs = hackage:
2 pkgs = hackage:
3 {
3 {
4 packages = {
4 packages = {
5− "binary".revision = (((hackage."binary")."0.8.5.1").revisions).default;
5+ "binary".revision = (((hackage."binary")."0.8.6.0").revisions).default;
6− "ghc-prim".revision = (((hackage."ghc-prim")."0.5.2.0").revisions).default;
6+ "ghc-prim".revision = (((hackage."ghc-prim")."0.5.3").revisions).default;
7− "extra".revision = (((hackage."extra")."1.6.14").revisions).default;
7+ "extra".revision = (((hackage."extra")."1.6.15").revisions).default;
8− "stm".revision = (((hackage."stm")."2.4.5.1").revisions).default;
9 "unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;
8 "unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;
10 "rts".revision = (((hackage."rts")."1.0").revisions).default;
9 "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;
12 "clock".flags.llvm = false;
11 "clock".flags.llvm = false;
13 "scientific".revision = (((hackage."scientific")."0.3.6.2").revisions).default;
12 "scientific".revision = (((hackage."scientific")."0.3.6.2").revisions).default;
14 "scientific".flags.integer-simple = false;
13 "scientific".flags.integer-simple = false;
15 "scientific".flags.bytestring-builder = false;
14 "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;
17 "random".revision = (((hackage."random")."1.1").revisions).default;
16 "random".revision = (((hackage."random")."1.1").revisions).default;
18 "uuid-types".revision = (((hackage."uuid-types")."1.0.3").revisions).default;
17 "uuid-types".revision = (((hackage."uuid-types")."1.0.3").revisions).default;
19 "optparse-applicative".revision = (((hackage."optparse-applicative")."0.14.3.0").revisions).default;
18 "optparse-applicative".revision = (((hackage."optparse-applicative")."0.14.3.0").revisions).default;
20 "dlist".revision = (((hackage."dlist")."0.8.0.6").revisions).default;
19 "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;
22 "transformers-compat".revision = (((hackage."transformers-compat")."0.6.4").revisions).default;
32 "transformers-compat".revision = (((hackage."transformers-compat")."0.6.4").revisions).default;
23 "transformers-compat".flags.five = false;
33 "transformers-compat".flags.five = false;
24 "transformers-compat".flags.generic-deriving = true;
34 "transformers-compat".flags.generic-deriving = true;
@@ -27,8 +37,8 @@
27 "transformers-compat".flags.mtl = true;
37 "transformers-compat".flags.mtl = true;
28 "transformers-compat".flags.four = false;
38 "transformers-compat".flags.four = false;
29 "transformers-compat".flags.three = false;
39 "transformers-compat".flags.three = false;
30− "template-haskell".revision = (((hackage."template-haskell")."2.13.0.0").revisions).default;
40+ "template-haskell".revision = (((hackage."template-haskell")."2.14.0.0").revisions).default;
31− "vector".revision = (((hackage."vector")."0.12.0.2").revisions).default;
41+ "vector".revision = (((hackage."vector")."0.12.0.3").revisions).default;
32 "vector".flags.unsafechecks = false;
42 "vector".flags.unsafechecks = false;
33 "vector".flags.internalchecks = false;
43 "vector".flags.internalchecks = false;
34 "vector".flags.wall = false;
44 "vector".flags.wall = false;
@@ -43,23 +53,17 @@
43 "tagged".revision = (((hackage."tagged")."0.8.6").revisions).default;
53 "tagged".revision = (((hackage."tagged")."0.8.6").revisions).default;
44 "tagged".flags.transformers = true;
54 "tagged".flags.transformers = true;
45 "tagged".flags.deepseq = true;
55 "tagged".flags.deepseq = true;
46− "containers".revision = (((hackage."containers")."0.5.11.0").revisions).default;
56+ "containers".revision = (((hackage."containers")."0.6.0.1").revisions).default;
47− "integer-logarithms".revision = (((hackage."integer-logarithms")."1.0.2.2").revisions).default;
57+ "integer-logarithms".revision = (((hackage."integer-logarithms")."1.0.3").revisions).default;
48 "integer-logarithms".flags.check-bounds = false;
58 "integer-logarithms".flags.check-bounds = false;
49 "integer-logarithms".flags.integer-gmp = true;
59 "integer-logarithms".flags.integer-gmp = true;
50 "bytestring".revision = (((hackage."bytestring")."0.10.8.2").revisions).default;
60 "bytestring".revision = (((hackage."bytestring")."0.10.8.2").revisions).default;
51 "ansi-wl-pprint".revision = (((hackage."ansi-wl-pprint")."0.6.8.2").revisions).default;
61 "ansi-wl-pprint".revision = (((hackage."ansi-wl-pprint")."0.6.8.2").revisions).default;
52 "ansi-wl-pprint".flags.example = false;
62 "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;
59 "text".revision = (((hackage."text")."1.2.3.1").revisions).default;
63 "text".revision = (((hackage."text")."1.2.3.1").revisions).default;
60 "unordered-containers".revision = (((hackage."unordered-containers")."0.2.10.0").revisions).default;
64 "unordered-containers".revision = (((hackage."unordered-containers")."0.2.10.0").revisions).default;
61 "unordered-containers".flags.debug = false;
65 "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;
63 "time".revision = (((hackage."time")."1.8.0.2").revisions).default;
67 "time".revision = (((hackage."time")."1.8.0.2").revisions).default;
64 "transformers".revision = (((hackage."transformers")."0.5.6.2").revisions).default;
68 "transformers".revision = (((hackage."transformers")."0.5.6.2").revisions).default;
65 "hashable".revision = (((hackage."hashable")."1.2.7.0").revisions).default;
69 "hashable".revision = (((hackage."hashable")."1.2.7.0").revisions).default;
@@ -70,44 +74,45 @@
70 "attoparsec".revision = (((hackage."attoparsec")."0.13.2.2").revisions).default;
74 "attoparsec".revision = (((hackage."attoparsec")."0.13.2.2").revisions).default;
71 "attoparsec".flags.developer = false;
75 "attoparsec".flags.developer = false;
72 "colour".revision = (((hackage."colour")."2.3.4").revisions).default;
76 "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;
74 "process".revision = (((hackage."process")."1.6.5.0").revisions).default;
78 "process".revision = (((hackage."process")."1.6.5.0").revisions).default;
75 "pretty".revision = (((hackage."pretty")."1.1.3.6").revisions).default;
79 "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;
77 "aeson".flags.cffi = false;
81 "aeson".flags.cffi = false;
78 "aeson".flags.fast = false;
82 "aeson".flags.fast = false;
79 "aeson".flags.bytestring-builder = false;
83 "aeson".flags.bytestring-builder = false;
80 "aeson".flags.developer = false;
84 "aeson".flags.developer = false;
81− "ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.4.4").revisions).default;
85+ "ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.6.4").revisions).default;
82− "th-abstraction".revision = (((hackage."th-abstraction")."0.2.11.0").revisions).default;
86+ "th-abstraction".revision = (((hackage."th-abstraction")."0.3.1.0").revisions).default;
83− "array".revision = (((hackage."array")."0.5.2.0").revisions).default;
87+ "array".revision = (((hackage."array")."0.5.3.0").revisions).default;
84 "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;
88 "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;
85 };
89 };
86 compiler = {
90 compiler = {
87− version = "8.4.4";
91+ version = "8.6.4";
88− nix-name = "ghc844";
92+ nix-name = "ghc864";
89 packages = {
93 packages = {
90− "binary" = "0.8.5.1";
94+ "binary" = "0.8.6.0";
91− "ghc-prim" = "0.5.2.0";
95+ "ghc-prim" = "0.5.3";
92− "stm" = "2.4.5.1";
93 "unix" = "2.7.2.2";
96 "unix" = "2.7.2.2";
94 "rts" = "1.0";
97 "rts" = "1.0";
95− "deepseq" = "1.4.3.0";
98+ "deepseq" = "1.4.4.0";
96− "directory" = "1.3.1.5";
99+ "directory" = "1.3.3.0";
97− "template-haskell" = "2.13.0.0";
100+ "template-haskell" = "2.14.0.0";
98− "containers" = "0.5.11.0";
101+ "containers" = "0.6.0.1";
99 "bytestring" = "0.10.8.2";
102 "bytestring" = "0.10.8.2";
100 "text" = "1.2.3.1";
103 "text" = "1.2.3.1";
101− "base" = "4.11.1.0";
104+ "base" = "4.12.0.0";
102 "time" = "1.8.0.2";
105 "time" = "1.8.0.2";
106+ "transformers" = "0.5.6.2";
103− "filepath" = "1.4.2";
107+ "filepath" = "1.4.2.1";
108+ "process" = "1.6.5.0";
104 "pretty" = "1.1.3.6";
109 "pretty" = "1.1.3.6";
105− "ghc-boot-th" = "8.4.4";
110+ "ghc-boot-th" = "8.6.4";
106− "array" = "0.5.2.0";
111+ "array" = "0.5.3.0";
107 "integer-gmp" = "1.0.2.0";
112 "integer-gmp" = "1.0.2.0";
108 };
113 };
109 };
114 };
110 };
115 };
111 extras = hackage:
116 extras = hackage:
112− { packages = {}; };
117+ { packages = { cabal-simple = ./.plan.nix/cabal-simple.nix; }; };
113− }
118+ }
test/cabal-sublib/cabal-sublib.nix → test/cabal-sublib/.plan.nix/cabal-sublib.nixrenamed+1−1
@@ -30,4 +30,4 @@
30 };
30 };
31 };
31 };
32 };
32 };
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
18 -- exposed-modules:
18 -- exposed-modules:
19 -- other-modules:
19 -- other-modules:
20 -- other-extensions:
20 -- other-extensions:
21− build-depends: base >=4.11 && <4.12
21+ build-depends: base
22 , slib
22 , slib
23 -- hs-source-dirs:
23 -- hs-source-dirs:
24 default-language: Haskell2010
24 default-language: Haskell2010
@@ -33,7 +33,7 @@ executable cabal-sublib
33 main-is: Main.hs
33 main-is: Main.hs
34 -- other-modules:
34 -- other-modules:
35 -- other-extensions:
35 -- other-extensions:
36− build-depends: base >=4.11 && <4.12
36+ build-depends: base
37 , cabal-sublib
37 , cabal-sublib
38 , extra
38 , extra
39 , optparse-applicative
39 , optparse-applicative
test/cabal-sublib/default.nix+8−7
@@ -1,15 +1,16 @@
1# Test a package set
1# Test a package set
2−{ stdenv, util, mkCabalProjectPkgSet }:
2+{ stdenv, util, mkPkgSet }:
3
3
4with stdenv.lib;
4with stdenv.lib;
5
5
6let
6let
7− pkgSet = mkCabalProjectPkgSet {
7+ ## steps to generate local files
8+ # 1. cabal new-build
9+ # 2. plan-to-nix -o .
8− plan-pkgs = import ./pkgs.nix;
10+ pkgs = import ./pkgs.nix;
11+ pkgSet = mkPkgSet {
12+ pkg-def = pkgs.pkgs;
9− pkg-def-extras = [
13+ pkg-def-extras = [ pkgs.extras ];
10− { cabal-sublib = ./cabal-sublib.nix;
11− }
12− ];
13 modules = [
14 modules = [
14 {
15 {
15 # Package has no exposed modules which causes
16 # Package has no exposed modules which causes
test/cabal-sublib/pkgs.nix+43−38
@@ -2,23 +2,33 @@
2 pkgs = hackage:
2 pkgs = hackage:
3 {
3 {
4 packages = {
4 packages = {
5− "binary".revision = (((hackage."binary")."0.8.5.1").revisions).default;
5+ "binary".revision = (((hackage."binary")."0.8.6.0").revisions).default;
6− "ghc-prim".revision = (((hackage."ghc-prim")."0.5.2.0").revisions).default;
6+ "ghc-prim".revision = (((hackage."ghc-prim")."0.5.3").revisions).default;
7− "extra".revision = (((hackage."extra")."1.6.14").revisions).default;
7+ "extra".revision = (((hackage."extra")."1.6.15").revisions).default;
8− "stm".revision = (((hackage."stm")."2.4.5.1").revisions).default;
9 "unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;
8 "unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;
10 "rts".revision = (((hackage."rts")."1.0").revisions).default;
9 "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;
12 "clock".flags.llvm = false;
11 "clock".flags.llvm = false;
13 "scientific".revision = (((hackage."scientific")."0.3.6.2").revisions).default;
12 "scientific".revision = (((hackage."scientific")."0.3.6.2").revisions).default;
14 "scientific".flags.integer-simple = false;
13 "scientific".flags.integer-simple = false;
15 "scientific".flags.bytestring-builder = false;
14 "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;
17 "random".revision = (((hackage."random")."1.1").revisions).default;
16 "random".revision = (((hackage."random")."1.1").revisions).default;
18 "uuid-types".revision = (((hackage."uuid-types")."1.0.3").revisions).default;
17 "uuid-types".revision = (((hackage."uuid-types")."1.0.3").revisions).default;
19 "optparse-applicative".revision = (((hackage."optparse-applicative")."0.14.3.0").revisions).default;
18 "optparse-applicative".revision = (((hackage."optparse-applicative")."0.14.3.0").revisions).default;
20 "dlist".revision = (((hackage."dlist")."0.8.0.6").revisions).default;
19 "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;
22 "transformers-compat".revision = (((hackage."transformers-compat")."0.6.4").revisions).default;
32 "transformers-compat".revision = (((hackage."transformers-compat")."0.6.4").revisions).default;
23 "transformers-compat".flags.five = false;
33 "transformers-compat".flags.five = false;
24 "transformers-compat".flags.generic-deriving = true;
34 "transformers-compat".flags.generic-deriving = true;
@@ -27,8 +37,8 @@
27 "transformers-compat".flags.mtl = true;
37 "transformers-compat".flags.mtl = true;
28 "transformers-compat".flags.four = false;
38 "transformers-compat".flags.four = false;
29 "transformers-compat".flags.three = false;
39 "transformers-compat".flags.three = false;
30− "template-haskell".revision = (((hackage."template-haskell")."2.13.0.0").revisions).default;
40+ "template-haskell".revision = (((hackage."template-haskell")."2.14.0.0").revisions).default;
31− "vector".revision = (((hackage."vector")."0.12.0.2").revisions).default;
41+ "vector".revision = (((hackage."vector")."0.12.0.3").revisions).default;
32 "vector".flags.unsafechecks = false;
42 "vector".flags.unsafechecks = false;
33 "vector".flags.internalchecks = false;
43 "vector".flags.internalchecks = false;
34 "vector".flags.wall = false;
44 "vector".flags.wall = false;
@@ -43,23 +53,17 @@
43 "tagged".revision = (((hackage."tagged")."0.8.6").revisions).default;
53 "tagged".revision = (((hackage."tagged")."0.8.6").revisions).default;
44 "tagged".flags.transformers = true;
54 "tagged".flags.transformers = true;
45 "tagged".flags.deepseq = true;
55 "tagged".flags.deepseq = true;
46− "containers".revision = (((hackage."containers")."0.5.11.0").revisions).default;
56+ "containers".revision = (((hackage."containers")."0.6.0.1").revisions).default;
47− "integer-logarithms".revision = (((hackage."integer-logarithms")."1.0.2.2").revisions).default;
57+ "integer-logarithms".revision = (((hackage."integer-logarithms")."1.0.3").revisions).default;
48 "integer-logarithms".flags.check-bounds = false;
58 "integer-logarithms".flags.check-bounds = false;
49 "integer-logarithms".flags.integer-gmp = true;
59 "integer-logarithms".flags.integer-gmp = true;
50 "bytestring".revision = (((hackage."bytestring")."0.10.8.2").revisions).default;
60 "bytestring".revision = (((hackage."bytestring")."0.10.8.2").revisions).default;
51 "ansi-wl-pprint".revision = (((hackage."ansi-wl-pprint")."0.6.8.2").revisions).default;
61 "ansi-wl-pprint".revision = (((hackage."ansi-wl-pprint")."0.6.8.2").revisions).default;
52 "ansi-wl-pprint".flags.example = false;
62 "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;
59 "text".revision = (((hackage."text")."1.2.3.1").revisions).default;
63 "text".revision = (((hackage."text")."1.2.3.1").revisions).default;
60 "unordered-containers".revision = (((hackage."unordered-containers")."0.2.10.0").revisions).default;
64 "unordered-containers".revision = (((hackage."unordered-containers")."0.2.10.0").revisions).default;
61 "unordered-containers".flags.debug = false;
65 "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;
63 "time".revision = (((hackage."time")."1.8.0.2").revisions).default;
67 "time".revision = (((hackage."time")."1.8.0.2").revisions).default;
64 "transformers".revision = (((hackage."transformers")."0.5.6.2").revisions).default;
68 "transformers".revision = (((hackage."transformers")."0.5.6.2").revisions).default;
65 "hashable".revision = (((hackage."hashable")."1.2.7.0").revisions).default;
69 "hashable".revision = (((hackage."hashable")."1.2.7.0").revisions).default;
@@ -70,44 +74,45 @@
70 "attoparsec".revision = (((hackage."attoparsec")."0.13.2.2").revisions).default;
74 "attoparsec".revision = (((hackage."attoparsec")."0.13.2.2").revisions).default;
71 "attoparsec".flags.developer = false;
75 "attoparsec".flags.developer = false;
72 "colour".revision = (((hackage."colour")."2.3.4").revisions).default;
76 "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;
74 "process".revision = (((hackage."process")."1.6.5.0").revisions).default;
78 "process".revision = (((hackage."process")."1.6.5.0").revisions).default;
75 "pretty".revision = (((hackage."pretty")."1.1.3.6").revisions).default;
79 "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;
77 "aeson".flags.cffi = false;
81 "aeson".flags.cffi = false;
78 "aeson".flags.fast = false;
82 "aeson".flags.fast = false;
79 "aeson".flags.bytestring-builder = false;
83 "aeson".flags.bytestring-builder = false;
80 "aeson".flags.developer = false;
84 "aeson".flags.developer = false;
81− "ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.4.4").revisions).default;
85+ "ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.6.4").revisions).default;
82− "th-abstraction".revision = (((hackage."th-abstraction")."0.2.11.0").revisions).default;
86+ "th-abstraction".revision = (((hackage."th-abstraction")."0.3.1.0").revisions).default;
83− "array".revision = (((hackage."array")."0.5.2.0").revisions).default;
87+ "array".revision = (((hackage."array")."0.5.3.0").revisions).default;
84 "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;
88 "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;
85 };
89 };
86 compiler = {
90 compiler = {
87− version = "8.4.4";
91+ version = "8.6.4";
88− nix-name = "ghc844";
92+ nix-name = "ghc864";
89 packages = {
93 packages = {
90− "binary" = "0.8.5.1";
94+ "binary" = "0.8.6.0";
91− "ghc-prim" = "0.5.2.0";
95+ "ghc-prim" = "0.5.3";
92− "stm" = "2.4.5.1";
93 "unix" = "2.7.2.2";
96 "unix" = "2.7.2.2";
94 "rts" = "1.0";
97 "rts" = "1.0";
95− "deepseq" = "1.4.3.0";
98+ "deepseq" = "1.4.4.0";
96− "directory" = "1.3.1.5";
99+ "directory" = "1.3.3.0";
97− "template-haskell" = "2.13.0.0";
100+ "template-haskell" = "2.14.0.0";
98− "containers" = "0.5.11.0";
101+ "containers" = "0.6.0.1";
99 "bytestring" = "0.10.8.2";
102 "bytestring" = "0.10.8.2";
100 "text" = "1.2.3.1";
103 "text" = "1.2.3.1";
101− "base" = "4.11.1.0";
104+ "base" = "4.12.0.0";
102 "time" = "1.8.0.2";
105 "time" = "1.8.0.2";
106+ "transformers" = "0.5.6.2";
103− "filepath" = "1.4.2";
107+ "filepath" = "1.4.2.1";
108+ "process" = "1.6.5.0";
104 "pretty" = "1.1.3.6";
109 "pretty" = "1.1.3.6";
105− "ghc-boot-th" = "8.4.4";
110+ "ghc-boot-th" = "8.6.4";
106− "array" = "0.5.2.0";
111+ "array" = "0.5.3.0";
107 "integer-gmp" = "1.0.2.0";
112 "integer-gmp" = "1.0.2.0";
108 };
113 };
109 };
114 };
110 };
115 };
111 extras = hackage:
116 extras = hackage:
112− { packages = {}; };
117+ { packages = { cabal-sublib = ./.plan.nix/cabal-sublib.nix; }; };
113− }
118+ }
test/with-packages/test-with-packages.nix → test/with-packages/.plan.nix/test-with-packages.nixrenamed+1−1
@@ -17,4 +17,4 @@
17 components = {
17 components = {
18 "library" = { depends = [ (hsPkgs.base) (hsPkgs.lens) ]; };
18 "library" = { depends = [ (hsPkgs.base) (hsPkgs.lens) ]; };
19 };
19 };
20− } // rec { src = (pkgs.lib).mkDefault ./.; }
20+ } // rec { src = (pkgs.lib).mkDefault ../.; }
test/with-packages/default.nix+8−6
@@ -1,14 +1,16 @@
1−{ stdenv, util, mkCabalProjectPkgSet }:
1+{ stdenv, util, mkPkgSet }:
2
2
3with stdenv.lib;
3with stdenv.lib;
4with util;
4with util;
5
5
6let
6let
7− pkgSet = mkCabalProjectPkgSet {
7+ pkgs = import ./pkgs.nix;
8− plan-pkgs = import ./pkgs.nix;
8+ pkgSet = mkPkgSet {
9+ # generated with:
10+ # cabal new-build
11+ # plan-to-nix -o .
12+ pkg-def = pkgs.pkgs;
9− pkg-def-extras = [
13+ pkg-def-extras = [ pkgs.extras ];
10− { test-with-packages = ./test-with-packages.nix; }
11− ];
12 modules = [
14 modules = [
13 # overrides to fix the build
15 # overrides to fix the build
14 {
16 {
test/with-packages/pkgs.nix+38−36
@@ -14,22 +14,22 @@
14 "semigroupoids".flags.contravariant = true;
14 "semigroupoids".flags.contravariant = true;
15 "free".revision = (((hackage."free")."5.1").revisions).default;
15 "free".revision = (((hackage."free")."5.1").revisions).default;
16 "exceptions".revision = (((hackage."exceptions")."0.10.1").revisions).default;
16 "exceptions".revision = (((hackage."exceptions")."0.10.1").revisions).default;
17− "binary".revision = (((hackage."binary")."0.8.5.1").revisions).default;
17+ "binary".revision = (((hackage."binary")."0.8.6.0").revisions).default;
18− "ghc-prim".revision = (((hackage."ghc-prim")."0.5.2.0").revisions).default;
18+ "ghc-prim".revision = (((hackage."ghc-prim")."0.5.3").revisions).default;
19− "bifunctors".revision = (((hackage."bifunctors")."5.5.3").revisions).default;
19+ "bifunctors".revision = (((hackage."bifunctors")."5.5.4").revisions).default;
20 "bifunctors".flags.semigroups = true;
20 "bifunctors".flags.semigroups = true;
21 "bifunctors".flags.tagged = true;
21 "bifunctors".flags.tagged = true;
22− "stm".revision = (((hackage."stm")."2.4.5.1").revisions).default;
22+ "stm".revision = (((hackage."stm")."2.5.0.0").revisions).default;
23 "unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;
23 "unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;
24 "mtl".revision = (((hackage."mtl")."2.2.2").revisions).default;
24 "mtl".revision = (((hackage."mtl")."2.2.2").revisions).default;
25 "rts".revision = (((hackage."rts")."1.0").revisions).default;
25 "rts".revision = (((hackage."rts")."1.0").revisions).default;
26 "adjunctions".revision = (((hackage."adjunctions")."4.4").revisions).default;
26 "adjunctions".revision = (((hackage."adjunctions")."4.4").revisions).default;
27− "invariant".revision = (((hackage."invariant")."0.5.1").revisions).default;
27+ "invariant".revision = (((hackage."invariant")."0.5.2").revisions).default;
28 "distributive".revision = (((hackage."distributive")."0.6").revisions).default;
28 "distributive".revision = (((hackage."distributive")."0.6").revisions).default;
29 "distributive".flags.semigroups = true;
29 "distributive".flags.semigroups = true;
30 "distributive".flags.tagged = true;
30 "distributive".flags.tagged = true;
31 "parallel".revision = (((hackage."parallel")."3.2.2.0").revisions).default;
31 "parallel".revision = (((hackage."parallel")."3.2.2.0").revisions).default;
32− "deepseq".revision = (((hackage."deepseq")."1.4.3.0").revisions).default;
32+ "deepseq".revision = (((hackage."deepseq")."1.4.4.0").revisions).default;
33 "semigroups".revision = (((hackage."semigroups")."0.18.5").revisions).default;
33 "semigroups".revision = (((hackage."semigroups")."0.18.5").revisions).default;
34 "semigroups".flags.bytestring = true;
34 "semigroups".flags.bytestring = true;
35 "semigroups".flags.unordered-containers = true;
35 "semigroups".flags.unordered-containers = true;
@@ -42,7 +42,7 @@
42 "semigroups".flags.deepseq = true;
42 "semigroups".flags.deepseq = true;
43 "semigroups".flags.bytestring-builder = false;
43 "semigroups".flags.bytestring-builder = false;
44 "parsec".revision = (((hackage."parsec")."3.1.13.0").revisions).default;
44 "parsec".revision = (((hackage."parsec")."3.1.13.0").revisions).default;
45− "directory".revision = (((hackage."directory")."1.3.1.5").revisions).default;
45+ "directory".revision = (((hackage."directory")."1.3.3.0").revisions).default;
46 "transformers-compat".revision = (((hackage."transformers-compat")."0.6.4").revisions).default;
46 "transformers-compat".revision = (((hackage."transformers-compat")."0.6.4").revisions).default;
47 "transformers-compat".flags.five = false;
47 "transformers-compat".flags.five = false;
48 "transformers-compat".flags.generic-deriving = true;
48 "transformers-compat".flags.generic-deriving = true;
@@ -51,8 +51,8 @@
51 "transformers-compat".flags.mtl = true;
51 "transformers-compat".flags.mtl = true;
52 "transformers-compat".flags.four = false;
52 "transformers-compat".flags.four = false;
53 "transformers-compat".flags.three = false;
53 "transformers-compat".flags.three = false;
54− "template-haskell".revision = (((hackage."template-haskell")."2.13.0.0").revisions).default;
54+ "template-haskell".revision = (((hackage."template-haskell")."2.14.0.0").revisions).default;
55− "vector".revision = (((hackage."vector")."0.12.0.2").revisions).default;
55+ "vector".revision = (((hackage."vector")."0.12.0.3").revisions).default;
56 "vector".flags.unsafechecks = false;
56 "vector".flags.unsafechecks = false;
57 "vector".flags.internalchecks = false;
57 "vector".flags.internalchecks = false;
58 "vector".flags.wall = false;
58 "vector".flags.wall = false;
@@ -63,7 +63,7 @@
63 "tagged".revision = (((hackage."tagged")."0.8.6").revisions).default;
63 "tagged".revision = (((hackage."tagged")."0.8.6").revisions).default;
64 "tagged".flags.transformers = true;
64 "tagged".flags.transformers = true;
65 "tagged".flags.deepseq = true;
65 "tagged".flags.deepseq = true;
66− "lens".revision = (((hackage."lens")."4.17").revisions).default;
66+ "lens".revision = (((hackage."lens")."4.17.1").revisions).default;
67 "lens".flags.j = false;
67 "lens".flags.j = false;
68 "lens".flags.test-properties = true;
68 "lens".flags.test-properties = true;
69 "lens".flags.old-inline-pragmas = false;
69 "lens".flags.old-inline-pragmas = false;
@@ -75,7 +75,7 @@
75 "lens".flags.dump-splices = false;
75 "lens".flags.dump-splices = false;
76 "lens".flags.test-hunit = true;
76 "lens".flags.test-hunit = true;
77 "lens".flags.safe = false;
77 "lens".flags.safe = false;
78− "containers".revision = (((hackage."containers")."0.5.11.0").revisions).default;
78+ "containers".revision = (((hackage."containers")."0.6.0.1").revisions).default;
79 "reflection".revision = (((hackage."reflection")."2.1.4").revisions).default;
79 "reflection".revision = (((hackage."reflection")."2.1.4").revisions).default;
80 "reflection".flags.slow = false;
80 "reflection".flags.slow = false;
81 "reflection".flags.template-haskell = true;
81 "reflection".flags.template-haskell = true;
@@ -87,10 +87,10 @@
87 "contravariant".flags.statevar = true;
87 "contravariant".flags.statevar = true;
88 "contravariant".flags.safe = false;
88 "contravariant".flags.safe = false;
89 "text".revision = (((hackage."text")."1.2.3.1").revisions).default;
89 "text".revision = (((hackage."text")."1.2.3.1").revisions).default;
90− "Cabal".revision = (((hackage."Cabal")."2.2.0.1").revisions).default;
90+ "Cabal".revision = (((hackage."Cabal")."2.4.0.1").revisions).default;
91 "unordered-containers".revision = (((hackage."unordered-containers")."0.2.10.0").revisions).default;
91 "unordered-containers".revision = (((hackage."unordered-containers")."0.2.10.0").revisions).default;
92 "unordered-containers".flags.debug = false;
92 "unordered-containers".flags.debug = false;
93− "base".revision = (((hackage."base")."4.11.1.0").revisions).default;
93+ "base".revision = (((hackage."base")."4.12.0.0").revisions).default;
94 "comonad".revision = (((hackage."comonad")."5.0.4").revisions).default;
94 "comonad".revision = (((hackage."comonad")."5.0.4").revisions).default;
95 "comonad".flags.distributive = true;
95 "comonad".flags.distributive = true;
96 "comonad".flags.test-doctests = true;
96 "comonad".flags.test-doctests = true;
@@ -105,47 +105,49 @@
105 "hashable".flags.examples = false;
105 "hashable".flags.examples = false;
106 "transformers-base".revision = (((hackage."transformers-base")."0.4.5.2").revisions).default;
106 "transformers-base".revision = (((hackage."transformers-base")."0.4.5.2").revisions).default;
107 "transformers-base".flags.orphaninstances = true;
107 "transformers-base".flags.orphaninstances = true;
108− "filepath".revision = (((hackage."filepath")."1.4.2").revisions).default;
108+ "filepath".revision = (((hackage."filepath")."1.4.2.1").revisions).default;
109− "process".revision = (((hackage."process")."1.6.3.0").revisions).default;
109+ "process".revision = (((hackage."process")."1.6.5.0").revisions).default;
110 "kan-extensions".revision = (((hackage."kan-extensions")."5.2").revisions).default;
110 "kan-extensions".revision = (((hackage."kan-extensions")."5.2").revisions).default;
111 "pretty".revision = (((hackage."pretty")."1.1.3.6").revisions).default;
111 "pretty".revision = (((hackage."pretty")."1.1.3.6").revisions).default;
112 "cabal-doctest".revision = (((hackage."cabal-doctest")."1.0.6").revisions).default;
112 "cabal-doctest".revision = (((hackage."cabal-doctest")."1.0.6").revisions).default;
113− "ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.4.4").revisions).default;
113+ "ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.6.4").revisions).default;
114 "base-orphans".revision = (((hackage."base-orphans")."0.8.1").revisions).default;
114 "base-orphans".revision = (((hackage."base-orphans")."0.8.1").revisions).default;
115− "th-abstraction".revision = (((hackage."th-abstraction")."0.2.11.0").revisions).default;
115+ "th-abstraction".revision = (((hackage."th-abstraction")."0.3.1.0").revisions).default;
116− "array".revision = (((hackage."array")."0.5.2.0").revisions).default;
116+ "array".revision = (((hackage."array")."0.5.3.0").revisions).default;
117 "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;
117 "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;
118 };
118 };
119 compiler = {
119 compiler = {
120− version = "8.4.4";
120+ version = "8.6.4";
121− nix-name = "ghc844";
121+ nix-name = "ghc864";
122 packages = {
122 packages = {
123− "binary" = "0.8.5.1";
123+ "binary" = "0.8.6.0";
124− "ghc-prim" = "0.5.2.0";
124+ "ghc-prim" = "0.5.3";
125− "stm" = "2.4.5.1";
125+ "stm" = "2.5.0.0";
126 "unix" = "2.7.2.2";
126 "unix" = "2.7.2.2";
127 "mtl" = "2.2.2";
127 "mtl" = "2.2.2";
128 "rts" = "1.0";
128 "rts" = "1.0";
129− "deepseq" = "1.4.3.0";
129+ "deepseq" = "1.4.4.0";
130 "parsec" = "3.1.13.0";
130 "parsec" = "3.1.13.0";
131− "directory" = "1.3.1.5";
131+ "directory" = "1.3.3.0";
132− "template-haskell" = "2.13.0.0";
132+ "template-haskell" = "2.14.0.0";
133− "containers" = "0.5.11.0";
133+ "containers" = "0.6.0.1";
134 "bytestring" = "0.10.8.2";
134 "bytestring" = "0.10.8.2";
135 "text" = "1.2.3.1";
135 "text" = "1.2.3.1";
136− "Cabal" = "2.2.0.1";
136+ "Cabal" = "2.4.0.1";
137− "base" = "4.11.1.0";
137+ "base" = "4.12.0.0";
138 "time" = "1.8.0.2";
138 "time" = "1.8.0.2";
139− "transformers" = "0.5.5.0";
139+ "transformers" = "0.5.6.2";
140− "filepath" = "1.4.2";
140+ "filepath" = "1.4.2.1";
141− "process" = "1.6.3.0";
141+ "process" = "1.6.5.0";
142 "pretty" = "1.1.3.6";
142 "pretty" = "1.1.3.6";
143− "ghc-boot-th" = "8.4.4";
143+ "ghc-boot-th" = "8.6.4";
144− "array" = "0.5.2.0";
144+ "array" = "0.5.3.0";
145 "integer-gmp" = "1.0.2.0";
145 "integer-gmp" = "1.0.2.0";
146 };
146 };
147 };
147 };
148 };
148 };
149 extras = hackage:
149 extras = hackage:
150− { packages = {}; };
150+ {
151+ packages = { test-with-packages = ./.plan.nix/test-with-packages.nix; };
152+ };
151− }
153+ }
test/with-packages/test-with-packages.cabal+1−1
@@ -9,7 +9,7 @@ library
9 exposed-modules: TestWithPackages
9 exposed-modules: TestWithPackages
10 -- other-modules:
10 -- other-modules:
11 -- other-extensions:
11 -- other-extensions:
12− build-depends: base ^>=4.11.1.0
12+ build-depends: base
13 , lens
13 , lens
14 -- hs-source-dirs:
14 -- hs-source-dirs:
15 default-language: Haskell2010
15 default-language: Haskell2010