d8c13de · haskell.nix · git.iko.soy

git.iko.soy/haskell.nix

on iko/ghcjs-patch-master help sign in

Regenerate nix for test/with-packages to avoid transformers-0.5.0.0 problem

commitd8c13de4150a4ba0a2ff0d1b5c09eade1ee1f8b5 authorRodney Lorrimar <rodney.lorrimar@iohk.io> dateTue 7 May 2019, 13:13 (7 years ago) parent0e02f1f

3 files changed+128−96

compare with iko/ghcjs-patch-master

unifiedsplit

test/with-packages/default.nix+1−1 test/with-packages/plan.nix+122−74 test/with-packages/test-with-packages.nix+5−21

test/with-packages/default.nix+1−1

@@ -6,7 +6,7 @@ with util;

66let

77 pkgSet = mkPkgSet {

88 # generated with:

9− # cabal new-build

9+ # nix-shell -p haskell.compiler.ghc844 --run "cabal new-configure --with-compiler ghc-8.4.4 --constraint 'transformers == 0.5.6.2' --constraint 'process == 1.6.5.0'"

1010 # plan-to-nix dist-newstyle/cache/plan.json > plan.nix

1111 # cabal-to-nix test-with-packages.cabal > test-with-packages.nix

1212 pkg-def = import ./plan.nix;

test/with-packages/plan.nix+122−74

@@ -1,99 +1,147 @@

11hackage:

22 {

33 packages = {

4− "void".revision = hackage."void"."0.7.2".revisions.default;

5− "semigroupoids".revision = hackage."semigroupoids"."5.2.2".revisions.default;

6− "free".revision = hackage."free"."5.0.2".revisions.default;

7− "exceptions".revision = hackage."exceptions"."0.10.0".revisions.default;

8− "binary".revision = hackage."binary"."0.8.5.1".revisions.default;

9− "ghc-prim".revision = hackage."ghc-prim"."0.5.2.0".revisions.default;

10− "bifunctors".revision = hackage."bifunctors"."5.5.3".revisions.default;

11− "stm".revision = hackage."stm"."2.4.5.1".revisions.default;

12− "mtl".revision = hackage."mtl"."2.2.2".revisions.default;

13− "rts".revision = hackage."rts"."1.0".revisions.default;

14− "adjunctions".revision = hackage."adjunctions"."4.4".revisions.default;

15− "invariant".revision = hackage."invariant"."0.5.1".revisions.default;

16− "distributive".revision = hackage."distributive"."0.5.3".revisions.default;

17− "parallel".revision = hackage."parallel"."3.2.2.0".revisions.default;

18− "deepseq".revision = hackage."deepseq"."1.4.3.0".revisions.default;

19− "semigroups".revision = hackage."semigroups"."0.18.5".revisions.default;

20− "transformers-compat".revision = hackage."transformers-compat"."0.6.2".revisions.default;

21− "template-haskell".revision = hackage."template-haskell"."2.13.0.0".revisions.default;

22− "vector".revision = hackage."vector"."0.12.0.1".revisions.default;

23− "call-stack".revision = hackage."call-stack"."0.1.0".revisions.default;

24− "primitive".revision = hackage."primitive"."0.6.3.0".revisions.default;

25− "profunctors".revision = hackage."profunctors"."5.2.2".revisions.default;

26− "tagged".revision = hackage."tagged"."0.8.5".revisions.default;

27− "lens".revision = hackage."lens"."4.16.1".revisions.default;

28− "containers".revision = hackage."containers"."0.5.11.0".revisions.default;

29− "reflection".revision = hackage."reflection"."2.1.4".revisions.default;

30− "bytestring".revision = hackage."bytestring"."0.10.8.2".revisions.default;

31− "StateVar".revision = hackage."StateVar"."1.1.1.1".revisions.default;

32− "contravariant".revision = hackage."contravariant"."1.4.1".revisions.default;

33− "text".revision = hackage."text"."1.2.3.1".revisions.default;

34− "unordered-containers".revision = hackage."unordered-containers"."0.2.9.0".revisions.default;

35− "base".revision = hackage."base"."4.11.1.0".revisions.default;

36− "comonad".revision = hackage."comonad"."5.0.4".revisions.default;

37− "transformers".revision = hackage."transformers"."0.5.5.0".revisions.default;

38− "hashable".revision = hackage."hashable"."1.2.7.0".revisions.default;

39− "transformers-base".revision = hackage."transformers-base"."0.4.5.2".revisions.default;

40− "filepath".revision = hackage."filepath"."1.4.2".revisions.default;

41− "kan-extensions".revision = hackage."kan-extensions"."5.2".revisions.default;

42− "pretty".revision = hackage."pretty"."1.1.3.6".revisions.default;

43− "ghc-boot-th".revision = hackage."ghc-boot-th"."8.4.4".revisions.default;

44− "base-orphans".revision = hackage."base-orphans"."0.7".revisions.default;

45− "th-abstraction".revision = hackage."th-abstraction"."0.2.8.0".revisions.default;

46− "array".revision = hackage."array"."0.5.2.0".revisions.default;

47− "integer-gmp".revision = hackage."integer-gmp"."1.0.2.0".revisions.default;

48− };

4+ "void".revision = (((hackage."void")."0.7.2").revisions).default;

5+ "void".flags.safe = false;

6+ "semigroupoids".revision = (((hackage."semigroupoids")."5.3.2").revisions).default;

7+ "semigroupoids".flags.comonad = true;

8+ "semigroupoids".flags.doctests = true;

9+ "semigroupoids".flags.unordered-containers = true;

10+ "semigroupoids".flags.distributive = true;

11+ "semigroupoids".flags.tagged = true;

12+ "semigroupoids".flags.containers = true;

13+ "semigroupoids".flags.contravariant = true;

14+ "free".revision = (((hackage."free")."5.1").revisions).default;

15+ "exceptions".revision = (((hackage."exceptions")."0.10.1").revisions).default;

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

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

18+ "bifunctors".revision = (((hackage."bifunctors")."5.5.3").revisions).default;

19+ "bifunctors".flags.semigroups = true;

20+ "bifunctors".flags.tagged = true;

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

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

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

24+ "rts".revision = (((hackage."rts")."1.0").revisions).default;

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

26+ "invariant".revision = (((hackage."invariant")."0.5.1").revisions).default;

27+ "distributive".revision = (((hackage."distributive")."0.6").revisions).default;

28+ "distributive".flags.semigroups = true;

29+ "distributive".flags.tagged = true;

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

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

32+ "semigroups".revision = (((hackage."semigroups")."0.18.5").revisions).default;

33+ "semigroups".flags.bytestring = true;

34+ "semigroups".flags.unordered-containers = true;

35+ "semigroups".flags.text = true;

36+ "semigroups".flags.tagged = true;

37+ "semigroups".flags.containers = true;

38+ "semigroups".flags.binary = true;

39+ "semigroups".flags.hashable = true;

40+ "semigroups".flags.transformers = true;

41+ "semigroups".flags.deepseq = true;

42+ "semigroups".flags.bytestring-builder = false;

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

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

45+ "transformers-compat".revision = (((hackage."transformers-compat")."0.6.4").revisions).default;

46+ "transformers-compat".flags.five = false;

47+ "transformers-compat".flags.generic-deriving = true;

48+ "transformers-compat".flags.two = false;

49+ "transformers-compat".flags.five-three = true;

50+ "transformers-compat".flags.mtl = true;

51+ "transformers-compat".flags.four = false;

52+ "transformers-compat".flags.three = false;

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

54+ "vector".revision = (((hackage."vector")."0.12.0.2").revisions).default;

55+ "vector".flags.unsafechecks = false;

56+ "vector".flags.internalchecks = false;

57+ "vector".flags.wall = false;

58+ "vector".flags.boundschecks = true;

59+ "call-stack".revision = (((hackage."call-stack")."0.1.0").revisions).default;

60+ "primitive".revision = (((hackage."primitive")."0.6.4.0").revisions).default;

61+ "profunctors".revision = (((hackage."profunctors")."5.3").revisions).default;

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

63+ "tagged".flags.transformers = true;

64+ "tagged".flags.deepseq = true;

65+ "lens".revision = (((hackage."lens")."4.17").revisions).default;

66+ "lens".flags.j = false;

67+ "lens".flags.test-properties = true;

68+ "lens".flags.old-inline-pragmas = false;

69+ "lens".flags.test-templates = true;

70+ "lens".flags.trustworthy = true;

71+ "lens".flags.test-doctests = true;

72+ "lens".flags.benchmark-uniplate = false;

73+ "lens".flags.inlining = true;

74+ "lens".flags.dump-splices = false;

75+ "lens".flags.test-hunit = true;

76+ "lens".flags.safe = false;

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

78+ "reflection".revision = (((hackage."reflection")."2.1.4").revisions).default;

79+ "reflection".flags.slow = false;

80+ "reflection".flags.template-haskell = true;

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

82+ "StateVar".revision = (((hackage."StateVar")."1.1.1.1").revisions).default;

83+ "contravariant".revision = (((hackage."contravariant")."1.5").revisions).default;

84+ "contravariant".flags.semigroups = true;

85+ "contravariant".flags.tagged = true;

86+ "contravariant".flags.statevar = true;

87+ "contravariant".flags.safe = false;

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

89+ "Cabal".revision = (((hackage."Cabal")."2.2.0.1").revisions).default;

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

91+ "unordered-containers".flags.debug = false;

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

93+ "comonad".revision = (((hackage."comonad")."5.0.4").revisions).default;

94+ "comonad".flags.distributive = true;

95+ "comonad".flags.test-doctests = true;

96+ "comonad".flags.containers = true;

97+ "comonad".flags.contravariant = true;

98+ "time".revision = (((hackage."time")."1.8.0.2").revisions).default;

99+ "transformers".revision = (((hackage."transformers")."0.5.6.2").revisions).default;

100+ "hashable".revision = (((hackage."hashable")."1.2.7.0").revisions).default;

101+ "hashable".flags.sse2 = true;

102+ "hashable".flags.integer-gmp = true;

103+ "hashable".flags.sse41 = false;

104+ "hashable".flags.examples = false;

105+ "transformers-base".revision = (((hackage."transformers-base")."0.4.5.2").revisions).default;

106+ "transformers-base".flags.orphaninstances = true;

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

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

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

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

111+ "cabal-doctest".revision = (((hackage."cabal-doctest")."1.0.6").revisions).default;

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

113+ "base-orphans".revision = (((hackage."base-orphans")."0.8.1").revisions).default;

114+ "th-abstraction".revision = (((hackage."th-abstraction")."0.2.11.0").revisions).default;

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

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

117+ };

49118 compiler = {

50119 version = "8.4.4";

51120 nix-name = "ghc844";

52121 packages = {

53− "void" = "0.7.2";

54− "semigroupoids" = "5.2.2";

55− "free" = "5.0.2";

56− "exceptions" = "0.10.0";

57122 "binary" = "0.8.5.1";

58123 "ghc-prim" = "0.5.2.0";

59− "bifunctors" = "5.5.3";

60124 "stm" = "2.4.5.1";

125+ "unix" = "2.7.2.2";

61126 "mtl" = "2.2.2";

62127 "rts" = "1.0";

63− "adjunctions" = "4.4";

64− "invariant" = "0.5.1";

65− "distributive" = "0.5.3";

66− "parallel" = "3.2.2.0";

67128 "deepseq" = "1.4.3.0";

68− "semigroups" = "0.18.5";

69− "transformers-compat" = "0.6.2";

129+ "parsec" = "3.1.13.0";

130+ "directory" = "1.3.1.5";

70131 "template-haskell" = "2.13.0.0";

71− "vector" = "0.12.0.1";

72− "call-stack" = "0.1.0";

73− "primitive" = "0.6.3.0";

74− "profunctors" = "5.2.2";

75− "tagged" = "0.8.5";

76− "lens" = "4.16.1";

77132 "containers" = "0.5.11.0";

78− "reflection" = "2.1.4";

79133 "bytestring" = "0.10.8.2";

80− "StateVar" = "1.1.1.1";

81− "contravariant" = "1.4.1";

82134 "text" = "1.2.3.1";

83− "unordered-containers" = "0.2.9.0";

135+ "Cabal" = "2.2.0.1";

84136 "base" = "4.11.1.0";

85− "comonad" = "5.0.4";

137+ "time" = "1.8.0.2";

86138 "transformers" = "0.5.5.0";

87− "hashable" = "1.2.7.0";

88− "transformers-base" = "0.4.5.2";

89139 "filepath" = "1.4.2";

90− "kan-extensions" = "5.2";

140+ "process" = "1.6.3.0";

91141 "pretty" = "1.1.3.6";

92142 "ghc-boot-th" = "8.4.4";

93− "base-orphans" = "0.7";

94− "th-abstraction" = "0.2.8.0";

95143 "array" = "0.5.2.0";

96144 "integer-gmp" = "1.0.2.0";

145+ };

97146 };

98− };

99− }

147+ }

test/with-packages/test-with-packages.nix+5−21

@@ -1,18 +1,9 @@

1−{ system

2−, compiler

3−, flags

4−, pkgs

5−, hsPkgs

6−, pkgconfPkgs

7−, ... }:

1+{ system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }:

82 {

93 flags = {};

104 package = {

115 specVersion = "2.2";

12− identifier = {

13− name = "test-with-packages";

14− version = "0.1.0.0";

15− };

6+ identifier = { name = "test-with-packages"; version = "0.1.0.0"; };

167 license = "NONE";

178 copyright = "";

189 maintainer = "rodney.lorrimar@iohk.io";

@@ -22,15 +13,8 @@

2213 synopsis = "";

2314 description = "";

2415 buildType = "Simple";

25− };

16+ };

2617 components = {

27− "library" = {

28− depends = [

29− (hsPkgs.base)

30− (hsPkgs.lens)

31− ];

18+ "library" = { depends = [ (hsPkgs.base) (hsPkgs.lens) ]; };

3219 };

33− };

34− } // rec {

35− src = pkgs.lib.mkDefault ./.;

36− }

20+ } // rec { src = (pkgs.lib).mkDefault ./.; }