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 14, 2019
1 parent 1859f0f commit 7919306c60e10b99d490aa6ff8ff7d9b6d1c4018
@@ -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.

@@ -18,12 +18,12 @@ 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
@@ -46,31 +46,31 @@ source-repository-package
source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger-specs
tag: ad86dcb64e8a5f3bd7670655ab92b50921946479
tag: 423a7359049b0fd6fb2a931c50877cae2a96eaae
subdir: byron/semantics/executable-spec

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

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

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

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

source-repository-package
@@ -87,8 +87,3 @@ source-repository-package
type: git
location: http://github.com/well-typed/canonical-json
tag: ddfe3593b80b5ceb88842bb7a6f2268df75d2c2f

source-repository-package
type: git
location: https://github.com/joelwilliamson/bimap
tag: 997fbb38b08dec14d225d064dac05b0a85f4ceae

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.

@@ -1,4 +1,4 @@
resolver: https://raw.githubusercontent.com/input-output-hk/cardano-prelude/cca3c4f8da1de19321e96a5a7cca376bc6c37637/snapshot.yaml
resolver: https://raw.githubusercontent.com/input-output-hk/cardano-prelude/68648612f916e8adaf6c9ca5fe39bc6712470a6a/snapshot.yaml

packages:
- cardano-ledger
@@ -7,32 +7,36 @@ packages:
- crypto/test
- validate-mainnet


extra-deps:
- libsystemd-journal-1.4.4

# Currently Hackage only
- tasty-hedgehog-1.0.0.1

# To be able to use `stack hoogle`
- haskell-src-exts-1.21.0

- git: https://github.com/input-output-hk/cardano-prelude
commit: cca3c4f8da1de19321e96a5a7cca376bc6c37637
commit: 68648612f916e8adaf6c9ca5fe39bc6712470a6a
subdirs:
- .
- test

- git: https://github.com/input-output-hk/cardano-base
commit: b676160954cea07d4378ccca870a61242bc188a2
commit: 2d0e0747f1c17bedfc251406ca9b1a59501071b1
subdirs:
- binary
- binary/test

- git: https://github.com/input-output-hk/cardano-ledger-specs
commit: ad86dcb64e8a5f3bd7670655ab92b50921946479
commit: 423a7359049b0fd6fb2a931c50877cae2a96eaae
subdirs:
- byron/semantics/executable-spec
- byron/ledger/executable-spec
- byron/chain/executable-spec

# Currently Hackage only
- tasty-hedgehog-1.0.0.1

# To be able to use `stack hoogle`
- haskell-src-exts-1.21.0
# Not yet in Stack
- bimap-0.4.0

# Following deps are for cardano-shell
- git: https://github.com/input-output-hk/cardano-shell
@@ -41,7 +45,7 @@ extra-deps:
- time-units-1.0.0

- git: https://github.com/input-output-hk/iohk-monitoring-framework
commit: f1c4ceef7d7ea6fb4425484c2b19b84048a3549d
commit: 6f4602f308fa7598cf660d5cf808fae4bd8cf70d
subdirs:
- contra-tracer
- iohk-monitoring
@@ -50,9 +54,6 @@ extra-deps:
- git: https://github.com/input-output-hk/cardano-sl-x509
commit: e8bfc1294e088f90e5ae0b4aedbc82ee46ac5ee4

- git: https://github.com/joelwilliamson/bimap
commit: 997fbb38b08dec14d225d064dac05b0a85f4ceae

flags:
iohk-monitoring:
disable-prometheus: true

0 comments on commit 7919306

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