fea02bd · haskell.nix · git.iko.soy

git.iko.soy/haskell.nix

on iko/ghcjs-patch-master help sign in

Update nix-tools with Cabal-3.2 (#591)

Update nix-tools and regenerate nix-tools plan Co-authored-by: Hamish Mackenzie <Hamish.Mackenzie@iohk.io>

commitfea02bdabab66881b3ec37ebe372acddbb3682e6 authorMaxim Koltsov <kolmax94@gmail.com> dateMon 11 May 2020, 14:54 (6 years ago) parentcaf4e30

8 files changed+331−381

compare with iko/ghcjs-patch-master

unifiedsplit

nix-tools/.plan.nix/hackage-db.nix+39−69 nix-tools/.plan.nix/nix-tools.nix+113−144 nix-tools/default.nix+7−17 nix-tools/nix-tools-src.json+6−4 nix-tools/pkgs-8.4.4.nix+71−71 nix-tools/pkgs.nix+71−71 nix-tools/regenerate.nix+23−4 release.nix+1−1

nix-tools/.plan.nix/hackage-db.nix+39−69

@@ -1,48 +1,17 @@

1−let

2− buildDepError = pkg:

3− builtins.throw ''

4− The Haskell package set does not contain the package: ${pkg} (build dependency).

5−

6− If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix.

7− '';

8− sysDepError = pkg:

9− builtins.throw ''

10− The Nixpkgs package set does not contain the package: ${pkg} (system dependency).

11−

12− You may need to augment the system package mapping in haskell.nix so that it can be found.

13− '';

14− pkgConfDepError = pkg:

15− builtins.throw ''

16− The pkg-conf packages does not contain the package: ${pkg} (pkg-conf dependency).

17−

18− You may need to augment the pkg-conf package mapping in haskell.nix so that it can be found.

19− '';

20− exeDepError = pkg:

21− builtins.throw ''

22− The local executable components do not include the component: ${pkg} (executable dependency).

23− '';

24− legacyExeDepError = pkg:

25− builtins.throw ''

26− The Haskell package set does not contain the package: ${pkg} (executable dependency).

27−

28− If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix.

29− '';

30− buildToolDepError = pkg:

31− builtins.throw ''

32− Neither the Haskell package set or the Nixpkgs package set contain the package: ${pkg} (build tool dependency).

33−

34− If this is a system dependency:

35− You may need to augment the system package mapping in haskell.nix so that it can be found.

36−

37− If this is a Haskell dependency:

38− If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix.

39− '';

40−in { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }:

1+{ system

2+ , compiler

3+ , flags

4+ , pkgs

5+ , hsPkgs

6+ , pkgconfPkgs

7+ , errorHandler

8+ , config

9+ , ... }:

4110 {

4211 flags = { install-examples = false; };

4312 package = {

4413 specVersion = "1.10";

45− identifier = { name = "hackage-db"; version = "2.0.1"; };

14+ identifier = { name = "hackage-db"; version = "2.1.0"; };

4615 license = "BSD-3-Clause";

4716 copyright = "";

4817 maintainer = "Peter Simons <simons@cryp.to>";

@@ -50,53 +19,54 @@ in { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }:

5019 homepage = "https://github.com/peti/hackage-db#readme";

5120 url = "";

5221 synopsis = "Access cabal-install's Hackage database via Data.Map";

53− description = "This library provides convenient access to the local copy of the Hackage\ndatabase that \"cabal update\" creates. Check out\nhttps://github.com/peti/hackage-db/tree/master/example/ for a collection of\nsimple example programs that demonstrate how to use this code.";

22+ description = "This library provides convenient access to the local copy of the Hackage\ndatabase that \\\"cabal update\\\" creates. Check out\n<https://github.com/peti/hackage-db/tree/master/example/> for a collection\nof simple example programs that demonstrate how to use this code.";

5423 buildType = "Simple";

5524 isLocal = true;

5625 };

5726 components = {

5827 "library" = {

5928 depends = [

60− (hsPkgs."base" or (buildDepError "base"))

61− (hsPkgs."Cabal" or (buildDepError "Cabal"))

62− (hsPkgs."containers" or (buildDepError "containers"))

63− (hsPkgs."aeson" or (buildDepError "aeson"))

64− (hsPkgs."bytestring" or (buildDepError "bytestring"))

65− (hsPkgs."directory" or (buildDepError "directory"))

66− (hsPkgs."filepath" or (buildDepError "filepath"))

67− (hsPkgs."tar" or (buildDepError "tar"))

68− (hsPkgs."time" or (buildDepError "time"))

69− (hsPkgs."utf8-string" or (buildDepError "utf8-string"))

29+ (hsPkgs."base" or (errorHandler.buildDepError "base"))

30+ (hsPkgs."Cabal" or (errorHandler.buildDepError "Cabal"))

31+ (hsPkgs."aeson" or (errorHandler.buildDepError "aeson"))

32+ (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring"))

33+ (hsPkgs."containers" or (errorHandler.buildDepError "containers"))

34+ (hsPkgs."directory" or (errorHandler.buildDepError "directory"))

35+ (hsPkgs."exceptions" or (errorHandler.buildDepError "exceptions"))

36+ (hsPkgs."filepath" or (errorHandler.buildDepError "filepath"))

37+ (hsPkgs."tar" or (errorHandler.buildDepError "tar"))

38+ (hsPkgs."time" or (errorHandler.buildDepError "time"))

39+ (hsPkgs."utf8-string" or (errorHandler.buildDepError "utf8-string"))

7040 ];

7141 buildable = true;

7242 };

7343 exes = {

7444 "list-known-versions" = {

7545 depends = (pkgs.lib).optionals (flags.install-examples) [

76− (hsPkgs."base" or (buildDepError "base"))

77− (hsPkgs."Cabal" or (buildDepError "Cabal"))

78− (hsPkgs."containers" or (buildDepError "containers"))

79− (hsPkgs."hackage-db" or (buildDepError "hackage-db"))

80− (hsPkgs."bytestring" or (buildDepError "bytestring"))

46+ (hsPkgs."base" or (errorHandler.buildDepError "base"))

47+ (hsPkgs."Cabal" or (errorHandler.buildDepError "Cabal"))

48+ (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring"))

49+ (hsPkgs."containers" or (errorHandler.buildDepError "containers"))

50+ (hsPkgs."hackage-db" or (errorHandler.buildDepError "hackage-db"))

8151 ];

8252 buildable = if flags.install-examples then true else false;

8353 };

8454 "show-meta-data" = {

8555 depends = (pkgs.lib).optionals (flags.install-examples) [

86− (hsPkgs."base" or (buildDepError "base"))

87− (hsPkgs."Cabal" or (buildDepError "Cabal"))

88− (hsPkgs."containers" or (buildDepError "containers"))

89− (hsPkgs."hackage-db" or (buildDepError "hackage-db"))

90− (hsPkgs."utf8-string" or (buildDepError "utf8-string"))

56+ (hsPkgs."base" or (errorHandler.buildDepError "base"))

57+ (hsPkgs."Cabal" or (errorHandler.buildDepError "Cabal"))

58+ (hsPkgs."containers" or (errorHandler.buildDepError "containers"))

59+ (hsPkgs."hackage-db" or (errorHandler.buildDepError "hackage-db"))

60+ (hsPkgs."utf8-string" or (errorHandler.buildDepError "utf8-string"))

9161 ];

9262 buildable = if flags.install-examples then true else false;

9363 };

9464 "show-package-versions" = {

9565 depends = (pkgs.lib).optionals (flags.install-examples) [

96− (hsPkgs."base" or (buildDepError "base"))

97− (hsPkgs."Cabal" or (buildDepError "Cabal"))

98− (hsPkgs."containers" or (buildDepError "containers"))

99− (hsPkgs."hackage-db" or (buildDepError "hackage-db"))

66+ (hsPkgs."base" or (errorHandler.buildDepError "base"))

67+ (hsPkgs."Cabal" or (errorHandler.buildDepError "Cabal"))

68+ (hsPkgs."containers" or (errorHandler.buildDepError "containers"))

69+ (hsPkgs."hackage-db" or (errorHandler.buildDepError "hackage-db"))

10070 ];

10171 buildable = if flags.install-examples then true else false;

10272 };

@@ -104,8 +74,8 @@ in { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }:

10474 };

10575 } // {

10676 src = (pkgs.lib).mkDefault (pkgs.fetchgit {

107− url = "https://github.com/ElvishJerricco/hackage-db.git";

108− rev = "84ca9fc75ad45a71880e938e0d93ea4bde05f5bd";

109− sha256 = "0y3kw1hrxhsqmyx59sxba8npj4ya8dpgjljc21gkgdvdy9628q4c";

77+ url = "https://github.com/hamishmack/hackage-db.git";

78+ rev = "f1f528db7b02d90e9953297c716de5e046f3570f";

79+ sha256 = "0j86xkpndxn41sy2mchx029zc3isaxh61hdvnakpiflkcmfaji1w";

11080 });

11181 }

nix-tools/.plan.nix/nix-tools.nix+113−144

@@ -1,43 +1,12 @@

1−let

2− buildDepError = pkg:

3− builtins.throw ''

4− The Haskell package set does not contain the package: ${pkg} (build dependency).

5−

7− '';

8− sysDepError = pkg:

9− builtins.throw ''

10− The Nixpkgs package set does not contain the package: ${pkg} (system dependency).

11−

12− You may need to augment the system package mapping in haskell.nix so that it can be found.

13− '';

14− pkgConfDepError = pkg:

15− builtins.throw ''

16− The pkg-conf packages does not contain the package: ${pkg} (pkg-conf dependency).

17−

18− You may need to augment the pkg-conf package mapping in haskell.nix so that it can be found.

19− '';

20− exeDepError = pkg:

21− builtins.throw ''

22− The local executable components do not include the component: ${pkg} (executable dependency).

23− '';

24− legacyExeDepError = pkg:

25− builtins.throw ''

26− The Haskell package set does not contain the package: ${pkg} (executable dependency).

27−

29− '';

30− buildToolDepError = pkg:

31− builtins.throw ''

32− Neither the Haskell package set or the Nixpkgs package set contain the package: ${pkg} (build tool dependency).

33−

34− If this is a system dependency:

35− You may need to augment the system package mapping in haskell.nix so that it can be found.

36−

37− If this is a Haskell dependency:

39− '';

40−in { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }:

1+{ system

2+ , compiler

3+ , flags

4+ , pkgs

5+ , hsPkgs

6+ , pkgconfPkgs

7+ , errorHandler

8+ , config

9+ , ... }:

4110 {

4211 flags = {};

4312 package = {

@@ -57,156 +26,156 @@ in { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }:

5726 components = {

5827 "library" = {

5928 depends = [

60− (hsPkgs."base" or (buildDepError "base"))

61− (hsPkgs."Cabal" or (buildDepError "Cabal"))

62− (hsPkgs."aeson" or (buildDepError "aeson"))

63− (hsPkgs."aeson-pretty" or (buildDepError "aeson-pretty"))

64− (hsPkgs."base16-bytestring" or (buildDepError "base16-bytestring"))

65− (hsPkgs."bytestring" or (buildDepError "bytestring"))

66− (hsPkgs."cryptohash-sha256" or (buildDepError "cryptohash-sha256"))

67− (hsPkgs."containers" or (buildDepError "containers"))

68− (hsPkgs."data-fix" or (buildDepError "data-fix"))

69− (hsPkgs."deepseq" or (buildDepError "deepseq"))

70− (hsPkgs."directory" or (buildDepError "directory"))

71− (hsPkgs."extra" or (buildDepError "extra"))

72− (hsPkgs."filepath" or (buildDepError "filepath"))

73− (hsPkgs."hnix" or (buildDepError "hnix"))

74− (hsPkgs."hpack" or (buildDepError "hpack"))

75− (hsPkgs."http-client" or (buildDepError "http-client"))

76− (hsPkgs."http-client-tls" or (buildDepError "http-client-tls"))

77− (hsPkgs."http-types" or (buildDepError "http-types"))

78− (hsPkgs."optparse-applicative" or (buildDepError "optparse-applicative"))

79− (hsPkgs."prettyprinter" or (buildDepError "prettyprinter"))

80− (hsPkgs."process" or (buildDepError "process"))

81− (hsPkgs."text" or (buildDepError "text"))

82− (hsPkgs."transformers" or (buildDepError "transformers"))

83− (hsPkgs."unordered-containers" or (buildDepError "unordered-containers"))

84− (hsPkgs."yaml" or (buildDepError "yaml"))

29+ (hsPkgs."base" or (errorHandler.buildDepError "base"))

30+ (hsPkgs."Cabal" or (errorHandler.buildDepError "Cabal"))

31+ (hsPkgs."aeson" or (errorHandler.buildDepError "aeson"))

32+ (hsPkgs."aeson-pretty" or (errorHandler.buildDepError "aeson-pretty"))

33+ (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring"))

34+ (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring"))

35+ (hsPkgs."cryptohash-sha256" or (errorHandler.buildDepError "cryptohash-sha256"))

36+ (hsPkgs."containers" or (errorHandler.buildDepError "containers"))

37+ (hsPkgs."data-fix" or (errorHandler.buildDepError "data-fix"))

38+ (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq"))

39+ (hsPkgs."directory" or (errorHandler.buildDepError "directory"))

40+ (hsPkgs."extra" or (errorHandler.buildDepError "extra"))

41+ (hsPkgs."filepath" or (errorHandler.buildDepError "filepath"))

42+ (hsPkgs."hnix" or (errorHandler.buildDepError "hnix"))

43+ (hsPkgs."hpack" or (errorHandler.buildDepError "hpack"))

44+ (hsPkgs."http-client" or (errorHandler.buildDepError "http-client"))

45+ (hsPkgs."http-client-tls" or (errorHandler.buildDepError "http-client-tls"))

46+ (hsPkgs."http-types" or (errorHandler.buildDepError "http-types"))

47+ (hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative"))

48+ (hsPkgs."prettyprinter" or (errorHandler.buildDepError "prettyprinter"))

49+ (hsPkgs."process" or (errorHandler.buildDepError "process"))

50+ (hsPkgs."text" or (errorHandler.buildDepError "text"))

51+ (hsPkgs."transformers" or (errorHandler.buildDepError "transformers"))

52+ (hsPkgs."unordered-containers" or (errorHandler.buildDepError "unordered-containers"))

53+ (hsPkgs."yaml" or (errorHandler.buildDepError "yaml"))

8554 ];

8655 buildable = true;

8756 };

8857 exes = {

8958 "cabal-to-nix" = {

9059 depends = [

91− (hsPkgs."base" or (buildDepError "base"))

92− (hsPkgs."transformers" or (buildDepError "transformers"))

93− (hsPkgs."bytestring" or (buildDepError "bytestring"))

94− (hsPkgs."hpack" or (buildDepError "hpack"))

95− (hsPkgs."hnix" or (buildDepError "hnix"))

96− (hsPkgs."text" or (buildDepError "text"))

97− (hsPkgs."nix-tools" or (buildDepError "nix-tools"))

98− (hsPkgs."filepath" or (buildDepError "filepath"))

99− (hsPkgs."directory" or (buildDepError "directory"))

100− (hsPkgs."prettyprinter" or (buildDepError "prettyprinter"))

60+ (hsPkgs."base" or (errorHandler.buildDepError "base"))

61+ (hsPkgs."transformers" or (errorHandler.buildDepError "transformers"))

62+ (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring"))

63+ (hsPkgs."hpack" or (errorHandler.buildDepError "hpack"))

64+ (hsPkgs."hnix" or (errorHandler.buildDepError "hnix"))

65+ (hsPkgs."text" or (errorHandler.buildDepError "text"))

66+ (hsPkgs."nix-tools" or (errorHandler.buildDepError "nix-tools"))

67+ (hsPkgs."filepath" or (errorHandler.buildDepError "filepath"))

68+ (hsPkgs."directory" or (errorHandler.buildDepError "directory"))

69+ (hsPkgs."prettyprinter" or (errorHandler.buildDepError "prettyprinter"))

10170 ];

10271 buildable = true;

10372 };

10473 "hashes-to-nix" = {

10574 depends = [

106− (hsPkgs."base" or (buildDepError "base"))

107− (hsPkgs."hnix" or (buildDepError "hnix"))

108− (hsPkgs."nix-tools" or (buildDepError "nix-tools"))

109− (hsPkgs."data-fix" or (buildDepError "data-fix"))

110− (hsPkgs."aeson" or (buildDepError "aeson"))

111− (hsPkgs."microlens" or (buildDepError "microlens"))

112− (hsPkgs."microlens-aeson" or (buildDepError "microlens-aeson"))

113− (hsPkgs."text" or (buildDepError "text"))

114− (hsPkgs."filepath" or (buildDepError "filepath"))

115− (hsPkgs."directory" or (buildDepError "directory"))

75+ (hsPkgs."base" or (errorHandler.buildDepError "base"))

76+ (hsPkgs."hnix" or (errorHandler.buildDepError "hnix"))

77+ (hsPkgs."nix-tools" or (errorHandler.buildDepError "nix-tools"))

78+ (hsPkgs."data-fix" or (errorHandler.buildDepError "data-fix"))

79+ (hsPkgs."aeson" or (errorHandler.buildDepError "aeson"))

80+ (hsPkgs."microlens" or (errorHandler.buildDepError "microlens"))

81+ (hsPkgs."microlens-aeson" or (errorHandler.buildDepError "microlens-aeson"))

82+ (hsPkgs."text" or (errorHandler.buildDepError "text"))

83+ (hsPkgs."filepath" or (errorHandler.buildDepError "filepath"))

84+ (hsPkgs."directory" or (errorHandler.buildDepError "directory"))

11685 ];

11786 buildable = true;

11887 };

11988 "plan-to-nix" = {

12089 depends = [

121− (hsPkgs."base" or (buildDepError "base"))

122− (hsPkgs."nix-tools" or (buildDepError "nix-tools"))

123− (hsPkgs."hnix" or (buildDepError "hnix"))

124− (hsPkgs."Cabal" or (buildDepError "Cabal"))

125− (hsPkgs."text" or (buildDepError "text"))

126− (hsPkgs."hpack" or (buildDepError "hpack"))

127− (hsPkgs."unordered-containers" or (buildDepError "unordered-containers"))

128− (hsPkgs."vector" or (buildDepError "vector"))

129− (hsPkgs."aeson" or (buildDepError "aeson"))

130− (hsPkgs."microlens" or (buildDepError "microlens"))

131− (hsPkgs."microlens-aeson" or (buildDepError "microlens-aeson"))

132− (hsPkgs."optparse-applicative" or (buildDepError "optparse-applicative"))

133− (hsPkgs."prettyprinter" or (buildDepError "prettyprinter"))

134− (hsPkgs."filepath" or (buildDepError "filepath"))

135− (hsPkgs."directory" or (buildDepError "directory"))

136− (hsPkgs."bytestring" or (buildDepError "bytestring"))

137− (hsPkgs."transformers" or (buildDepError "transformers"))

138− (hsPkgs."extra" or (buildDepError "extra"))

90+ (hsPkgs."base" or (errorHandler.buildDepError "base"))

91+ (hsPkgs."nix-tools" or (errorHandler.buildDepError "nix-tools"))

92+ (hsPkgs."hnix" or (errorHandler.buildDepError "hnix"))

93+ (hsPkgs."Cabal" or (errorHandler.buildDepError "Cabal"))

94+ (hsPkgs."text" or (errorHandler.buildDepError "text"))

95+ (hsPkgs."hpack" or (errorHandler.buildDepError "hpack"))

96+ (hsPkgs."unordered-containers" or (errorHandler.buildDepError "unordered-containers"))

97+ (hsPkgs."vector" or (errorHandler.buildDepError "vector"))

98+ (hsPkgs."aeson" or (errorHandler.buildDepError "aeson"))

99+ (hsPkgs."microlens" or (errorHandler.buildDepError "microlens"))

100+ (hsPkgs."microlens-aeson" or (errorHandler.buildDepError "microlens-aeson"))

101+ (hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative"))

102+ (hsPkgs."prettyprinter" or (errorHandler.buildDepError "prettyprinter"))

103+ (hsPkgs."filepath" or (errorHandler.buildDepError "filepath"))

104+ (hsPkgs."directory" or (errorHandler.buildDepError "directory"))

105+ (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring"))

106+ (hsPkgs."transformers" or (errorHandler.buildDepError "transformers"))

107+ (hsPkgs."extra" or (errorHandler.buildDepError "extra"))

139108 ];

140109 buildable = true;

141110 };

142111 "hackage-to-nix" = {

143112 depends = [

144− (hsPkgs."base" or (buildDepError "base"))

145− (hsPkgs."nix-tools" or (buildDepError "nix-tools"))

146− (hsPkgs."hackage-db" or (buildDepError "hackage-db"))

147− (hsPkgs."hnix" or (buildDepError "hnix"))

148− (hsPkgs."Cabal" or (buildDepError "Cabal"))

149− (hsPkgs."aeson" or (buildDepError "aeson"))

150− (hsPkgs."aeson-pretty" or (buildDepError "aeson-pretty"))

151− (hsPkgs."containers" or (buildDepError "containers"))

152− (hsPkgs."bytestring" or (buildDepError "bytestring"))

153− (hsPkgs."text" or (buildDepError "text"))

154− (hsPkgs."cryptohash-sha256" or (buildDepError "cryptohash-sha256"))

155− (hsPkgs."base16-bytestring" or (buildDepError "base16-bytestring"))

156− (hsPkgs."base64-bytestring" or (buildDepError "base64-bytestring"))

157− (hsPkgs."filepath" or (buildDepError "filepath"))

158− (hsPkgs."directory" or (buildDepError "directory"))

159− (hsPkgs."transformers" or (buildDepError "transformers"))

113+ (hsPkgs."base" or (errorHandler.buildDepError "base"))

114+ (hsPkgs."nix-tools" or (errorHandler.buildDepError "nix-tools"))

115+ (hsPkgs."hackage-db" or (errorHandler.buildDepError "hackage-db"))

116+ (hsPkgs."hnix" or (errorHandler.buildDepError "hnix"))

117+ (hsPkgs."Cabal" or (errorHandler.buildDepError "Cabal"))

118+ (hsPkgs."aeson" or (errorHandler.buildDepError "aeson"))

119+ (hsPkgs."aeson-pretty" or (errorHandler.buildDepError "aeson-pretty"))

120+ (hsPkgs."containers" or (errorHandler.buildDepError "containers"))

121+ (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring"))

122+ (hsPkgs."text" or (errorHandler.buildDepError "text"))

123+ (hsPkgs."cryptohash-sha256" or (errorHandler.buildDepError "cryptohash-sha256"))

124+ (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring"))

125+ (hsPkgs."base64-bytestring" or (errorHandler.buildDepError "base64-bytestring"))

126+ (hsPkgs."filepath" or (errorHandler.buildDepError "filepath"))

127+ (hsPkgs."directory" or (errorHandler.buildDepError "directory"))

128+ (hsPkgs."transformers" or (errorHandler.buildDepError "transformers"))

160129 ];

161130 buildable = true;

162131 };

163132 "lts-to-nix" = {

164133 depends = [

165− (hsPkgs."base" or (buildDepError "base"))

166− (hsPkgs."nix-tools" or (buildDepError "nix-tools"))

167− (hsPkgs."hnix" or (buildDepError "hnix"))

168− (hsPkgs."yaml" or (buildDepError "yaml"))

169− (hsPkgs."aeson" or (buildDepError "aeson"))

170− (hsPkgs."microlens" or (buildDepError "microlens"))

171− (hsPkgs."microlens-aeson" or (buildDepError "microlens-aeson"))

172− (hsPkgs."text" or (buildDepError "text"))

173− (hsPkgs."filepath" or (buildDepError "filepath"))

174− (hsPkgs."directory" or (buildDepError "directory"))

175− (hsPkgs."unordered-containers" or (buildDepError "unordered-containers"))

176− (hsPkgs."vector" or (buildDepError "vector"))

177− (hsPkgs."Cabal" or (buildDepError "Cabal"))

134+ (hsPkgs."base" or (errorHandler.buildDepError "base"))

135+ (hsPkgs."nix-tools" or (errorHandler.buildDepError "nix-tools"))

136+ (hsPkgs."hnix" or (errorHandler.buildDepError "hnix"))

137+ (hsPkgs."yaml" or (errorHandler.buildDepError "yaml"))

138+ (hsPkgs."aeson" or (errorHandler.buildDepError "aeson"))

139+ (hsPkgs."microlens" or (errorHandler.buildDepError "microlens"))

140+ (hsPkgs."microlens-aeson" or (errorHandler.buildDepError "microlens-aeson"))

141+ (hsPkgs."text" or (errorHandler.buildDepError "text"))

142+ (hsPkgs."filepath" or (errorHandler.buildDepError "filepath"))

143+ (hsPkgs."directory" or (errorHandler.buildDepError "directory"))

144+ (hsPkgs."unordered-containers" or (errorHandler.buildDepError "unordered-containers"))

145+ (hsPkgs."vector" or (errorHandler.buildDepError "vector"))

146+ (hsPkgs."Cabal" or (errorHandler.buildDepError "Cabal"))

178147 ];

179148 buildable = true;

180149 };

181150 "stack-to-nix" = {

182151 depends = [

183− (hsPkgs."base" or (buildDepError "base"))

184− (hsPkgs."nix-tools" or (buildDepError "nix-tools"))

152+ (hsPkgs."base" or (errorHandler.buildDepError "base"))

153+ (hsPkgs."nix-tools" or (errorHandler.buildDepError "nix-tools"))

185154 ];

186155 buildable = true;

187156 };

188157 "truncate-index" = {

189158 depends = [

190− (hsPkgs."base" or (buildDepError "base"))

191− (hsPkgs."optparse-applicative" or (buildDepError "optparse-applicative"))

192− (hsPkgs."zlib" or (buildDepError "zlib"))

193− (hsPkgs."tar" or (buildDepError "tar"))

194− (hsPkgs."bytestring" or (buildDepError "bytestring"))

195− (hsPkgs."time" or (buildDepError "time"))

159+ (hsPkgs."base" or (errorHandler.buildDepError "base"))

160+ (hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative"))

161+ (hsPkgs."zlib" or (errorHandler.buildDepError "zlib"))

162+ (hsPkgs."tar" or (errorHandler.buildDepError "tar"))

163+ (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring"))

164+ (hsPkgs."time" or (errorHandler.buildDepError "time"))

196165 ];

197166 buildable = true;

198167 };

199168 "stack-repos" = {

200169 depends = [

201− (hsPkgs."base" or (buildDepError "base"))

202− (hsPkgs."nix-tools" or (buildDepError "nix-tools"))

170+ (hsPkgs."base" or (errorHandler.buildDepError "base"))

171+ (hsPkgs."nix-tools" or (errorHandler.buildDepError "nix-tools"))

203172 ];

204173 buildable = true;

205174 };

206175 "cabal-name" = {

207176 depends = [

208− (hsPkgs."base" or (buildDepError "base"))

209− (hsPkgs."nix-tools" or (buildDepError "nix-tools"))

177+ (hsPkgs."base" or (errorHandler.buildDepError "base"))

178+ (hsPkgs."nix-tools" or (errorHandler.buildDepError "nix-tools"))

210179 ];

211180 buildable = true;

212181 };

nix-tools/default.nix+7−17

@@ -12,24 +12,10 @@ let

1212 };

1313 };

1414

15− # we need to patch Cabal, as its data directory logic is broken for component builds, which haskell.nix

16− # uses excessively. See issue https://github.com/haskell/cabal/issues/5862, and the fix for Cabal 3.0

17− # in https://github.com/haskell/cabal/pull/6055. We apply the haskell/cabal#6055 here.

18− cabalPatch = pkgs.fetchpatch {

19− url = "https://patch-diff.githubusercontent.com/raw/haskell/cabal/pull/6055.diff";

20− sha256 = "145g7s3z9q8d18pxgyngvixgsm6gmwh1rgkzkhacy4krqiq0qyvx";

21− stripLen = 1;

22− };

23−

2415 pkgSet = mkCabalProjectPkgSet {

2516 plan-pkgs = if args ? ghc

2617 then import (./pkgs + "-${args.ghc.version}.nix")

2718 else import ./pkgs.nix;

28− pkg-def-extras = [

29− # We need this, as we are going to *re-isntall* happy, and happy > 1.19.9 needs

30− # a patched lib:Cabal to be properly installed.

31− (hackage: { packages = { happy = hackage.happy."1.19.9".revisions.default; }; })

32− ];

3319 modules = [

3420 {

3521 packages.transformers-compat.components.library.doExactConfig = true;

@@ -41,9 +27,13 @@ let

4127 packages.nix-tools.src = src;

4228 }

4329

44− {

45− packages.Cabal.patches = [ cabalPatch ];

46− }

30+ # This is needed for ghc 8.4.4 to make sure a new version of Cabal

31+ # is used to build setup for happy. The one that comes with ghc 8.4.4

32+ # does not work for newer versions of happy and haskell.nix)

33+ ({config, ...}: {

34+ packages.happy.package.buildType = lib.mkForce "Custom";

35+ packages.happy.package.setup-depends = [ config.hsPkgs.Cabal ];

36+ })

4737

4838 {

4939 # Make Cabal reinstallable

nix-tools/nix-tools-src.json+6−4

@@ -1,7 +1,9 @@

11{

22 "url": "https://github.com/input-output-hk/nix-tools",

3− "rev": "b24da60d4c984c982d6f533aa41c0cafd82e984a",

4− "date": "2020-03-24T10:24:17+08:00",

5− "sha256": "0xvhxk9i465an4yg2pf0jv58pqcm1ydg8bnp9hk6vnlmmjca2xrm",

6− "fetchSubmodules": false

3+ "rev": "2d817aa6fc5ac3917400e88f205c934107ad3fe9",

4+ "date": "2020-05-11T13:44:42+08:00",

5+ "sha256": "16934nj7ky8bf6nj7kb4v5bgdcb4i2bc86gj66hmyca2xz15knsw",

6+ "fetchSubmodules": false,

7+ "deepClone": false,

8+ "leaveDotGit": false

79}

nix-tools/pkgs-8.4.4.nix+71−71

@@ -2,7 +2,7 @@

22 pkgs = hackage:

33 {

44 packages = {

5− "http-client".revision = (((hackage."http-client")."0.5.14").revisions).default;

5+ "http-client".revision = (((hackage."http-client")."0.6.4.1").revisions).default;

66 "http-client".flags.network-uri = true;

77 "cookie".revision = (((hackage."cookie")."0.4.5").revisions).default;

88 "void".revision = (((hackage."void")."0.7.3").revisions).default;

@@ -16,7 +16,6 @@

1616 "semigroupoids".flags.containers = true;

1717 "semigroupoids".flags.contravariant = true;

1818 "free".revision = (((hackage."free")."5.1.3").revisions).default;

19− "tf-random".revision = (((hackage."tf-random")."0.5").revisions).default;

2019 "cereal".revision = (((hackage."cereal")."0.5.8.1").revisions).default;

2120 "cereal".flags.bytestring-builder = false;

2221 "exceptions".revision = (((hackage."exceptions")."0.10.4").revisions).default;

@@ -25,38 +24,39 @@

2524 "cryptohash-sha256".flags.exe = false;

2625 "binary".revision = (((hackage."binary")."0.8.5.1").revisions).default;

2726 "interpolate".revision = (((hackage."interpolate")."0.2.0").revisions).default;

28− "hnix".revision = (((hackage."hnix")."0.6.1").revisions).default;

27+ "hnix".revision = (((hackage."hnix")."0.7.1").revisions).default;

2928 "hnix".flags.profiling = false;

3029 "hnix".flags.optimize = false;

3130 "tar".revision = (((hackage."tar")."0.5.1.1").revisions).default;

3231 "tar".flags.old-time = false;

3332 "tar".flags.old-bytestring = false;

34− "regex-tdfa".revision = (((hackage."regex-tdfa")."1.2.3.2").revisions).default;

35− "regex-tdfa".flags.devel = false;

33+ "regex-tdfa".revision = (((hackage."regex-tdfa")."1.3.1.0").revisions).default;

34+ "regex-tdfa".flags.force-o2 = false;

3635 "ghc-prim".revision = (((hackage."ghc-prim")."0.5.2.0").revisions).default;

3736 "text-metrics".revision = (((hackage."text-metrics")."0.3.0").revisions).default;

3837 "text-metrics".flags.dev = false;

3938 "utf8-string".revision = (((hackage."utf8-string")."1.0.1.1").revisions).default;

40− "bifunctors".revision = (((hackage."bifunctors")."5.5.6").revisions).default;

39+ "bifunctors".revision = (((hackage."bifunctors")."5.5.7").revisions).default;

4140 "bifunctors".flags.semigroups = true;

4241 "bifunctors".flags.tagged = true;

4342 "hashing".revision = (((hackage."hashing")."0.1.0.1").revisions).default;

44− "extra".revision = (((hackage."extra")."1.6.18").revisions).default;

43+ "extra".revision = (((hackage."extra")."1.7.1").revisions).default;

4544 "haskeline".revision = (((hackage."haskeline")."0.7.4.2").revisions).default;

46− "logict".revision = (((hackage."logict")."0.6.0.3").revisions).default;

45+ "logict".revision = (((hackage."logict")."0.7.0.2").revisions).default;

4746 "x509-validation".revision = (((hackage."x509-validation")."1.6.11").revisions).default;

48− "split".revision = (((hackage."split")."0.2.3.3").revisions).default;

49− "data-fix".revision = (((hackage."data-fix")."0.2.0").revisions).default;

47+ "split".revision = (((hackage."split")."0.2.3.4").revisions).default;

48+ "data-fix".revision = (((hackage."data-fix")."0.2.1").revisions).default;

5049 "stm".revision = (((hackage."stm")."2.4.5.1").revisions).default;

50+ "base-compat-batteries".revision = (((hackage."base-compat-batteries")."0.11.1").revisions).default;

51+ "constraints-extras".revision = (((hackage."constraints-extras")."0.3.0.2").revisions).default;

52+ "constraints-extras".flags.build-readme = true;

5153 "hourglass".revision = (((hackage."hourglass")."0.2.12").revisions).default;

5254 "case-insensitive".revision = (((hackage."case-insensitive")."1.2.1.0").revisions).default;

5355 "unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;

5456 "mtl".revision = (((hackage."mtl")."2.2.2").revisions).default;

55− "network-uri".revision = (((hackage."network-uri")."2.6.1.0").revisions).default;

57+ "network-uri".revision = (((hackage."network-uri")."2.6.3.0").revisions).default;

5658 "asn1-parse".revision = (((hackage."asn1-parse")."0.9.5").revisions).default;

57− "regex-base".revision = (((hackage."regex-base")."0.93.2").revisions).default;

58− "regex-base".flags.splitbase = true;

59− "regex-base".flags.newbase = true;

59+ "regex-base".revision = (((hackage."regex-base")."0.94.0.0").revisions).default;

6060 "zlib".revision = (((hackage."zlib")."0.6.2.1").revisions).default;

6161 "zlib".flags.non-blocking-ffi = false;

6262 "zlib".flags.pkg-config = false;

@@ -64,7 +64,7 @@

6464 "cmdargs".revision = (((hackage."cmdargs")."0.10.20").revisions).default;

6565 "cmdargs".flags.testprog = false;

6666 "cmdargs".flags.quotation = true;

67− "th-expand-syns".revision = (((hackage."th-expand-syns")."0.4.5.0").revisions).default;

67+ "th-expand-syns".revision = (((hackage."th-expand-syns")."0.4.6.0").revisions).default;

6868 "cryptonite".revision = (((hackage."cryptonite")."0.26").revisions).default;

6969 "cryptonite".flags.support_sse = false;

7070 "cryptonite".flags.integer-gmp = true;

@@ -77,19 +77,20 @@

7777 "microlens-aeson".revision = (((hackage."microlens-aeson")."2.3.0.4").revisions).default;

7878 "clock".revision = (((hackage."clock")."0.8").revisions).default;

7979 "clock".flags.llvm = false;

80+ "saltine".revision = (((hackage."saltine")."0.1.1.0").revisions).default;

8081 "adjunctions".revision = (((hackage."adjunctions")."4.4").revisions).default;

8182 "cryptohash-md5".revision = (((hackage."cryptohash-md5")."0.11.100.1").revisions).default;

8283 "invariant".revision = (((hackage."invariant")."0.5.3").revisions).default;

83− "th-orphans".revision = (((hackage."th-orphans")."0.13.9").revisions).default;

84+ "th-orphans".revision = (((hackage."th-orphans")."0.13.10").revisions).default;

8485 "pem".revision = (((hackage."pem")."0.2.4").revisions).default;

85− "megaparsec".revision = (((hackage."megaparsec")."7.0.5").revisions).default;

86+ "megaparsec".revision = (((hackage."megaparsec")."8.0.0").revisions).default;

8687 "megaparsec".flags.dev = false;

8788 "syb".revision = (((hackage."syb")."0.7.1").revisions).default;

88− "distributive".revision = (((hackage."distributive")."0.6.1").revisions).default;

89+ "distributive".revision = (((hackage."distributive")."0.6.2").revisions).default;

8990 "distributive".flags.semigroups = true;

9091 "distributive".flags.tagged = true;

9192 "asn1-encoding".revision = (((hackage."asn1-encoding")."0.9.6").revisions).default;

92− "QuickCheck".revision = (((hackage."QuickCheck")."2.12.6.1").revisions).default;

93+ "QuickCheck".revision = (((hackage."QuickCheck")."2.14").revisions).default;

9394 "QuickCheck".flags.templatehaskell = true;

9495 "scientific".revision = (((hackage."scientific")."0.3.6.2").revisions).default;

9596 "scientific".flags.integer-simple = false;

@@ -98,21 +99,26 @@

9899 "half".revision = (((hackage."half")."0.3").revisions).default;

99100 "parallel".revision = (((hackage."parallel")."3.2.2.0").revisions).default;

100101 "deepseq".revision = (((hackage."deepseq")."1.4.3.0").revisions).default;

101− "hnix-store-core".revision = (((hackage."hnix-store-core")."0.1.0.0").revisions).default;

102+ "hnix-store-core".revision = (((hackage."hnix-store-core")."0.2.0.0").revisions).default;

102103 "hnix-store-core".flags.bounded_memory = false;

104+ "haskell-src-meta".revision = (((hackage."haskell-src-meta")."0.8.5").revisions).default;

103105 "random".revision = (((hackage."random")."1.1").revisions).default;

104106 "uuid-types".revision = (((hackage."uuid-types")."1.0.3").revisions).default;

105− "optparse-applicative".revision = (((hackage."optparse-applicative")."0.14.3.0").revisions).default;

107+ "optparse-applicative".revision = (((hackage."optparse-applicative")."0.15.1.0").revisions).default;

106108 "network".revision = (((hackage."network")."3.1.1.1").revisions).default;

107109 "connection".revision = (((hackage."connection")."0.3.1").revisions).default;

110+ "splitmix".revision = (((hackage."splitmix")."0.0.4").revisions).default;

111+ "splitmix".flags.optimised-mixer = false;

112+ "splitmix".flags.random = true;

108113 "async".revision = (((hackage."async")."2.2.2").revisions).default;

109114 "async".flags.bench = false;

110− "dlist".revision = (((hackage."dlist")."0.8.0.7").revisions).default;

111− "conduit".revision = (((hackage."conduit")."1.3.1.2").revisions).default;

115+ "dlist".revision = (((hackage."dlist")."0.8.0.8").revisions).default;

116+ "conduit".revision = (((hackage."conduit")."1.3.2").revisions).default;

112117 "ref-tf".revision = (((hackage."ref-tf")."0.4.0.2").revisions).default;

113118 "x509-store".revision = (((hackage."x509-store")."1.6.7").revisions).default;

119+ "constraints".revision = (((hackage."constraints")."0.11.2").revisions).default;

114120 "lens-family-th".revision = (((hackage."lens-family-th")."0.5.0.2").revisions).default;

115− "semigroups".revision = (((hackage."semigroups")."0.18.5").revisions).default;

121+ "semigroups".revision = (((hackage."semigroups")."0.19.1").revisions).default;

116122 "semigroups".flags.bytestring = true;

117123 "semigroups".flags.unordered-containers = true;

118124 "semigroups".flags.text = true;

@@ -123,14 +129,13 @@

123129 "semigroups".flags.transformers = true;

124130 "semigroups".flags.deepseq = true;

125131 "semigroups".flags.bytestring-builder = false;

126− "vector-instances".revision = (((hackage."vector-instances")."3.4").revisions).default;

127− "vector-instances".flags.hashable = true;

132+ "semigroups".flags.template-haskell = true;

128133 "parsec".revision = (((hackage."parsec")."3.1.13.0").revisions).default;

129134 "th-reify-many".revision = (((hackage."th-reify-many")."0.1.9").revisions).default;

130− "hsc2hs".revision = (((hackage."hsc2hs")."0.68.6").revisions).default;

135+ "hsc2hs".revision = (((hackage."hsc2hs")."0.68.7").revisions).default;

131136 "hsc2hs".flags.in-ghc-tree = false;

132137 "directory".revision = (((hackage."directory")."1.3.1.5").revisions).default;

133− "yaml".revision = (((hackage."yaml")."0.11.2.0").revisions).default;

138+ "yaml".revision = (((hackage."yaml")."0.11.3.0").revisions).default;

134139 "yaml".flags.no-exe = true;

135140 "yaml".flags.no-examples = true;

136141 "transformers-compat".revision = (((hackage."transformers-compat")."0.6.5").revisions).default;

@@ -144,29 +149,28 @@

144149 "hpack".revision = (((hackage."hpack")."0.33.0").revisions).default;

145150 "template-haskell".revision = (((hackage."template-haskell")."2.13.0.0").revisions).default;

146151 "mono-traversable".revision = (((hackage."mono-traversable")."1.0.15.1").revisions).default;

147− "vector".revision = (((hackage."vector")."0.12.0.3").revisions).default;

152+ "vector".revision = (((hackage."vector")."0.12.1.2").revisions).default;

148153 "vector".flags.unsafechecks = false;

149154 "vector".flags.internalchecks = false;

150155 "vector".flags.wall = false;

151156 "vector".flags.boundschecks = true;

152157 "call-stack".revision = (((hackage."call-stack")."0.2.0").revisions).default;

153− "primitive".revision = (((hackage."primitive")."0.7.0.0").revisions).default;

154− "profunctors".revision = (((hackage."profunctors")."5.5.1").revisions).default;

158+ "primitive".revision = (((hackage."primitive")."0.7.0.1").revisions).default;

159+ "profunctors".revision = (((hackage."profunctors")."5.5.2").revisions).default;

155160 "safe".revision = (((hackage."safe")."0.3.18").revisions).default;

156161 "blaze-builder".revision = (((hackage."blaze-builder")."0.4.1.0").revisions).default;

157− "base-compat".revision = (((hackage."base-compat")."0.10.5").revisions).default;

158− "time-compat".revision = (((hackage."time-compat")."1.9.2.2").revisions).default;

162+ "base-compat".revision = (((hackage."base-compat")."0.11.1").revisions).default;

163+ "time-compat".revision = (((hackage."time-compat")."1.9.3").revisions).default;

159164 "time-compat".flags.old-locale = false;

160165 "x509-system".revision = (((hackage."x509-system")."1.6.6").revisions).default;

161− "keys".revision = (((hackage."keys")."3.12.2").revisions).default;

162− "ansi-terminal".revision = (((hackage."ansi-terminal")."0.10.2").revisions).default;

166+ "ansi-terminal".revision = (((hackage."ansi-terminal")."0.10.3").revisions).default;

163167 "ansi-terminal".flags.example = false;

164168 "tagged".revision = (((hackage."tagged")."0.8.6").revisions).default;

165169 "tagged".flags.transformers = true;

166170 "tagged".flags.deepseq = true;

167171 "x509".revision = (((hackage."x509")."1.7.5").revisions).default;

168− "haskell-src-exts".revision = (((hackage."haskell-src-exts")."1.21.1").revisions).default;

169− "lens".revision = (((hackage."lens")."4.17.1").revisions).default;

172+ "haskell-src-exts".revision = (((hackage."haskell-src-exts")."1.23.0").revisions).default;

173+ "lens".revision = (((hackage."lens")."4.19.2").revisions).default;

170174 "lens".flags.j = false;

171175 "lens".flags.test-properties = true;

172176 "lens".flags.old-inline-pragmas = false;

@@ -178,22 +182,27 @@

178182 "lens".flags.dump-splices = false;

179183 "lens".flags.test-hunit = true;

180184 "lens".flags.safe = false;

181− "unliftio-core".revision = (((hackage."unliftio-core")."0.1.2.0").revisions).default;

185+ "unliftio-core".revision = (((hackage."unliftio-core")."0.2.0.1").revisions).default;

182186 "containers".revision = (((hackage."containers")."0.5.11.0").revisions).default;

183187 "integer-logarithms".revision = (((hackage."integer-logarithms")."1.0.3").revisions).default;

184188 "integer-logarithms".flags.check-bounds = false;

185189 "integer-logarithms".flags.integer-gmp = true;

190+ "semialign".revision = (((hackage."semialign")."1.1").revisions).default;

191+ "semialign".flags.semigroupoids = true;

186192 "reflection".revision = (((hackage."reflection")."2.1.5").revisions).default;

187193 "reflection".flags.slow = false;

188194 "reflection".flags.template-haskell = true;

189− "these".revision = (((hackage."these")."0.7.6").revisions).default;

190− "regex-tdfa-text".revision = (((hackage."regex-tdfa-text")."1.0.0.3").revisions).default;

191− "dependent-sum".revision = (((hackage."dependent-sum")."0.4").revisions).default;

195+ "these".revision = (((hackage."these")."1.0.1").revisions).default;

196+ "these".flags.semigroupoids = true;

197+ "these".flags.assoc = true;

198+ "these".flags.quickcheck = true;

199+ "these".flags.aeson = true;

200+ "dependent-sum".revision = (((hackage."dependent-sum")."0.6.2.0").revisions).default;

192201 "socks".revision = (((hackage."socks")."0.6.1").revisions).default;

193202 "streaming-commons".revision = (((hackage."streaming-commons")."0.2.1.2").revisions).default;

194203 "streaming-commons".flags.use-bytestring-builder = false;

195− "haskell-lexer".revision = (((hackage."haskell-lexer")."1.0.2").revisions).default;

196− "lens-family".revision = (((hackage."lens-family")."2.0.0").revisions).default;

204+ "haskell-lexer".revision = (((hackage."haskell-lexer")."1.1").revisions).default;

205+ "lens-family".revision = (((hackage."lens-family")."2.1.0").revisions).default;

197206 "bytestring".revision = (((hackage."bytestring")."0.10.8.2").revisions).default;

198207 "ansi-wl-pprint".revision = (((hackage."ansi-wl-pprint")."0.6.9").revisions).default;

199208 "ansi-wl-pprint".flags.example = false;

@@ -208,28 +217,21 @@

208217 "contravariant".flags.semigroups = true;

209218 "contravariant".flags.tagged = true;

210219 "contravariant".flags.statevar = true;

211− "pointed".revision = (((hackage."pointed")."5.0.1").revisions).default;

212− "pointed".flags.semigroupoids = true;

213− "pointed".flags.stm = true;

214− "pointed".flags.comonad = true;

215− "pointed".flags.unordered-containers = true;

216− "pointed".flags.kan-extensions = true;

217− "pointed".flags.semigroups = true;

218− "pointed".flags.tagged = true;

219− "pointed".flags.containers = true;

220− "pointed".flags.transformers = true;

221− "parser-combinators".revision = (((hackage."parser-combinators")."1.0.3").revisions).default;

220+ "type-equality".revision = (((hackage."type-equality")."1").revisions).default;

221+ "parser-combinators".revision = (((hackage."parser-combinators")."1.2.1").revisions).default;

222222 "parser-combinators".flags.dev = false;

223+ "semialign-indexed".revision = (((hackage."semialign-indexed")."1.1").revisions).default;

223224 "deriving-compat".revision = (((hackage."deriving-compat")."0.5.8").revisions).default;

224225 "deriving-compat".flags.base-4-9 = true;

225226 "deriving-compat".flags.template-haskell-2-11 = true;

226227 "deriving-compat".flags.new-functor-classes = true;

227228 "text".revision = (((hackage."text")."1.2.3.1").revisions).default;

228− "Cabal".revision = (((hackage."Cabal")."2.4.1.0").revisions).default;

229+ "Cabal".revision = (((hackage."Cabal")."3.2.0.0").revisions).default;

229230 "Cabal".flags.bundled-binary-generic = false;

231+ "assoc".revision = (((hackage."assoc")."1.0.1").revisions).default;

230232 "unordered-containers".revision = (((hackage."unordered-containers")."0.2.10.0").revisions).default;

231233 "unordered-containers".flags.debug = false;

232− "base64-bytestring".revision = (((hackage."base64-bytestring")."1.0.0.2").revisions).default;

234+ "base64-bytestring".revision = (((hackage."base64-bytestring")."1.1.0.0").revisions).default;

233235 "aeson-pretty".revision = (((hackage."aeson-pretty")."0.8.8").revisions).default;

234236 "aeson-pretty".flags.lib-only = false;

235237 "base".revision = (((hackage."base")."4.11.1.0").revisions).default;

@@ -248,17 +250,17 @@

248250 "vector-algorithms".flags.boundschecks = true;

249251 "vector-algorithms".flags.bench = true;

250252 "vector-algorithms".flags.properties = true;

251− "prettyprinter".revision = (((hackage."prettyprinter")."1.2.1.1").revisions).default;

253+ "prettyprinter".revision = (((hackage."prettyprinter")."1.6.1").revisions).default;

252254 "prettyprinter".flags.buildreadme = false;

253255 "cryptohash-sha512".revision = (((hackage."cryptohash-sha512")."0.11.100.1").revisions).default;

254256 "pretty-show".revision = (((hackage."pretty-show")."1.9.5").revisions).default;

255257 "transformers".revision = (((hackage."transformers")."0.5.5.0").revisions).default;

256− "hashable".revision = (((hackage."hashable")."1.2.7.0").revisions).default;

258+ "hashable".revision = (((hackage."hashable")."1.3.0.0").revisions).default;

257259 "hashable".flags.sse2 = true;

258260 "hashable".flags.integer-gmp = true;

259261 "hashable".flags.sse41 = false;

260262 "hashable".flags.examples = false;

261− "attoparsec".revision = (((hackage."attoparsec")."0.13.2.3").revisions).default;

263+ "attoparsec".revision = (((hackage."attoparsec")."0.13.2.4").revisions).default;

262264 "attoparsec".flags.developer = false;

263265 "infer-license".revision = (((hackage."infer-license")."0.2.0").revisions).default;

264266 "colour".revision = (((hackage."colour")."2.3.5").revisions).default;

@@ -267,35 +269,35 @@

267269 "happy".revision = (((hackage."happy")."1.19.12").revisions).default;

268270 "happy".flags.small_base = true;

269271 "filepath".revision = (((hackage."filepath")."1.4.2").revisions).default;

270− "asn1-types".revision = (((hackage."asn1-types")."0.3.3").revisions).default;

272+ "asn1-types".revision = (((hackage."asn1-types")."0.3.4").revisions).default;

271273 "cborg".revision = (((hackage."cborg")."0.2.2.1").revisions).default;

272274 "cborg".flags.optimize-gmp = true;

273275 "monad-control".revision = (((hackage."monad-control")."1.0.2.3").revisions).default;

274276 "process".revision = (((hackage."process")."1.6.3.0").revisions).default;

275− "tls".revision = (((hackage."tls")."1.5.3").revisions).default;

277+ "tls".revision = (((hackage."tls")."1.5.4").revisions).default;

276278 "tls".flags.compat = true;

277279 "tls".flags.network = true;

278280 "tls".flags.hans = false;

279281 "kan-extensions".revision = (((hackage."kan-extensions")."5.2").revisions).default;

280282 "th-lift".revision = (((hackage."th-lift")."0.8.1").revisions).default;

281− "libyaml".revision = (((hackage."libyaml")."0.1.1.1").revisions).default;

283+ "libyaml".revision = (((hackage."libyaml")."0.1.2").revisions).default;

282284 "libyaml".flags.system-libyaml = false;

283285 "libyaml".flags.no-unicode = false;

284− "resourcet".revision = (((hackage."resourcet")."1.2.2").revisions).default;

286+ "resourcet".revision = (((hackage."resourcet")."1.2.4").revisions).default;

285287 "pretty".revision = (((hackage."pretty")."1.1.3.6").revisions).default;

286288 "cabal-doctest".revision = (((hackage."cabal-doctest")."1.0.8").revisions).default;

287289 "Glob".revision = (((hackage."Glob")."0.10.0").revisions).default;

288290 "microlens".revision = (((hackage."microlens")."0.4.11.2").revisions).default;

289− "aeson".revision = (((hackage."aeson")."1.4.6.0").revisions).default;

291+ "aeson".revision = (((hackage."aeson")."1.4.7.1").revisions).default;

290292 "aeson".flags.cffi = false;

291293 "aeson".flags.fast = false;

292294 "aeson".flags.bytestring-builder = false;

293295 "aeson".flags.developer = false;

294296 "http-types".revision = (((hackage."http-types")."0.12.3").revisions).default;

295297 "ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.4.4").revisions).default;

296− "th-lift-instances".revision = (((hackage."th-lift-instances")."0.1.14").revisions).default;

297− "base-orphans".revision = (((hackage."base-orphans")."0.8.1").revisions).default;

298− "th-abstraction".revision = (((hackage."th-abstraction")."0.3.1.0").revisions).default;

298+ "th-lift-instances".revision = (((hackage."th-lift-instances")."0.1.16").revisions).default;

299+ "base-orphans".revision = (((hackage."base-orphans")."0.8.2").revisions).default;

300+ "th-abstraction".revision = (((hackage."th-abstraction")."0.3.2.0").revisions).default;

299301 "memory".revision = (((hackage."memory")."0.15.0").revisions).default;

300302 "memory".flags.support_bytestring = true;

301303 "memory".flags.support_basement = true;

@@ -304,8 +306,7 @@

304306 "array".revision = (((hackage."array")."0.5.2.0").revisions).default;

305307 "repline".revision = (((hackage."repline")."0.2.2.0").revisions).default;

306308 "xml".revision = (((hackage."xml")."1.3.14").revisions).default;

307− "erf".revision = (((hackage."erf")."2.0.0.0").revisions).default;

308− "lens-family-core".revision = (((hackage."lens-family-core")."2.0.0").revisions).default;

309+ "lens-family-core".revision = (((hackage."lens-family-core")."2.1.0").revisions).default;

309310 "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;

310311 };

311312 compiler = {

@@ -326,6 +327,7 @@

326327 "containers" = "0.5.11.0";

327328 "bytestring" = "0.10.8.2";

328329 "text" = "1.2.3.1";

330+ "Cabal" = "2.2.0.1";

329331 "base" = "4.11.1.0";

330332 "time" = "1.8.0.2";

331333 "terminfo" = "0.4.1.1";

@@ -344,7 +346,6 @@

344346 packages = {

345347 nix-tools = ./.plan.nix/nix-tools.nix;

346348 hackage-db = ./.plan.nix/hackage-db.nix;

347− haskell-src-meta = ./.plan.nix/haskell-src-meta.nix;

348349 };

349350 };

350351 modules = [

@@ -355,7 +356,6 @@

355356 "hackage-db" = {

356357 flags = { "install-examples" = lib.mkOverride 900 false; };

357358 };

358− "haskell-src-meta" = { flags = {}; };

359359 };

360360 })

361361 ];

nix-tools/pkgs.nix+71−71