Skip to content
This repository has been archived by the owner on Feb 9, 2021. It is now read-only.

Commit

Permalink
Merge #320
Browse files Browse the repository at this point in the history
320: Remove the specs (moving to fm-ledger-rules) r=nc6 a=nc6



Co-authored-by: Nicholas Clarke <nick@topos.org.uk>
  • Loading branch information
iohk-bors[bot] and nc6 committed Feb 13, 2019
2 parents 12bf185 + 17240e5 commit 89d6ed9
Show file tree
Hide file tree
Showing 89 changed files with 88 additions and 8,629 deletions.
22 changes: 9 additions & 13 deletions .stack-to-nix.cache

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

28 changes: 22 additions & 6 deletions cabal.project
@@ -1,9 +1,7 @@
packages: specs/semantics/hs
specs/ledger/hs
specs/chain/hs
binary
crypto
./
packages:
binary
crypto
./

source-repository-package
type: git
Expand All @@ -25,3 +23,21 @@ source-repository-package
type: git
location: https://github.com/avieth/plutus-prototype
tag: d094be301195fcd8ab864d793f114970426a4478

source-repository-package
type: git
location: https://github.com/input-output-hk/fm-ledger-rules
tag: bf059d1d593e7ef9f3b983a0c904e7bb81362af9
subdir: specs/semantics/hs

source-repository-package
type: git
location: https://github.com/input-output-hk/fm-ledger-rules
tag: bf059d1d593e7ef9f3b983a0c904e7bb81362af9
subdir: specs/ledger/hs

source-repository-package
type: git
location: https://github.com/input-output-hk/fm-ledger-rules
tag: bf059d1d593e7ef9f3b983a0c904e7bb81362af9
subdir: specs/chain/hs
6 changes: 0 additions & 6 deletions default.nix
Expand Up @@ -27,9 +27,3 @@ in
# We will instantiate the defaul-nix template with the
# nix/pkgs.nix file...
localLib.nix-tools.default-nix ./nix/pkgs.nix args
# ... and add a few custom packages as well.
// {
byronLedgerSpec = import ./specs/ledger/latex {};
byronChainSpec = import ./specs/chain/latex {};
semanticsSpec = import ./specs/semantics/latex {};
}
6 changes: 3 additions & 3 deletions nix/.stack-pkgs.nix

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

4 changes: 2 additions & 2 deletions nix/.stack.nix/canonical-json.nix

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

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

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

4 changes: 2 additions & 2 deletions nix/.stack.nix/cardano-binary.nix

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

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

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

4 changes: 2 additions & 2 deletions nix/.stack.nix/cardano-crypto-wrapper.nix

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

4 changes: 2 additions & 2 deletions nix/.stack.nix/cardano-crypto.nix

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

4 changes: 2 additions & 2 deletions nix/.stack.nix/cardano-mainnet-mirror.nix

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

4 changes: 2 additions & 2 deletions nix/.stack.nix/cborg.nix

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

9 changes: 8 additions & 1 deletion nix/.stack.nix/cs-blockchain.nix

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

9 changes: 8 additions & 1 deletion nix/.stack.nix/cs-ledger.nix

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

4 changes: 2 additions & 2 deletions nix/.stack.nix/hedgehog.nix

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

4 changes: 2 additions & 2 deletions nix/.stack.nix/plutus-prototype.nix

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

9 changes: 8 additions & 1 deletion nix/.stack.nix/small-steps.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/pkgs.nix
Expand Up @@ -16,7 +16,8 @@ let
th-packages = [
"hedgehog" "cardano-crypto-wrapper"
"cardano-crypto-test" "cardano-chain"
"small-steps" "cs-ledger" "cs-blockchain" ];
"small-steps" "cs-ledger" "cs-blockchain"
];

# Build the packageset with module support.
# We can essentially override anything in the modules
Expand Down
24 changes: 0 additions & 24 deletions pkgs.nix

This file was deleted.

19 changes: 1 addition & 18 deletions release.nix
Expand Up @@ -6,7 +6,7 @@ localLib.nix-tools.release-nix {

# packages from our stack.yaml or plan file (via nix/pkgs.nix) we
# are intereted in building on CI via nix-tools.
packages = [ "cardano-chain" "cs-ledger" "small-steps" "cs-blockchain" ];
packages = [ "cardano-chain" ];

# The set of jobs we consider crutial for each CI run.
# if a single one of these fails, the build will be marked
Expand Down Expand Up @@ -39,32 +39,15 @@ localLib.nix-tools.release-nix {
#
required-name = "cardano-chain-required-checks";
required-targets = jobs: [
jobs.byronLedgerSpec
jobs.byronChainSpec
jobs.semanticsSpec

jobs.nix-tools.libs.cs-blockchain.x86_64-darwin
jobs.nix-tools.libs.cs-blockchain.x86_64-linux
jobs.nix-tools.libs.small-steps.x86_64-darwin
jobs.nix-tools.libs.small-steps.x86_64-linux

jobs.nix-tools.libs.cardano-chain.x86_64-darwin
jobs.nix-tools.libs.cardano-chain.x86_64-linux
jobs.nix-tools.tests.cardano-chain.cardano-chain-test.x86_64-darwin
jobs.nix-tools.tests.cardano-chain.cardano-chain-test.x86_64-linux

jobs.nix-tools.libs.cs-ledger.x86_64-darwin
jobs.nix-tools.libs.cs-ledger.x86_64-linux
jobs.nix-tools.tests.cs-ledger.ledger-delegation-test.x86_64-darwin
jobs.nix-tools.tests.cs-ledger.ledger-delegation-test.x86_64-linux

# windows cross compilation targets
jobs.nix-tools.libs.x86_64-pc-mingw32-cardano-chain.x86_64-linux
jobs.nix-tools.libs.x86_64-pc-mingw32-cs-blockchain.x86_64-linux
jobs.nix-tools.libs.x86_64-pc-mingw32-cs-ledger.x86_64-linux
jobs.nix-tools.libs.x86_64-pc-mingw32-small-steps.x86_64-linux
jobs.nix-tools.tests.x86_64-pc-mingw32-cardano-chain.cardano-chain-test.x86_64-linux
jobs.nix-tools.tests.x86_64-pc-mingw32-cs-ledger.ledger-delegation-test.x86_64-linux
];

}

0 comments on commit 89d6ed9

Please sign in to comment.