Skip to content
This repository was archived by the owner on Aug 18, 2020. It is now read-only.

Commit fc9f41f

Browse files
deepfiredeepfire
committed
nix: regenerate with new iohk-nix
1 parent b3b9890 commit fc9f41f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+4137
-2121
lines changed

‎nix/.stack.nix/cardano-binary-test.nix

+59-18
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,43 @@
1-
{ system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }:
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, ... }:
241
{
342
flags = { development = false; };
443
package = {
@@ -13,33 +52,35 @@
1352
synopsis = "Test helpers from cardano-binary exposed to other packages";
1453
description = "Test helpers from cardano-binary exposed to other packages";
1554
buildType = "Simple";
55+
isLocal = true;
1656
};
1757
components = {
1858
"library" = {
1959
depends = [
20-
(hsPkgs.base)
21-
(hsPkgs.bytestring)
22-
(hsPkgs.cardano-binary)
23-
(hsPkgs.cardano-prelude)
24-
(hsPkgs.cardano-prelude-test)
25-
(hsPkgs.cborg)
26-
(hsPkgs.containers)
27-
(hsPkgs.formatting)
28-
(hsPkgs.hedgehog)
29-
(hsPkgs.hspec)
30-
(hsPkgs.pretty-show)
31-
(hsPkgs.QuickCheck)
32-
(hsPkgs.quickcheck-instances)
33-
(hsPkgs.text)
34-
(hsPkgs.vector)
60+
(hsPkgs."base" or (buildDepError "base"))
61+
(hsPkgs."bytestring" or (buildDepError "bytestring"))
62+
(hsPkgs."cardano-binary" or (buildDepError "cardano-binary"))
63+
(hsPkgs."cardano-prelude" or (buildDepError "cardano-prelude"))
64+
(hsPkgs."cardano-prelude-test" or (buildDepError "cardano-prelude-test"))
65+
(hsPkgs."cborg" or (buildDepError "cborg"))
66+
(hsPkgs."containers" or (buildDepError "containers"))
67+
(hsPkgs."formatting" or (buildDepError "formatting"))
68+
(hsPkgs."hedgehog" or (buildDepError "hedgehog"))
69+
(hsPkgs."hspec" or (buildDepError "hspec"))
70+
(hsPkgs."pretty-show" or (buildDepError "pretty-show"))
71+
(hsPkgs."QuickCheck" or (buildDepError "QuickCheck"))
72+
(hsPkgs."quickcheck-instances" or (buildDepError "quickcheck-instances"))
73+
(hsPkgs."text" or (buildDepError "text"))
74+
(hsPkgs."vector" or (buildDepError "vector"))
3575
];
76+
buildable = true;
3677
};
3778
};
3879
} // {
3980
src = (pkgs.lib).mkDefault (pkgs.fetchgit {
4081
url = "https://github.com/input-output-hk/cardano-base";
41-
rev = "13e7ffbc142eb1b9d7266c8f5373d787acb65266";
42-
sha256 = "1dkral9wxd84zwcxrvids94zb2hp4g9wykxhwfj2pjih0qm8h9ng";
82+
rev = "5c575d46afbfe333de0ccba70b084db8302abf42";
83+
sha256 = "1v1q20fjb6klcdhl9mhpvd10j6vc7biwk91dgyfp6ld7xvj2703x";
4384
});
4485
postUnpack = "sourceRoot+=/binary/test; echo source root reset to \$sourceRoot";
4586
}

‎nix/.stack.nix/cardano-binary.nix

