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

[GH-170] Fix CI Hydra issue #171

Merged
merged 4 commits into from
May 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions cardano-shell.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,12 @@ test-suite cardano-shell-test
, safe-exceptions
-- quickcheck
, QuickCheck
-- SM
, quickcheck-state-machine >= 0.6
-- required because of QSM
, tree-diff
, pretty-show >=1.9.5
-- tests
, hspec
, hspec-contrib
, concurrency
Expand Down
20 changes: 0 additions & 20 deletions iohk-monitoring-contra-tracer.nix

This file was deleted.

40 changes: 0 additions & 40 deletions iohk-monitoring.nix

This file was deleted.

10 changes: 0 additions & 10 deletions libyaml.nix

This file was deleted.

6 changes: 4 additions & 2 deletions nix/.stack.nix/cardano-prelude-test.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 29 additions & 2 deletions nix/.stack.nix/cardano-prelude.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion nix/.stack.nix/cardano-shell.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 8 additions & 10 deletions nix/.stack.nix/default.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 0 additions & 31 deletions stack-hpc-coveralls.nix

This file was deleted.

71 changes: 0 additions & 71 deletions stack-nix.yaml

This file was deleted.

1 change: 0 additions & 1 deletion stack-shell.nix

This file was deleted.

14 changes: 5 additions & 9 deletions stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# resolver: ./custom-snapshot.yaml
# resolver: https://example.com/snapshots/2018-01-01.yaml

resolver: https://raw.githubusercontent.com/input-output-hk/cardano-prelude/7f8544ae9e162b6664f07093227edb148f1c8a5b/snapshot.yaml
resolver: https://raw.githubusercontent.com/input-output-hk/cardano-prelude/a136c4242b9c9f6124b811329bc8ccdfd86c514e/snapshot.yaml

# User packages to be built.
# Various formats can be used as shown in the example below.
Expand All @@ -40,10 +40,11 @@ packages:
# using the same syntax as the packages field.
# (e.g., acme-missiles-0.3)
extra-deps:
- quickcheck-state-machine-0.6.0 # Used a specific dependency, new release.
- quickcheck-state-machine-0.6.0 # Used a specific dependency, new release.
- pretty-show-1.9.5 # Used for quickcheck-state-machine.

- git: https://github.com/input-output-hk/cardano-prelude
commit: 2256fd727c5f92e6218afdcf8cddf6e01c4a9dcd
commit: 892661cc3951e0d3a385c49c4563b2ae1cf9a4c2
subdirs:
- .
- test
Expand All @@ -54,7 +55,6 @@ extra-deps:
- contra-tracer
- iohk-monitoring


# Extracted from cardano-sl since it's quite useful
- git: https://github.com/input-output-hk/cardano-sl-x509
commit: 71115d199368f1cc969a4936a856808539063253
Expand All @@ -70,10 +70,6 @@ extra-deps:
- prometheus-2.1.1
- containers-0.5.11.0

- process-1.6.5.0

- transformers-0.5.6.2

# Override default flag values for local packages and extra-deps
# flags: {}

Expand Down Expand Up @@ -101,4 +97,4 @@ extra-deps:
nix:
enable: true
pure: false
shell-file: stack-shell.nix
shell-file: shell.nix