on iko/ghcjs-patch-master help sign in
tests: add more dependencies to the cabal-simple project
78629caRodney Lorrimar
test/cabal-22/default.nix−1
@@ -31,7 +31,6 @@ in
31 printf "checking whether executable runs... " >& 2
31 printf "checking whether executable runs... " >& 2
32 "$exe"
32 "$exe"
33
33
34− # fixme: linux-specific
35 printf "checking that executable is dynamically linked to system libraries... " >& 2
34 printf "checking that executable is dynamically linked to system libraries... " >& 2
36 '' + pkgs.lib.optionalString pkgs.stdenv.isLinux ''
35 '' + pkgs.lib.optionalString pkgs.stdenv.isLinux ''
37 ldd $exe | grep libpthread
36 ldd $exe | grep libpthread
test/cabal-simple/cabal-simple.cabal+5
@@ -19,6 +19,9 @@ library
19 -- other-modules:
19 -- other-modules:
20 -- other-extensions:
20 -- other-extensions:
21 build-depends: base >=4.11 && <4.12
21 build-depends: base >=4.11 && <4.12
22+ , extra
23+ , safe
24+ , aeson
22 -- hs-source-dirs:
25 -- hs-source-dirs:
23 default-language: Haskell2010
26 default-language: Haskell2010
24
27
@@ -27,5 +30,7 @@ executable cabal-simple
27 -- other-modules:
30 -- other-modules:
28 -- other-extensions:
31 -- other-extensions:
29 build-depends: base >=4.11 && <4.12
32 build-depends: base >=4.11 && <4.12
33+ , extra
34+ , optparse-applicative
30 -- hs-source-dirs:
35 -- hs-source-dirs:
31 default-language: Haskell2010
36 default-language: Haskell2010
test/cabal-simple/cabal-simple.nix+11−2
@@ -25,11 +25,20 @@
25 };
25 };
26 components = {
26 components = {
27 "library" = {
27 "library" = {
28+ depends = [
28− depends = [ (hsPkgs.base) ];
29+ (hsPkgs.base)
30+ (hsPkgs.extra)
31+ (hsPkgs.safe)
32+ (hsPkgs.aeson)
33+ ];
29 };
34 };
30 exes = {
35 exes = {
31 "cabal-simple" = {
36 "cabal-simple" = {
37+ depends = [
32− depends = [ (hsPkgs.base) ];
38+ (hsPkgs.base)
39+ (hsPkgs.extra)
40+ (hsPkgs.optparse-applicative)
41+ ];
33 };
42 };
34 };
43 };
35 };
44 };
test/cabal-simple/default.nix+1−1
@@ -49,7 +49,7 @@ in
49 '';
49 '';
50
50
51 meta.platforms = platforms.all;
51 meta.platforms = platforms.all;
52−} // { inherit (packages) cabal-simple; }
52+} // { inherit (packages) cabal-simple; inherit pkgSet; }
53
53
54## steps to generate local files
54## steps to generate local files
55# 1. cabal-to-nix cabal-simple.cabal > cabal-simple.nix
55# 1. cabal-to-nix cabal-simple.cabal > cabal-simple.nix
test/cabal-simple/plan.nix+92
@@ -1,18 +1,110 @@
1hackage:
1hackage:
2 {
2 {
3 packages = {
3 packages = {
4+ "binary".revision = hackage."binary"."0.8.5.1".revisions.default;
4 "ghc-prim".revision = hackage."ghc-prim"."0.5.2.0".revisions.default;
5 "ghc-prim".revision = hackage."ghc-prim"."0.5.2.0".revisions.default;
6+ "extra".revision = hackage."extra"."1.6.14".revisions.default;
7+ "stm".revision = hackage."stm"."2.4.5.1".revisions.default;
8+ "unix".revision = hackage."unix"."2.7.2.2".revisions.default;
5 "rts".revision = hackage."rts"."1.0".revisions.default;
9 "rts".revision = hackage."rts"."1.0".revisions.default;
10+ "clock".revision = hackage."clock"."0.7.2".revisions.default;
11+ "clock".flags.llvm = false;
12+ "scientific".revision = hackage."scientific"."0.3.6.2".revisions.default;
13+ "scientific".flags.integer-simple = false;
14+ "scientific".flags.bytestring-builder = false;
15+ "deepseq".revision = hackage."deepseq"."1.4.3.0".revisions.default;
16+ "random".revision = hackage."random"."1.1".revisions.default;
17+ "uuid-types".revision = hackage."uuid-types"."1.0.3".revisions.default;
18+ "optparse-applicative".revision = hackage."optparse-applicative"."0.14.3.0".revisions.default;
19+ "dlist".revision = hackage."dlist"."0.8.0.5".revisions.default;
20+ "directory".revision = hackage."directory"."1.3.1.5".revisions.default;
21+ "transformers-compat".revision = hackage."transformers-compat"."0.6.2".revisions.default;
22+ "transformers-compat".flags.five = false;
23+ "transformers-compat".flags.generic-deriving = true;
24+ "transformers-compat".flags.two = false;
25+ "transformers-compat".flags.five-three = true;
26+ "transformers-compat".flags.mtl = true;
27+ "transformers-compat".flags.four = false;
28+ "transformers-compat".flags.three = false;
29+ "template-haskell".revision = hackage."template-haskell"."2.13.0.0".revisions.default;
30+ "vector".revision = hackage."vector"."0.12.0.2".revisions.default;
31+ "vector".flags.unsafechecks = false;
32+ "vector".flags.internalchecks = false;
33+ "vector".flags.wall = false;
34+ "vector".flags.boundschecks = true;
35+ "primitive".revision = hackage."primitive"."0.6.4.0".revisions.default;
36+ "time-locale-compat".revision = hackage."time-locale-compat"."0.1.1.5".revisions.default;
37+ "time-locale-compat".flags.old-locale = false;
38+ "safe".revision = hackage."safe"."0.3.17".revisions.default;
39+ "base-compat".revision = hackage."base-compat"."0.10.5".revisions.default;
40+ "ansi-terminal".revision = hackage."ansi-terminal"."0.8.2".revisions.default;
41+ "ansi-terminal".flags.example = false;
42+ "tagged".revision = hackage."tagged"."0.8.6".revisions.default;
43+ "tagged".flags.transformers = true;
44+ "tagged".flags.deepseq = true;
45+ "containers".revision = hackage."containers"."0.5.11.0".revisions.default;
46+ "integer-logarithms".revision = hackage."integer-logarithms"."1.0.2.2".revisions.default;
47+ "integer-logarithms".flags.check-bounds = false;
48+ "integer-logarithms".flags.integer-gmp = true;
49+ "bytestring".revision = hackage."bytestring"."0.10.8.2".revisions.default;
50+ "ansi-wl-pprint".revision = hackage."ansi-wl-pprint"."0.6.8.2".revisions.default;
51+ "ansi-wl-pprint".flags.example = false;
52+ "StateVar".revision = hackage."StateVar"."1.1.1.1".revisions.default;
53+ "contravariant".revision = hackage."contravariant"."1.5".revisions.default;
54+ "contravariant".flags.semigroups = true;
55+ "contravariant".flags.tagged = true;
56+ "contravariant".flags.statevar = true;
57+ "contravariant".flags.safe = false;
58+ "text".revision = hackage."text"."1.2.3.1".revisions.default;
59+ "unordered-containers".revision = hackage."unordered-containers"."0.2.9.0".revisions.default;
60+ "unordered-containers".flags.debug = false;
6 "base".revision = hackage."base"."4.11.1.0".revisions.default;
61 "base".revision = hackage."base"."4.11.1.0".revisions.default;
62+ "time".revision = hackage."time"."1.8.0.2".revisions.default;
63+ "transformers".revision = hackage."transformers"."0.5.5.0".revisions.default;
64+ "hashable".revision = hackage."hashable"."1.2.7.0".revisions.default;
65+ "hashable".flags.sse2 = true;
66+ "hashable".flags.integer-gmp = true;
67+ "hashable".flags.sse41 = false;
68+ "hashable".flags.examples = false;
69+ "attoparsec".revision = hackage."attoparsec"."0.13.2.2".revisions.default;
70+ "attoparsec".flags.developer = false;
71+ "colour".revision = hackage."colour"."2.3.4".revisions.default;
72+ "filepath".revision = hackage."filepath"."1.4.2".revisions.default;
73+ "process".revision = hackage."process"."1.6.3.0".revisions.default;
74+ "pretty".revision = hackage."pretty"."1.1.3.6".revisions.default;
75+ "aeson".revision = hackage."aeson"."1.4.2.0".revisions.default;
76+ "aeson".flags.cffi = false;
77+ "aeson".flags.fast = false;
78+ "aeson".flags.bytestring-builder = false;
79+ "aeson".flags.developer = false;
80+ "ghc-boot-th".revision = hackage."ghc-boot-th"."8.4.4".revisions.default;
81+ "th-abstraction".revision = hackage."th-abstraction"."0.2.10.0".revisions.default;
82+ "array".revision = hackage."array"."0.5.2.0".revisions.default;
7 "integer-gmp".revision = hackage."integer-gmp"."1.0.2.0".revisions.default;
83 "integer-gmp".revision = hackage."integer-gmp"."1.0.2.0".revisions.default;
8 };
84 };
9 compiler = {
85 compiler = {
10 version = "8.4.4";
86 version = "8.4.4";
11 nix-name = "ghc844";
87 nix-name = "ghc844";
12 packages = {
88 packages = {
89+ "binary" = "0.8.5.1";
13 "ghc-prim" = "0.5.2.0";
90 "ghc-prim" = "0.5.2.0";
91+ "stm" = "2.4.5.1";
92+ "unix" = "2.7.2.2";
14 "rts" = "1.0";
93 "rts" = "1.0";
94+ "deepseq" = "1.4.3.0";
95+ "directory" = "1.3.1.5";
96+ "template-haskell" = "2.13.0.0";
97+ "containers" = "0.5.11.0";
98+ "bytestring" = "0.10.8.2";
99+ "text" = "1.2.3.1";
15 "base" = "4.11.1.0";
100 "base" = "4.11.1.0";
101+ "time" = "1.8.0.2";
102+ "transformers" = "0.5.5.0";
103+ "filepath" = "1.4.2";
104+ "process" = "1.6.3.0";
105+ "pretty" = "1.1.3.6";
106+ "ghc-boot-th" = "8.4.4";
107+ "array" = "0.5.2.0";
16 "integer-gmp" = "1.0.2.0";
108 "integer-gmp" = "1.0.2.0";
17 };
109 };
18 };
110 };