+75-33
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,43 @@
1-
{ system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }:
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, ... }:
241
{
342
flags = { development = false; };
443
package = {
@@ -13,54 +52,57 @@
1352
synopsis = "Binary serialization for Cardano";
1453
description = "This package includes the binary serialization format for Cardano";
1554
buildType = "Simple";
55+
isLocal = true;
1656
};
1757
components = {
1858
"library" = {
1959
depends = [
20-
(hsPkgs.base)
21-
(hsPkgs.aeson)
22-
(hsPkgs.bytestring)
23-
(hsPkgs.cardano-prelude)
24-
(hsPkgs.cborg)
25-
(hsPkgs.containers)
26-
(hsPkgs.digest)
27-
(hsPkgs.formatting)
28-
(hsPkgs.recursion-schemes)
29-
(hsPkgs.safe-exceptions)
30-
(hsPkgs.tagged)
31-
(hsPkgs.text)
32-
(hsPkgs.time)
33-
(hsPkgs.vector)
60+
(hsPkgs."base" or (buildDepError "base"))
61+
(hsPkgs."aeson" or (buildDepError "aeson"))
62+
(hsPkgs."bytestring" or (buildDepError "bytestring"))
63+
(hsPkgs."cardano-prelude" or (buildDepError "cardano-prelude"))
64+
(hsPkgs."cborg" or (buildDepError "cborg"))
65+
(hsPkgs."containers" or (buildDepError "containers"))
66+
(hsPkgs."digest" or (buildDepError "digest"))
67+
(hsPkgs."formatting" or (buildDepError "formatting"))
68+
(hsPkgs."recursion-schemes" or (buildDepError "recursion-schemes"))
69+
(hsPkgs."safe-exceptions" or (buildDepError "safe-exceptions"))
70+
(hsPkgs."tagged" or (buildDepError "tagged"))
71+
(hsPkgs."text" or (buildDepError "text"))
72+
(hsPkgs."time" or (buildDepError "time"))
73+
(hsPkgs."vector" or (buildDepError "vector"))
3474
];
75+
buildable = true;
3576
};
3677
tests = {
3778
"test" = {
3879
depends = [
39-
(hsPkgs.base)
40-
(hsPkgs.bytestring)
41-
(hsPkgs.cardano-binary)
42-
(hsPkgs.cardano-prelude)
43-
(hsPkgs.cardano-prelude-test)
44-
(hsPkgs.cborg)
45-
(hsPkgs.containers)
46-
(hsPkgs.formatting)
47-
(hsPkgs.hedgehog)
48-
(hsPkgs.hspec)
49-
(hsPkgs.pretty-show)
50-
(hsPkgs.QuickCheck)
51-
(hsPkgs.quickcheck-instances)
52-
(hsPkgs.tagged)
53-
(hsPkgs.text)
54-
(hsPkgs.vector)
80+
(hsPkgs."base" or (buildDepError "base"))
81+
(hsPkgs."bytestring" or (buildDepError "bytestring"))
82+
(hsPkgs."cardano-binary" or (buildDepError "cardano-binary"))
83+
(hsPkgs."cardano-prelude" or (buildDepError "cardano-prelude"))
84+
(hsPkgs."cardano-prelude-test" or (buildDepError "cardano-prelude-test"))
85+
(hsPkgs."cborg" or (buildDepError "cborg"))
86+
(hsPkgs."containers" or (buildDepError "containers"))
87+
(hsPkgs."formatting" or (buildDepError "formatting"))
88+
(hsPkgs."hedgehog" or (buildDepError "hedgehog"))
89+
(hsPkgs."hspec" or (buildDepError "hspec"))
90+
(hsPkgs."pretty-show" or (buildDepError "pretty-show"))
91+
(hsPkgs."QuickCheck" or (buildDepError "QuickCheck"))
92+
(hsPkgs."quickcheck-instances" or (buildDepError "quickcheck-instances"))
93+
(hsPkgs."tagged" or (buildDepError "tagged"))
94+
(hsPkgs."text" or (buildDepError "text"))
95+
(hsPkgs."vector" or (buildDepError "vector"))
5596
];
97+
buildable = true;
5698
};
5799
};
58100
};
59101
} // {
60102
src = (pkgs.lib).mkDefault (pkgs.fetchgit {
61103
url = "https://github.com/input-output-hk/cardano-base";
62-
rev = "13e7ffbc142eb1b9d7266c8f5373d787acb65266";
63-
sha256 = "1dkral9wxd84zwcxrvids94zb2hp4g9wykxhwfj2pjih0qm8h9ng";
104+
rev = "5c575d46afbfe333de0ccba70b084db8302abf42";
105+
sha256 = "1v1q20fjb6klcdhl9mhpvd10j6vc7biwk91dgyfp6ld7xvj2703x";
64106
});
65107
postUnpack = "sourceRoot+=/binary; echo source root reset to \$sourceRoot";
66108
}

0 commit comments

Comments
 (0)