git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Try to fix tests (#138)

* tests: Regenerate nix * tests: Use mkCabalProjectPkgSet * tests: Disable callCabalProjectToNix test

commitfa6327eb24d15f27414f32e86fa14252ebac2325 authorRodney Lorrimar <rodney.lorrimar@iohk.io> dateMon 20 May 2019, 23:29 (7 years ago) parent8f8b626
14 files changed+165−130
compare with iko/ghcjs-patch-master
unifiedsplit
test/builder-haddock/.plan.nix/test-haddock.nix+18 test/builder-haddock/default.nix−3 test/builder-haddock/pkgs.nix+1−1 test/cabal-22/.plan.nix/project.nix+21 test/cabal-22/default.nix−4 test/cabal-22/pkgs.nix+1−1 test/cabal-simple/.plan.nix/cabal-simple.nix+1−1 test/cabal-simple/default.nix+3−8 test/cabal-simple/pkgs.nix+36−30 test/cabal-sublib/default.nix+3−8 test/cabal-sublib/pkgs.nix+36−30 test/default.nix+3−1 test/with-packages/.plan.nix/test-with-packages.nix+1−1 test/with-packages/pkgs.nix+41−42
test/builder-haddock/.plan.nix/test-haddock.nixnew file+18
@@ -0,0 +1,18 @@
1+{ system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }:
2+ {
3+ flags = {};
4+ package = {
5+ specVersion = "2.2";
6+ identifier = { name = "test-haddock"; version = "0.1.0.0"; };
7+ license = "NONE";
8+ copyright = "";
9+ maintainer = "rodney.lorrimar@iohk.io";
10+ author = "Rodney Lorrimar";
11+ homepage = "";
12+ url = "";
13+ synopsis = "";
14+ description = "";
15+ buildType = "Simple";
16+ };
17+ components = { "library" = { depends = [ (hsPkgs.base) (hsPkgs.stm) ]; }; };
18+ } // rec { src = (pkgs.lib).mkDefault ../.; }
test/builder-haddock/default.nix−3
@@ -5,9 +5,6 @@ with stdenv.lib;
55let
66 pkgSet = mkCabalProjectPkgSet {
77 plan-pkgs = import ./pkgs.nix;
8− pkg-def-extras = [
9− { test-haddock = ./test-haddock.nix; }
10− ];
118 modules = [
129 # overrides to fix the build
1310 {
test/builder-haddock/pkgs.nix+1−1
@@ -23,5 +23,5 @@
2323 };
2424 };
2525 extras = hackage:
26− { packages = {}; };
26+ { packages = { test-haddock = ./.plan.nix/test-haddock.nix; }; };
2727 }
test/cabal-22/.plan.nix/project.nixnew file+21
@@ -0,0 +1,21 @@
1+{ system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }:
2+ {
3+ flags = {};
4+ package = {
5+ specVersion = "2.2";
6+ identifier = { name = "project"; version = "0.1.0.0"; };
7+ license = "NONE";
8+ copyright = "";
9+ maintainer = "rodney.lorrimar@iohk.io";
10+ author = "Rodney Lorrimar";
11+ homepage = "";
12+ url = "";
13+ synopsis = "";
14+ description = "";
15+ buildType = "Simple";
16+ };
17+ components = {
18+ "library" = { depends = [ (hsPkgs.base) ]; };
19+ exes = { "project" = { depends = [ (hsPkgs.base) (hsPkgs.project) ]; }; };
20+ };
21+ } // rec { src = (pkgs.lib).mkDefault ../.; }
test/cabal-22/default.nix−4
@@ -5,10 +5,6 @@ with stdenv.lib;
55let
66 pkgSet = mkCabalProjectPkgSet {
77 plan-pkgs = import ./pkgs.nix;
8− pkg-def-extras = [
9− { project = ./project.nix; }
10− ];
11− modules = [ ];
128 };
139
1410 packages = pkgSet.config.hsPkgs;
test/cabal-22/pkgs.nix+1−1
@@ -19,5 +19,5 @@
1919 };
2020 };
2121 extras = hackage:
22− { packages = {}; };
22+ { packages = { project = ./.plan.nix/project.nix; }; };
2323 }
test/cabal-simple/.plan.nix/cabal-simple.nix+1−1
@@ -29,4 +29,4 @@
2929 };
3030 };
3131 };
32− } // rec { src = (pkgs.lib).mkDefault ../.; }
32+ } // rec { src = (pkgs.lib).mkDefault ../.; }
test/cabal-simple/default.nix+3−8
@@ -1,16 +1,11 @@
11# Test a package set
2−{ stdenv, util, mkPkgSet }:
2+{ stdenv, util, mkCabalProjectPkgSet }:
33
44with stdenv.lib;
55
66let
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 ];
7+ pkgSet = mkCabalProjectPkgSet {
8+ plan-pkgs = import ./pkgs.nix;
149 modules = [
1510 {
1611 # Package has no exposed modules which causes
test/cabal-simple/pkgs.nix+36−30
@@ -2,9 +2,10 @@
22 pkgs = hackage:
33 {
44 packages = {
5− "binary".revision = (((hackage."binary")."0.8.6.0").revisions).default;
6− "ghc-prim".revision = (((hackage."ghc-prim")."0.5.3").revisions).default;
5+ "binary".revision = (((hackage."binary")."0.8.5.1").revisions).default;
6+ "ghc-prim".revision = (((hackage."ghc-prim")."0.5.2.0").revisions).default;
77 "extra".revision = (((hackage."extra")."1.6.15").revisions).default;
8+ "stm".revision = (((hackage."stm")."2.4.5.1").revisions).default;
89 "unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;
910 "rts".revision = (((hackage."rts")."1.0").revisions).default;
1011 "clock".revision = (((hackage."clock")."0.8").revisions).default;
@@ -12,12 +13,12 @@
1213 "scientific".revision = (((hackage."scientific")."0.3.6.2").revisions).default;
1314 "scientific".flags.integer-simple = false;
1415 "scientific".flags.bytestring-builder = false;
15− "deepseq".revision = (((hackage."deepseq")."1.4.4.0").revisions).default;
16+ "deepseq".revision = (((hackage."deepseq")."1.4.3.0").revisions).default;
1617 "random".revision = (((hackage."random")."1.1").revisions).default;
1718 "uuid-types".revision = (((hackage."uuid-types")."1.0.3").revisions).default;
1819 "optparse-applicative".revision = (((hackage."optparse-applicative")."0.14.3.0").revisions).default;
1920 "dlist".revision = (((hackage."dlist")."0.8.0.6").revisions).default;
20− "semigroups".revision = (((hackage."semigroups")."0.18.5").revisions).default;
21+ "semigroups".revision = (((hackage."semigroups")."0.19").revisions).default;
2122 "semigroups".flags.bytestring = true;
2223 "semigroups".flags.unordered-containers = true;
2324 "semigroups".flags.text = true;
@@ -28,8 +29,9 @@
2829 "semigroups".flags.transformers = true;
2930 "semigroups".flags.deepseq = true;
3031 "semigroups".flags.bytestring-builder = false;
31− "directory".revision = (((hackage."directory")."1.3.3.0").revisions).default;
32− "transformers-compat".revision = (((hackage."transformers-compat")."0.6.4").revisions).default;
32+ "semigroups".flags.template-haskell = true;
33+ "directory".revision = (((hackage."directory")."1.3.1.5").revisions).default;
34+ "transformers-compat".revision = (((hackage."transformers-compat")."0.6.5").revisions).default;
3335 "transformers-compat".flags.five = false;
3436 "transformers-compat".flags.generic-deriving = true;
3537 "transformers-compat".flags.two = false;
@@ -37,7 +39,7 @@
3739 "transformers-compat".flags.mtl = true;
3840 "transformers-compat".flags.four = false;
3941 "transformers-compat".flags.three = false;
40− "template-haskell".revision = (((hackage."template-haskell")."2.14.0.0").revisions).default;
42+ "template-haskell".revision = (((hackage."template-haskell")."2.13.0.0").revisions).default;
4143 "vector".revision = (((hackage."vector")."0.12.0.3").revisions).default;
4244 "vector".flags.unsafechecks = false;
4345 "vector".flags.internalchecks = false;
@@ -48,22 +50,27 @@
4850 "time-locale-compat".flags.old-locale = false;
4951 "safe".revision = (((hackage."safe")."0.3.17").revisions).default;
5052 "base-compat".revision = (((hackage."base-compat")."0.10.5").revisions).default;
51− "ansi-terminal".revision = (((hackage."ansi-terminal")."0.9").revisions).default;
53+ "ansi-terminal".revision = (((hackage."ansi-terminal")."0.9.1").revisions).default;
5254 "ansi-terminal".flags.example = false;
5355 "tagged".revision = (((hackage."tagged")."0.8.6").revisions).default;
5456 "tagged".flags.transformers = true;
5557 "tagged".flags.deepseq = true;
56− "containers".revision = (((hackage."containers")."0.6.0.1").revisions).default;
58+ "containers".revision = (((hackage."containers")."0.5.11.0").revisions).default;
5759 "integer-logarithms".revision = (((hackage."integer-logarithms")."1.0.3").revisions).default;
5860 "integer-logarithms".flags.check-bounds = false;
5961 "integer-logarithms".flags.integer-gmp = true;
6062 "bytestring".revision = (((hackage."bytestring")."0.10.8.2").revisions).default;
61− "ansi-wl-pprint".revision = (((hackage."ansi-wl-pprint")."0.6.8.2").revisions).default;
63+ "ansi-wl-pprint".revision = (((hackage."ansi-wl-pprint")."0.6.9").revisions).default;
6264 "ansi-wl-pprint".flags.example = false;
65+ "StateVar".revision = (((hackage."StateVar")."1.1.1.1").revisions).default;
66+ "contravariant".revision = (((hackage."contravariant")."1.5.1").revisions).default;
67+ "contravariant".flags.semigroups = true;
68+ "contravariant".flags.tagged = true;
69+ "contravariant".flags.statevar = true;
6370 "text".revision = (((hackage."text")."1.2.3.1").revisions).default;
6471 "unordered-containers".revision = (((hackage."unordered-containers")."0.2.10.0").revisions).default;
6572 "unordered-containers".flags.debug = false;
66− "base".revision = (((hackage."base")."4.12.0.0").revisions).default;
73+ "base".revision = (((hackage."base")."4.11.1.0").revisions).default;
6774 "time".revision = (((hackage."time")."1.8.0.2").revisions).default;
6875 "transformers".revision = (((hackage."transformers")."0.5.6.2").revisions).default;
6976 "hashable".revision = (((hackage."hashable")."1.2.7.0").revisions).default;
@@ -73,8 +80,8 @@
7380 "hashable".flags.examples = false;
7481 "attoparsec".revision = (((hackage."attoparsec")."0.13.2.2").revisions).default;
7582 "attoparsec".flags.developer = false;
76− "colour".revision = (((hackage."colour")."2.3.4").revisions).default;
77− "filepath".revision = (((hackage."filepath")."1.4.2.1").revisions).default;
83+ "colour".revision = (((hackage."colour")."2.3.5").revisions).default;
84+ "filepath".revision = (((hackage."filepath")."1.4.2").revisions).default;
7885 "process".revision = (((hackage."process")."1.6.5.0").revisions).default;
7986 "pretty".revision = (((hackage."pretty")."1.1.3.6").revisions).default;
8087 "aeson".revision = (((hackage."aeson")."1.4.3.0").revisions).default;
@@ -82,37 +89,36 @@
8289 "aeson".flags.fast = false;
8390 "aeson".flags.bytestring-builder = false;
8491 "aeson".flags.developer = false;
85− "ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.6.4").revisions).default;
92+ "ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.4.4").revisions).default;
8693 "th-abstraction".revision = (((hackage."th-abstraction")."0.3.1.0").revisions).default;
87− "array".revision = (((hackage."array")."0.5.3.0").revisions).default;
94+ "array".revision = (((hackage."array")."0.5.2.0").revisions).default;
8895 "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;
8996 };
9097 compiler = {
91− version = "8.6.4";
92− nix-name = "ghc864";
98+ version = "8.4.4";
99+ nix-name = "ghc844";
93100 packages = {
94− "binary" = "0.8.6.0";
95− "ghc-prim" = "0.5.3";
101+ "binary" = "0.8.5.1";
102+ "ghc-prim" = "0.5.2.0";
103+ "stm" = "2.4.5.1";
96104 "unix" = "2.7.2.2";
97105 "rts" = "1.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";
106+ "deepseq" = "1.4.3.0";
107+ "directory" = "1.3.1.5";
108+ "template-haskell" = "2.13.0.0";
109+ "containers" = "0.5.11.0";
102110 "bytestring" = "0.10.8.2";
103111 "text" = "1.2.3.1";
104− "base" = "4.12.0.0";
112+ "base" = "4.11.1.0";
105113 "time" = "1.8.0.2";
106− "transformers" = "0.5.6.2";
107− "filepath" = "1.4.2.1";
108− "process" = "1.6.5.0";
114+ "filepath" = "1.4.2";
109115 "pretty" = "1.1.3.6";
110− "ghc-boot-th" = "8.6.4";
111− "array" = "0.5.3.0";
116+ "ghc-boot-th" = "8.4.4";
117+ "array" = "0.5.2.0";
112118 "integer-gmp" = "1.0.2.0";
113119 };
114120 };
115121 };
116122 extras = hackage:
117123 { packages = { cabal-simple = ./.plan.nix/cabal-simple.nix; }; };
118− }
124+ }
test/cabal-sublib/default.nix+3−8
@@ -1,16 +1,11 @@
11# Test a package set
2−{ stdenv, util, mkPkgSet }:
2+{ stdenv, util, mkCabalProjectPkgSet }:
33
44with stdenv.lib;
55
66let
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 ];
7+ pkgSet = mkCabalProjectPkgSet {
8+ plan-pkgs = import ./pkgs.nix;
149 modules = [
1510 {
1611 # Package has no exposed modules which causes
test/cabal-sublib/pkgs.nix+36−30
@@ -2,9 +2,10 @@
22 pkgs = hackage:
33 {
44 packages = {
5− "binary".revision = (((hackage."binary")."0.8.6.0").revisions).default;
6− "ghc-prim".revision = (((hackage."ghc-prim")."0.5.3").revisions).default;
5+ "binary".revision = (((hackage."binary")."0.8.5.1").revisions).default;
6+ "ghc-prim".revision = (((hackage."ghc-prim")."0.5.2.0").revisions).default;
77 "extra".revision = (((hackage."extra")."1.6.15").revisions).default;
8+ "stm".revision = (((hackage."stm")."2.4.5.1").revisions).default;
89 "unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;
910 "rts".revision = (((hackage."rts")."1.0").revisions).default;
1011 "clock".revision = (((hackage."clock")."0.8").revisions).default;
@@ -12,12 +13,12 @@
1213 "scientific".revision = (((hackage."scientific")."0.3.6.2").revisions).default;
1314 "scientific".flags.integer-simple = false;
1415 "scientific".flags.bytestring-builder = false;
15− "deepseq".revision = (((hackage."deepseq")."1.4.4.0").revisions).default;
16+ "deepseq".revision = (((hackage."deepseq")."1.4.3.0").revisions).default;
1617 "random".revision = (((hackage."random")."1.1").revisions).default;
1718 "uuid-types".revision = (((hackage."uuid-types")."1.0.3").revisions).default;
1819 "optparse-applicative".revision = (((hackage."optparse-applicative")."0.14.3.0").revisions).default;
1920 "dlist".revision = (((hackage."dlist")."0.8.0.6").revisions).default;
20− "semigroups".revision = (((hackage."semigroups")."0.18.5").revisions).default;
21+ "semigroups".revision = (((hackage."semigroups")."0.19").revisions).default;
2122 "semigroups".flags.bytestring = true;
2223 "semigroups".flags.unordered-containers = true;
2324 "semigroups".flags.text = true;
@@ -28,8 +29,9 @@
2829 "semigroups".flags.transformers = true;
2930 "semigroups".flags.deepseq = true;
3031 "semigroups".flags.bytestring-builder = false;
31− "directory".revision = (((hackage."directory")."1.3.3.0").revisions).default;
32− "transformers-compat".revision = (((hackage."transformers-compat")."0.6.4").revisions).default;
32+ "semigroups".flags.template-haskell = true;
33+ "directory".revision = (((hackage."directory")."1.3.1.5").revisions).default;
34+ "transformers-compat".revision = (((hackage."transformers-compat")."0.6.5").revisions).default;
3335 "transformers-compat".flags.five = false;
3436 "transformers-compat".flags.generic-deriving = true;
3537 "transformers-compat".flags.two = false;
@@ -37,7 +39,7 @@
3739 "transformers-compat".flags.mtl = true;
3840 "transformers-compat".flags.four = false;
3941 "transformers-compat".flags.three = false;
40− "template-haskell".revision = (((hackage."template-haskell")."2.14.0.0").revisions).default;
42+ "template-haskell".revision = (((hackage."template-haskell")."2.13.0.0").revisions).default;
4143 "vector".revision = (((hackage."vector")."0.12.0.3").revisions).default;
4244 "vector".flags.unsafechecks = false;
4345 "vector".flags.internalchecks = false;
@@ -48,22 +50,27 @@
4850 "time-locale-compat".flags.old-locale = false;
4951 "safe".revision = (((hackage."safe")."0.3.17").revisions).default;
5052 "base-compat".revision = (((hackage."base-compat")."0.10.5").revisions).default;
51− "ansi-terminal".revision = (((hackage."ansi-terminal")."0.9").revisions).default;
53+ "ansi-terminal".revision = (((hackage."ansi-terminal")."0.9.1").revisions).default;
5254 "ansi-terminal".flags.example = false;
5355 "tagged".revision = (((hackage."tagged")."0.8.6").revisions).default;
5456 "tagged".flags.transformers = true;
5557 "tagged".flags.deepseq = true;
56− "containers".revision = (((hackage."containers")."0.6.0.1").revisions).default;
58+ "containers".revision = (((hackage."containers")."0.5.11.0").revisions).default;
5759 "integer-logarithms".revision = (((hackage."integer-logarithms")."1.0.3").revisions).default;
5860 "integer-logarithms".flags.check-bounds = false;
5961 "integer-logarithms".flags.integer-gmp = true;
6062 "bytestring".revision = (((hackage."bytestring")."0.10.8.2").revisions).default;
61− "ansi-wl-pprint".revision = (((hackage."ansi-wl-pprint")."0.6.8.2").revisions).default;
63+ "ansi-wl-pprint".revision = (((hackage."ansi-wl-pprint")."0.6.9").revisions).default;
6264 "ansi-wl-pprint".flags.example = false;
65+ "StateVar".revision = (((hackage."StateVar")."1.1.1.1").revisions).default;
66+ "contravariant".revision = (((hackage."contravariant")."1.5.1").revisions).default;
67+ "contravariant".flags.semigroups = true;
68+ "contravariant".flags.tagged = true;
69+ "contravariant".flags.statevar = true;
6370 "text".revision = (((hackage."text")."1.2.3.1").revisions).default;
6471 "unordered-containers".revision = (((hackage."unordered-containers")."0.2.10.0").revisions).default;
6572 "unordered-containers".flags.debug = false;
66− "base".revision = (((hackage."base")."4.12.0.0").revisions).default;
73+ "base".revision = (((hackage."base")."4.11.1.0").revisions).default;
6774 "time".revision = (((hackage."time")."1.8.0.2").revisions).default;
6875 "transformers".revision = (((hackage."transformers")."0.5.6.2").revisions).default;
6976 "hashable".revision = (((hackage."hashable")."1.2.7.0").revisions).default;
@@ -73,8 +80,8 @@
7380 "hashable".flags.examples = false;
7481 "attoparsec".revision = (((hackage."attoparsec")."0.13.2.2").revisions).default;
7582 "attoparsec".flags.developer = false;
76− "colour".revision = (((hackage."colour")."2.3.4").revisions).default;
77− "filepath".revision = (((hackage."filepath")."1.4.2.1").revisions).default;
83+ "colour".revision = (((hackage."colour")."2.3.5").revisions).default;
84+ "filepath".revision = (((hackage."filepath")."1.4.2").revisions).default;
7885 "process".revision = (((hackage."process")."1.6.5.0").revisions).default;
7986 "pretty".revision = (((hackage."pretty")."1.1.3.6").revisions).default;
8087 "aeson".revision = (((hackage."aeson")."1.4.3.0").revisions).default;
@@ -82,37 +89,36 @@
8289 "aeson".flags.fast = false;
8390 "aeson".flags.bytestring-builder = false;
8491 "aeson".flags.developer = false;
85− "ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.6.4").revisions).default;
92+ "ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.4.4").revisions).default;
8693 "th-abstraction".revision = (((hackage."th-abstraction")."0.3.1.0").revisions).default;
87− "array".revision = (((hackage."array")."0.5.3.0").revisions).default;
94+ "array".revision = (((hackage."array")."0.5.2.0").revisions).default;
8895 "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;
8996 };
9097 compiler = {
91− version = "8.6.4";
92− nix-name = "ghc864";
98+ version = "8.4.4";
99+ nix-name = "ghc844";
93100 packages = {
94− "binary" = "0.8.6.0";
95− "ghc-prim" = "0.5.3";
101+ "binary" = "0.8.5.1";
102+ "ghc-prim" = "0.5.2.0";
103+ "stm" = "2.4.5.1";
96104 "unix" = "2.7.2.2";
97105 "rts" = "1.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";
106+ "deepseq" = "1.4.3.0";
107+ "directory" = "1.3.1.5";
108+ "template-haskell" = "2.13.0.0";
109+ "containers" = "0.5.11.0";
102110 "bytestring" = "0.10.8.2";
103111 "text" = "1.2.3.1";
104− "base" = "4.12.0.0";
112+ "base" = "4.11.1.0";
105113 "time" = "1.8.0.2";
106− "transformers" = "0.5.6.2";
107− "filepath" = "1.4.2.1";
108− "process" = "1.6.5.0";
114+ "filepath" = "1.4.2";
109115 "pretty" = "1.1.3.6";
110− "ghc-boot-th" = "8.6.4";
111− "array" = "0.5.3.0";
116+ "ghc-boot-th" = "8.4.4";
117+ "array" = "0.5.2.0";
112118 "integer-gmp" = "1.0.2.0";
113119 };
114120 };
115121 };
116122 extras = hackage:
117123 { packages = { cabal-sublib = ./.plan.nix/cabal-sublib.nix; }; };
118− }
124+ }
test/default.nix+3−1
@@ -16,7 +16,9 @@ in {
1616 builder-haddock = haskell.callPackage ./builder-haddock {};
1717 stack-simple = haskell.callPackage ./stack-simple {};
1818 callStackToNix = haskell.callPackage ./callStackToNix {};
19− callCabalProjectToNix = haskell.callPackage ./call-cabal-project-to-nix {};
19+
20+ # Disabled -- doesn't work in a sandboxed build
21+ # callCabalProjectToNix = haskell.callPackage ./call-cabal-project-to-nix {};
2022
2123 # Run unit tests with: nix-instantiate --eval --strict -A unit
2224 # An empty list means success.
test/with-packages/.plan.nix/test-with-packages.nix+1−1
@@ -17,4 +17,4 @@
1717 components = {
1818 "library" = { depends = [ (hsPkgs.base) (hsPkgs.lens) ]; };
1919 };
20− } // rec { src = (pkgs.lib).mkDefault ../.; }
20+ } // rec { src = (pkgs.lib).mkDefault ../.; }
test/with-packages/pkgs.nix+41−42
@@ -2,7 +2,7 @@
22 pkgs = hackage:
33 {
44 packages = {
5− "void".revision = (((hackage."void")."0.7.2").revisions).default;
5+ "void".revision = (((hackage."void")."0.7.3").revisions).default;
66 "void".flags.safe = false;
77 "semigroupoids".revision = (((hackage."semigroupoids")."5.3.2").revisions).default;
88 "semigroupoids".flags.comonad = true;
@@ -12,25 +12,25 @@
1212 "semigroupoids".flags.tagged = true;
1313 "semigroupoids".flags.containers = true;
1414 "semigroupoids".flags.contravariant = true;
15− "free".revision = (((hackage."free")."5.1").revisions).default;
16− "exceptions".revision = (((hackage."exceptions")."0.10.1").revisions).default;
17− "binary".revision = (((hackage."binary")."0.8.6.0").revisions).default;
18− "ghc-prim".revision = (((hackage."ghc-prim")."0.5.3").revisions).default;
15+ "free".revision = (((hackage."free")."5.1.1").revisions).default;
16+ "exceptions".revision = (((hackage."exceptions")."0.10.2").revisions).default;
17+ "binary".revision = (((hackage."binary")."0.8.5.1").revisions).default;
18+ "ghc-prim".revision = (((hackage."ghc-prim")."0.5.2.0").revisions).default;
1919 "bifunctors".revision = (((hackage."bifunctors")."5.5.4").revisions).default;
2020 "bifunctors".flags.semigroups = true;
2121 "bifunctors".flags.tagged = true;
22− "stm".revision = (((hackage."stm")."2.5.0.0").revisions).default;
22+ "stm".revision = (((hackage."stm")."2.4.5.1").revisions).default;
2323 "unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;
2424 "mtl".revision = (((hackage."mtl")."2.2.2").revisions).default;
2525 "rts".revision = (((hackage."rts")."1.0").revisions).default;
2626 "adjunctions".revision = (((hackage."adjunctions")."4.4").revisions).default;
27− "invariant".revision = (((hackage."invariant")."0.5.2").revisions).default;
27+ "invariant".revision = (((hackage."invariant")."0.5.3").revisions).default;
2828 "distributive".revision = (((hackage."distributive")."0.6").revisions).default;
2929 "distributive".flags.semigroups = true;
3030 "distributive".flags.tagged = true;
3131 "parallel".revision = (((hackage."parallel")."3.2.2.0").revisions).default;
32− "deepseq".revision = (((hackage."deepseq")."1.4.4.0").revisions).default;
33− "semigroups".revision = (((hackage."semigroups")."0.18.5").revisions).default;
32+ "deepseq".revision = (((hackage."deepseq")."1.4.3.0").revisions).default;
33+ "semigroups".revision = (((hackage."semigroups")."0.19").revisions).default;
3434 "semigroups".flags.bytestring = true;
3535 "semigroups".flags.unordered-containers = true;
3636 "semigroups".flags.text = true;
@@ -41,9 +41,10 @@
4141 "semigroups".flags.transformers = true;
4242 "semigroups".flags.deepseq = true;
4343 "semigroups".flags.bytestring-builder = false;
44+ "semigroups".flags.template-haskell = true;
4445 "parsec".revision = (((hackage."parsec")."3.1.13.0").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+ "directory".revision = (((hackage."directory")."1.3.1.5").revisions).default;
47+ "transformers-compat".revision = (((hackage."transformers-compat")."0.6.5").revisions).default;
4748 "transformers-compat".flags.five = false;
4849 "transformers-compat".flags.generic-deriving = true;
4950 "transformers-compat".flags.two = false;
@@ -51,15 +52,15 @@
5152 "transformers-compat".flags.mtl = true;
5253 "transformers-compat".flags.four = false;
5354 "transformers-compat".flags.three = false;
54− "template-haskell".revision = (((hackage."template-haskell")."2.14.0.0").revisions).default;
55+ "template-haskell".revision = (((hackage."template-haskell")."2.13.0.0").revisions).default;
5556 "vector".revision = (((hackage."vector")."0.12.0.3").revisions).default;
5657 "vector".flags.unsafechecks = false;
5758 "vector".flags.internalchecks = false;
5859 "vector".flags.wall = false;
5960 "vector".flags.boundschecks = true;
6061 "call-stack".revision = (((hackage."call-stack")."0.1.0").revisions).default;
61− "primitive".revision = (((hackage."primitive")."0.6.4.0").revisions).default;
62− "profunctors".revision = (((hackage."profunctors")."5.3").revisions).default;
62+ "primitive".revision = (((hackage."primitive")."0.7.0.0").revisions).default;
63+ "profunctors".revision = (((hackage."profunctors")."5.4").revisions).default;
6364 "tagged".revision = (((hackage."tagged")."0.8.6").revisions).default;
6465 "tagged".flags.transformers = true;
6566 "tagged".flags.deepseq = true;
@@ -75,27 +76,25 @@
7576 "lens".flags.dump-splices = false;
7677 "lens".flags.test-hunit = true;
7778 "lens".flags.safe = false;
78− "containers".revision = (((hackage."containers")."0.6.0.1").revisions).default;
79+ "containers".revision = (((hackage."containers")."0.5.11.0").revisions).default;
7980 "reflection".revision = (((hackage."reflection")."2.1.4").revisions).default;
8081 "reflection".flags.slow = false;
8182 "reflection".flags.template-haskell = true;
8283 "bytestring".revision = (((hackage."bytestring")."0.10.8.2").revisions).default;
8384 "StateVar".revision = (((hackage."StateVar")."1.1.1.1").revisions).default;
84− "contravariant".revision = (((hackage."contravariant")."1.5").revisions).default;
85+ "contravariant".revision = (((hackage."contravariant")."1.5.1").revisions).default;
8586 "contravariant".flags.semigroups = true;
8687 "contravariant".flags.tagged = true;
8788 "contravariant".flags.statevar = true;
88− "contravariant".flags.safe = false;
8989 "text".revision = (((hackage."text")."1.2.3.1").revisions).default;
90− "Cabal".revision = (((hackage."Cabal")."2.4.0.1").revisions).default;
90+ "Cabal".revision = (((hackage."Cabal")."2.2.0.1").revisions).default;
9191 "unordered-containers".revision = (((hackage."unordered-containers")."0.2.10.0").revisions).default;
9292 "unordered-containers".flags.debug = false;
93− "base".revision = (((hackage."base")."4.12.0.0").revisions).default;
94− "comonad".revision = (((hackage."comonad")."5.0.4").revisions).default;
93+ "base".revision = (((hackage."base")."4.11.1.0").revisions).default;
94+ "comonad".revision = (((hackage."comonad")."5.0.5").revisions).default;
9595 "comonad".flags.distributive = true;
9696 "comonad".flags.test-doctests = true;
9797 "comonad".flags.containers = true;
98− "comonad".flags.contravariant = true;
9998 "time".revision = (((hackage."time")."1.8.0.2").revisions).default;
10099 "transformers".revision = (((hackage."transformers")."0.5.6.2").revisions).default;
101100 "hashable".revision = (((hackage."hashable")."1.2.7.0").revisions).default;
@@ -105,43 +104,43 @@
105104 "hashable".flags.examples = false;
106105 "transformers-base".revision = (((hackage."transformers-base")."0.4.5.2").revisions).default;
107106 "transformers-base".flags.orphaninstances = true;
108− "filepath".revision = (((hackage."filepath")."1.4.2.1").revisions).default;
109− "process".revision = (((hackage."process")."1.6.5.0").revisions).default;
107+ "filepath".revision = (((hackage."filepath")."1.4.2").revisions).default;
108+ "process".revision = (((hackage."process")."1.6.3.0").revisions).default;
110109 "kan-extensions".revision = (((hackage."kan-extensions")."5.2").revisions).default;
111110 "pretty".revision = (((hackage."pretty")."1.1.3.6").revisions).default;
112111 "cabal-doctest".revision = (((hackage."cabal-doctest")."1.0.6").revisions).default;
113− "ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.6.4").revisions).default;
112+ "ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.4.4").revisions).default;
114113 "base-orphans".revision = (((hackage."base-orphans")."0.8.1").revisions).default;
115114 "th-abstraction".revision = (((hackage."th-abstraction")."0.3.1.0").revisions).default;
116− "array".revision = (((hackage."array")."0.5.3.0").revisions).default;
115+ "array".revision = (((hackage."array")."0.5.2.0").revisions).default;
117116 "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;
118117 };
119118 compiler = {
120− version = "8.6.4";
121− nix-name = "ghc864";
119+ version = "8.4.4";
120+ nix-name = "ghc844";
122121 packages = {
123− "binary" = "0.8.6.0";
124− "ghc-prim" = "0.5.3";
125− "stm" = "2.5.0.0";
122+ "binary" = "0.8.5.1";
123+ "ghc-prim" = "0.5.2.0";
124+ "stm" = "2.4.5.1";
126125 "unix" = "2.7.2.2";
127126 "mtl" = "2.2.2";
128127 "rts" = "1.0";
129− "deepseq" = "1.4.4.0";
128+ "deepseq" = "1.4.3.0";
130129 "parsec" = "3.1.13.0";
131− "directory" = "1.3.3.0";
132− "template-haskell" = "2.14.0.0";
133− "containers" = "0.6.0.1";
130+ "directory" = "1.3.1.5";
131+ "template-haskell" = "2.13.0.0";
132+ "containers" = "0.5.11.0";
134133 "bytestring" = "0.10.8.2";
135134 "text" = "1.2.3.1";
136− "Cabal" = "2.4.0.1";
137− "base" = "4.12.0.0";
135+ "Cabal" = "2.2.0.1";
136+ "base" = "4.11.1.0";
138137 "time" = "1.8.0.2";
139− "transformers" = "0.5.6.2";
140− "filepath" = "1.4.2.1";
141− "process" = "1.6.5.0";
138+ "transformers" = "0.5.5.0";
139+ "filepath" = "1.4.2";
140+ "process" = "1.6.3.0";
142141 "pretty" = "1.1.3.6";
143− "ghc-boot-th" = "8.6.4";
144− "array" = "0.5.3.0";
142+ "ghc-boot-th" = "8.4.4";
143+ "array" = "0.5.2.0";
145144 "integer-gmp" = "1.0.2.0";
146145 };
147146 };
@@ -150,4 +149,4 @@
150149 {
151150 packages = { test-with-packages = ./.plan.nix/test-with-packages.nix; };
152151 };
153− }
152+ }