git.iko.soy/typeable/cabal2nix
on master help sign in
test: update golden Nix files

Cabal 2.2.x is much better at honoring default flag choices, which changes the set of executables some packages build because their executables (or tests) are disabled by default.

commit4a0b8591811eb9ec28cc768a89e62fc450bdb31f authorPeter Simons <simons@cryp.to> dateFri 9 Mar 2018, 14:12 (9 years ago) parent9ef6995
9 files changed+14−36
compare with master
unifiedsplit
test/golden-test-cases/SHA.nix.golden+2−3 test/golden-test-cases/butcher.nix.golden−4 test/golden-test-cases/giphy-api.nix.golden−1 test/golden-test-cases/gl.nix.golden+2−2 test/golden-test-cases/highlighting-kate.nix.golden−1 test/golden-test-cases/mwc-random.nix.golden+2−7 test/golden-test-cases/servant-checked-exceptions.nix.golden+3−9 test/golden-test-cases/texmath.nix.golden+2−3 test/golden-test-cases/weigh.nix.golden+3−6
test/golden-test-cases/SHA.nix.golden+2−3
@@ -1,5 +1,5 @@
1−{ mkDerivation, array, base, binary, bytestring, directory
2−, fetchurl, QuickCheck, test-framework, test-framework-quickcheck2
1+{ mkDerivation, array, base, binary, bytestring, fetchurl
2+, QuickCheck, test-framework, test-framework-quickcheck2
33}:
44mkDerivation {
55 pname = "SHA";
@@ -11,7 +11,6 @@ mkDerivation {
1111 isLibrary = true;
1212 isExecutable = true;
1313 libraryHaskellDepends = [ array base binary bytestring ];
14− executableHaskellDepends = [ base bytestring directory ];
1514 testHaskellDepends = [
1615 array base binary bytestring QuickCheck test-framework
1716 test-framework-quickcheck2
test/golden-test-cases/butcher.nix.golden−4
@@ -13,10 +13,6 @@ mkDerivation {
1313 base bifunctors containers deque either extra free microlens
1414 microlens-th mtl multistate pretty transformers unsafe void
1515 ];
16− testHaskellDepends = [
17− base containers deque either extra free microlens microlens-th mtl
18− multistate pretty transformers unsafe
19− ];
2016 homepage = "https://github.com/lspitzner/butcher/";
2117 description = "Chops a command or program invocation into digestable pieces";
2218 license = stdenv.lib.licenses.bsd3;
test/golden-test-cases/giphy-api.nix.golden−1
@@ -17,7 +17,6 @@ mkDerivation {
1717 microlens microlens-th mtl network-uri servant servant-client text
1818 transformers
1919 ];
20− executableHaskellDepends = [ base network-uri text ];
2120 testHaskellDepends = [
2221 aeson base basic-prelude bytestring containers directory hspec lens
2322 network-uri text
test/golden-test-cases/gl.nix.golden+2−2
@@ -1,5 +1,5 @@
11{ mkDerivation, base, Cabal, containers, directory, fetchurl
2−, filepath, fixed, half, hxt, mesa, transformers
2+, filepath, fixed, half, hxt, libGL, transformers
33}:
44mkDerivation {
55 pname = "gl";
@@ -14,7 +14,7 @@ mkDerivation {
1414 libraryHaskellDepends = [
1515 base containers fixed half transformers
1616 ];
17− librarySystemDepends = [ mesa ];
17+ librarySystemDepends = [ libGL ];
1818 description = "Complete OpenGL raw bindings";
1919 license = stdenv.lib.licenses.bsd3;
2020}
test/golden-test-cases/highlighting-kate.nix.golden−1
@@ -15,7 +15,6 @@ mkDerivation {
1515 base blaze-html containers mtl parsec regex-pcre-builtin
1616 utf8-string
1717 ];
18− executableHaskellDepends = [ base blaze-html containers filepath ];
1918 testHaskellDepends = [
2019 base blaze-html containers Diff directory filepath process
2120 ];
test/golden-test-cases/mwc-random.nix.golden+2−7
@@ -1,6 +1,5 @@
1−{ mkDerivation, base, fetchurl, HUnit, math-functions, primitive
2−, QuickCheck, statistics, test-framework, test-framework-hunit
3−, test-framework-quickcheck2, time, vector
1+{ mkDerivation, base, fetchurl, math-functions, primitive, time
2+, vector
43}:
54mkDerivation {
65 pname = "mwc-random";
@@ -12,10 +11,6 @@ mkDerivation {
1211 libraryHaskellDepends = [
1312 base math-functions primitive time vector
1413 ];
15− testHaskellDepends = [
16− base HUnit QuickCheck statistics test-framework
17− test-framework-hunit test-framework-quickcheck2 vector
18− ];
1914 doCheck = false;
2015 homepage = "https://github.com/bos/mwc-random";
2116 description = "Fast, high quality pseudo random number generation";
test/golden-test-cases/servant-checked-exceptions.nix.golden+3−9
@@ -1,8 +1,7 @@
11{ mkDerivation, aeson, base, bytestring, deepseq, doctest, fetchurl
2−, Glob, hspec-wai, http-api-data, http-client, http-media
3−, natural-transformation, optparse-applicative, profunctors
4−, servant, servant-client, servant-docs, servant-server, tagged
5−, tasty, tasty-hspec, tasty-hunit, text, wai, warp
2+, Glob, hspec-wai, http-media, profunctors, servant, servant-client
3+, servant-docs, servant-server, tagged, tasty, tasty-hspec
4+, tasty-hunit, text, wai
65}:
76mkDerivation {
87 pname = "servant-checked-exceptions";
@@ -17,11 +16,6 @@ mkDerivation {
1716 aeson base bytestring deepseq http-media profunctors servant
1817 servant-client servant-docs servant-server tagged text
1918 ];
20− executableHaskellDepends = [
21− aeson base http-api-data http-client natural-transformation
22− optparse-applicative servant servant-client servant-docs
23− servant-server text wai warp
24− ];
2519 testHaskellDepends = [
2620 base bytestring doctest Glob hspec-wai servant servant-server tasty
2721 tasty-hspec tasty-hunit wai
test/golden-test-cases/texmath.nix.golden+2−3
@@ -1,6 +1,6 @@
11{ mkDerivation, base, bytestring, containers, directory, fetchurl
2−, filepath, mtl, network-uri, pandoc-types, parsec, process, split
3−, syb, temporary, text, utf8-string, xml
2+, filepath, mtl, pandoc-types, parsec, process, split, syb
3+, temporary, text, utf8-string, xml
44}:
55mkDerivation {
66 pname = "texmath";
@@ -14,7 +14,6 @@ mkDerivation {
1414 libraryHaskellDepends = [
1515 base containers mtl pandoc-types parsec syb xml
1616 ];
17− executableHaskellDepends = [ network-uri ];
1817 testHaskellDepends = [
1918 base bytestring directory filepath process split temporary text
2019 utf8-string xml
test/golden-test-cases/weigh.nix.golden+3−6
@@ -1,6 +1,5 @@
1−{ mkDerivation, base, bytestring-trie, containers, deepseq
2−, fetchurl, mtl, process, random, split, template-haskell
3−, temporary, unordered-containers
1+{ mkDerivation, base, deepseq, fetchurl, mtl, process, split
2+, template-haskell, temporary
43}:
54mkDerivation {
65 pname = "weigh";
@@ -12,9 +11,7 @@ mkDerivation {
1211 libraryHaskellDepends = [
1312 base deepseq mtl process split template-haskell temporary
1413 ];
15− testHaskellDepends = [
16− base bytestring-trie containers deepseq random unordered-containers
17− ];
14+ testHaskellDepends = [ base deepseq ];
1815 homepage = "https://github.com/fpco/weigh#readme";
1916 description = "Measure allocations of a Haskell functions/values";
2017 license = stdenv.lib.licenses.bsd3;