Skip to content
Permalink
Browse files

Merge #1590

1590: SRE-34 haskell overhaul r=disassembler a=craigem

This is the overhaul of Haskell for `ouroboros-network` along the lines of `cardano-node` [PR #507](input-output-hk/cardano-node#507).

Co-authored-by: Craige McWhirter <craige.mcwhirter@iohk.io>
  • Loading branch information
iohk-bors and craigem committed Feb 14, 2020
2 parents f5741ef + 143826c commit 6b28f1062aae81bfc3ce041229b4eb2ab5d1c53a
Showing with 760 additions and 2,479 deletions.
  1. +21 −6 .buildkite/pipeline.yml
  2. +7 −7 README.md
  3. +20 −4 cabal.project
  4. +0 −45 ci/check-dependencies-merged-in-master.sh
  5. +0 −34 ci/check-hydra.sh
  6. +0 −20 ci/check-stack2nix.sh
  7. +45 −47 default.nix
  8. +42 −0 lib.nix
  9. +1 −1 network-mux/README.md
  10. +0 −40 nix/.stack-pkgs.nix
  11. +0 −62 nix/.stack.nix/Win32-network.nix
  12. +0 −45 nix/.stack.nix/cardano-binary-test.nix
  13. +0 −66 nix/.stack.nix/cardano-binary.nix
  14. +0 −55 nix/.stack.nix/cardano-crypto-class.nix
  15. +0 −41 nix/.stack.nix/cardano-crypto-test.nix
  16. +0 −66 nix/.stack.nix/cardano-crypto-wrapper.nix
  17. +0 −88 nix/.stack.nix/cardano-crypto.nix
  18. +0 −62 nix/.stack.nix/cardano-ledger-test.nix
  19. +0 −125 nix/.stack.nix/cardano-ledger.nix
  20. +0 −49 nix/.stack.nix/cardano-prelude-test.nix
  21. +0 −80 nix/.stack.nix/cardano-prelude.nix
  22. +0 −39 nix/.stack.nix/cardano-slotting.nix
  23. +0 −31 nix/.stack.nix/contra-tracer.nix
  24. +0 −57 nix/.stack.nix/cs-blockchain.nix
  25. +0 −76 nix/.stack.nix/cs-ledger.nix
  26. +0 −59 nix/.stack.nix/default.nix
  27. +0 −56 nix/.stack.nix/goblins.nix
  28. +0 −29 nix/.stack.nix/io-sim-classes.nix
  29. +0 −44 nix/.stack.nix/io-sim.nix
  30. +0 −100 nix/.stack.nix/iohk-monitoring.nix
  31. +0 −61 nix/.stack.nix/network-mux.nix
  32. +0 −53 nix/.stack.nix/ntp-client.nix
  33. +0 −202 nix/.stack.nix/ouroboros-consensus.nix
  34. +0 −52 nix/.stack.nix/ouroboros-network-framework.nix
  35. +0 −28 nix/.stack.nix/ouroboros-network-testing.nix
  36. +0 −168 nix/.stack.nix/ouroboros-network.nix
  37. +0 −82 nix/.stack.nix/small-steps.nix
  38. +0 −46 nix/.stack.nix/typed-protocols-examples.nix
  39. +0 −28 nix/.stack.nix/typed-protocols.nix
  40. +46 −0 nix/default.nix
  41. +77 −0 nix/haskell.nix
  42. +0 −14 nix/iohk-common.nix
  43. +0 −7 nix/iohk-nix-src.json
  44. +0 −32 nix/libiserv-network-3.patch
  45. +0 −27 nix/nix-tools.nix
  46. +0 −3 nix/nixos/default.nix
  47. +0 −2 nix/nixos/module-list.nix
  48. +0 −6 nix/old-cardano-sl-src.json
  49. +0 −5 nix/old-cardano.nix
  50. +11 −59 nix/pkgs.nix
  51. +2 −3 nix/regenerate.sh
  52. +38 −0 nix/sources.json
  53. +134 −0 nix/sources.nix
  54. +5 −9 nix/stack-shell.nix
  55. +0 −9 nix/update-iohk-nix.sh
  56. +14 −0 nix/util.nix
  57. +0 −37 nix/validate-mainnet.nix
  58. +3 −3 ntp-client/README.md
  59. +2 −2 ouroboros-consensus/ouroboros-consensus.cabal
  60. +3 −3 ouroboros-network/ouroboros-network.cabal
  61. +63 −102 release.nix
  62. +17 −0 scripts/buildkite/default.nix
  63. +74 −0 scripts/buildkite/rebuild.hs
  64. +26 −0 scripts/buildkite/stack-cabal-sync.sh
  65. +34 −0 scripts/buildkite/stack-cabal_config_check.sh
  66. +74 −2 shell.nix
  67. +1 −0 stack.yaml
@@ -1,13 +1,28 @@
steps:
- label: 'check-hydra'
command: 'ci/check-hydra.sh'
- label: 'hydra-eval-errors'
command: 'nix-build ./nix -A iohkNix.hydraEvalErrors && ./result/bin/hydra-eval-errors.py'
agents:
system: x86_64-linux
- label: 'stack2nix'
command: 'ci/check-stack2nix.sh'

- label: 'stack rebuild'
env:
STACK_ROOT: "/build/ouroroboros-network.stack"
command:
- "rm -rf /build/ouroroboros-network"
- "cp -R . /build/ouroroboros-network"
- "cd /build/ouroroboros-network"
- "nix-build scripts/buildkite -o stack-rebuild"
- "./stack-rebuild"
branches: master
agents:
system: x86_64-linux
- label: 'dependencies-in-master'
command: 'ci/check-dependencies-merged-in-master.sh'

- label: 'stack-cabal-sync'
command: 'nix-shell ./nix -A iohkNix.stack-cabal-sync-shell --run scripts/buildkite/stack-cabal-sync.sh'
agents:
system: x86_64-linux

- label: 'check-cabal-project'
command: 'nix-build ./nix -A iohkNix.checkCabalProject -o check-cabal-project.sh && ./check-cabal-project.sh'
agents:
system: x86_64-linux
@@ -3,7 +3,7 @@
# Ouroboros-Network

* io-sim - `IOSim` simulator monad which supports asynchronous exceptions,
`STM` transactions and `async` interface, timers.
`STM` transactions and `async` interface, timers.
* io-sim-classes - type classes, all of them have instance for both `IOSim` and
`IO`.
* `typed-protocols` - session type framework with support of [protocol pipelining](https://en.wikipedia.org/wiki/Protocol_pipelining)
@@ -38,31 +38,31 @@ cabal new-run pkg:typed-protocols:tests
```
or with `nix`
```
nix-build -A nix-tools.tests.ouroboros-network
nix-build -A haskellPackages.typed-protocols.checks
```
### IOSim test suite
```
cabal new-run pkg:io-sim:tests
```
or with `nix`
```
nix-build -A nix-tools.tests.io-sim
nix-build -A haskellPackages.io-sim.checks
```
### Ouroboros-Network test suite
```
cabal new-run pkg:ouroboros-network:tests
```
or with `nix`
```
nix-build -A nix-tools.tests.ouroboros-network
nix-build -A haskellPackages.ouroboros-network.checks
```
### Ouroboros-Consensus test suite
```
cabal new-run pkg:ouroboros-consensus:tests
```
or with `nix`
```
nix-build -A nix-tools.tests.ouroboros-consensus
nix-build -A haskellPackages.ouroboros-consensus.checks
```

# Ouroboros-Consensus
@@ -77,13 +77,13 @@ cabal new-run pkg:ouroboros-consensus:test-consensus
```
or with `nix`
```
nix-build -A nix-tools.tests.ouroboros-consensus.test-consensus
nix-build -A haskellPackages.ouroboros-consensus.checks.test-consensus
```
### Storage test suite
```
cabal new-run pkg:ouroboros-consensus:test-storage
```
or with `nix`
```
nix-build -A nix-tools.tests.ouroboros-consensus.test-storage
nix-build -A haskellPackages.ouroboros-consensus.checks.test-storage
```
@@ -1,3 +1,5 @@
index-state: 2020-01-31T00:00:00Z

packages: ./typed-protocols
./typed-protocols-examples
./ouroboros-network-testing
@@ -43,7 +45,7 @@ package mux

package ouroboros-network
tests: True
flags: +asserts
flags: +asserts -cddl

package ouroboros-consensus
tests: True
@@ -55,95 +57,109 @@ package contra-tracer
source-repository-package
type: git
location: https://github.com/input-output-hk/iohk-monitoring-framework
subdir: contra-tracer
tag: dd30455144e11efb435619383ba84ce02aee720d
--sha256: 1g08bg99fvss99kg27l7pmxm7lh60573xln8l8x2rzvwfvfgk2i5
subdir: contra-tracer

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-prelude
tag: 00487726c4bc21b4744e59d913334ebfeac7d68e
subdir: .
--sha256: 0v4fcq5kdd2r5dgwys8kv46ff33qp756n26ycxrca10wq14zkwm5

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-prelude
tag: 00487726c4bc21b4744e59d913334ebfeac7d68e
--sha256: 0v4fcq5kdd2r5dgwys8kv46ff33qp756n26ycxrca10wq14zkwm5
subdir: test

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-base
tag: 474622cfde663730e10e2e0d5de0ed06a867a844
--sha256: 1waqjyp6ycmn8lqrsnb8d14p43645mqknd5m0apb7814s3xd3f07
subdir: binary

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-base
tag: 474622cfde663730e10e2e0d5de0ed06a867a844
--sha256: 1waqjyp6ycmn8lqrsnb8d14p43645mqknd5m0apb7814s3xd3f07
subdir: binary/test

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-base
tag: 474622cfde663730e10e2e0d5de0ed06a867a844
--sha256: 1waqjyp6ycmn8lqrsnb8d14p43645mqknd5m0apb7814s3xd3f07
subdir: cardano-crypto-class

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-base
tag: 474622cfde663730e10e2e0d5de0ed06a867a844
--sha256: 1waqjyp6ycmn8lqrsnb8d14p43645mqknd5m0apb7814s3xd3f07
subdir: slotting

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger-specs
tag: 6d154d16de01edf2d3ff56303b7a34cb188ed217
--sha256: 010hgxnia3ryq74k9cf2yn39qnni1j27vg7xlzmdqr27p8ikkrw7
subdir: byron/semantics/executable-spec

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger-specs
tag: 6d154d16de01edf2d3ff56303b7a34cb188ed217
--sha256: 010hgxnia3ryq74k9cf2yn39qnni1j27vg7xlzmdqr27p8ikkrw7
subdir: byron/ledger/executable-spec

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger-specs
tag: 6d154d16de01edf2d3ff56303b7a34cb188ed217
--sha256: 010hgxnia3ryq74k9cf2yn39qnni1j27vg7xlzmdqr27p8ikkrw7
subdir: byron/chain/executable-spec

source-repository-package
type: git
location: https://github.com/input-output-hk/goblins
tag: 26d35ad52fe9ade3391532dbfeb2f416f07650bc
--sha256: 17p5x0hj6c67jkdqx0cysqlwq2zs2l87azihn1alzajy9ak6ii0b

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger
tag: 6d533b72d4a91b756cd8ffe164928d5f5eebcfa0
--sha256: 08jbmlq5jj36jkn2iw9znl7jkgnjgq37i70asmp62igqyjhis8q6
subdir: cardano-ledger

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger
tag: 6d533b72d4a91b756cd8ffe164928d5f5eebcfa0
--sha256: 08jbmlq5jj36jkn2iw9znl7jkgnjgq37i70asmp62igqyjhis8q6
subdir: crypto

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger
tag: 6d533b72d4a91b756cd8ffe164928d5f5eebcfa0
--sha256: 08jbmlq5jj36jkn2iw9znl7jkgnjgq37i70asmp62igqyjhis8q6
subdir: cardano-ledger/test

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger
tag: 6d533b72d4a91b756cd8ffe164928d5f5eebcfa0
--sha256: 08jbmlq5jj36jkn2iw9znl7jkgnjgq37i70asmp62igqyjhis8q6
subdir: crypto/test

-- version number matching the one specified in the stack resolver file
source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-crypto/
tag: 3c707936ba0a665375acf5bd240dc4b6eaa6c0bc
subdir: .
--sha256: 0g8ln8k8wx4csdv92bz09pr7v9dp4lcyv1334b09c9rgwdwhqg1b

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 6b28f10

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