Skip to content
Permalink
Browse files

Update stack/cabal to lts-13.24/ghc-8.6.5

* Nix magic
* Update iohk-nix version and regenerate
* Add systemd to stack shell
* Add disable-prometheus flag to pkgs.nix

Co-authored-by: Michael Bishop <cleverca22@gmail.com>
  • Loading branch information...
erikd and cleverca22 committed Jun 12, 2019
1 parent 7f5263e commit 3888e1fc69363efb45992f1e195fd47c3c790297
@@ -13,12 +13,12 @@ steps:
agents:
system: x86_64-linux

- label: 'nix-tools'
command: 'scripts/buildkite/check-nix-tools.sh'
- label: Check Hydra evaluation of release.nix
command: 'nix-build -A _lib.check-hydra -o check-hydra.sh && ./check-hydra.sh'
agents:
system: x86_64-linux

- label: 'release.nix'
command: 'scripts/buildkite/check-hydra.sh'
- label: Check auto-generated Nix
command: 'nix-build -A _lib.check-nix-tools -o check-nix-tools.sh && ./check-nix-tools.sh'
agents:
system: x86_64-linux

This file was deleted.

@@ -1,6 +1,6 @@
packages:
cardano-ledger cardano-ledger/test
crypto crypto/test
./ ./test
validate-mainnet

package cardano-ledger
@@ -18,24 +18,24 @@ source-repository-package
source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-prelude
tag: cca3c4f8da1de19321e96a5a7cca376bc6c37637
tag: 68648612f916e8adaf6c9ca5fe39bc6712470a6a

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-prelude
tag: cca3c4f8da1de19321e96a5a7cca376bc6c37637
tag: 68648612f916e8adaf6c9ca5fe39bc6712470a6a
subdir: test

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-base
tag: b676160954cea07d4378ccca870a61242bc188a2
tag: 2d0e0747f1c17bedfc251406ca9b1a59501071b1
subdir: binary

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-base
tag: b676160954cea07d4378ccca870a61242bc188a2
tag: 2d0e0747f1c17bedfc251406ca9b1a59501071b1
subdir: binary/test

source-repository-package
@@ -46,37 +46,37 @@ source-repository-package
source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger-specs
tag: 07e1933f84e9fabd95ccfcbd77b1f0434d7a0731
tag: ad86dcb64e8a5f3bd7670655ab92b50921946479
subdir: byron/semantics/executable-spec

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger-specs
tag: 07e1933f84e9fabd95ccfcbd77b1f0434d7a0731
tag: ad86dcb64e8a5f3bd7670655ab92b50921946479
subdir: byron/ledger/executable-spec

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger-specs
tag: 07e1933f84e9fabd95ccfcbd77b1f0434d7a0731
tag: ad86dcb64e8a5f3bd7670655ab92b50921946479
subdir: byron/chain/executable-spec

source-repository-package
type: git
location: https://github.com/input-output-hk/iohk-monitoring-framework
tag: f1c4ceef7d7ea6fb4425484c2b19b84048a3549d
tag: b0ea8317ba5a887d46969e9b3040862a10e6efb3
subdir: contra-tracer

source-repository-package
type: git
location: https://github.com/input-output-hk/iohk-monitoring-framework
tag: f1c4ceef7d7ea6fb4425484c2b19b84048a3549d
tag: b0ea8317ba5a887d46969e9b3040862a10e6efb3
subdir: iohk-monitoring

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-shell
tag: 44fa2129e07668ebc620708c3a83913cff6fff7c
tag: f6fcda280ddd1d4ef87e5203d65d132f924a6e39

source-repository-package
type: git
@@ -85,8 +85,8 @@ source-repository-package

source-repository-package
type: git
location: http://github.com/nc6/canonical-json
tag: a9dc9b893649bc2e2a770ab22d278a780f7e3a3c
location: http://github.com/well-typed/canonical-json
tag: ddfe3593b80b5ceb88842bb7a6f2268df75d2c2f

source-repository-package
type: git

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

@@ -1,7 +1,7 @@
{
"url": "https://github.com/input-output-hk/iohk-nix",
"rev": "a343a042d1102b537df0916f58662d02eb308531",
"date": "2019-06-07T16:03:26+00:00",
"sha256": "00jyji6vvadp4d4qyk8zwr1dlra7d1jm0f1vndk397zy6rl5f8jk",
"rev": "138b2ec4f9800284203910cefa437df4ae0fd1e7",
"date": "2019-06-11T03:33:57+00:00",
"sha256": "0ggdysn042dryl9gfla5p55k6fmlpynypvmnva7p84qjn9hmq3mi",
"fetchSubmodules": false
}
@@ -45,6 +45,10 @@ let
# Let's force it to accept out packageset.
packages.katip.doExactConfig = true;

# The generated iohk-monitoring.nix doesn't turn off prometheus yet,
# because it doesn't respect the flags section of stack.yaml
packages.iohk-monitoring.flags.disable-prometheus = true;

packages.cardano-ledger.preBuild =
"export CARDANO_MAINNET_MIRROR=${cardano-mainnet-mirror}/epochs";

@@ -7,7 +7,7 @@ let

in haskell.lib.buildStackProject {
name = "cardano-ledger-env";
buildInputs = [ zlib openssl gmp libffi git ];
buildInputs = [ zlib openssl gmp libffi git systemd.dev systemd.lib ];
ghc = haskell.packages.${compiler}.ghc;
CARDANO_MAINNET_MIRROR =
"${import ./cardano-mainnet-mirror.nix {inherit pkgs;}}/epochs";

This file was deleted.

This file was deleted.

0 comments on commit 3888e1f

Please sign in to comment.
You can’t perform that action at this time.