on iko/ghcjs-patch-master help sign in
Add cross-compiled musl libc builds of tests (#157)

* Add cross-compiled musl libc builds of tests * Bump nixpkgs to latest 19.03 * tests: Update stack-simple LTS * docs: Add note about tests * Regenerate tests * haskellPackages: lts-13.18 -> lts-13.26 This contains GHC 8.6.5 which can successfully build under pkgsCross.musl64, whereas GHC 8.6.4 could not. * Bump nix-tools * Regenerate nix-tools -- changed compiler from GHC 8.6.4 -> GHC 8.6.5.

commit3bb58214f10cfded2b500eba24a9f9cd991cae28 authorRodney Lorrimar <rodney.lorrimar@iohk.io> dateTue 2 Jul 2019, 18:25 (7 years ago) parent6c2baa3
22 files changed+264−229
default.nix+1−1 docs/dev/tests.md+1 mkdocs.yml+1 nix-tools/.plan.nix/hnix.nix+3−1 nix-tools/nix-tools-src.json+3−3 nix-tools/pkgs.nix+184−167 nixpkgs/github.json+2−3 release.nix+3 test/README.md+1−1 test/builder-haddock/default.nix+2−1 test/cabal-22/default.nix+3−2 test/cabal-simple-prof/default.nix−12 test/cabal-simple/default.nix+24−8 test/cabal-simple/pkgs.nix+9−8 test/cabal-sublib/default.nix+1−1 test/cabal-sublib/pkgs.nix+9−8 test/shell-for/default.nix+2 test/shell-for/pkgs.nix+8−8 test/stack-simple/pkgs.nix+1−1 test/stack-simple/stack.yaml+1−1 test/with-packages/default.nix+2 test/with-packages/pkgs.nix+3−3
default.nix+1−1
@@ -118,7 +118,7 @@ let
118118 # Package sets for all stackage snapshots.
119119 snapshots = self.callPackage ./snapshots.nix {};
120120 # Pick a recent LTS snapshot to be our "default" package set.
121− haskellPackages = self.snapshots."lts-13.18";
121+ haskellPackages = self.snapshots."lts-13.26";
122122
123123 # Programs for generating Nix expressions from Cabal and Stack
124124 # files. We need to make sure we build this from the buildPackages,
docs/dev/tests.mdnew file+1
@@ -0,0 +1 @@
1+../../test/README.md
mkdocs.yml+1
@@ -42,4 +42,5 @@ pages:
4242 - 'Removing withPackage wrapper': dev/removing-with-package-wrapper.md
4343 - 'Maintainer Scripts': dev/maintainer-scripts.md
4444 - 'Nixpkgs Pin': dev/nixpkgs-pin.md
45+ - 'Test Suite': dev/tests.md
4546 - 'ChangeLog': changelog.md
nix-tools/.plan.nix/hnix.nix+3−1
@@ -154,7 +154,9 @@
154154 (hsPkgs.cryptohash-sha512)
155155 (hsPkgs.serialise)
156156 ];
157− build-tools = [ ((hsPkgs.buildPackages).hspec-discover) ];
157+ build-tools = [
158+ (hsPkgs.buildPackages.hspec-discover or (pkgs.buildPackages.hspec-discover))
159+ ];
158160 };
159161 };
160162 benchmarks = {
nix-tools/nix-tools-src.json+3−3
@@ -1,7 +1,7 @@
11{
22 "url": "https://github.com/input-output-hk/nix-tools",
3− "rev": "69ca9bd0c1994f7bddb12bc1a99ac980e7365c14",
4− "date": "2019-05-23T11:35:17+08:00",
5− "sha256": "0f9ds6i4qni6xfgh8bq5kr469wr8j7a2zlb9l9g6gqy0y3hpihqm",
3+ "rev": "3d021291ddf148220050adef350ac51bf27d415f",
4+ "date": "2019-05-31T11:38:58+08:00",
5+ "sha256": "1zgkmm1a3xhclwvnfcbcsqp9zl91g20csiirk2rqyn8k8vy8wwkb",
66 "fetchSubmodules": false
77}
nix-tools/pkgs.nix+184−167
@@ -3,30 +3,19 @@
33 {
44 packages = {
55 "criterion-measurement".revision = (((hackage."criterion-measurement")."0.1.1.0").revisions).default;
6− "criterion-measurement".flags.fast = false;
76 "test-framework-hunit".revision = (((hackage."test-framework-hunit")."0.3.0.2").revisions).default;
87 "test-framework-hunit".flags.base4 = true;
98 "test-framework-hunit".flags.base3 = false;
10− "http-client".revision = (((hackage."http-client")."0.6.4").revisions).default;
11− "http-client".flags.network-uri = true;
9+ "http-client".revision = (((hackage."http-client")."0.5.14").revisions).default;
1210 "cookie".revision = (((hackage."cookie")."0.4.4").revisions).default;
1311 "void".revision = (((hackage."void")."0.7.2").revisions).default;
14− "void".flags.safe = false;
1512 "semigroupoids".revision = (((hackage."semigroupoids")."5.3.2").revisions).default;
16− "semigroupoids".flags.comonad = true;
17− "semigroupoids".flags.doctests = true;
18− "semigroupoids".flags.unordered-containers = true;
19− "semigroupoids".flags.distributive = true;
20− "semigroupoids".flags.tagged = true;
21− "semigroupoids".flags.containers = true;
22− "semigroupoids".flags.contravariant = true;
2313 "free".revision = (((hackage."free")."5.1.1").revisions).default;
14+ "tf-random".revision = (((hackage."tf-random")."0.5").revisions).default;
2415 "Only".revision = (((hackage."Only")."0.1").revisions).default;
2516 "cereal".revision = (((hackage."cereal")."0.5.8.0").revisions).default;
26− "cereal".flags.bytestring-builder = false;
2717 "exceptions".revision = (((hackage."exceptions")."0.10.2").revisions).default;
2818 "cryptohash-sha256".revision = (((hackage."cryptohash-sha256")."0.11.101.0").revisions).default;
29− "cryptohash-sha256".flags.exe = false;
3019 "binary".revision = (((hackage."binary")."0.8.6.0").revisions).default;
3120 "interpolate".revision = (((hackage."interpolate")."0.2.0").revisions).default;
3221 "generic-random".revision = (((hackage."generic-random")."1.2.0.0").revisions).default;
@@ -34,14 +23,11 @@
3423 "tar".flags.old-time = false;
3524 "tar".flags.old-bytestring = false;
3625 "regex-tdfa".revision = (((hackage."regex-tdfa")."1.2.3.1").revisions).default;
37− "regex-tdfa".flags.devel = false;
3826 "ghc-prim".revision = (((hackage."ghc-prim")."0.5.3").revisions).default;
3927 "text-metrics".revision = (((hackage."text-metrics")."0.3.0").revisions).default;
4028 "text-metrics".flags.dev = false;
4129 "utf8-string".revision = (((hackage."utf8-string")."1.0.1.1").revisions).default;
4230 "bifunctors".revision = (((hackage."bifunctors")."5.5.4").revisions).default;
43− "bifunctors".flags.semigroups = true;
44− "bifunctors".flags.tagged = true;
4531 "hashing".revision = (((hackage."hashing")."0.1.0.1").revisions).default;
4632 "extra".revision = (((hackage."extra")."1.6.15").revisions).default;
4733 "haskeline".revision = (((hackage."haskeline")."0.7.4.3").revisions).default;
@@ -54,63 +40,41 @@
5440 "stm".revision = (((hackage."stm")."2.5.0.0").revisions).default;
5541 "tasty-th".revision = (((hackage."tasty-th")."0.1.7").revisions).default;
5642 "text-short".revision = (((hackage."text-short")."0.1.2").revisions).default;
57− "text-short".flags.asserts = false;
5843 "microstache".revision = (((hackage."microstache")."1.0.1.1").revisions).default;
5944 "base-compat-batteries".revision = (((hackage."base-compat-batteries")."0.10.5").revisions).default;
6045 "hourglass".revision = (((hackage."hourglass")."0.2.12").revisions).default;
61− "case-insensitive".revision = (((hackage."case-insensitive")."1.2.1.0").revisions).default;
46+ "case-insensitive".revision = (((hackage."case-insensitive")."1.2.0.11").revisions).default;
6247 "extensible-exceptions".revision = (((hackage."extensible-exceptions")."0.1.1.4").revisions).default;
6348 "unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;
64− "tasty-quickcheck".revision = (((hackage."tasty-quickcheck")."0.10").revisions).default;
49+ "tasty-quickcheck".revision = (((hackage."tasty-quickcheck")."0.10.1").revisions).default;
6550 "mtl".revision = (((hackage."mtl")."2.2.2").revisions).default;
6651 "lifted-async".revision = (((hackage."lifted-async")."0.10.0.4").revisions).default;
6752 "network-uri".revision = (((hackage."network-uri")."2.6.1.0").revisions).default;
6853 "asn1-parse".revision = (((hackage."asn1-parse")."0.9.4").revisions).default;
6954 "regex-base".revision = (((hackage."regex-base")."0.93.2").revisions).default;
70− "regex-base".flags.splitbase = true;
71− "regex-base".flags.newbase = true;
7255 "zlib".revision = (((hackage."zlib")."0.6.2").revisions).default;
73− "zlib".flags.non-blocking-ffi = false;
74− "zlib".flags.pkg-config = false;
7556 "rts".revision = (((hackage."rts")."1.0").revisions).default;
7657 "mmorph".revision = (((hackage."mmorph")."1.1.3").revisions).default;
7758 "js-flot".revision = (((hackage."js-flot")."0.8.3").revisions).default;
7859 "statistics".revision = (((hackage."statistics")."0.15.0.0").revisions).default;
7960 "th-expand-syns".revision = (((hackage."th-expand-syns")."0.4.4.0").revisions).default;
8061 "regex-posix".revision = (((hackage."regex-posix")."0.95.2").revisions).default;
81− "regex-posix".flags.splitbase = true;
82− "regex-posix".flags.newbase = true;
8362 "cryptonite".revision = (((hackage."cryptonite")."0.25").revisions).default;
84− "cryptonite".flags.support_sse = false;
85− "cryptonite".flags.integer-gmp = true;
86− "cryptonite".flags.support_rdrand = true;
87− "cryptonite".flags.support_aesni = true;
88− "cryptonite".flags.support_deepseq = true;
89− "cryptonite".flags.support_pclmuldq = false;
90− "cryptonite".flags.check_alignment = false;
91− "cryptonite".flags.old_toolchain_inliner = false;
92− "microlens-aeson".revision = (((hackage."microlens-aeson")."2.3.0.1").revisions).default;
93− "clock".revision = (((hackage."clock")."0.8").revisions).default;
94− "clock".flags.llvm = false;
63+ "microlens-aeson".revision = (((hackage."microlens-aeson")."2.3.0.4").revisions).default;
64+ "clock".revision = (((hackage."clock")."0.7.2").revisions).default;
9565 "adjunctions".revision = (((hackage."adjunctions")."4.4").revisions).default;
9666 "cryptohash-md5".revision = (((hackage."cryptohash-md5")."0.11.100.1").revisions).default;
9767 "invariant".revision = (((hackage."invariant")."0.5.3").revisions).default;
9868 "th-orphans".revision = (((hackage."th-orphans")."0.13.7").revisions).default;
9969 "pem".revision = (((hackage."pem")."0.2.4").revisions).default;
10070 "megaparsec".revision = (((hackage."megaparsec")."7.0.5").revisions).default;
101− "megaparsec".flags.dev = false;
10271 "syb".revision = (((hackage."syb")."0.7").revisions).default;
10372 "distributive".revision = (((hackage."distributive")."0.6").revisions).default;
104− "distributive".flags.semigroups = true;
105− "distributive".flags.tagged = true;
10673 "asn1-encoding".revision = (((hackage."asn1-encoding")."0.9.5").revisions).default;
10774 "vector-th-unbox".revision = (((hackage."vector-th-unbox")."0.2.1.6").revisions).default;
108− "QuickCheck".revision = (((hackage."QuickCheck")."2.13.1").revisions).default;
109− "QuickCheck".flags.templatehaskell = true;
75+ "QuickCheck".revision = (((hackage."QuickCheck")."2.12.6.1").revisions).default;
11076 "scientific".revision = (((hackage."scientific")."0.3.6.2").revisions).default;
111− "scientific".flags.integer-simple = false;
112− "scientific".flags.bytestring-builder = false;
113− "tasty".revision = (((hackage."tasty")."1.2.1").revisions).default;
77+ "tasty".revision = (((hackage."tasty")."1.2").revisions).default;
11478 "tasty".flags.clock = true;
11579 "hspec-discover".revision = (((hackage."hspec-discover")."2.7.1").revisions).default;
11680 "monadlist".revision = (((hackage."monadlist")."0.0.2").revisions).default;
@@ -120,11 +84,9 @@
12084 "random".revision = (((hackage."random")."1.1").revisions).default;
12185 "uuid-types".revision = (((hackage."uuid-types")."1.0.3").revisions).default;
12286 "optparse-applicative".revision = (((hackage."optparse-applicative")."0.14.3.0").revisions).default;
123− "network".revision = (((hackage."network")."3.1.0.0").revisions).default;
124− "connection".revision = (((hackage."connection")."0.3.0").revisions).default;
125− "splitmix".revision = (((hackage."splitmix")."0.0.2").revisions).default;
87+ "network".revision = (((hackage."network")."2.8.0.1").revisions).default;
88+ "connection".revision = (((hackage."connection")."0.2.8").revisions).default;
12689 "async".revision = (((hackage."async")."2.2.1").revisions).default;
127− "async".flags.bench = false;
12890 "dlist".revision = (((hackage."dlist")."0.8.0.6").revisions).default;
12991 "conduit".revision = (((hackage."conduit")."1.3.1.1").revisions).default;
13092 "ref-tf".revision = (((hackage."ref-tf")."0.4.0.1").revisions).default;
@@ -132,19 +94,8 @@
13294 "constraints".revision = (((hackage."constraints")."0.10.1").revisions).default;
13395 "lens-family-th".revision = (((hackage."lens-family-th")."0.5.0.2").revisions).default;
13496 "semigroups".revision = (((hackage."semigroups")."0.18.5").revisions).default;
135− "semigroups".flags.bytestring = true;
136− "semigroups".flags.unordered-containers = true;
137− "semigroups".flags.text = true;
138− "semigroups".flags.tagged = true;
139− "semigroups".flags.containers = true;
140− "semigroups".flags.binary = true;
141− "semigroups".flags.hashable = true;
142− "semigroups".flags.transformers = true;
143− "semigroups".flags.deepseq = true;
144− "semigroups".flags.bytestring-builder = false;
14597 "HUnit".revision = (((hackage."HUnit")."1.6.0.0").revisions).default;
14698 "vector-instances".revision = (((hackage."vector-instances")."3.4").revisions).default;
147− "vector-instances".flags.hashable = true;
14899 "lifted-base".revision = (((hackage."lifted-base")."0.2.3.12").revisions).default;
149100 "parsec".revision = (((hackage."parsec")."3.1.13.0").revisions).default;
150101 "th-reify-many".revision = (((hackage."th-reify-many")."0.1.9").revisions).default;
@@ -152,89 +103,50 @@
152103 "hsc2hs".flags.in-ghc-tree = false;
153104 "directory".revision = (((hackage."directory")."1.3.3.0").revisions).default;
154105 "yaml".revision = (((hackage."yaml")."0.11.0.0").revisions).default;
155− "yaml".flags.no-exe = true;
156− "yaml".flags.no-examples = true;
157106 "transformers-compat".revision = (((hackage."transformers-compat")."0.6.4").revisions).default;
158− "transformers-compat".flags.five = false;
159− "transformers-compat".flags.generic-deriving = true;
160− "transformers-compat".flags.two = false;
161− "transformers-compat".flags.five-three = true;
162− "transformers-compat".flags.mtl = true;
163− "transformers-compat".flags.four = false;
164− "transformers-compat".flags.three = false;
165107 "hpack".revision = (((hackage."hpack")."0.31.2").revisions).default;
166108 "template-haskell".revision = (((hackage."template-haskell")."2.14.0.0").revisions).default;
167109 "mono-traversable".revision = (((hackage."mono-traversable")."1.0.11.0").revisions).default;
168110 "vector".revision = (((hackage."vector")."0.12.0.3").revisions).default;
169− "vector".flags.unsafechecks = false;
170− "vector".flags.internalchecks = false;
171− "vector".flags.wall = false;
172− "vector".flags.boundschecks = true;
173111 "call-stack".revision = (((hackage."call-stack")."0.1.0").revisions).default;
174112 "primitive".revision = (((hackage."primitive")."0.6.4.0").revisions).default;
175113 "profunctors".revision = (((hackage."profunctors")."5.3").revisions).default;
176114 "time-locale-compat".revision = (((hackage."time-locale-compat")."0.1.1.5").revisions).default;
177− "time-locale-compat".flags.old-locale = false;
178115 "safe".revision = (((hackage."safe")."0.3.17").revisions).default;
179116 "blaze-builder".revision = (((hackage."blaze-builder")."0.4.1.0").revisions).default;
180117 "base-compat".revision = (((hackage."base-compat")."0.10.5").revisions).default;
181118 "js-jquery".revision = (((hackage."js-jquery")."3.3.1").revisions).default;
182119 "terminal-size".revision = (((hackage."terminal-size")."0.3.2.1").revisions).default;
183120 "math-functions".revision = (((hackage."math-functions")."0.3.1.0").revisions).default;
184− "math-functions".flags.system-expm1 = false;
185121 "x509-system".revision = (((hackage."x509-system")."1.6.6").revisions).default;
186122 "keys".revision = (((hackage."keys")."3.12.2").revisions).default;
187− "ansi-terminal".revision = (((hackage."ansi-terminal")."0.9").revisions).default;
188− "ansi-terminal".flags.example = false;
123+ "ansi-terminal".revision = (((hackage."ansi-terminal")."0.8.2").revisions).default;
189124 "vector-binary-instances".revision = (((hackage."vector-binary-instances")."0.2.5.1").revisions).default;
190125 "tagged".revision = (((hackage."tagged")."0.8.6").revisions).default;
191− "tagged".flags.transformers = true;
192− "tagged".flags.deepseq = true;
193126 "x509".revision = (((hackage."x509")."1.7.5").revisions).default;
194127 "cassava".revision = (((hackage."cassava")."0.5.1.0").revisions).default;
195− "cassava".flags.bytestring--lt-0_10_4 = false;
196128 "haskell-src-exts".revision = (((hackage."haskell-src-exts")."1.20.3").revisions).default;
197129 "lens".revision = (((hackage."lens")."4.17.1").revisions).default;
198− "lens".flags.j = false;
199− "lens".flags.test-properties = true;
200− "lens".flags.old-inline-pragmas = false;
201− "lens".flags.test-templates = true;
202− "lens".flags.trustworthy = true;
203− "lens".flags.test-doctests = true;
204− "lens".flags.benchmark-uniplate = false;
205− "lens".flags.inlining = true;
206− "lens".flags.dump-splices = false;
207− "lens".flags.test-hunit = true;
208− "lens".flags.safe = false;
209130 "unliftio-core".revision = (((hackage."unliftio-core")."0.1.2.0").revisions).default;
210131 "containers".revision = (((hackage."containers")."0.6.0.1").revisions).default;
211132 "wl-pprint-annotated".revision = (((hackage."wl-pprint-annotated")."0.1.0.1").revisions).default;
212133 "integer-logarithms".revision = (((hackage."integer-logarithms")."1.0.3").revisions).default;
213− "integer-logarithms".flags.check-bounds = false;
214− "integer-logarithms".flags.integer-gmp = true;
215134 "reflection".revision = (((hackage."reflection")."2.1.4").revisions).default;
216− "reflection".flags.slow = false;
217− "reflection".flags.template-haskell = true;
218− "these".revision = (((hackage."these")."0.8").revisions).default;
135+ "these".revision = (((hackage."these")."0.7.6").revisions).default;
219136 "regex-tdfa-text".revision = (((hackage."regex-tdfa-text")."1.0.0.3").revisions).default;
220− "dependent-sum".revision = (((hackage."dependent-sum")."0.5").revisions).default;
221− "socks".revision = (((hackage."socks")."0.6.0").revisions).default;
137+ "dependent-sum".revision = (((hackage."dependent-sum")."0.4").revisions).default;
138+ "socks".revision = (((hackage."socks")."0.5.6").revisions).default;
222139 "streaming-commons".revision = (((hackage."streaming-commons")."0.2.1.0").revisions).default;
223− "streaming-commons".flags.use-bytestring-builder = false;
224140 "haskell-lexer".revision = (((hackage."haskell-lexer")."1.0.2").revisions).default;
225141 "monad-par".revision = (((hackage."monad-par")."0.3.4.8").revisions).default;
226− "monad-par".flags.newgeneric = false;
227− "monad-par".flags.chaselev = false;
228142 "lens-family".revision = (((hackage."lens-family")."1.2.3").revisions).default;
229143 "bytestring".revision = (((hackage."bytestring")."0.10.8.2").revisions).default;
230144 "ansi-wl-pprint".revision = (((hackage."ansi-wl-pprint")."0.6.8.2").revisions).default;
231− "ansi-wl-pprint".flags.example = false;
232145 "mwc-random".revision = (((hackage."mwc-random")."0.14.0.0").revisions).default;
233146 "basement".revision = (((hackage."basement")."0.0.10").revisions).default;
234147 "test-framework".revision = (((hackage."test-framework")."0.8.2.0").revisions).default;
235148 "cryptohash-sha1".revision = (((hackage."cryptohash-sha1")."0.11.100.1").revisions).default;
236149 "serialise".revision = (((hackage."serialise")."0.2.1.0").revisions).default;
237− "serialise".flags.newtime15 = true;
238150 "hostname".revision = (((hackage."hostname")."1.0").revisions).default;
239151 "old-locale".revision = (((hackage."old-locale")."1.0.0.7").revisions).default;
240152 "wcwidth".revision = (((hackage."wcwidth")."0.0.2").revisions).default;
@@ -244,147 +156,252 @@
244156 "mime-types".revision = (((hackage."mime-types")."0.1.0.9").revisions).default;
245157 "http-client-tls".revision = (((hackage."http-client-tls")."0.3.5.3").revisions).default;
246158 "contravariant".revision = (((hackage."contravariant")."1.5.1").revisions).default;
247− "contravariant".flags.semigroups = true;
248− "contravariant".flags.tagged = true;
249− "contravariant".flags.statevar = true;
250159 "pointed".revision = (((hackage."pointed")."5.0.1").revisions).default;
251− "pointed".flags.semigroupoids = true;
252− "pointed".flags.stm = true;
253− "pointed".flags.comonad = true;
254− "pointed".flags.unordered-containers = true;
255− "pointed".flags.kan-extensions = true;
256− "pointed".flags.semigroups = true;
257− "pointed".flags.tagged = true;
258− "pointed".flags.containers = true;
259− "pointed".flags.transformers = true;
260160 "parser-combinators".revision = (((hackage."parser-combinators")."1.0.2").revisions).default;
261− "parser-combinators".flags.dev = false;
262161 "deriving-compat".revision = (((hackage."deriving-compat")."0.5.6").revisions).default;
263− "deriving-compat".flags.base-4-9 = true;
264− "deriving-compat".flags.template-haskell-2-11 = true;
265− "deriving-compat".flags.new-functor-classes = true;
266162 "text".revision = (((hackage."text")."1.2.3.1").revisions).default;
267163 "Cabal".revision = (((hackage."Cabal")."2.4.0.1").revisions).default;
268− "assoc".revision = (((hackage."assoc")."1").revisions).default;
269164 "Diff".revision = (((hackage."Diff")."0.3.4").revisions).default;
270− "unordered-containers".revision = (((hackage."unordered-containers")."0.2.10.0").revisions).default;
271− "unordered-containers".flags.debug = false;
165+ "unordered-containers".revision = (((hackage."unordered-containers")."0.2.9.0").revisions).default;
272166 "base".revision = (((hackage."base")."4.12.0.0").revisions).default;
273167 "abstract-deque".revision = (((hackage."abstract-deque")."0.3").revisions).default;
274− "abstract-deque".flags.usecas = false;
275− "tasty-hedgehog".revision = (((hackage."tasty-hedgehog")."0.2.0.0").revisions).default;
168+ "tasty-hedgehog".revision = (((hackage."tasty-hedgehog")."1.0.0.1").revisions).default;
276169 "comonad".revision = (((hackage."comonad")."5.0.5").revisions).default;
277− "comonad".flags.distributive = true;
278− "comonad".flags.test-doctests = true;
279− "comonad".flags.containers = true;
280170 "time".revision = (((hackage."time")."1.8.0.2").revisions).default;
281171 "data-default-class".revision = (((hackage."data-default-class")."0.1.2.0").revisions).default;
282172 "terminfo".revision = (((hackage."terminfo")."0.4.1.2").revisions).default;
283173 "base16-bytestring".revision = (((hackage."base16-bytestring")."0.1.1.6").revisions).default;
284174 "vector-algorithms".revision = (((hackage."vector-algorithms")."0.8.0.1").revisions).default;
285− "vector-algorithms".flags.unsafechecks = false;
286− "vector-algorithms".flags.internalchecks = false;
287− "vector-algorithms".flags.llvm = false;
288− "vector-algorithms".flags.boundschecks = true;
289− "vector-algorithms".flags.bench = true;
290− "vector-algorithms".flags.properties = true;
291175 "prettyprinter".revision = (((hackage."prettyprinter")."1.2.1").revisions).default;
292− "prettyprinter".flags.buildreadme = false;
293176 "cryptohash-sha512".revision = (((hackage."cryptohash-sha512")."0.11.100.1").revisions).default;
294177 "tasty-hunit".revision = (((hackage."tasty-hunit")."0.10.0.1").revisions).default;
295178 "pretty-show".revision = (((hackage."pretty-show")."1.8.2").revisions).default;
296179 "transformers".revision = (((hackage."transformers")."0.5.6.2").revisions).default;
297180 "hashable".revision = (((hackage."hashable")."1.2.7.0").revisions).default;
298− "hashable".flags.sse2 = true;
299− "hashable".flags.integer-gmp = true;
300− "hashable".flags.sse41 = false;
301− "hashable".flags.examples = false;
302181 "attoparsec".revision = (((hackage."attoparsec")."0.13.2.2").revisions).default;
303− "attoparsec".flags.developer = false;
304182 "infer-license".revision = (((hackage."infer-license")."0.2.0").revisions).default;
305183 "colour".revision = (((hackage."colour")."2.3.5").revisions).default;
306184 "transformers-base".revision = (((hackage."transformers-base")."0.4.5.2").revisions).default;
307− "transformers-base".flags.orphaninstances = true;
308− "happy".revision = (((hackage."happy")."1.19.9").revisions).default;
185+ "happy".revision = (((hackage."happy")."1.19.11").revisions).default;
309186 "happy".flags.small_base = true;
187+ "byteable".revision = (((hackage."byteable")."0.1.1").revisions).default;
310188 "criterion".revision = (((hackage."criterion")."1.5.5.0").revisions).default;
311− "criterion".flags.embed-data-files = false;
312− "criterion".flags.fast = false;
313189 "monad-par-extras".revision = (((hackage."monad-par-extras")."0.3.3").revisions).default;
314190 "filepath".revision = (((hackage."filepath")."1.4.2.1").revisions).default;
315191 "code-page".revision = (((hackage."code-page")."0.2").revisions).default;
316192 "asn1-types".revision = (((hackage."asn1-types")."0.3.2").revisions).default;
317193 "unbounded-delays".revision = (((hackage."unbounded-delays")."0.1.1.0").revisions).default;
318− "hedgehog".revision = (((hackage."hedgehog")."0.6.1").revisions).default;
194+ "hedgehog".revision = (((hackage."hedgehog")."1.0").revisions).default;
319195 "cborg".revision = (((hackage."cborg")."0.2.1.0").revisions).default;
320− "cborg".flags.optimize-gmp = true;
321196 "monad-control".revision = (((hackage."monad-control")."1.0.2.3").revisions).default;
322197 "process".revision = (((hackage."process")."1.6.5.0").revisions).default;
323198 "tls".revision = (((hackage."tls")."1.4.1").revisions).default;
324− "tls".flags.compat = true;
325− "tls".flags.network = true;
326− "tls".flags.hans = false;
327199 "kan-extensions".revision = (((hackage."kan-extensions")."5.2").revisions).default;
328− "th-lift".revision = (((hackage."th-lift")."0.8").revisions).default;
200+ "th-lift".revision = (((hackage."th-lift")."0.7.11").revisions).default;
329201 "libyaml".revision = (((hackage."libyaml")."0.1.1.0").revisions).default;
330− "libyaml".flags.system-libyaml = false;
331− "libyaml".flags.no-unicode = false;
332202 "resourcet".revision = (((hackage."resourcet")."1.2.2").revisions).default;
333203 "pretty".revision = (((hackage."pretty")."1.1.3.6").revisions).default;
334− "cabal-doctest".revision = (((hackage."cabal-doctest")."1.0.6").revisions).default;
335− "Glob".revision = (((hackage."Glob")."0.10.0").revisions).default;
204+ "Glob".revision = (((hackage."Glob")."0.9.3").revisions).default;
336205 "microlens".revision = (((hackage."microlens")."0.4.10").revisions).default;
337− "aeson".revision = (((hackage."aeson")."1.4.3.0").revisions).default;
338− "aeson".flags.cffi = false;
339− "aeson".flags.fast = false;
340− "aeson".flags.bytestring-builder = false;
341− "aeson".flags.developer = false;
206+ "aeson".revision = (((hackage."aeson")."1.4.2.0").revisions).default;
342207 "abstract-par".revision = (((hackage."abstract-par")."0.3.3").revisions).default;
343208 "http-types".revision = (((hackage."http-types")."0.12.3").revisions).default;
344− "ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.6.4").revisions).default;
345− "th-lift-instances".revision = (((hackage."th-lift-instances")."0.1.13").revisions).default;
209+ "ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.6.5").revisions).default;
210+ "th-lift-instances".revision = (((hackage."th-lift-instances")."0.1.12").revisions).default;
346211 "base-orphans".revision = (((hackage."base-orphans")."0.8.1").revisions).default;
347− "th-abstraction".revision = (((hackage."th-abstraction")."0.3.1.0").revisions).default;
212+ "th-abstraction".revision = (((hackage."th-abstraction")."0.2.11.0").revisions).default;
348213 "memory".revision = (((hackage."memory")."0.14.18").revisions).default;
349− "memory".flags.support_bytestring = true;
350− "memory".flags.support_basement = true;
351− "memory".flags.support_foundation = true;
352− "memory".flags.support_deepseq = true;
353214 "concurrent-output".revision = (((hackage."concurrent-output")."1.10.9").revisions).default;
354215 "array".revision = (((hackage."array")."0.5.3.0").revisions).default;
355216 "repline".revision = (((hackage."repline")."0.2.1.0").revisions).default;
356217 "xml".revision = (((hackage."xml")."1.3.14").revisions).default;
218+ "erf".revision = (((hackage."erf")."2.0.0.0").revisions).default;
357219 "lens-family-core".revision = (((hackage."lens-family-core")."1.2.3").revisions).default;
358220 "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;
359221 };
360222 compiler = {
361− version = "8.6.4";
362− nix-name = "ghc864";
223+ version = "8.6.5";
224+ nix-name = "ghc865";
363225 packages = {
226+ "criterion-measurement" = "0.1.1.0";
227+ "http-client" = "0.5.14";
228+ "cookie" = "0.4.4";
229+ "void" = "0.7.2";
230+ "semigroupoids" = "5.3.2";
231+ "free" = "5.1.1";
232+ "tf-random" = "0.5";
233+ "Only" = "0.1";
234+ "cereal" = "0.5.8.0";
235+ "exceptions" = "0.10.2";
236+ "cryptohash-sha256" = "0.11.101.0";
364237 "binary" = "0.8.6.0";
238+ "regex-tdfa" = "1.2.3.1";
365239 "ghc-prim" = "0.5.3";
240+ "utf8-string" = "1.0.1.1";
241+ "bifunctors" = "5.5.4";
242+ "hashing" = "0.1.0.1";
243+ "extra" = "1.6.15";
366244 "haskeline" = "0.7.4.3";
245+ "logict" = "0.6.0.3";
246+ "x509-validation" = "1.6.11";
247+ "fail" = "4.9.0.0";
248+ "dense-linear-algebra" = "0.1.0.0";
249+ "split" = "0.2.3.3";
250+ "data-fix" = "0.2.0";
367251 "stm" = "2.5.0.0";
252+ "text-short" = "0.1.2";
253+ "microstache" = "1.0.1.1";
254+ "base-compat-batteries" = "0.10.5";
255+ "hourglass" = "0.2.12";
256+ "case-insensitive" = "1.2.0.11";
368257 "unix" = "2.7.2.2";
369258 "mtl" = "2.2.2";
259+ "lifted-async" = "0.10.0.4";
260+ "network-uri" = "2.6.1.0";
261+ "asn1-parse" = "0.9.4";
262+ "regex-base" = "0.93.2";
263+ "zlib" = "0.6.2";
370264 "rts" = "1.0";
265+ "mmorph" = "1.1.3";
266+ "js-flot" = "0.8.3";
267+ "statistics" = "0.15.0.0";
268+ "th-expand-syns" = "0.4.4.0";
269+ "regex-posix" = "0.95.2";
270+ "cryptonite" = "0.25";
271+ "clock" = "0.7.2";
272+ "adjunctions" = "4.4";
273+ "cryptohash-md5" = "0.11.100.1";
274+ "invariant" = "0.5.3";
275+ "th-orphans" = "0.13.7";
276+ "pem" = "0.2.4";
277+ "megaparsec" = "7.0.5";
278+ "syb" = "0.7";
279+ "distributive" = "0.6";
280+ "asn1-encoding" = "0.9.5";
281+ "vector-th-unbox" = "0.2.1.6";
282+ "QuickCheck" = "2.12.6.1";
283+ "scientific" = "0.3.6.2";
284+ "monadlist" = "0.0.2";
285+ "half" = "0.3";
286+ "parallel" = "3.2.2.0";
371287 "deepseq" = "1.4.4.0";
288+ "random" = "1.1";
289+ "uuid-types" = "1.0.3";
290+ "optparse-applicative" = "0.14.3.0";
291+ "network" = "2.8.0.1";
292+ "connection" = "0.2.8";
293+ "async" = "2.2.1";
294+ "dlist" = "0.8.0.6";
295+ "conduit" = "1.3.1.1";
296+ "ref-tf" = "0.4.0.1";
297+ "x509-store" = "1.6.7";
298+ "constraints" = "0.10.1";
299+ "lens-family-th" = "0.5.0.2";
300+ "semigroups" = "0.18.5";
301+ "HUnit" = "1.6.0.0";
302+ "vector-instances" = "3.4";
303+ "lifted-base" = "0.2.3.12";
372304 "parsec" = "3.1.13.0";
305+ "th-reify-many" = "0.1.9";
373306 "directory" = "1.3.3.0";
307+ "yaml" = "0.11.0.0";
308+ "transformers-compat" = "0.6.4";
374309 "template-haskell" = "2.14.0.0";
310+ "mono-traversable" = "1.0.11.0";
311+ "vector" = "0.12.0.3";
312+ "call-stack" = "0.1.0";
313+ "primitive" = "0.6.4.0";
314+ "profunctors" = "5.3";
315+ "time-locale-compat" = "0.1.1.5";
316+ "safe" = "0.3.17";
317+ "blaze-builder" = "0.4.1.0";
318+ "base-compat" = "0.10.5";
319+ "js-jquery" = "3.3.1";
320+ "math-functions" = "0.3.1.0";
321+ "x509-system" = "1.6.6";
322+ "keys" = "3.12.2";
323+ "ansi-terminal" = "0.8.2";
324+ "vector-binary-instances" = "0.2.5.1";
325+ "tagged" = "0.8.6";
326+ "x509" = "1.7.5";
327+ "cassava" = "0.5.1.0";
328+ "haskell-src-exts" = "1.20.3";
329+ "lens" = "4.17.1";
330+ "unliftio-core" = "0.1.2.0";
375331 "containers" = "0.6.0.1";
332+ "integer-logarithms" = "1.0.3";
333+ "reflection" = "2.1.4";
334+ "these" = "0.7.6";
335+ "regex-tdfa-text" = "1.0.0.3";
336+ "dependent-sum" = "0.4";
337+ "socks" = "0.5.6";
338+ "streaming-commons" = "0.2.1.0";
339+ "haskell-lexer" = "1.0.2";
340+ "monad-par" = "0.3.4.8";
341+ "lens-family" = "1.2.3";
376342 "bytestring" = "0.10.8.2";
343+ "ansi-wl-pprint" = "0.6.8.2";
344+ "mwc-random" = "0.14.0.0";
345+ "basement" = "0.0.10";
346+ "cryptohash-sha1" = "0.11.100.1";
347+ "serialise" = "0.2.1.0";
348+ "hostname" = "1.0";
349+ "old-locale" = "1.0.0.7";
350+ "StateVar" = "1.1.1.1";
351+ "mime-types" = "0.1.0.9";
352+ "http-client-tls" = "0.3.5.3";
353+ "contravariant" = "1.5.1";
354+ "pointed" = "5.0.1";
355+ "parser-combinators" = "1.0.2";
356+ "deriving-compat" = "0.5.6";
377357 "text" = "1.2.3.1";
378358 "Cabal" = "2.4.0.1";
359+ "unordered-containers" = "0.2.9.0";
379360 "base" = "4.12.0.0";
361+ "abstract-deque" = "0.3";
362+ "comonad" = "5.0.5";
380363 "time" = "1.8.0.2";
364+ "data-default-class" = "0.1.2.0";
381365 "terminfo" = "0.4.1.2";
366+ "base16-bytestring" = "0.1.1.6";
367+ "vector-algorithms" = "0.8.0.1";
368+ "prettyprinter" = "1.2.1";
369+ "cryptohash-sha512" = "0.11.100.1";
382370 "transformers" = "0.5.6.2";
371+ "hashable" = "1.2.7.0";
372+ "attoparsec" = "0.13.2.2";
373+ "colour" = "2.3.5";
374+ "transformers-base" = "0.4.5.2";
375+ "byteable" = "0.1.1";
376+ "criterion" = "1.5.5.0";
377+ "monad-par-extras" = "0.3.3";
383378 "filepath" = "1.4.2.1";
379+ "code-page" = "0.2";
380+ "asn1-types" = "0.3.2";
381+ "cborg" = "0.2.1.0";
382+ "monad-control" = "1.0.2.3";
384383 "process" = "1.6.5.0";
384+ "tls" = "1.4.1";
385+ "kan-extensions" = "5.2";
386+ "th-lift" = "0.7.11";
387+ "libyaml" = "0.1.1.0";
388+ "resourcet" = "1.2.2";
385389 "pretty" = "1.1.3.6";
386− "ghc-boot-th" = "8.6.4";
390+ "Glob" = "0.9.3";
391+ "microlens" = "0.4.10";
392+ "aeson" = "1.4.2.0";
393+ "abstract-par" = "0.3.3";
394+ "http-types" = "0.12.3";
395+ "ghc-boot-th" = "8.6.5";
396+ "th-lift-instances" = "0.1.12";
397+ "base-orphans" = "0.8.1";
398+ "th-abstraction" = "0.2.11.0";
399+ "memory" = "0.14.18";
387400 "array" = "0.5.3.0";
401+ "repline" = "0.2.1.0";
402+ "xml" = "1.3.14";
403+ "erf" = "2.0.0.0";
404+ "lens-family-core" = "1.2.3";
388405 "integer-gmp" = "1.0.2.0";
389406 };
390407 };
nixpkgs/github.json+2−3
@@ -1,7 +1,6 @@
11{
22 "url": "https://github.com/NixOS/nixpkgs",
3− "rev": "538639a55ce915effc543b3e9c6c901f8ea624c1",
4− "date": "2019-06-07T01:19:18+02:00",
5− "sha256": "1chkvpwj44xk8j7756sn1cymvzrv1nwryr8p13z1fv28lqjflz4p",
3+ "rev": "fe797e0adefc0ff50867a9898d445aee0d4e8f49",
4+ "sha256": "0ddhhfh87bl165j8jxscyq9bzzvykqz1f1r00nad0g6c7b59rifz",
65 "fetchSubmodules": false
76}
release.nix+3
@@ -20,8 +20,11 @@ let
2020 tests = filterAttrs (_: nonEmpty) (mapAttrs (name: removeDisabled) jobs.tests);
2121 };
2222
23+ inherit (systems.examples) musl64;
24+
2325 jobs = {
2426 native = filterTests (mapTestOn (packagePlatforms pkgs));
27+ "${musl64.config}" = filterTests (mapTestOnCross musl64 (packagePlatforms pkgs));
2528 } // {
2629 # On IOHK Hydra, "required" is a special job that updates the
2730 # GitHub CI status.
test/README.md+1−1
@@ -1,6 +1,6 @@
11### Haskell infrastructure test cases
22
3−To build the test cases, run from this directory:
3+To build the test cases, run from the `test` directory:
44
55 nix-build --no-out-link default.nix
66
test/builder-haddock/default.nix+2−1
@@ -39,7 +39,7 @@ in
3939 ########################################################################
4040 # test haddock
4141
42− doc="${toString library.doc}"
42+ doc="${toString library.doc or null}"
4343 docDir="${toString library.haddockDir}"
4444
4545 # exeDoc="$ disabled {toString packages.test-haddock.components.exes.test-haddock.doc}"
@@ -78,4 +78,5 @@ in
7878 '';
7979
8080 meta.platforms = platforms.all;
81+ meta.disabled = stdenv.hostPlatform.isMusl;
8182} // { inherit packages pkgSet; }
test/cabal-22/default.nix+3−2
@@ -25,7 +25,7 @@ in
2525
2626 printf "checking that executable is dynamically linked to system libraries... " >& 2
2727 '' + optionalString stdenv.isLinux ''
28− ldd $exe | grep libpthread
28+ ldd $exe | grep libgmp
2929 '' + optionalString stdenv.isDarwin ''
3030 otool -L $exe | grep "libSystem.B"
3131 '' + ''
@@ -37,12 +37,13 @@ in
3737 sofile=$(find "${packages.project.components.library}" | grep -e '\.dylib$')
3838 '' + ''
3939 echo "$sofile"
40+ '' + optionalString (!stdenv.hostPlatform.isMusl) (''
4041 printf "checking that dynamic library is dynamically linked to prim... " >& 2
4142 '' + optionalString stdenv.isLinux ''
4243 ldd $sofile | grep libHSghc-prim
4344 '' + optionalString stdenv.isDarwin ''
4445 otool -L $sofile | grep libHSghc-prim
45− '' + ''
46+ '') + ''
4647 touch $out
4748 '';
4849
test/cabal-simple-prof/default.nix−12
@@ -34,18 +34,6 @@ in
3434 printf "checking whether executable runs with profiling... " >& 2
3535 $exe +RTS -p -h
3636
37− printf "checking that executable is dynamically linked to system libraries... " >& 2
38− '' + optionalString stdenv.isLinux ''
39− ldd $exe | grep libpthread
40− '' + optionalString stdenv.isDarwin ''
41− otool -L $exe |grep .dylib
42− '' + ''
43−
44− printf "Checking that \"all\" component has the programs... " >& 2
45− all_exe="${packages.cabal-simple.components.all}/bin/cabal-simple"
46− test -f "$all_exe"
47− echo "$all_exe" >& 2
48−
4937 touch $out
5038 '';
5139
test/cabal-simple/default.nix+24−8
@@ -1,5 +1,5 @@
11# Test a package set
2−{ stdenv, util, mkCabalProjectPkgSet }:
2+{ stdenv, util, mkCabalProjectPkgSet, gmp6, zlib }:
33
44with stdenv.lib;
55
@@ -11,6 +11,19 @@ let
1111 # Package has no exposed modules which causes
1212 # haddock: No input file(s)
1313 packages.cabal-simple.doHaddock = false;
14+
15+ # When compiling with musl ghc, build a statically linked
16+ # executable against static libraries.
17+ # Ref: https://vaibhavsagar.com/blog/2018/01/03/static-haskell-nix/
18+ packages.cabal-simple.components.exes.cabal-simple.configureFlags =
19+ optionals stdenv.hostPlatform.isMusl [
20+ "--disable-executable-dynamic"
21+ "--disable-shared"
22+ "--ghc-option=-optl=-pthread"
23+ "--ghc-option=-optl=-static"
24+ "--ghc-option=-optl=-L${gmp6.override { withStatic = true; }}/lib"
25+ # "--ghc-option=-optl=-L${zlib.static}/lib"
26+ ];
1427 }
1528 ];
1629 };
@@ -30,13 +43,16 @@ in
3043 # fixme: run on target platform when cross-compiled
3144 printf "checking whether executable runs... " >& 2
3245 $exe
33−
34− printf "checking that executable is dynamically linked to system libraries... " >& 2
35− '' + optionalString stdenv.isLinux ''
36− ldd $exe | grep libpthread
37− '' + optionalString stdenv.isDarwin ''
38− otool -L $exe |grep .dylib
39− '' + ''
46+ '' + (if stdenv.hostPlatform.isMusl then ''
47+ printf "checking that executable is statically linked... " >& 2
48+ (ldd $exe 2>&1 || true) | grep -i "not a"
49+ '' else ''
50+ printf "checking that executable is dynamically linked to system libraries... " >& 2
51+ '' + optionalString stdenv.isLinux ''
52+ ldd $exe | grep libpthread
53+ '' + optionalString stdenv.isDarwin ''
54+ otool -L $exe |grep .dylib
55+ '') + ''
4056
4157 printf "Checking that \"all\" component has the programs... " >& 2
4258 all_exe="${packages.cabal-simple.components.all}/bin/cabal-simple"
test/cabal-simple/pkgs.nix+9−8
@@ -4,7 +4,7 @@
44 packages = {
55 "binary".revision = (((hackage."binary")."0.8.5.1").revisions).default;
66 "ghc-prim".revision = (((hackage."ghc-prim")."0.5.2.0").revisions).default;
7− "extra".revision = (((hackage."extra")."1.6.15").revisions).default;
7+ "extra".revision = (((hackage."extra")."1.6.17").revisions).default;
88 "stm".revision = (((hackage."stm")."2.4.5.1").revisions).default;
99 "unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;
1010 "rts".revision = (((hackage."rts")."1.0").revisions).default;
@@ -45,11 +45,11 @@
4545 "vector".flags.internalchecks = false;
4646 "vector".flags.wall = false;
4747 "vector".flags.boundschecks = true;
48− "primitive".revision = (((hackage."primitive")."0.6.4.0").revisions).default;
49− "time-locale-compat".revision = (((hackage."time-locale-compat")."0.1.1.5").revisions).default;
50− "time-locale-compat".flags.old-locale = false;
48+ "primitive".revision = (((hackage."primitive")."0.7.0.0").revisions).default;
5149 "safe".revision = (((hackage."safe")."0.3.17").revisions).default;
5250 "base-compat".revision = (((hackage."base-compat")."0.10.5").revisions).default;
51+ "time-compat".revision = (((hackage."time-compat")."1.9.2.2").revisions).default;
52+ "time-compat".flags.old-locale = false;
5353 "ansi-terminal".revision = (((hackage."ansi-terminal")."0.9.1").revisions).default;
5454 "ansi-terminal".flags.example = false;
5555 "tagged".revision = (((hackage."tagged")."0.8.6").revisions).default;
@@ -62,8 +62,8 @@
6262 "bytestring".revision = (((hackage."bytestring")."0.10.8.2").revisions).default;
6363 "ansi-wl-pprint".revision = (((hackage."ansi-wl-pprint")."0.6.9").revisions).default;
6464 "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;
65+ "StateVar".revision = (((hackage."StateVar")."1.2").revisions).default;
66+ "contravariant".revision = (((hackage."contravariant")."1.5.2").revisions).default;
6767 "contravariant".flags.semigroups = true;
6868 "contravariant".flags.tagged = true;
6969 "contravariant".flags.statevar = true;
@@ -73,7 +73,7 @@
7373 "base".revision = (((hackage."base")."4.11.1.0").revisions).default;
7474 "time".revision = (((hackage."time")."1.8.0.2").revisions).default;
7575 "transformers".revision = (((hackage."transformers")."0.5.6.2").revisions).default;
76− "hashable".revision = (((hackage."hashable")."1.2.7.0").revisions).default;
76+ "hashable".revision = (((hackage."hashable")."1.3.0.0").revisions).default;
7777 "hashable".flags.sse2 = true;
7878 "hashable".flags.integer-gmp = true;
7979 "hashable".flags.sse41 = false;
@@ -84,12 +84,13 @@
8484 "filepath".revision = (((hackage."filepath")."1.4.2").revisions).default;
8585 "process".revision = (((hackage."process")."1.6.5.0").revisions).default;
8686 "pretty".revision = (((hackage."pretty")."1.1.3.6").revisions).default;
87− "aeson".revision = (((hackage."aeson")."1.4.3.0").revisions).default;
87+ "aeson".revision = (((hackage."aeson")."1.4.4.0").revisions).default;
8888 "aeson".flags.cffi = false;
8989 "aeson".flags.fast = false;
9090 "aeson".flags.bytestring-builder = false;
9191 "aeson".flags.developer = false;
9292 "ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.4.4").revisions).default;
93+ "base-orphans".revision = (((hackage."base-orphans")."0.8.1").revisions).default;
9394 "th-abstraction".revision = (((hackage."th-abstraction")."0.3.1.0").revisions).default;
9495 "array".revision = (((hackage."array")."0.5.2.0").revisions).default;
9596 "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;
test/cabal-sublib/default.nix+1−1
@@ -33,7 +33,7 @@ in
3333
3434 printf "checking that executable is dynamically linked to system libraries... " >& 2
3535 '' + optionalString stdenv.isLinux ''
36− ldd $exe | grep libpthread
36+ ldd $exe | grep libgmp
3737 '' + optionalString stdenv.isDarwin ''
3838 otool -L $exe |grep .dylib
3939 '' + ''
test/cabal-sublib/pkgs.nix+9−8
@@ -4,7 +4,7 @@
44 packages = {
55 "binary".revision = (((hackage."binary")."0.8.5.1").revisions).default;
66 "ghc-prim".revision = (((hackage."ghc-prim")."0.5.2.0").revisions).default;
7− "extra".revision = (((hackage."extra")."1.6.15").revisions).default;
7+ "extra".revision = (((hackage."extra")."1.6.17").revisions).default;
88 "stm".revision = (((hackage."stm")."2.4.5.1").revisions).default;
99 "unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;
1010 "rts".revision = (((hackage."rts")."1.0").revisions).default;
@@ -45,11 +45,11 @@
4545 "vector".flags.internalchecks = false;
4646 "vector".flags.wall = false;
4747 "vector".flags.boundschecks = true;
48− "primitive".revision = (((hackage."primitive")."0.6.4.0").revisions).default;
49− "time-locale-compat".revision = (((hackage."time-locale-compat")."0.1.1.5").revisions).default;
50− "time-locale-compat".flags.old-locale = false;
48+ "primitive".revision = (((hackage."primitive")."0.7.0.0").revisions).default;
5149 "safe".revision = (((hackage."safe")."0.3.17").revisions).default;
5250 "base-compat".revision = (((hackage."base-compat")."0.10.5").revisions).default;
51+ "time-compat".revision = (((hackage."time-compat")."1.9.2.2").revisions).default;
52+ "time-compat".flags.old-locale = false;
5353 "ansi-terminal".revision = (((hackage."ansi-terminal")."0.9.1").revisions).default;
5454 "ansi-terminal".flags.example = false;
5555 "tagged".revision = (((hackage."tagged")."0.8.6").revisions).default;
@@ -62,8 +62,8 @@
6262 "bytestring".revision = (((hackage."bytestring")."0.10.8.2").revisions).default;
6363 "ansi-wl-pprint".revision = (((hackage."ansi-wl-pprint")."0.6.9").revisions).default;
6464 "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;
65+ "StateVar".revision = (((hackage."StateVar")."1.2").revisions).default;
66+ "contravariant".revision = (((hackage."contravariant")."1.5.2").revisions).default;
6767 "contravariant".flags.semigroups = true;
6868 "contravariant".flags.tagged = true;
6969 "contravariant".flags.statevar = true;
@@ -73,7 +73,7 @@
7373 "base".revision = (((hackage."base")."4.11.1.0").revisions).default;
7474 "time".revision = (((hackage."time")."1.8.0.2").revisions).default;
7575 "transformers".revision = (((hackage."transformers")."0.5.6.2").revisions).default;
76− "hashable".revision = (((hackage."hashable")."1.2.7.0").revisions).default;
76+ "hashable".revision = (((hackage."hashable")."1.3.0.0").revisions).default;
7777 "hashable".flags.sse2 = true;
7878 "hashable".flags.integer-gmp = true;
7979 "hashable".flags.sse41 = false;
@@ -84,12 +84,13 @@
8484 "filepath".revision = (((hackage."filepath")."1.4.2").revisions).default;
8585 "process".revision = (((hackage."process")."1.6.5.0").revisions).default;
8686 "pretty".revision = (((hackage."pretty")."1.1.3.6").revisions).default;
87− "aeson".revision = (((hackage."aeson")."1.4.3.0").revisions).default;
87+ "aeson".revision = (((hackage."aeson")."1.4.4.0").revisions).default;
8888 "aeson".flags.cffi = false;
8989 "aeson".flags.fast = false;
9090 "aeson".flags.bytestring-builder = false;
9191 "aeson".flags.developer = false;
9292 "ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.4.4").revisions).default;
93+ "base-orphans".revision = (((hackage."base-orphans")."0.8.1").revisions).default;
9394 "th-abstraction".revision = (((hackage."th-abstraction")."0.3.1.0").revisions).default;
9495 "array".revision = (((hackage."array")."0.5.2.0").revisions).default;
9596 "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;
test/shell-for/default.nix+2
@@ -50,6 +50,8 @@ in
5050 '';
5151
5252 meta.platforms = platforms.all;
53+ meta.disabled = stdenv.hostPlatform.isMusl;
54+
5355 passthru = {
5456 # Used for debugging with nix repl
5557 inherit pkgSet;
test/shell-for/pkgs.nix+8−8
@@ -39,8 +39,8 @@
3939 "deepseq".revision = (((hackage."deepseq")."1.4.3.0").revisions).default;
4040 "random".revision = (((hackage."random")."1.1").revisions).default;
4141 "optparse-applicative".revision = (((hackage."optparse-applicative")."0.14.3.0").revisions).default;
42− "network".revision = (((hackage."network")."3.1.0.0").revisions).default;
43− "async".revision = (((hackage."async")."2.2.1").revisions).default;
42+ "network".revision = (((hackage."network")."3.1.0.1").revisions).default;
43+ "async".revision = (((hackage."async")."2.2.2").revisions).default;
4444 "async".flags.bench = false;
4545 "conduit".revision = (((hackage."conduit")."1.3.1.1").revisions).default;
4646 "semigroups".revision = (((hackage."semigroups")."0.19").revisions).default;
@@ -102,14 +102,14 @@
102102 "reflection".revision = (((hackage."reflection")."2.1.4").revisions).default;
103103 "reflection".flags.slow = false;
104104 "reflection".flags.template-haskell = true;
105− "streaming-commons".revision = (((hackage."streaming-commons")."0.2.1.0").revisions).default;
105+ "streaming-commons".revision = (((hackage."streaming-commons")."0.2.1.1").revisions).default;
106106 "streaming-commons".flags.use-bytestring-builder = false;
107107 "bytestring".revision = (((hackage."bytestring")."0.10.8.2").revisions).default;
108108 "ansi-wl-pprint".revision = (((hackage."ansi-wl-pprint")."0.6.9").revisions).default;
109109 "ansi-wl-pprint".flags.example = false;
110− "StateVar".revision = (((hackage."StateVar")."1.1.1.1").revisions).default;
111− "typed-process".revision = (((hackage."typed-process")."0.2.4.0").revisions).default;
112− "contravariant".revision = (((hackage."contravariant")."1.5.1").revisions).default;
110+ "StateVar".revision = (((hackage."StateVar")."1.2").revisions).default;
111+ "typed-process".revision = (((hackage."typed-process")."0.2.5.0").revisions).default;
112+ "contravariant".revision = (((hackage."contravariant")."1.5.2").revisions).default;
113113 "contravariant".flags.semigroups = true;
114114 "contravariant".flags.tagged = true;
115115 "contravariant".flags.statevar = true;
@@ -131,7 +131,7 @@
131131 "vector-algorithms".flags.bench = true;
132132 "vector-algorithms".flags.properties = true;
133133 "transformers".revision = (((hackage."transformers")."0.5.6.2").revisions).default;
134− "hashable".revision = (((hackage."hashable")."1.2.7.0").revisions).default;
134+ "hashable".revision = (((hackage."hashable")."1.3.0.0").revisions).default;
135135 "hashable".flags.sse2 = true;
136136 "hashable".flags.integer-gmp = true;
137137 "hashable".flags.sse41 = false;
@@ -151,7 +151,7 @@
151151 "base-orphans".revision = (((hackage."base-orphans")."0.8.1").revisions).default;
152152 "th-abstraction".revision = (((hackage."th-abstraction")."0.3.1.0").revisions).default;
153153 "array".revision = (((hackage."array")."0.5.2.0").revisions).default;
154− "conduit-extra".revision = (((hackage."conduit-extra")."1.3.1.1").revisions).default;
154+ "conduit-extra".revision = (((hackage."conduit-extra")."1.3.3").revisions).default;
155155 "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;
156156 };
157157 compiler = {
test/stack-simple/pkgs.nix+1−1
@@ -6,5 +6,5 @@
66 "process" = (((hackage.process)."1.6.5.0").revisions).default;
77 } // { stack-simple = ./stack-simple.nix; };
88 };
9− resolver = "lts-13.18";
9+ resolver = "lts-13.26";
1010 }
test/stack-simple/stack.yaml+1−1
@@ -17,7 +17,7 @@
1717#
1818# resolver: ./custom-snapshot.yaml
1919# resolver: https://example.com/snapshots/2018-01-01.yaml
20−resolver: lts-13.18
20+resolver: lts-13.26
2121
2222# User packages to be built.
2323# Various formats can be used as shown in the example below.
test/with-packages/default.nix+2
@@ -73,6 +73,8 @@ in
7373 '';
7474
7575 meta.platforms = platforms.all;
76+ meta.disabled = stdenv.hostPlatform.isMusl;
77+
7678 passthru = {
7779 # Used for debugging with nix repl
7880 inherit packages pkgSet;
test/with-packages/pkgs.nix+3−3
@@ -81,8 +81,8 @@
8181 "reflection".flags.slow = false;
8282 "reflection".flags.template-haskell = true;
8383 "bytestring".revision = (((hackage."bytestring")."0.10.8.2").revisions).default;
84− "StateVar".revision = (((hackage."StateVar")."1.1.1.1").revisions).default;
85− "contravariant".revision = (((hackage."contravariant")."1.5.1").revisions).default;
84+ "StateVar".revision = (((hackage."StateVar")."1.2").revisions).default;
85+ "contravariant".revision = (((hackage."contravariant")."1.5.2").revisions).default;
8686 "contravariant".flags.semigroups = true;
8787 "contravariant".flags.tagged = true;
8888 "contravariant".flags.statevar = true;
@@ -97,7 +97,7 @@
9797 "comonad".flags.containers = true;
9898 "time".revision = (((hackage."time")."1.8.0.2").revisions).default;
9999 "transformers".revision = (((hackage."transformers")."0.5.6.2").revisions).default;
100− "hashable".revision = (((hackage."hashable")."1.2.7.0").revisions).default;
100+ "hashable".revision = (((hackage."hashable")."1.3.0.0").revisions).default;
101101 "hashable".flags.sse2 = true;
102102 "hashable".flags.integer-gmp = true;
103103 "hashable".flags.sse41 = false;