From c1db817d167fdb81f32742017eab37690c0aa7b4 Mon Sep 17 00:00:00 2001 From: Max Tomago <noreply@tomagotech.com> Date: Fri, 5 May 2023 13:28:06 +0000 Subject: [PATCH] cardano-ledger: -> 180271602640bcac1214084b6de61d0468332f00 --- horizon.dhall | 8 +- horizon.lock | 74 +++--- overlay.nix | 8 + pkgs/FailT.nix | 40 ++++ pkgs/OddWord.nix | 10 +- pkgs/Win32-network.nix | 2 +- pkgs/algebraic-graphs.nix | 28 ++- pkgs/base-deriving-via.nix | 2 +- pkgs/byron-spec-chain.nix | 58 +++-- pkgs/byron-spec-ledger.nix | 67 ++++-- pkgs/cardano-binary-test.nix | 42 +++- pkgs/cardano-binary.nix | 69 +++++- pkgs/cardano-crypto-class.nix | 53 ++++- pkgs/cardano-crypto-praos.nix | 20 +- pkgs/cardano-crypto-test.nix | 40 +++- pkgs/cardano-crypto-tests.nix | 51 +++- pkgs/cardano-crypto-wrapper.nix | 80 +++++-- pkgs/cardano-crypto.nix | 41 +++- pkgs/cardano-data.nix | 46 ++-- pkgs/cardano-ledger-allegra.nix | 66 ++++++ pkgs/cardano-ledger-alonzo-test.nix | 118 +++++++--- pkgs/cardano-ledger-alonzo.nix | 102 ++++++-- pkgs/cardano-ledger-api.nix | 69 ++++-- pkgs/cardano-ledger-babbage-test.nix | 95 +++++--- pkgs/cardano-ledger-babbage.nix | 75 ++++-- pkgs/cardano-ledger-binary.nix | 136 +++++++++++ pkgs/cardano-ledger-byron-test.nix | 88 +++++-- pkgs/cardano-ledger-byron.nix | 135 ++++++++--- pkgs/cardano-ledger-conway-test.nix | 83 +++++-- pkgs/cardano-ledger-conway.nix | 72 ++++-- pkgs/cardano-ledger-core.nix | 132 +++++++++-- pkgs/cardano-ledger-mary.nix | 76 ++++++ pkgs/cardano-ledger-pretty.nix | 74 ++++-- pkgs/cardano-ledger-shelley-ma-test.nix | 111 ++++++--- pkgs/cardano-ledger-shelley-ma.nix | 34 +-- pkgs/cardano-ledger-shelley-test.nix | 190 +++++++++++---- pkgs/cardano-ledger-shelley.nix | 89 +++++-- pkgs/cardano-ledger-test.nix | 170 ++++++++++---- pkgs/cardano-prelude-test.nix | 64 +++++- pkgs/cardano-prelude.nix | 46 +++- pkgs/cardano-protocol-tpraos.nix | 73 ++++-- pkgs/cardano-slotting.nix | 27 ++- pkgs/cardano-strict-containers.nix | 28 ++- pkgs/contra-tracer.nix | 2 +- pkgs/flat.nix | 70 +++++- pkgs/goblins.nix | 51 +++- pkgs/gray-code.nix | 2 +- pkgs/heapwords.nix | 24 +- pkgs/io-classes.nix | 27 ++- pkgs/io-sim.nix | 70 +++++- pkgs/iohk-monitoring.nix | 136 +++++++++-- pkgs/measures.nix | 12 +- pkgs/monoidal-containers.nix | 30 ++- pkgs/monoidal-synchronisation.nix | 20 +- pkgs/moo.nix | 50 +++- pkgs/network-mux.nix | 91 ++++++-- pkgs/non-integral.nix | 10 +- pkgs/nothunks.nix | 39 +++- pkgs/ntp-client.nix | 41 +++- pkgs/optparse-applicative-fork.nix | 22 +- pkgs/ouroboros-network-api.nix | 56 ++++- pkgs/ouroboros-network-framework.nix | 134 +++++++++-- pkgs/ouroboros-network-mock.nix | 27 ++- pkgs/ouroboros-network-protocols.nix | 95 ++++++-- pkgs/ouroboros-network-testing.nix | 36 ++- pkgs/ouroboros-network.nix | 159 ++++++++++--- pkgs/plutus-core.nix | 294 ++++++++++++++++++++---- pkgs/plutus-ledger-api.nix | 87 +++++-- pkgs/plutus-preprocessor.nix | 38 ++- pkgs/plutus-tx-plugin.nix | 73 +++++- pkgs/plutus-tx.nix | 92 ++++++-- pkgs/prettyprinter-configurable.nix | 35 ++- pkgs/quickcheck-transformer.nix | 2 +- pkgs/set-algebra.nix | 34 ++- pkgs/small-steps-test.nix | 69 ++++-- pkgs/small-steps.nix | 40 +++- pkgs/strict-containers.nix | 28 ++- pkgs/strict-stm.nix | 2 +- pkgs/tracer-transformers.nix | 17 +- pkgs/typed-protocols-cborg.nix | 16 +- pkgs/typed-protocols-examples.nix | 44 +++- pkgs/typed-protocols.nix | 2 +- pkgs/vector-map.nix | 45 +++- pkgs/word-array.nix | 22 +- 84 files changed, 4058 insertions(+), 978 deletions(-) create mode 100644 pkgs/FailT.nix create mode 100644 pkgs/cardano-ledger-allegra.nix create mode 100644 pkgs/cardano-ledger-binary.nix create mode 100644 pkgs/cardano-ledger-mary.nix diff --git a/horizon.dhall b/horizon.dhall index 5f84383..64b3a08 100644 --- a/horizon.dhall +++ b/horizon.dhall @@ -25,8 +25,8 @@ let callCardanoBase let callCardanoLedger : H.Subdir → H.HaskellPackage.Type = callRepository - "https://github.com/milloni/cardano-ledger" - "3aa1fd8469424778454644f0d371988fb4490b4a" + "https://github.com/input-output-hk/cardano-ledger" + "180271602640bcac1214084b6de61d0468332f00" let callCardanoNode : H.Subdir → H.HaskellPackage.Type @@ -81,6 +81,7 @@ let plutusLibraries = , cardano-ledger-babbage = callCardanoLedger "eras/babbage/impl" , cardano-ledger-babbage-test = callCardanoLedger "eras/babbage/test-suite" + , cardano-ledger-binary = callCardanoLedger "libs/cardano-ledger-binary" , cardano-ledger-conway = callCardanoLedger "eras/conway/impl" , cardano-ledger-conway-test = callCardanoLedger "eras/conway/test-suite" @@ -116,6 +117,7 @@ let otherLibraries = "https://github.com/input-output-hk/Win32-network" "1a6bd1f67d1463d7243ab4c34fc4f7d84ee0554a" (None H.Subdir) + , FailT = H.callHackage "FailT" "0.1.2.0" , algebraic-graphs = H.callHackage "algebraic-graphs" "0.7" , base-deriving-via = callCardanoBase "base-deriving-via" , byron-spec-chain = @@ -135,6 +137,8 @@ let otherLibraries = , cardano-crypto-test = callCardanoLedger "eras/byron/crypto/test" , cardano-crypto-wrapper = callCardanoLedger "eras/byron/crypto" , cardano-data = callCardanoLedger "libs/cardano-data" + , cardano-ledger-allegra = callCardanoLedger "eras/allegra/impl" + , cardano-ledger-mary = callCardanoLedger "eras/mary/impl" , cardano-ledger-byron = callCardanoLedger "eras/byron/ledger/impl" , cardano-ledger-byron-test = callCardanoLedger "eras/byron/ledger/impl/test" diff --git a/horizon.lock b/horizon.lock index aaf6da4..cd273df 100644 --- a/horizon.lock +++ b/horizon.lock @@ -1,4 +1,8 @@ -[ { mapKey = "OddWord" +[ { mapKey = "FailT" + , mapValue = + "da2d926fa89ad9331484cfe64014a48dfd4897959710b42fbeba47c40ce0fd7f" + } +, { mapKey = "OddWord" , mapValue = "23731607a6bbaa6fdae9228f91639fffbce08f0a0b5df6ec10b08048c1fd782f" } @@ -16,11 +20,11 @@ } , { mapKey = "byron-spec-chain" , mapValue = - "d09506c181143bf70b4a64caf27da1fad1ed646e20943f289aff0fd3b50cfb27" + "508b8a36578a4c921c0ac572d512483c9b8474254e501a261ca02b2cc9b8ff53" } , { mapKey = "byron-spec-ledger" , mapValue = - "1d0735eda5e97b969ed83f6210f9d4792df38f757cd9e5b4de69552021f1f706" + "9f679dae5945b6247bb4081d247b1d08bd032cb972980830e2e03d9f81225fc9" } , { mapKey = "cardano-binary" , mapValue = @@ -44,7 +48,7 @@ } , { mapKey = "cardano-crypto-test" , mapValue = - "32b21927d2287e12ae12ef6d35581edefcf2fcf07876a35736740fb9df3af7ba" + "90058ed506bf3490e6c28fd9177115b5423545bcc106a18d8d55afd54a414a57" } , { mapKey = "cardano-crypto-tests" , mapValue = @@ -52,75 +56,87 @@ } , { mapKey = "cardano-crypto-wrapper" , mapValue = - "f2947e3228e09db86ca962985903f766c3d261fcd0ee3565be0fa78f60392983" + "a18272cb5a542f8e7ca6584dd2b83a29b0de6b9fba7a46fcbfda18e69bd92f8f" } , { mapKey = "cardano-data" , mapValue = - "8cc4e2c8987943eb7eff715149ffe069bfdbb7627973621b5940dbc83b2bd66c" + "f4da58c8d3a433665668ccaf0060e729e8250648eeebbde74f12edd01818e121" + } +, { mapKey = "cardano-ledger-allegra" + , mapValue = + "a5f71095a774e4046ce0ef2293dfdffe143c5afd4fc3265c7f96f5bafc01c537" } , { mapKey = "cardano-ledger-alonzo" , mapValue = - "9e707918cfd0dc0b28428cb0ff7473fac72635b4e64c8c74c9b112fba1fbe2df" + "f1bb96f592de141812bf2f189623af18c75901331fd8cddf7e6e399d3b7f48df" } , { mapKey = "cardano-ledger-alonzo-test" , mapValue = - "90b784e8a90f5eceb2c5595b3354ada30147812d928ee95fc753a8f0c88b14f2" + "d14c796a270cea1c1b968e1d90b08e282afa691a033c81a09c518718e7ea25ad" } , { mapKey = "cardano-ledger-api" , mapValue = - "d12e85a559dc9dcc3b9e768fc874f46ecf13ec7c45d5b9f66af781d19afac040" + "24b96995d182a0436d1ee85c89a623d14a56061cfe934f56f82257a8e88053cb" } , { mapKey = "cardano-ledger-babbage" , mapValue = - "3bccaf830034aedc130b33ff65dc8b790fd9c6a94ad52eb5225e6110554cf28c" + "9e799fce00fe94f4b1e8223c9ce3b6f6c85b50b430d3e8f84a19262046497e6e" } , { mapKey = "cardano-ledger-babbage-test" , mapValue = - "28b5c6f75f34add493222f53a595585417f9b54f591a5313fb941da5a5646b36" + "6f0aaf0c71c090e883744d950e320648c962842f29376e4e9d006503182f367f" + } +, { mapKey = "cardano-ledger-binary" + , mapValue = + "a20a67c161c9cd9fe65b5e1a2764bd663ad35f1d3e381700fe4665205b1faaea" } , { mapKey = "cardano-ledger-byron" , mapValue = - "c46fe40a57f274314db6460257ab5cb273ce1de4e68f40f0c878e98a48ff24f3" + "f621685e534968c221522e9c3eb7eef3c67dc05f57faeab2fa65617ea1e9fe32" } , { mapKey = "cardano-ledger-byron-test" , mapValue = - "9bd57f82a5d0c25f336e6fadbcf752c105418f0d1f93366d199a03ae6cce2646" + "c56beb240ed69c32b4680694de648d9947b23c25969462261a7a4ef0c8cdfb26" } , { mapKey = "cardano-ledger-conway" , mapValue = - "f319d73bba72028e3f9701b25a32a2e4775570867594e67998ab50f65daa62a9" + "b10b23f48ba2d8d2d0ad794e34c9cb674f4e4d9b77ba10ea57a2422a83904e9b" } , { mapKey = "cardano-ledger-conway-test" , mapValue = - "c7eda75ff16a4b1903806b3519f5afac60cb59980490e1d562f522ab503d0f04" + "abdaec72d5ea7c18076ab56aece3ac8db67af3226ffc9b42f1d63cbccdee6aad" } , { mapKey = "cardano-ledger-core" , mapValue = - "d4317a046da7ef9278aa76b2833063850b8486193c97e5e9e1f5391e0dadb851" + "b84c6b5bb439f5ace75aca8725b9f380cbc699f66f5eddac4c7d1793a9cbc026" + } +, { mapKey = "cardano-ledger-mary" + , mapValue = + "2f1076cefd4e4351619621885ecbf137e252d6ea9f86ffddb8b475a61c7bf0e2" } , { mapKey = "cardano-ledger-pretty" , mapValue = - "0b3337b028b10b2507bc5e6c8433db061cd9537001379163c5121aa71c09015d" + "399309a570fdf06c73891d5b0b7e486bb2328696ffb8d2700ba6eae7bcc04b2f" } , { mapKey = "cardano-ledger-shelley" , mapValue = - "1db72c0054a594a00764979b4575a5ce20956dfe513d85d1bcfdf476fee3f665" + "924dcecbfba4568d12fe9314c19eb05ee8f06a9d6fa1a92828a17e8b1bc1ce18" } , { mapKey = "cardano-ledger-shelley-ma" , mapValue = - "3f5f809373bcb3a4b503fad711b7ee766b896b2376cb0c6596569a3b2aad994d" + "619d5fdb4ce81fb5978247efef643097d25a167c27b033cd852e73b10e117537" } , { mapKey = "cardano-ledger-shelley-ma-test" , mapValue = - "63a4775a4aca200ac75c775c8b0151a5a15d7b1fe3824445650d9d1940e7d0cf" + "57181f8d1edacc87ca7dc3e2729526f323f57465f966b48917c5e0617e388eb8" } , { mapKey = "cardano-ledger-shelley-test" , mapValue = - "ac76bbfb82f605d9cda3470d83ea093142dcf14f87c770a379c23408085355f8" + "248cc18146f372a0ec6dfb6611a693194f291f08987a9d77ae0098b3129520c0" } , { mapKey = "cardano-ledger-test" , mapValue = - "1f6fb5ef5539f540688959d7308d81fc123e4840ed5527cb02b746e7521b13c3" + "73102b2cc3d7c68f909ed76942b9cd4b3b129c4f5b6849569f3cad7e718cc0b8" } , { mapKey = "cardano-prelude" , mapValue = @@ -132,7 +148,7 @@ } , { mapKey = "cardano-protocol-tpraos" , mapValue = - "3c5b8b63bf1ec01c4d51227cbd82ed17386d46a53c7f58d8551f81934a134697" + "0ecd75b6f6f9a054885796f73fe1e7b0177cc7f31fb895e67d31c684875beb8e" } , { mapKey = "cardano-slotting" , mapValue = @@ -196,7 +212,7 @@ } , { mapKey = "non-integral" , mapValue = - "3284d57136bba664902555f4282c22757f6b893cf39f206c7f7c1c8822930820" + "f584cfc6f6d97510f4e0cbf3288edf1c279f28ce9ed1e7a3eac7689583c3cfc9" } , { mapKey = "nothunks" , mapValue = @@ -244,7 +260,7 @@ } , { mapKey = "plutus-preprocessor" , mapValue = - "ee3810ea81411dc736289feef6d5bb4a9f4f69c2f6a30e48ea74a7ac0c3fb7eb" + "972b4c5658a06e972cfd681f9f229447b594b63912e54adf4129ee127d31825a" } , { mapKey = "plutus-tx" , mapValue = @@ -264,15 +280,15 @@ } , { mapKey = "set-algebra" , mapValue = - "4be3f18fdd97116ec236e555e265cf9bc1e1c0bf361221c36beda2c6c7fa2933" + "9a6e10c69569b1415cdfe90949bea5c9ecc57ef3b8a4fb1a1da8ed967cd234d9" } , { mapKey = "small-steps" , mapValue = - "47072b1998e13937f1513339d5c7e80e361820b43c414fbba7b121615ef3ec01" + "ba0fbad0e9cfa12b1755144b62167687524e9e75b08224420bc5ec38512e9d01" } , { mapKey = "small-steps-test" , mapValue = - "fe282b6537458ce3317bf1ed9072d9dc0942fcef9dbd0436a17d110e6a0cba4b" + "28c2a4d5c1970adb58fb1e82ea79cf5a3fe768020c608b8d8095bb337c22031a" } , { mapKey = "strict-containers" , mapValue = @@ -300,7 +316,7 @@ } , { mapKey = "vector-map" , mapValue = - "3b2b23f4237816f333913bccc728320c18d0c6b292549f4d2a0ab4b68f345d42" + "232a777e66e0745163960ef1dd5f1153e027e6391c8cbb3d1c309c825cbcd635" } , { mapKey = "word-array" , mapValue = diff --git a/overlay.nix b/overlay.nix index 727844c..1b58e0c 100644 --- a/overlay.nix +++ b/overlay.nix @@ -1,6 +1,8 @@ { pkgs, ... }: final: prev: with pkgs.haskell.lib; { + FailT = final.callPackage (./pkgs/FailT.nix) { }; + OddWord = final.callPackage (./pkgs/OddWord.nix) { }; Win32-network = final.callPackage (./pkgs/Win32-network.nix) { }; @@ -31,6 +33,8 @@ final: prev: with pkgs.haskell.lib; { cardano-data = final.callPackage (./pkgs/cardano-data.nix) { }; + cardano-ledger-allegra = final.callPackage (./pkgs/cardano-ledger-allegra.nix) { }; + cardano-ledger-alonzo = final.callPackage (./pkgs/cardano-ledger-alonzo.nix) { }; cardano-ledger-alonzo-test = final.callPackage (./pkgs/cardano-ledger-alonzo-test.nix) { }; @@ -41,6 +45,8 @@ final: prev: with pkgs.haskell.lib; { cardano-ledger-babbage-test = final.callPackage (./pkgs/cardano-ledger-babbage-test.nix) { }; + cardano-ledger-binary = final.callPackage (./pkgs/cardano-ledger-binary.nix) { }; + cardano-ledger-byron = final.callPackage (./pkgs/cardano-ledger-byron.nix) { }; cardano-ledger-byron-test = final.callPackage (./pkgs/cardano-ledger-byron-test.nix) { }; @@ -51,6 +57,8 @@ final: prev: with pkgs.haskell.lib; { cardano-ledger-core = final.callPackage (./pkgs/cardano-ledger-core.nix) { }; + cardano-ledger-mary = final.callPackage (./pkgs/cardano-ledger-mary.nix) { }; + cardano-ledger-pretty = final.callPackage (./pkgs/cardano-ledger-pretty.nix) { }; cardano-ledger-shelley = final.callPackage (./pkgs/cardano-ledger-shelley.nix) { }; diff --git a/pkgs/FailT.nix b/pkgs/FailT.nix new file mode 100644 index 0000000..a364e20 --- /dev/null +++ b/pkgs/FailT.nix @@ -0,0 +1,40 @@ +{ mkDerivation +, QuickCheck +, base +, doctest +, exceptions +, hspec +, lib +, mtl +, quickcheck-classes +, text +}: +mkDerivation { + pname = "FailT"; + version = "0.1.2.0"; + sha256 = "f1e3d5714df7e7e134545239bd78927bc9949a9b4760dfa061ff2b35ff0a76c3"; + isLibrary = true; + isExecutable = false; + enableSeparateDataOutput = false; + libraryHaskellDepends = [ base exceptions mtl text ]; + testHaskellDepends = [ + base + doctest + exceptions + hspec + mtl + QuickCheck + quickcheck-classes + ]; + enableLibraryProfiling = true; + enableExecutableProfiling = true; + doHaddock = false; + jailbreak = true; + doCheck = false; + doBenchmark = false; + hyperlinkSource = false; + homepage = "https://github.com/lehins/FailT"; + description = "A 'FailT' monad transformer that plays well with 'MonadFail'"; + license = lib.licenses.bsd3; + broken = false; +} diff --git a/pkgs/OddWord.nix b/pkgs/OddWord.nix index 10aa719..134c244 100644 --- a/pkgs/OddWord.nix +++ b/pkgs/OddWord.nix @@ -1,4 +1,10 @@ -{ mkDerivation, QuickCheck, base, criterion, fetchgit, hspec, lib +{ mkDerivation +, QuickCheck +, base +, criterion +, fetchgit +, hspec +, lib }: mkDerivation { pname = "OddWord"; @@ -26,4 +32,4 @@ mkDerivation { description = "Provides a wrapper for deriving word types with fewer bits"; license = lib.licenses.bsd3; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/Win32-network.nix b/pkgs/Win32-network.nix index 629d3cb..4ea22df 100644 --- a/pkgs/Win32-network.nix +++ b/pkgs/Win32-network.nix @@ -24,4 +24,4 @@ mkDerivation { description = "Win32 network API"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/algebraic-graphs.nix b/pkgs/algebraic-graphs.nix index 8bd1e05..a61ab2e 100644 --- a/pkgs/algebraic-graphs.nix +++ b/pkgs/algebraic-graphs.nix @@ -1,5 +1,13 @@ -{ mkDerivation, QuickCheck, array, base, containers, deepseq, extra -, inspection-testing, lib, transformers +{ mkDerivation +, QuickCheck +, array +, base +, containers +, deepseq +, extra +, inspection-testing +, lib +, transformers }: mkDerivation { pname = "algebraic-graphs"; @@ -9,10 +17,20 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - array base containers deepseq transformers + array + base + containers + deepseq + transformers ]; testHaskellDepends = [ - array base containers deepseq extra inspection-testing QuickCheck + array + base + containers + deepseq + extra + inspection-testing + QuickCheck transformers ]; enableLibraryProfiling = true; @@ -26,4 +44,4 @@ mkDerivation { description = "A library for algebraic graph construction and transformation"; license = lib.licenses.mit; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/base-deriving-via.nix b/pkgs/base-deriving-via.nix index 7c046f1..46b876f 100644 --- a/pkgs/base-deriving-via.nix +++ b/pkgs/base-deriving-via.nix @@ -23,4 +23,4 @@ mkDerivation { description = "A general hook newtype for use with deriving via"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/byron-spec-chain.nix b/pkgs/byron-spec-chain.nix index 6156643..e05a402 100644 --- a/pkgs/byron-spec-chain.nix +++ b/pkgs/byron-spec-chain.nix @@ -1,15 +1,29 @@ -{ mkDerivation, base, bimap, byron-spec-ledger, bytestring -, containers, data-ordlist, fetchgit, hashable, hedgehog, lib -, microlens, microlens-th, small-steps, small-steps-test, tasty -, tasty-hedgehog, tasty-hunit +{ mkDerivation +, base +, bimap +, byron-spec-ledger +, bytestring +, containers +, data-ordlist +, fetchgit +, hashable +, hedgehog +, lib +, microlens +, microlens-th +, small-steps +, small-steps-test +, tasty +, tasty-hedgehog +, tasty-hunit }: mkDerivation { pname = "byron-spec-chain"; - version = "0.1.0.0"; + version = "1.0.0.0"; src = fetchgit { - url = "https://github.com/milloni/cardano-ledger"; - sha256 = "08nj6hcqj5apvb17n1irc8j7rzf10bcdh5gh1mkmhwbyw6h2d4ab"; - rev = "3aa1fd8469424778454644f0d371988fb4490b4a"; + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/byron/chain/executable-spec/; echo source root reset to $sourceRoot"; @@ -17,12 +31,30 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - base bimap byron-spec-ledger bytestring containers hashable - hedgehog microlens microlens-th small-steps small-steps-test + base + bimap + byron-spec-ledger + bytestring + containers + hashable + hedgehog + microlens + microlens-th + small-steps + small-steps-test ]; testHaskellDepends = [ - base byron-spec-ledger containers data-ordlist hedgehog microlens - small-steps small-steps-test tasty tasty-hedgehog tasty-hunit + base + byron-spec-ledger + containers + data-ordlist + hedgehog + microlens + small-steps + small-steps-test + tasty + tasty-hedgehog + tasty-hunit ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -35,4 +67,4 @@ mkDerivation { description = "Executable specification of the Cardano blockchain"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/byron-spec-ledger.nix b/pkgs/byron-spec-ledger.nix index ad3ef8c..188e8ab 100644 --- a/pkgs/byron-spec-ledger.nix +++ b/pkgs/byron-spec-ledger.nix @@ -1,15 +1,32 @@ -{ mkDerivation, Unique, base, bimap, bytestring, cardano-binary -, cardano-crypto-class, containers, cryptonite, fetchgit, hashable -, hedgehog, lib, microlens, microlens-th, nothunks, small-steps -, small-steps-test, tasty, tasty-hedgehog, tasty-hunit +{ mkDerivation +, Unique +, base +, bimap +, bytestring +, cardano-crypto-class +, cardano-ledger-binary +, containers +, cryptonite +, fetchgit +, hashable +, hedgehog +, lib +, microlens +, microlens-th +, nothunks +, small-steps +, small-steps-test +, tasty +, tasty-hedgehog +, tasty-hunit }: mkDerivation { pname = "byron-spec-ledger"; - version = "0.1.0.0"; + version = "1.0.0.0"; src = fetchgit { - url = "https://github.com/milloni/cardano-ledger"; - sha256 = "08nj6hcqj5apvb17n1irc8j7rzf10bcdh5gh1mkmhwbyw6h2d4ab"; - rev = "3aa1fd8469424778454644f0d371988fb4490b4a"; + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/byron/ledger/executable-spec/; echo source root reset to $sourceRoot"; @@ -17,13 +34,35 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - base bimap bytestring cardano-binary cardano-crypto-class - containers cryptonite hashable hedgehog microlens microlens-th - nothunks small-steps small-steps-test Unique + base + bimap + bytestring + cardano-crypto-class + cardano-ledger-binary + containers + cryptonite + hashable + hedgehog + microlens + microlens-th + nothunks + small-steps + small-steps-test + Unique ]; testHaskellDepends = [ - base bimap containers hedgehog microlens microlens-th small-steps - small-steps-test tasty tasty-hedgehog tasty-hunit Unique + base + bimap + containers + hedgehog + microlens + microlens-th + small-steps + small-steps-test + tasty + tasty-hedgehog + tasty-hunit + Unique ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -36,4 +75,4 @@ mkDerivation { description = "Executable specification of Cardano ledger"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-binary-test.nix b/pkgs/cardano-binary-test.nix index b184ae5..11bc5e0 100644 --- a/pkgs/cardano-binary-test.nix +++ b/pkgs/cardano-binary-test.nix @@ -1,7 +1,21 @@ -{ mkDerivation, QuickCheck, base, bytestring, cardano-binary -, cardano-prelude-test, cborg, containers, fetchgit, formatting -, hedgehog, hspec, lib, pretty-show, quickcheck-instances, text -, time, vector +{ mkDerivation +, QuickCheck +, base +, bytestring +, cardano-binary +, cardano-prelude-test +, cborg +, containers +, fetchgit +, formatting +, hedgehog +, hspec +, lib +, pretty-show +, quickcheck-instances +, text +, time +, vector }: mkDerivation { pname = "cardano-binary-test"; @@ -17,9 +31,21 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - base bytestring cardano-binary cardano-prelude-test cborg - containers formatting hedgehog hspec pretty-show QuickCheck - quickcheck-instances text time vector + base + bytestring + cardano-binary + cardano-prelude-test + cborg + containers + formatting + hedgehog + hspec + pretty-show + QuickCheck + quickcheck-instances + text + time + vector ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -31,4 +57,4 @@ mkDerivation { description = "Test helpers from cardano-binary exposed to other packages"; license = lib.licenses.mit; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-binary.nix b/pkgs/cardano-binary.nix index 7439b42..c3894c6 100644 --- a/pkgs/cardano-binary.nix +++ b/pkgs/cardano-binary.nix @@ -1,8 +1,28 @@ -{ mkDerivation, QuickCheck, aeson, base, bytestring -, cardano-prelude-test, cborg, containers, data-fix, deepseq -, fetchgit, formatting, hedgehog, hspec, lib, nothunks, pretty-show -, primitive, quickcheck-instances, recursion-schemes -, safe-exceptions, tagged, text, time, vector +{ mkDerivation +, QuickCheck +, aeson +, base +, bytestring +, cardano-prelude-test +, cborg +, containers +, data-fix +, deepseq +, fetchgit +, formatting +, hedgehog +, hspec +, lib +, nothunks +, pretty-show +, primitive +, quickcheck-instances +, recursion-schemes +, safe-exceptions +, tagged +, text +, time +, vector }: mkDerivation { pname = "cardano-binary"; @@ -18,14 +38,39 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - aeson base bytestring cborg containers data-fix deepseq formatting - nothunks primitive recursion-schemes safe-exceptions tagged text - time vector + aeson + base + bytestring + cborg + containers + data-fix + deepseq + formatting + nothunks + primitive + recursion-schemes + safe-exceptions + tagged + text + time + vector ]; testHaskellDepends = [ - base bytestring cardano-prelude-test cborg containers formatting - hedgehog hspec pretty-show QuickCheck quickcheck-instances tagged - text time vector + base + bytestring + cardano-prelude-test + cborg + containers + formatting + hedgehog + hspec + pretty-show + QuickCheck + quickcheck-instances + tagged + text + time + vector ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -37,4 +82,4 @@ mkDerivation { description = "Binary serialization for Cardano"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-crypto-class.nix b/pkgs/cardano-crypto-class.nix index be0aaa3..fc8e5d9 100644 --- a/pkgs/cardano-crypto-class.nix +++ b/pkgs/cardano-crypto-class.nix @@ -1,8 +1,27 @@ -{ mkDerivation, aeson, base, base16-bytestring, bytestring -, cardano-binary, cardano-strict-containers, cryptonite, deepseq -, fetchgit, heapwords, lib, libsodium, memory, nothunks, primitive -, secp256k1, serialise, template-haskell, text, th-compat -, transformers, unix, vector +{ mkDerivation +, aeson +, base +, base16-bytestring +, bytestring +, cardano-binary +, cardano-strict-containers +, cryptonite +, deepseq +, fetchgit +, heapwords +, lib +, libsodium +, memory +, nothunks +, primitive +, secp256k1 +, serialise +, template-haskell +, text +, th-compat +, transformers +, unix +, vector }: mkDerivation { pname = "cardano-crypto-class"; @@ -18,10 +37,24 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cardano-binary - cardano-strict-containers cryptonite deepseq heapwords memory - nothunks primitive serialise template-haskell text th-compat - transformers vector + aeson + base + base16-bytestring + bytestring + cardano-binary + cardano-strict-containers + cryptonite + deepseq + heapwords + memory + nothunks + primitive + serialise + template-haskell + text + th-compat + transformers + vector ]; libraryPkgconfigDepends = [ libsodium secp256k1 ]; testHaskellDepends = [ base bytestring unix ]; @@ -35,4 +68,4 @@ mkDerivation { description = "Type classes abstracting over cryptography primitives for Cardano"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-crypto-praos.nix b/pkgs/cardano-crypto-praos.nix index 88c34cc..9a45368 100644 --- a/pkgs/cardano-crypto-praos.nix +++ b/pkgs/cardano-crypto-praos.nix @@ -1,5 +1,13 @@ -{ mkDerivation, base, bytestring, cardano-binary -, cardano-crypto-class, deepseq, fetchgit, lib, libsodium, nothunks +{ mkDerivation +, base +, bytestring +, cardano-binary +, cardano-crypto-class +, deepseq +, fetchgit +, lib +, libsodium +, nothunks }: mkDerivation { pname = "cardano-crypto-praos"; @@ -15,7 +23,11 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - base bytestring cardano-binary cardano-crypto-class deepseq + base + bytestring + cardano-binary + cardano-crypto-class + deepseq nothunks ]; libraryPkgconfigDepends = [ libsodium ]; @@ -29,4 +41,4 @@ mkDerivation { description = "Crypto primitives from libsodium"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-crypto-test.nix b/pkgs/cardano-crypto-test.nix index fe4871f..87ca804 100644 --- a/pkgs/cardano-crypto-test.nix +++ b/pkgs/cardano-crypto-test.nix @@ -1,15 +1,24 @@ -{ mkDerivation, base, bytestring, cardano-binary -, cardano-binary-test, cardano-crypto, cardano-crypto-wrapper -, cardano-prelude, cardano-prelude-test, cryptonite, fetchgit -, hedgehog, lib, memory +{ mkDerivation +, base +, bytestring +, cardano-crypto +, cardano-crypto-wrapper +, cardano-ledger-binary +, cardano-prelude +, cardano-prelude-test +, cryptonite +, fetchgit +, hedgehog +, lib +, memory }: mkDerivation { pname = "cardano-crypto-test"; - version = "1.3.0"; + version = "1.5.0.0"; src = fetchgit { - url = "https://github.com/milloni/cardano-ledger"; - sha256 = "08nj6hcqj5apvb17n1irc8j7rzf10bcdh5gh1mkmhwbyw6h2d4ab"; - rev = "3aa1fd8469424778454644f0d371988fb4490b4a"; + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/byron/crypto/test/; echo source root reset to $sourceRoot"; @@ -17,9 +26,16 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring cardano-binary cardano-binary-test cardano-crypto - cardano-crypto-wrapper cardano-prelude cardano-prelude-test - cryptonite hedgehog memory + base + bytestring + cardano-crypto + cardano-crypto-wrapper + cardano-ledger-binary + cardano-prelude + cardano-prelude-test + cryptonite + hedgehog + memory ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -31,4 +47,4 @@ mkDerivation { description = "Test helpers from cardano-crypto exposed to other packages"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-crypto-tests.nix b/pkgs/cardano-crypto-tests.nix index 459cc5f..68082b4 100644 --- a/pkgs/cardano-crypto-tests.nix +++ b/pkgs/cardano-crypto-tests.nix @@ -1,7 +1,22 @@ -{ mkDerivation, QuickCheck, base, bytestring, cardano-binary -, cardano-crypto-class, cardano-crypto-praos, cborg, criterion -, cryptonite, deepseq, fetchgit, formatting, lib, nothunks -, pretty-show, quickcheck-instances, tasty, tasty-hunit +{ mkDerivation +, QuickCheck +, base +, bytestring +, cardano-binary +, cardano-crypto-class +, cardano-crypto-praos +, cborg +, criterion +, cryptonite +, deepseq +, fetchgit +, formatting +, lib +, nothunks +, pretty-show +, quickcheck-instances +, tasty +, tasty-hunit , tasty-quickcheck }: mkDerivation { @@ -18,13 +33,29 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - base bytestring cardano-binary cardano-crypto-class - cardano-crypto-praos cborg criterion cryptonite deepseq formatting - nothunks pretty-show QuickCheck quickcheck-instances tasty - tasty-hunit tasty-quickcheck + base + bytestring + cardano-binary + cardano-crypto-class + cardano-crypto-praos + cborg + criterion + cryptonite + deepseq + formatting + nothunks + pretty-show + QuickCheck + quickcheck-instances + tasty + tasty-hunit + tasty-quickcheck ]; testHaskellDepends = [ - base cardano-crypto-class tasty tasty-quickcheck + base + cardano-crypto-class + tasty + tasty-quickcheck ]; benchmarkHaskellDepends = [ base cardano-crypto-class criterion ]; enableLibraryProfiling = true; @@ -37,4 +68,4 @@ mkDerivation { description = "Tests for cardano-crypto-class and -praos"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-crypto-wrapper.nix b/pkgs/cardano-crypto-wrapper.nix index e35f583..b33a86e 100644 --- a/pkgs/cardano-crypto-wrapper.nix +++ b/pkgs/cardano-crypto-wrapper.nix @@ -1,17 +1,36 @@ -{ mkDerivation, aeson, base, base16-bytestring, base64-bytestring -, base64-bytestring-type, binary, bytestring, canonical-json -, cardano-binary, cardano-binary-test, cardano-crypto -, cardano-prelude, cardano-prelude-test, cryptonite, data-default -, fetchgit, filepath, formatting, heapwords, hedgehog, lib, memory -, nothunks, text +{ mkDerivation +, aeson +, base +, base16-bytestring +, base64-bytestring +, base64-bytestring-type +, binary +, bytestring +, canonical-json +, cardano-crypto +, cardano-ledger-binary +, cardano-prelude +, cardano-prelude-test +, cryptonite +, data-default +, deepseq +, fetchgit +, filepath +, formatting +, heapwords +, hedgehog +, lib +, memory +, nothunks +, text }: mkDerivation { pname = "cardano-crypto-wrapper"; - version = "1.3.0"; + version = "1.5.1.0"; src = fetchgit { - url = "https://github.com/milloni/cardano-ledger"; - sha256 = "08nj6hcqj5apvb17n1irc8j7rzf10bcdh5gh1mkmhwbyw6h2d4ab"; - rev = "3aa1fd8469424778454644f0d371988fb4490b4a"; + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/byron/crypto/; echo source root reset to $sourceRoot"; @@ -19,15 +38,38 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base base16-bytestring base64-bytestring - base64-bytestring-type binary bytestring canonical-json - cardano-binary cardano-crypto cardano-prelude cryptonite - data-default formatting heapwords memory nothunks text + aeson + base + base16-bytestring + base64-bytestring + base64-bytestring-type + binary + bytestring + canonical-json + cardano-crypto + cardano-ledger-binary + cardano-prelude + cryptonite + data-default + deepseq + formatting + heapwords + memory + nothunks + text ]; testHaskellDepends = [ - base bytestring cardano-binary cardano-binary-test cardano-crypto - cardano-prelude cardano-prelude-test cryptonite filepath formatting - hedgehog memory + base + bytestring + cardano-crypto + cardano-ledger-binary + cardano-prelude + cardano-prelude-test + cryptonite + filepath + formatting + hedgehog + memory ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -36,7 +78,7 @@ mkDerivation { doCheck = false; doBenchmark = false; hyperlinkSource = false; - description = "Cryptographic primitives used in the Cardano project"; + description = "Cryptographic primitives used in Byron era of the Cardano project"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-crypto.nix b/pkgs/cardano-crypto.nix index 53b3b70..b4ab4a0 100644 --- a/pkgs/cardano-crypto.nix +++ b/pkgs/cardano-crypto.nix @@ -1,5 +1,16 @@ -{ mkDerivation, base, basement, bytestring, cryptonite, deepseq -, fetchgit, foundation, gauge, hashable, integer-gmp, lib, memory +{ mkDerivation +, base +, basement +, bytestring +, cryptonite +, deepseq +, fetchgit +, foundation +, gauge +, hashable +, integer-gmp +, lib +, memory }: mkDerivation { pname = "cardano-crypto"; @@ -14,14 +25,30 @@ mkDerivation { isExecutable = true; enableSeparateDataOutput = false; libraryHaskellDepends = [ - base basement bytestring cryptonite deepseq foundation hashable - integer-gmp memory + base + basement + bytestring + cryptonite + deepseq + foundation + hashable + integer-gmp + memory ]; testHaskellDepends = [ - base basement bytestring cryptonite foundation memory + base + basement + bytestring + cryptonite + foundation + memory ]; benchmarkHaskellDepends = [ - base bytestring cryptonite gauge memory + base + bytestring + cryptonite + gauge + memory ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -34,4 +61,4 @@ mkDerivation { description = "Cryptography primitives for cardano"; license = lib.licenses.mit; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-data.nix b/pkgs/cardano-data.nix index 250986b..88112bb 100644 --- a/pkgs/cardano-data.nix +++ b/pkgs/cardano-data.nix @@ -1,16 +1,24 @@ -{ mkDerivation, QuickCheck, aeson, base, bytestring, cardano-binary -, cardano-strict-containers, cborg, containers, deepseq, fetchgit -, formatting, lib, microlens, mtl, nothunks, primitive, tasty -, tasty-hunit, tasty-quickcheck, text, transformers, vector -, vector-map +{ mkDerivation +, QuickCheck +, aeson +, base +, cardano-ledger-binary +, containers +, deepseq +, fetchgit +, hspec +, lib +, mtl +, nothunks +, vector }: mkDerivation { pname = "cardano-data"; - version = "0.1.0.0"; + version = "1.1.0.0"; src = fetchgit { - url = "https://github.com/milloni/cardano-ledger"; - sha256 = "08nj6hcqj5apvb17n1irc8j7rzf10bcdh5gh1mkmhwbyw6h2d4ab"; - rev = "3aa1fd8469424778454644f0d371988fb4490b4a"; + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/libs/cardano-data/; echo source root reset to $sourceRoot"; @@ -18,14 +26,18 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - aeson base bytestring cardano-binary cardano-strict-containers - cborg containers deepseq formatting microlens mtl nothunks - primitive QuickCheck text transformers vector vector-map - ]; - testHaskellDepends = [ - base bytestring cardano-binary cardano-strict-containers cborg - containers QuickCheck tasty tasty-hunit tasty-quickcheck text + aeson + base + cardano-ledger-binary + containers + deepseq + hspec + mtl + nothunks + QuickCheck + vector ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; enableLibraryProfiling = true; enableExecutableProfiling = true; doHaddock = false; @@ -37,4 +49,4 @@ mkDerivation { description = "Specialized data for Cardano project"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-ledger-allegra.nix b/pkgs/cardano-ledger-allegra.nix new file mode 100644 index 0000000..573389e --- /dev/null +++ b/pkgs/cardano-ledger-allegra.nix @@ -0,0 +1,66 @@ +{ mkDerivation +, QuickCheck +, base +, bytestring +, cardano-crypto-class +, cardano-ledger-binary +, cardano-ledger-core +, cardano-ledger-shelley +, cardano-slotting +, cardano-strict-containers +, cborg +, containers +, deepseq +, fetchgit +, generic-random +, lib +, microlens +, nothunks +, small-steps +, transformers +, validation-selective +}: +mkDerivation { + pname = "cardano-ledger-allegra"; + version = "1.1.1.0"; + src = fetchgit { + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/eras/allegra/impl/; echo source root reset to $sourceRoot"; + isLibrary = true; + isExecutable = false; + enableSeparateDataOutput = false; + libraryHaskellDepends = [ + base + bytestring + cardano-crypto-class + cardano-ledger-binary + cardano-ledger-core + cardano-ledger-shelley + cardano-slotting + cardano-strict-containers + cborg + containers + deepseq + generic-random + microlens + nothunks + QuickCheck + small-steps + transformers + validation-selective + ]; + enableLibraryProfiling = true; + enableExecutableProfiling = true; + doHaddock = false; + jailbreak = true; + doCheck = false; + doBenchmark = false; + hyperlinkSource = false; + description = "Allegra ledger era that introduces time lock support"; + license = lib.licenses.asl20; + broken = false; +} diff --git a/pkgs/cardano-ledger-alonzo-test.nix b/pkgs/cardano-ledger-alonzo-test.nix index f870dc5..e90baab 100644 --- a/pkgs/cardano-ledger-alonzo-test.nix +++ b/pkgs/cardano-ledger-alonzo-test.nix @@ -1,21 +1,45 @@ -{ mkDerivation, QuickCheck, base, base16-bytestring, bytestring -, cardano-binary, cardano-data, cardano-ledger-alonzo -, cardano-ledger-core, cardano-ledger-pretty -, cardano-ledger-shelley, cardano-ledger-shelley-ma -, cardano-ledger-shelley-ma-test, cardano-ledger-shelley-test -, cardano-protocol-tpraos, cardano-slotting -, cardano-strict-containers, cborg, containers, data-default-class -, fetchgit, hashable, lib, microlens, plutus-core -, plutus-ledger-api, plutus-tx, small-steps, small-steps-test -, tasty, tasty-hunit, tasty-quickcheck, text, time, transformers +{ mkDerivation +, QuickCheck +, aeson +, base +, base16-bytestring +, bytestring +, cardano-ledger-allegra +, cardano-ledger-alonzo +, cardano-ledger-binary +, cardano-ledger-core +, cardano-ledger-mary +, cardano-ledger-pretty +, cardano-ledger-shelley +, cardano-ledger-shelley-ma-test +, cardano-ledger-shelley-test +, cardano-protocol-tpraos +, cardano-slotting +, cardano-strict-containers +, cborg +, containers +, data-default-class +, fetchgit +, lib +, microlens +, plutus-ledger-api +, plutus-tx +, random +, small-steps +, small-steps-test +, tasty +, tasty-hunit +, tasty-quickcheck +, time +, transformers }: mkDerivation { pname = "cardano-ledger-alonzo-test"; - version = "0.1.0.0"; + version = "1.1.0.0"; src = fetchgit { - url = "https://github.com/milloni/cardano-ledger"; - sha256 = "08nj6hcqj5apvb17n1irc8j7rzf10bcdh5gh1mkmhwbyw6h2d4ab"; - rev = "3aa1fd8469424778454644f0d371988fb4490b4a"; + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/alonzo/test-suite/; echo source root reset to $sourceRoot"; @@ -23,22 +47,58 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring cardano-binary cardano-data cardano-ledger-alonzo - cardano-ledger-core cardano-ledger-pretty cardano-ledger-shelley - cardano-ledger-shelley-ma cardano-ledger-shelley-ma-test - cardano-ledger-shelley-test cardano-protocol-tpraos - cardano-slotting cardano-strict-containers cborg containers - data-default-class hashable microlens plutus-core plutus-ledger-api - plutus-tx QuickCheck small-steps small-steps-test text transformers + base + bytestring + cardano-ledger-allegra + cardano-ledger-alonzo + cardano-ledger-binary + cardano-ledger-core + cardano-ledger-mary + cardano-ledger-pretty + cardano-ledger-shelley + cardano-ledger-shelley-ma-test + cardano-ledger-shelley-test + cardano-protocol-tpraos + cardano-slotting + cardano-strict-containers + cborg + containers + data-default-class + microlens + plutus-ledger-api + plutus-tx + QuickCheck + random + small-steps + small-steps-test + transformers ]; testHaskellDepends = [ - base base16-bytestring bytestring cardano-binary cardano-data - cardano-ledger-alonzo cardano-ledger-core cardano-ledger-shelley - cardano-ledger-shelley-ma cardano-ledger-shelley-ma-test - cardano-ledger-shelley-test cardano-protocol-tpraos - cardano-slotting cardano-strict-containers cborg containers - data-default-class microlens plutus-ledger-api QuickCheck - small-steps small-steps-test tasty tasty-hunit tasty-quickcheck + aeson + base + base16-bytestring + bytestring + cardano-ledger-allegra + cardano-ledger-alonzo + cardano-ledger-binary + cardano-ledger-core + cardano-ledger-mary + cardano-ledger-shelley + cardano-ledger-shelley-ma-test + cardano-ledger-shelley-test + cardano-protocol-tpraos + cardano-slotting + cardano-strict-containers + containers + data-default-class + microlens + plutus-ledger-api + QuickCheck + small-steps + small-steps-test + tasty + tasty-hunit + tasty-quickcheck time ]; enableLibraryProfiling = false; @@ -51,4 +111,4 @@ mkDerivation { description = "Tests for Cardano ledger introducing Plutus Core"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-ledger-alonzo.nix b/pkgs/cardano-ledger-alonzo.nix index 7e48ec9..58c0723 100644 --- a/pkgs/cardano-ledger-alonzo.nix +++ b/pkgs/cardano-ledger-alonzo.nix @@ -1,20 +1,50 @@ -{ mkDerivation, aeson, array, base, base-deriving-via -, base64-bytestring, bytestring, cardano-binary -, cardano-crypto-class, cardano-data, cardano-ledger-core -, cardano-ledger-shelley, cardano-ledger-shelley-ma -, cardano-slotting, cardano-strict-containers, containers -, data-default, deepseq, fetchgit, heapwords, lib, measures -, microlens, mtl, nothunks, plutus-core, plutus-ledger-api -, prettyprinter, scientific, serialise, set-algebra, small-steps -, text, time, transformers, utf8-string, validation-selective +{ mkDerivation +, FailT +, aeson +, base +, base-deriving-via +, base64-bytestring +, bytestring +, cardano-crypto-class +, cardano-data +, cardano-ledger-allegra +, cardano-ledger-binary +, cardano-ledger-core +, cardano-ledger-mary +, cardano-ledger-shelley +, cardano-slotting +, cardano-strict-containers +, containers +, data-default-class +, deepseq +, fetchgit +, heapwords +, lib +, measures +, microlens +, mtl +, nothunks +, plutus-core +, plutus-ledger-api +, prettyprinter +, scientific +, serialise +, set-algebra +, small-steps +, text +, time +, transformers +, tree-diff +, utf8-string +, validation-selective }: mkDerivation { pname = "cardano-ledger-alonzo"; - version = "0.1.0.0"; + version = "1.2.0.0"; src = fetchgit { - url = "https://github.com/milloni/cardano-ledger"; - sha256 = "08nj6hcqj5apvb17n1irc8j7rzf10bcdh5gh1mkmhwbyw6h2d4ab"; - rev = "3aa1fd8469424778454644f0d371988fb4490b4a"; + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/alonzo/impl/; echo source root reset to $sourceRoot"; @@ -22,14 +52,42 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - aeson array base base-deriving-via base64-bytestring bytestring - cardano-binary cardano-crypto-class cardano-data - cardano-ledger-core cardano-ledger-shelley - cardano-ledger-shelley-ma cardano-slotting - cardano-strict-containers containers data-default deepseq heapwords - measures microlens mtl nothunks plutus-core plutus-ledger-api - prettyprinter scientific serialise set-algebra small-steps text - time transformers utf8-string validation-selective + aeson + base + base-deriving-via + base64-bytestring + bytestring + cardano-crypto-class + cardano-data + cardano-ledger-allegra + cardano-ledger-binary + cardano-ledger-core + cardano-ledger-mary + cardano-ledger-shelley + cardano-slotting + cardano-strict-containers + containers + data-default-class + deepseq + FailT + heapwords + measures + microlens + mtl + nothunks + plutus-core + plutus-ledger-api + prettyprinter + scientific + serialise + set-algebra + small-steps + text + time + transformers + tree-diff + utf8-string + validation-selective ]; enableLibraryProfiling = false; enableExecutableProfiling = false; @@ -41,4 +99,4 @@ mkDerivation { description = "Cardano ledger introducing Plutus Core"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-ledger-api.nix b/pkgs/cardano-ledger-api.nix index 55d35c4..bc67bae 100644 --- a/pkgs/cardano-ledger-api.nix +++ b/pkgs/cardano-ledger-api.nix @@ -1,17 +1,31 @@ -{ mkDerivation, QuickCheck, base, bytestring, cardano-binary -, cardano-ledger-alonzo, cardano-ledger-babbage -, cardano-ledger-babbage-test, cardano-ledger-conway -, cardano-ledger-core, cardano-ledger-shelley -, cardano-ledger-shelley-ma, fetchgit, lib, microlens, tasty -, tasty-quickcheck +{ mkDerivation +, array +, base +, bytestring +, cardano-ledger-allegra +, cardano-ledger-alonzo +, cardano-ledger-babbage +, cardano-ledger-binary +, cardano-ledger-conway +, cardano-ledger-core +, cardano-ledger-mary +, cardano-ledger-shelley +, cardano-slotting +, cardano-strict-containers +, containers +, fetchgit +, lib +, microlens +, plutus-ledger-api +, text }: mkDerivation { pname = "cardano-ledger-api"; - version = "0.1.0.0"; + version = "1.2.0.0"; src = fetchgit { - url = "https://github.com/milloni/cardano-ledger"; - sha256 = "08nj6hcqj5apvb17n1irc8j7rzf10bcdh5gh1mkmhwbyw6h2d4ab"; - rev = "3aa1fd8469424778454644f0d371988fb4490b4a"; + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/libs/cardano-ledger-api/; echo source root reset to $sourceRoot"; @@ -19,15 +33,34 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - base cardano-ledger-alonzo cardano-ledger-babbage - cardano-ledger-conway cardano-ledger-core cardano-ledger-shelley - cardano-ledger-shelley-ma microlens + array + base + bytestring + cardano-ledger-allegra + cardano-ledger-alonzo + cardano-ledger-babbage + cardano-ledger-binary + cardano-ledger-conway + cardano-ledger-core + cardano-ledger-mary + cardano-ledger-shelley + cardano-slotting + containers + microlens + plutus-ledger-api + text ]; testHaskellDepends = [ - base bytestring cardano-binary cardano-ledger-alonzo - cardano-ledger-babbage cardano-ledger-babbage-test - cardano-ledger-core cardano-ledger-shelley microlens QuickCheck - tasty tasty-quickcheck + base + bytestring + cardano-ledger-babbage + cardano-ledger-binary + cardano-ledger-conway + cardano-ledger-core + cardano-ledger-shelley + cardano-strict-containers + containers + microlens ]; enableLibraryProfiling = false; enableExecutableProfiling = false; @@ -39,4 +72,4 @@ mkDerivation { description = "Public API for the cardano ledger codebase"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-ledger-babbage-test.nix b/pkgs/cardano-ledger-babbage-test.nix index 6b6419a..f55d746 100644 --- a/pkgs/cardano-ledger-babbage-test.nix +++ b/pkgs/cardano-ledger-babbage-test.nix @@ -1,21 +1,39 @@ -{ mkDerivation, QuickCheck, base, base16-bytestring, bytestring -, cardano-binary, cardano-data, cardano-ledger-alonzo -, cardano-ledger-alonzo-test, cardano-ledger-babbage -, cardano-ledger-core, cardano-ledger-shelley -, cardano-ledger-shelley-ma, cardano-ledger-shelley-ma-test -, cardano-ledger-shelley-test, cardano-protocol-tpraos -, cardano-slotting, cardano-strict-containers, cborg, containers -, data-default-class, fetchgit, lib, plutus-ledger-api, plutus-tx -, pretty-show, small-steps, tasty, tasty-hunit, tasty-quickcheck +{ mkDerivation +, QuickCheck +, base +, bytestring +, cardano-ledger-allegra +, cardano-ledger-alonzo +, cardano-ledger-alonzo-test +, cardano-ledger-babbage +, cardano-ledger-binary +, cardano-ledger-core +, cardano-ledger-mary +, cardano-ledger-shelley +, cardano-ledger-shelley-ma-test +, cardano-ledger-shelley-test +, cardano-protocol-tpraos +, cardano-slotting +, cardano-strict-containers +, containers +, data-default-class +, fetchgit +, lib +, microlens +, plutus-ledger-api +, plutus-tx +, tasty +, tasty-hunit +, tasty-quickcheck , time }: mkDerivation { pname = "cardano-ledger-babbage-test"; - version = "0.1.0.0"; + version = "1.1.1.0"; src = fetchgit { - url = "https://github.com/milloni/cardano-ledger"; - sha256 = "08nj6hcqj5apvb17n1irc8j7rzf10bcdh5gh1mkmhwbyw6h2d4ab"; - rev = "3aa1fd8469424778454644f0d371988fb4490b4a"; + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/babbage/test-suite/; echo source root reset to $sourceRoot"; @@ -23,23 +41,42 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base cardano-binary cardano-ledger-alonzo - cardano-ledger-alonzo-test cardano-ledger-babbage - cardano-ledger-core cardano-ledger-shelley - cardano-ledger-shelley-ma cardano-ledger-shelley-ma-test - cardano-ledger-shelley-test cardano-slotting - cardano-strict-containers containers data-default-class plutus-tx - QuickCheck small-steps + base + cardano-ledger-allegra + cardano-ledger-alonzo + cardano-ledger-alonzo-test + cardano-ledger-babbage + cardano-ledger-binary + cardano-ledger-core + cardano-ledger-mary + cardano-ledger-shelley + cardano-ledger-shelley-ma-test + cardano-ledger-shelley-test + cardano-slotting + cardano-strict-containers + containers + data-default-class + microlens + plutus-ledger-api + plutus-tx + QuickCheck + tasty + tasty-hunit + time ]; testHaskellDepends = [ - base base16-bytestring bytestring cardano-binary cardano-data - cardano-ledger-alonzo cardano-ledger-alonzo-test - cardano-ledger-babbage cardano-ledger-core cardano-ledger-shelley - cardano-ledger-shelley-ma cardano-ledger-shelley-ma-test - cardano-ledger-shelley-test cardano-protocol-tpraos - cardano-slotting cardano-strict-containers cborg containers - data-default-class plutus-ledger-api pretty-show tasty tasty-hunit - tasty-quickcheck time + base + bytestring + cardano-ledger-allegra + cardano-ledger-alonzo + cardano-ledger-babbage + cardano-ledger-binary + cardano-ledger-core + cardano-ledger-shelley-ma-test + cardano-ledger-shelley-test + cardano-protocol-tpraos + tasty + tasty-quickcheck ]; enableLibraryProfiling = false; enableExecutableProfiling = false; @@ -51,4 +88,4 @@ mkDerivation { description = "Tests for Cardano ledger babbage era"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-ledger-babbage.nix b/pkgs/cardano-ledger-babbage.nix index b5d2b53..2ad59b3 100644 --- a/pkgs/cardano-ledger-babbage.nix +++ b/pkgs/cardano-ledger-babbage.nix @@ -1,19 +1,38 @@ -{ mkDerivation, base, bytestring, cardano-binary -, cardano-crypto-class, cardano-data, cardano-ledger-alonzo -, cardano-ledger-core, cardano-ledger-shelley -, cardano-ledger-shelley-ma, cardano-slotting -, cardano-strict-containers, containers, data-default, deepseq -, fetchgit, lib, microlens, nothunks, plutus-ledger-api -, set-algebra, small-steps, text, transformers +{ mkDerivation +, QuickCheck +, aeson +, base +, bytestring +, cardano-crypto-class +, cardano-data +, cardano-ledger-allegra +, cardano-ledger-alonzo +, cardano-ledger-binary +, cardano-ledger-core +, cardano-ledger-mary +, cardano-ledger-shelley +, cardano-slotting +, cardano-strict-containers +, containers +, deepseq +, fetchgit +, lib +, microlens +, nothunks +, plutus-ledger-api +, set-algebra +, small-steps +, text +, transformers , validation-selective }: mkDerivation { pname = "cardano-ledger-babbage"; - version = "0.1.0.0"; + version = "1.2.0.0"; src = fetchgit { - url = "https://github.com/milloni/cardano-ledger"; - sha256 = "08nj6hcqj5apvb17n1irc8j7rzf10bcdh5gh1mkmhwbyw6h2d4ab"; - rev = "3aa1fd8469424778454644f0d371988fb4490b4a"; + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/babbage/impl/; echo source root reset to $sourceRoot"; @@ -21,12 +40,30 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - base bytestring cardano-binary cardano-crypto-class cardano-data - cardano-ledger-alonzo cardano-ledger-core cardano-ledger-shelley - cardano-ledger-shelley-ma cardano-slotting - cardano-strict-containers containers data-default deepseq microlens - nothunks plutus-ledger-api set-algebra small-steps text - transformers validation-selective + aeson + base + bytestring + cardano-crypto-class + cardano-data + cardano-ledger-allegra + cardano-ledger-alonzo + cardano-ledger-binary + cardano-ledger-core + cardano-ledger-mary + cardano-ledger-shelley + cardano-slotting + cardano-strict-containers + containers + deepseq + microlens + nothunks + plutus-ledger-api + QuickCheck + set-algebra + small-steps + text + transformers + validation-selective ]; enableLibraryProfiling = false; enableExecutableProfiling = false; @@ -35,7 +72,7 @@ mkDerivation { doCheck = false; doBenchmark = false; hyperlinkSource = false; - description = "TODO"; + description = "Cardano ledger introducing refrence scripts and inline datums"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-ledger-binary.nix b/pkgs/cardano-ledger-binary.nix new file mode 100644 index 0000000..3c437b8 --- /dev/null +++ b/pkgs/cardano-ledger-binary.nix @@ -0,0 +1,136 @@ +{ mkDerivation +, QuickCheck +, aeson +, base +, base16-bytestring +, binary +, bytestring +, cardano-binary +, cardano-crypto-class +, cardano-crypto-praos +, cardano-crypto-tests +, cardano-prelude-test +, cardano-slotting +, cardano-strict-containers +, cborg +, containers +, data-fix +, deepseq +, fetchgit +, formatting +, half +, hedgehog +, hedgehog-quickcheck +, hspec +, iproute +, lib +, microlens +, mtl +, network +, nothunks +, plutus-ledger-api +, pretty-show +, primitive +, quickcheck-instances +, random +, recursion-schemes +, serialise +, tagged +, tasty-hunit +, text +, time +, transformers +, tree-diff +, vector +, vector-map +}: +mkDerivation { + pname = "cardano-ledger-binary"; + version = "1.1.1.0"; + src = fetchgit { + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/libs/cardano-ledger-binary/; echo source root reset to $sourceRoot"; + isLibrary = true; + isExecutable = false; + enableSeparateDataOutput = false; + libraryHaskellDepends = [ + aeson + base + base16-bytestring + binary + bytestring + cardano-binary + cardano-crypto-class + cardano-crypto-praos + cardano-crypto-tests + cardano-prelude-test + cardano-slotting + cardano-strict-containers + cborg + containers + data-fix + deepseq + formatting + half + hedgehog + hspec + iproute + microlens + mtl + network + nothunks + plutus-ledger-api + pretty-show + primitive + QuickCheck + quickcheck-instances + random + recursion-schemes + serialise + tagged + tasty-hunit + text + time + transformers + tree-diff + vector + vector-map + ]; + testHaskellDepends = [ + base + bytestring + cardano-crypto-class + cardano-crypto-praos + cardano-prelude-test + cardano-slotting + cardano-strict-containers + cborg + containers + hedgehog + hedgehog-quickcheck + hspec + iproute + primitive + QuickCheck + tagged + text + time + vector + vector-map + ]; + enableLibraryProfiling = false; + enableExecutableProfiling = false; + doHaddock = false; + jailbreak = true; + doCheck = false; + doBenchmark = false; + hyperlinkSource = false; + homepage = "https://github.com/input-output-hk/cardano-ledger"; + description = "Binary serialization library used throughout ledger"; + license = lib.licenses.asl20; + broken = false; +} diff --git a/pkgs/cardano-ledger-byron-test.nix b/pkgs/cardano-ledger-byron-test.nix index 6d0ce0b..8e47a77 100644 --- a/pkgs/cardano-ledger-byron-test.nix +++ b/pkgs/cardano-ledger-byron-test.nix @@ -1,19 +1,44 @@ -{ mkDerivation, base, base16-bytestring, bimap, byron-spec-chain -, byron-spec-ledger, bytestring, cardano-binary -, cardano-binary-test, cardano-crypto, cardano-crypto-test -, cardano-crypto-wrapper, cardano-ledger-byron, cardano-prelude -, cardano-prelude-test, containers, directory, fetchgit, filepath -, formatting, generic-monoid, heapwords, hedgehog, lib, microlens -, resourcet, small-steps, small-steps-test, streaming, tasty -, tasty-hedgehog, text, time, vector +{ mkDerivation +, base +, base16-bytestring +, bimap +, byron-spec-chain +, byron-spec-ledger +, bytestring +, cardano-crypto +, cardano-crypto-test +, cardano-crypto-wrapper +, cardano-ledger-binary +, cardano-ledger-byron +, cardano-prelude +, cardano-prelude-test +, containers +, directory +, fetchgit +, filepath +, formatting +, generic-monoid +, heapwords +, hedgehog +, lib +, microlens +, resourcet +, small-steps +, small-steps-test +, streaming +, tasty +, tasty-hedgehog +, text +, time +, vector }: mkDerivation { pname = "cardano-ledger-byron-test"; - version = "1.3.0"; + version = "1.5.0.0"; src = fetchgit { - url = "https://github.com/milloni/cardano-ledger"; - sha256 = "08nj6hcqj5apvb17n1irc8j7rzf10bcdh5gh1mkmhwbyw6h2d4ab"; - rev = "3aa1fd8469424778454644f0d371988fb4490b4a"; + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/byron/ledger/impl/test/; echo source root reset to $sourceRoot"; @@ -21,13 +46,36 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base base16-bytestring bimap byron-spec-chain byron-spec-ledger - bytestring cardano-binary cardano-binary-test cardano-crypto - cardano-crypto-test cardano-crypto-wrapper cardano-ledger-byron - cardano-prelude cardano-prelude-test containers directory filepath - formatting generic-monoid heapwords hedgehog microlens resourcet - small-steps small-steps-test streaming tasty tasty-hedgehog text - time vector + base + base16-bytestring + bimap + byron-spec-chain + byron-spec-ledger + bytestring + cardano-crypto + cardano-crypto-test + cardano-crypto-wrapper + cardano-ledger-binary + cardano-ledger-byron + cardano-prelude + cardano-prelude-test + containers + directory + filepath + formatting + generic-monoid + heapwords + hedgehog + microlens + resourcet + small-steps + small-steps-test + streaming + tasty + tasty-hedgehog + text + time + vector ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -39,4 +87,4 @@ mkDerivation { description = "Test helpers from cardano-ledger exposed to other packages"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-ledger-byron.nix b/pkgs/cardano-ledger-byron.nix index a84d9ea..ef75458 100644 --- a/pkgs/cardano-ledger-byron.nix +++ b/pkgs/cardano-ledger-byron.nix @@ -1,21 +1,56 @@ -{ mkDerivation, Cabal, aeson, base, base16-bytestring -, base58-bytestring, bimap, binary, byron-spec-chain -, byron-spec-ledger, bytestring, canonical-json, cardano-binary -, cardano-binary-test, cardano-crypto, cardano-crypto-test -, cardano-crypto-wrapper, cardano-prelude, cardano-prelude-test -, cborg, containers, contra-tracer, cryptonite, digest, directory -, fetchgit, filepath, formatting, generic-monoid, heapwords -, hedgehog, lib, microlens, nothunks, quiet, resourcet, small-steps -, small-steps-test, streaming, streaming-binary -, streaming-bytestring, tasty, tasty-hedgehog, text, time, vector +{ mkDerivation +, Cabal +, aeson +, base +, base16-bytestring +, base58-bytestring +, bimap +, binary +, byron-spec-chain +, byron-spec-ledger +, bytestring +, canonical-json +, cardano-crypto +, cardano-crypto-test +, cardano-crypto-wrapper +, cardano-ledger-binary +, cardano-prelude +, cardano-prelude-test +, cborg +, containers +, contra-tracer +, cryptonite +, digest +, directory +, fetchgit +, filepath +, formatting +, generic-monoid +, heapwords +, hedgehog +, lib +, microlens +, nothunks +, quiet +, resourcet +, small-steps +, small-steps-test +, streaming +, streaming-binary +, streaming-bytestring +, tasty +, tasty-hedgehog +, text +, time +, vector }: mkDerivation { pname = "cardano-ledger-byron"; - version = "0.1.0.0"; + version = "1.0.0.0"; src = fetchgit { - url = "https://github.com/milloni/cardano-ledger"; - sha256 = "08nj6hcqj5apvb17n1irc8j7rzf10bcdh5gh1mkmhwbyw6h2d4ab"; - rev = "3aa1fd8469424778454644f0d371988fb4490b4a"; + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/byron/ledger/impl/; echo source root reset to $sourceRoot"; @@ -23,19 +58,67 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base base58-bytestring bimap binary bytestring Cabal - canonical-json cardano-binary cardano-crypto cardano-crypto-wrapper - cardano-prelude cborg containers contra-tracer cryptonite digest - directory filepath formatting heapwords nothunks quiet resourcet - streaming streaming-binary streaming-bytestring text time vector + aeson + base + base58-bytestring + bimap + binary + bytestring + Cabal + canonical-json + cardano-crypto + cardano-crypto-wrapper + cardano-ledger-binary + cardano-prelude + cborg + containers + contra-tracer + cryptonite + digest + directory + filepath + formatting + heapwords + nothunks + quiet + resourcet + streaming + streaming-binary + streaming-bytestring + text + time + vector ]; testHaskellDepends = [ - base base16-bytestring bimap byron-spec-chain byron-spec-ledger - bytestring cardano-binary cardano-binary-test cardano-crypto - cardano-crypto-test cardano-crypto-wrapper cardano-prelude - cardano-prelude-test containers directory filepath formatting - generic-monoid heapwords hedgehog microlens resourcet small-steps - small-steps-test streaming tasty tasty-hedgehog text time vector + base + base16-bytestring + bimap + byron-spec-chain + byron-spec-ledger + bytestring + cardano-crypto + cardano-crypto-test + cardano-crypto-wrapper + cardano-ledger-binary + cardano-prelude + cardano-prelude-test + containers + directory + filepath + formatting + generic-monoid + heapwords + hedgehog + microlens + resourcet + small-steps + small-steps-test + streaming + tasty + tasty-hedgehog + text + time + vector ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -47,4 +130,4 @@ mkDerivation { description = "The blockchain layer of Cardano during the Byron era"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-ledger-conway-test.nix b/pkgs/cardano-ledger-conway-test.nix index 3795846..c18e28a 100644 --- a/pkgs/cardano-ledger-conway-test.nix +++ b/pkgs/cardano-ledger-conway-test.nix @@ -1,36 +1,75 @@ -{ mkDerivation, QuickCheck, base, cardano-ledger-alonzo -, cardano-ledger-alonzo-test, cardano-ledger-babbage -, cardano-ledger-babbage-test, cardano-ledger-conway -, cardano-ledger-core, cardano-ledger-shelley -, cardano-ledger-shelley-ma, cardano-ledger-shelley-ma-test -, cardano-ledger-shelley-test, cardano-slotting -, cardano-strict-containers, containers, data-default-class -, fetchgit, lib, plutus-tx, tasty, tasty-quickcheck +{ mkDerivation +, base +, bytestring +, cardano-ledger-allegra +, cardano-ledger-alonzo +, cardano-ledger-babbage +, cardano-ledger-babbage-test +, cardano-ledger-binary +, cardano-ledger-conway +, cardano-ledger-core +, cardano-ledger-mary +, cardano-ledger-shelley +, cardano-ledger-shelley-ma-test +, cardano-ledger-shelley-test +, cardano-slotting +, cardano-strict-containers +, containers +, data-default-class +, fetchgit +, lib +, microlens +, plutus-tx +, small-steps +, tasty +, tasty-quickcheck }: mkDerivation { pname = "cardano-ledger-conway-test"; - version = "0.1.0.0"; + version = "1.1.1.0"; src = fetchgit { - url = "https://github.com/milloni/cardano-ledger"; - sha256 = "08nj6hcqj5apvb17n1irc8j7rzf10bcdh5gh1mkmhwbyw6h2d4ab"; - rev = "3aa1fd8469424778454644f0d371988fb4490b4a"; + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/conway/test-suite/; echo source root reset to $sourceRoot"; isLibrary = true; isExecutable = false; - enableSeparateDataOutput = false; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - base cardano-ledger-alonzo cardano-ledger-alonzo-test - cardano-ledger-babbage cardano-ledger-babbage-test - cardano-ledger-conway cardano-ledger-core cardano-ledger-shelley - cardano-ledger-shelley-ma cardano-ledger-shelley-ma-test - cardano-ledger-shelley-test cardano-slotting - cardano-strict-containers containers data-default-class plutus-tx - QuickCheck tasty tasty-quickcheck + base + cardano-ledger-allegra + cardano-ledger-alonzo + cardano-ledger-babbage + cardano-ledger-binary + cardano-ledger-conway + cardano-ledger-core + cardano-ledger-mary + cardano-ledger-shelley + cardano-ledger-shelley-ma-test + cardano-ledger-shelley-test + cardano-slotting + cardano-strict-containers + containers + data-default-class + microlens + plutus-tx + small-steps + tasty + tasty-quickcheck ]; testHaskellDepends = [ - base cardano-ledger-conway cardano-ledger-shelley-test tasty + base + bytestring + cardano-ledger-allegra + cardano-ledger-alonzo + cardano-ledger-babbage + cardano-ledger-babbage-test + cardano-ledger-conway + cardano-ledger-core + cardano-ledger-shelley-test + tasty ]; enableLibraryProfiling = false; enableExecutableProfiling = false; @@ -42,4 +81,4 @@ mkDerivation { description = "Tests for Cardano ledger Conway era"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-ledger-conway.nix b/pkgs/cardano-ledger-conway.nix index 99dcb93..25a0faf 100644 --- a/pkgs/cardano-ledger-conway.nix +++ b/pkgs/cardano-ledger-conway.nix @@ -1,16 +1,38 @@ -{ mkDerivation, aeson, base, bytestring, cardano-binary -, cardano-ledger-alonzo, cardano-ledger-babbage -, cardano-ledger-core, cardano-ledger-shelley -, cardano-ledger-shelley-ma, cardano-strict-containers, containers -, fetchgit, lib, microlens, nothunks +{ mkDerivation +, aeson +, base +, bytestring +, cardano-crypto-class +, cardano-ledger-allegra +, cardano-ledger-alonzo +, cardano-ledger-babbage +, cardano-ledger-binary +, cardano-ledger-core +, cardano-ledger-mary +, cardano-ledger-shelley +, cardano-slotting +, cardano-strict-containers +, containers +, data-default-class +, deepseq +, fetchgit +, lib +, microlens +, nothunks +, plutus-ledger-api +, set-algebra +, small-steps +, text +, transformers +, validation-selective }: mkDerivation { pname = "cardano-ledger-conway"; - version = "0.1.0.0"; + version = "1.2.0.0"; src = fetchgit { - url = "https://github.com/milloni/cardano-ledger"; - sha256 = "08nj6hcqj5apvb17n1irc8j7rzf10bcdh5gh1mkmhwbyw6h2d4ab"; - rev = "3aa1fd8469424778454644f0d371988fb4490b4a"; + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/conway/impl/; echo source root reset to $sourceRoot"; @@ -18,10 +40,30 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - aeson base bytestring cardano-binary cardano-ledger-alonzo - cardano-ledger-babbage cardano-ledger-core cardano-ledger-shelley - cardano-ledger-shelley-ma cardano-strict-containers containers - microlens nothunks + aeson + base + bytestring + cardano-crypto-class + cardano-ledger-allegra + cardano-ledger-alonzo + cardano-ledger-babbage + cardano-ledger-binary + cardano-ledger-core + cardano-ledger-mary + cardano-ledger-shelley + cardano-slotting + cardano-strict-containers + containers + data-default-class + deepseq + microlens + nothunks + plutus-ledger-api + set-algebra + small-steps + text + transformers + validation-selective ]; enableLibraryProfiling = false; enableExecutableProfiling = false; @@ -30,7 +72,7 @@ mkDerivation { doCheck = false; doBenchmark = false; hyperlinkSource = false; - description = "TODO"; + description = "Cardano ledger with an updated on-chain governance system"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-ledger-core.nix b/pkgs/cardano-ledger-core.nix index 34b3819..446f0cb 100644 --- a/pkgs/cardano-ledger-core.nix +++ b/pkgs/cardano-ledger-core.nix @@ -1,20 +1,60 @@ -{ mkDerivation, aeson, base, base16-bytestring, binary, bytestring -, cardano-binary, cardano-crypto, cardano-crypto-class -, cardano-crypto-praos, cardano-crypto-wrapper, cardano-data -, cardano-ledger-byron, cardano-prelude, cardano-slotting -, cardano-strict-containers, cborg, containers, data-default-class -, deepseq, fetchgit, groups, heapwords, iproute, lib, microlens -, mtl, network, non-integral, nothunks, partial-order, primitive -, quiet, scientific, set-algebra, small-steps, text, time -, transformers, validation-selective +{ mkDerivation +, FailT +, QuickCheck +, aeson +, base +, base16-bytestring +, binary +, bytestring +, cardano-crypto +, cardano-crypto-class +, cardano-crypto-praos +, cardano-crypto-wrapper +, cardano-data +, cardano-ledger-binary +, cardano-ledger-byron +, cardano-ledger-byron-test +, cardano-prelude +, cardano-slotting +, cardano-strict-containers +, containers +, data-default-class +, deepseq +, fetchgit +, generic-random +, genvalidity +, genvalidity-scientific +, groups +, heapwords +, hedgehog-quickcheck +, hspec +, iproute +, lib +, microlens +, mtl +, network +, non-integral +, nothunks +, partial-order +, primitive +, quiet +, scientific +, set-algebra +, small-steps +, text +, time +, transformers +, tree-diff +, validation-selective +, vector-map }: mkDerivation { pname = "cardano-ledger-core"; - version = "0.1.0.0"; + version = "1.2.0.0"; src = fetchgit { - url = "https://github.com/milloni/cardano-ledger"; - sha256 = "08nj6hcqj5apvb17n1irc8j7rzf10bcdh5gh1mkmhwbyw6h2d4ab"; - rev = "3aa1fd8469424778454644f0d371988fb4490b4a"; + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/libs/cardano-ledger-core/; echo source root reset to $sourceRoot"; @@ -22,14 +62,64 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - aeson base base16-bytestring binary bytestring cardano-binary - cardano-crypto cardano-crypto-class cardano-crypto-praos - cardano-crypto-wrapper cardano-data cardano-ledger-byron - cardano-prelude cardano-slotting cardano-strict-containers cborg - containers data-default-class deepseq groups heapwords iproute - microlens mtl network non-integral nothunks partial-order primitive - quiet scientific set-algebra small-steps text time transformers + aeson + base + base16-bytestring + binary + bytestring + cardano-crypto + cardano-crypto-class + cardano-crypto-praos + cardano-crypto-wrapper + cardano-data + cardano-ledger-binary + cardano-ledger-byron + cardano-ledger-byron-test + cardano-prelude + cardano-slotting + cardano-strict-containers + containers + data-default-class + deepseq + FailT + generic-random + genvalidity + groups + heapwords + hedgehog-quickcheck + hspec + iproute + microlens + mtl + network + non-integral + nothunks + partial-order + primitive + QuickCheck + quiet + scientific + set-algebra + small-steps + text + time + transformers + tree-diff validation-selective + vector-map + ]; + testHaskellDepends = [ + aeson + base + binary + bytestring + cardano-crypto-class + cardano-ledger-binary + containers + FailT + genvalidity + genvalidity-scientific + scientific ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -41,4 +131,4 @@ mkDerivation { description = "Core components of Cardano ledgers from the Shelley release on"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-ledger-mary.nix b/pkgs/cardano-ledger-mary.nix new file mode 100644 index 0000000..be7279d --- /dev/null +++ b/pkgs/cardano-ledger-mary.nix @@ -0,0 +1,76 @@ +{ mkDerivation +, QuickCheck +, aeson +, base +, base16-bytestring +, bytestring +, cardano-crypto-class +, cardano-data +, cardano-ledger-allegra +, cardano-ledger-binary +, cardano-ledger-core +, cardano-ledger-shelley +, cardano-strict-containers +, containers +, deepseq +, fetchgit +, groups +, lib +, microlens +, nothunks +, primitive +, text +}: +mkDerivation { + pname = "cardano-ledger-mary"; + version = "1.1.1.0"; + src = fetchgit { + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/eras/mary/impl/; echo source root reset to $sourceRoot"; + isLibrary = true; + isExecutable = false; + enableSeparateDataOutput = false; + libraryHaskellDepends = [ + aeson + base + base16-bytestring + bytestring + cardano-crypto-class + cardano-data + cardano-ledger-allegra + cardano-ledger-binary + cardano-ledger-core + cardano-ledger-shelley + cardano-strict-containers + containers + deepseq + groups + microlens + nothunks + primitive + QuickCheck + text + ]; + testHaskellDepends = [ + base + base16-bytestring + bytestring + cardano-data + cardano-ledger-binary + cardano-ledger-core + ]; + enableLibraryProfiling = true; + enableExecutableProfiling = true; + doHaddock = false; + jailbreak = true; + doCheck = false; + doBenchmark = false; + hyperlinkSource = false; + description = "Cardano ledger with multiasset support"; + license = lib.licenses.asl20; + broken = false; +} diff --git a/pkgs/cardano-ledger-pretty.nix b/pkgs/cardano-ledger-pretty.nix index 7df3e39..4565793 100644 --- a/pkgs/cardano-ledger-pretty.nix +++ b/pkgs/cardano-ledger-pretty.nix @@ -1,18 +1,38 @@ -{ mkDerivation, base, bech32, bytestring, cardano-crypto-class -, cardano-ledger-alonzo, cardano-ledger-babbage -, cardano-ledger-byron, cardano-ledger-core, cardano-ledger-shelley -, cardano-ledger-shelley-ma, cardano-protocol-tpraos -, cardano-slotting, cardano-strict-containers, containers, fetchgit -, hashable, iproute, lib, microlens, plutus-ledger-api -, prettyprinter, small-steps, text, vector-map +{ mkDerivation +, base +, bech32 +, bytestring +, cardano-crypto-class +, cardano-ledger-allegra +, cardano-ledger-alonzo +, cardano-ledger-babbage +, cardano-ledger-byron +, cardano-ledger-conway +, cardano-ledger-core +, cardano-ledger-mary +, cardano-ledger-shelley +, cardano-protocol-tpraos +, cardano-slotting +, cardano-strict-containers +, containers +, fetchgit +, hashable +, iproute +, lib +, microlens +, plutus-ledger-api +, prettyprinter +, small-steps +, text +, vector-map }: mkDerivation { pname = "cardano-ledger-pretty"; - version = "0.1.0.0"; + version = "1.1.1.0"; src = fetchgit { - url = "https://github.com/milloni/cardano-ledger"; - sha256 = "08nj6hcqj5apvb17n1irc8j7rzf10bcdh5gh1mkmhwbyw6h2d4ab"; - rev = "3aa1fd8469424778454644f0d371988fb4490b4a"; + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/libs/cardano-ledger-pretty/; echo source root reset to $sourceRoot"; @@ -20,12 +40,30 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - base bech32 bytestring cardano-crypto-class cardano-ledger-alonzo - cardano-ledger-babbage cardano-ledger-byron cardano-ledger-core - cardano-ledger-shelley cardano-ledger-shelley-ma - cardano-protocol-tpraos cardano-slotting cardano-strict-containers - containers hashable iproute microlens plutus-ledger-api - prettyprinter small-steps text vector-map + base + bech32 + bytestring + cardano-crypto-class + cardano-ledger-allegra + cardano-ledger-alonzo + cardano-ledger-babbage + cardano-ledger-byron + cardano-ledger-conway + cardano-ledger-core + cardano-ledger-mary + cardano-ledger-shelley + cardano-protocol-tpraos + cardano-slotting + cardano-strict-containers + containers + hashable + iproute + microlens + plutus-ledger-api + prettyprinter + small-steps + text + vector-map ]; enableLibraryProfiling = false; enableExecutableProfiling = false; @@ -37,4 +75,4 @@ mkDerivation { description = "Pretty-printers for Cardano ledger datatypes"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-ledger-shelley-ma-test.nix b/pkgs/cardano-ledger-shelley-ma-test.nix index 6fe9a89..2d0fe63 100644 --- a/pkgs/cardano-ledger-shelley-ma-test.nix +++ b/pkgs/cardano-ledger-shelley-ma-test.nix @@ -1,20 +1,43 @@ -{ mkDerivation, QuickCheck, base, base16-bytestring, bytestring -, cardano-binary, cardano-crypto-class, cardano-data -, cardano-ledger-core, cardano-ledger-pretty -, cardano-ledger-shelley, cardano-ledger-shelley-ma -, cardano-ledger-shelley-test, cardano-protocol-tpraos -, cardano-slotting, cardano-strict-containers, cborg, containers -, data-default-class, fetchgit, generic-random, hashable, lib -, microlens, mtl, small-steps, small-steps-test, tasty, tasty-hunit -, tasty-quickcheck, text +{ mkDerivation +, QuickCheck +, base +, bytestring +, cardano-crypto-class +, cardano-data +, cardano-ledger-allegra +, cardano-ledger-binary +, cardano-ledger-core +, cardano-ledger-mary +, cardano-ledger-pretty +, cardano-ledger-shelley +, cardano-ledger-shelley-test +, cardano-protocol-tpraos +, cardano-slotting +, cardano-strict-containers +, cborg +, containers +, data-default-class +, deepseq +, fetchgit +, groups +, hashable +, lib +, microlens +, mtl +, small-steps +, small-steps-test +, tasty +, tasty-hunit +, tasty-quickcheck +, text }: mkDerivation { pname = "cardano-ledger-shelley-ma-test"; - version = "0.1.0.0"; + version = "1.1.0.0"; src = fetchgit { - url = "https://github.com/milloni/cardano-ledger"; - sha256 = "08nj6hcqj5apvb17n1irc8j7rzf10bcdh5gh1mkmhwbyw6h2d4ab"; - rev = "3aa1fd8469424778454644f0d371988fb4490b4a"; + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/shelley-ma/test-suite/; echo source root reset to $sourceRoot"; @@ -22,21 +45,55 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base base16-bytestring bytestring cardano-binary - cardano-crypto-class cardano-data cardano-ledger-core - cardano-ledger-pretty cardano-ledger-shelley - cardano-ledger-shelley-ma cardano-ledger-shelley-test - cardano-slotting cardano-strict-containers containers - generic-random hashable microlens mtl QuickCheck small-steps tasty - tasty-hunit tasty-quickcheck text + base + bytestring + cardano-ledger-allegra + cardano-ledger-binary + cardano-ledger-core + cardano-ledger-mary + cardano-ledger-pretty + cardano-ledger-shelley + cardano-ledger-shelley-test + cardano-slotting + cardano-strict-containers + containers + hashable + microlens + mtl + QuickCheck + small-steps + tasty + tasty-hunit + tasty-quickcheck + text ]; testHaskellDepends = [ - base bytestring cardano-binary cardano-data cardano-ledger-core - cardano-ledger-shelley cardano-ledger-shelley-ma - cardano-ledger-shelley-test cardano-protocol-tpraos - cardano-slotting cardano-strict-containers cborg containers - data-default-class microlens mtl QuickCheck small-steps - small-steps-test tasty tasty-hunit tasty-quickcheck + base + bytestring + cardano-crypto-class + cardano-data + cardano-ledger-allegra + cardano-ledger-binary + cardano-ledger-core + cardano-ledger-mary + cardano-ledger-shelley + cardano-ledger-shelley-test + cardano-protocol-tpraos + cardano-slotting + cardano-strict-containers + cborg + containers + data-default-class + deepseq + groups + microlens + mtl + QuickCheck + small-steps + small-steps-test + tasty + tasty-hunit + tasty-quickcheck ]; enableLibraryProfiling = false; enableExecutableProfiling = false; @@ -48,4 +105,4 @@ mkDerivation { description = "Shelley ledger with multiasset and time lock support"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-ledger-shelley-ma.nix b/pkgs/cardano-ledger-shelley-ma.nix index 543343c..cd64621 100644 --- a/pkgs/cardano-ledger-shelley-ma.nix +++ b/pkgs/cardano-ledger-shelley-ma.nix @@ -1,17 +1,18 @@ -{ mkDerivation, base, base16-bytestring, bytestring, cardano-binary -, cardano-crypto-class, cardano-data, cardano-ledger-core -, cardano-ledger-shelley, cardano-slotting -, cardano-strict-containers, cborg, containers, deepseq, fetchgit -, groups, lib, microlens, mtl, nothunks, primitive, small-steps -, text, transformers, validation-selective +{ mkDerivation +, base +, cardano-ledger-allegra +, cardano-ledger-mary +, cardano-ledger-shelley +, fetchgit +, lib }: mkDerivation { pname = "cardano-ledger-shelley-ma"; - version = "0.1.0.0"; + version = "1.1.0.0"; src = fetchgit { - url = "https://github.com/milloni/cardano-ledger"; - sha256 = "08nj6hcqj5apvb17n1irc8j7rzf10bcdh5gh1mkmhwbyw6h2d4ab"; - rev = "3aa1fd8469424778454644f0d371988fb4490b4a"; + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/shelley-ma/impl/; echo source root reset to $sourceRoot"; @@ -19,11 +20,10 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - base base16-bytestring bytestring cardano-binary - cardano-crypto-class cardano-data cardano-ledger-core - cardano-ledger-shelley cardano-slotting cardano-strict-containers - cborg containers deepseq groups microlens mtl nothunks primitive - small-steps text transformers validation-selective + base + cardano-ledger-allegra + cardano-ledger-mary + cardano-ledger-shelley ]; enableLibraryProfiling = false; enableExecutableProfiling = false; @@ -32,7 +32,7 @@ mkDerivation { doCheck = false; doBenchmark = false; hyperlinkSource = false; - description = "Shelley ledger with multiasset and time lock support"; + description = "Deprecated package that used to implement Allegra and Mary eras"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-ledger-shelley-test.nix b/pkgs/cardano-ledger-shelley-test.nix index c7b7e03..9827f8d 100644 --- a/pkgs/cardano-ledger-shelley-test.nix +++ b/pkgs/cardano-ledger-shelley-test.nix @@ -1,24 +1,65 @@ -{ mkDerivation, QuickCheck, aeson, base, base16-bytestring, binary -, bytestring, cardano-binary, cardano-crypto, cardano-crypto-class -, cardano-crypto-praos, cardano-crypto-test, cardano-crypto-wrapper -, cardano-data, cardano-ledger-byron, cardano-ledger-byron-test -, cardano-ledger-core, cardano-ledger-pretty -, cardano-ledger-shelley, cardano-protocol-tpraos, cardano-slotting -, cardano-strict-containers, cborg, containers, criterion -, data-default-class, deepseq, fetchgit, generic-random, groups -, hashable, hedgehog, hedgehog-quickcheck, iproute, lib, microlens -, mtl, nothunks, plutus-ledger-api, prettyprinter, process-extras -, scientific, serialise, set-algebra, small-steps, small-steps-test -, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck, text, time -, transformers, tree-diff, unliftio, vector, vector-map +{ mkDerivation +, QuickCheck +, aeson +, base +, base16-bytestring +, binary +, bytestring +, cardano-crypto +, cardano-crypto-class +, cardano-crypto-praos +, cardano-crypto-test +, cardano-crypto-wrapper +, cardano-data +, cardano-ledger-binary +, cardano-ledger-byron +, cardano-ledger-byron-test +, cardano-ledger-core +, cardano-ledger-pretty +, cardano-ledger-shelley +, cardano-protocol-tpraos +, cardano-slotting +, cardano-strict-containers +, cborg +, containers +, criterion +, data-default-class +, deepseq +, fetchgit +, groups +, hashable +, hedgehog +, hedgehog-quickcheck +, iproute +, lib +, microlens +, mtl +, nothunks +, plutus-ledger-api +, prettyprinter +, process-extras +, scientific +, serialise +, set-algebra +, small-steps +, small-steps-test +, tasty +, tasty-hunit +, tasty-quickcheck +, text +, time +, transformers +, unliftio +, vector +, vector-map }: mkDerivation { pname = "cardano-ledger-shelley-test"; - version = "0.1.0.0"; + version = "1.1.0.0"; src = fetchgit { - url = "https://github.com/milloni/cardano-ledger"; - sha256 = "08nj6hcqj5apvb17n1irc8j7rzf10bcdh5gh1mkmhwbyw6h2d4ab"; - rev = "3aa1fd8469424778454644f0d371988fb4490b4a"; + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/shelley/test-suite/; echo source root reset to $sourceRoot"; @@ -26,33 +67,102 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base base16-bytestring binary bytestring cardano-binary - cardano-crypto cardano-crypto-class cardano-crypto-test - cardano-crypto-wrapper cardano-data cardano-ledger-byron - cardano-ledger-byron-test cardano-ledger-core cardano-ledger-pretty - cardano-ledger-shelley cardano-protocol-tpraos cardano-slotting - cardano-strict-containers cborg containers data-default-class - deepseq generic-random hashable hedgehog hedgehog-quickcheck - iproute microlens mtl nothunks plutus-ledger-api process-extras - QuickCheck serialise set-algebra small-steps small-steps-test tasty - tasty-hunit tasty-quickcheck text time transformers tree-diff - unliftio vector vector-map + base + base16-bytestring + bytestring + cardano-crypto + cardano-crypto-class + cardano-crypto-test + cardano-crypto-wrapper + cardano-data + cardano-ledger-binary + cardano-ledger-byron + cardano-ledger-byron-test + cardano-ledger-core + cardano-ledger-pretty + cardano-ledger-shelley + cardano-protocol-tpraos + cardano-slotting + cardano-strict-containers + cborg + containers + data-default-class + deepseq + hashable + hedgehog + hedgehog-quickcheck + microlens + mtl + nothunks + plutus-ledger-api + process-extras + QuickCheck + serialise + set-algebra + small-steps + small-steps-test + tasty + tasty-hunit + tasty-quickcheck + text + time + transformers + unliftio + vector + vector-map ]; testHaskellDepends = [ - aeson base base16-bytestring binary bytestring cardano-binary - cardano-crypto-class cardano-data cardano-ledger-byron - cardano-ledger-core cardano-ledger-pretty cardano-ledger-shelley - cardano-protocol-tpraos cardano-slotting cardano-strict-containers - cborg containers data-default-class groups hedgehog iproute - microlens prettyprinter QuickCheck scientific small-steps - small-steps-test tasty tasty-hedgehog tasty-hunit tasty-quickcheck + aeson + base + base16-bytestring + binary + bytestring + cardano-crypto-class + cardano-data + cardano-ledger-binary + cardano-ledger-byron + cardano-ledger-core + cardano-ledger-pretty + cardano-ledger-shelley + cardano-protocol-tpraos + cardano-slotting + cardano-strict-containers + cborg + containers + data-default-class + deepseq + groups + iproute + microlens + prettyprinter + QuickCheck + scientific + small-steps + small-steps-test + tasty + tasty-hunit + tasty-quickcheck time ]; benchmarkHaskellDepends = [ - base cardano-crypto-class cardano-crypto-praos cardano-data - cardano-ledger-core cardano-ledger-shelley cardano-protocol-tpraos - cardano-slotting cardano-strict-containers containers criterion - deepseq mtl QuickCheck set-algebra small-steps small-steps-test + base + cardano-crypto-class + cardano-crypto-praos + cardano-data + cardano-ledger-binary + cardano-ledger-core + cardano-ledger-shelley + cardano-protocol-tpraos + cardano-slotting + cardano-strict-containers + containers + criterion + deepseq + mtl + QuickCheck + set-algebra + small-steps + small-steps-test ]; enableLibraryProfiling = false; enableExecutableProfiling = false; @@ -64,4 +174,4 @@ mkDerivation { description = "Test helpers from cardano-ledger-shelley exposed to other packages"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-ledger-shelley.nix b/pkgs/cardano-ledger-shelley.nix index 714fa26..5febaa9 100644 --- a/pkgs/cardano-ledger-shelley.nix +++ b/pkgs/cardano-ledger-shelley.nix @@ -1,19 +1,44 @@ -{ mkDerivation, aeson, base, base16-bytestring, bytestring -, cardano-binary, cardano-crypto, cardano-crypto-class -, cardano-crypto-wrapper, cardano-data, cardano-ledger-byron -, cardano-ledger-core, cardano-slotting, cardano-strict-containers -, cborg, containers, data-default-class, deepseq, fetchgit, groups -, heapwords, iproute, lib, microlens, mtl, nothunks, quiet -, set-algebra, small-steps, text, time, transformers -, validation-selective, vector-map +{ mkDerivation +, aeson +, base +, bytestring +, cardano-crypto-class +, cardano-crypto-wrapper +, cardano-data +, cardano-ledger-binary +, cardano-ledger-byron +, cardano-ledger-byron-test +, cardano-ledger-core +, cardano-slotting +, cardano-strict-containers +, containers +, data-default-class +, deepseq +, fetchgit +, generic-random +, groups +, heapwords +, hedgehog-quickcheck +, lib +, microlens +, mtl +, nothunks +, quiet +, set-algebra +, small-steps +, text +, time +, transformers +, validation-selective +, vector-map }: mkDerivation { pname = "cardano-ledger-shelley"; - version = "0.1.0.0"; + version = "1.2.0.0"; src = fetchgit { - url = "https://github.com/milloni/cardano-ledger"; - sha256 = "08nj6hcqj5apvb17n1irc8j7rzf10bcdh5gh1mkmhwbyw6h2d4ab"; - rev = "3aa1fd8469424778454644f0d371988fb4490b4a"; + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/shelley/impl/; echo source root reset to $sourceRoot"; @@ -21,14 +46,38 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cardano-binary - cardano-crypto cardano-crypto-class cardano-crypto-wrapper - cardano-data cardano-ledger-byron cardano-ledger-core - cardano-slotting cardano-strict-containers cborg containers - data-default-class deepseq groups heapwords iproute microlens mtl - nothunks quiet set-algebra small-steps text time transformers - validation-selective vector-map + aeson + base + bytestring + cardano-crypto-class + cardano-crypto-wrapper + cardano-data + cardano-ledger-binary + cardano-ledger-byron + cardano-ledger-byron-test + cardano-ledger-core + cardano-slotting + cardano-strict-containers + containers + data-default-class + deepseq + generic-random + groups + heapwords + hedgehog-quickcheck + microlens + mtl + nothunks + quiet + set-algebra + small-steps + text + time + transformers + validation-selective + vector-map ]; + testHaskellDepends = [ base cardano-ledger-core ]; enableLibraryProfiling = false; enableExecutableProfiling = false; doHaddock = false; @@ -39,4 +88,4 @@ mkDerivation { description = "Shelley Ledger Executable Model"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-ledger-test.nix b/pkgs/cardano-ledger-test.nix index 4c2c2b7..7ac59c0 100644 --- a/pkgs/cardano-ledger-test.nix +++ b/pkgs/cardano-ledger-test.nix @@ -1,26 +1,62 @@ -{ mkDerivation, QuickCheck, aeson, array, base, bytestring -, cardano-binary, cardano-crypto-class, cardano-data -, cardano-ledger-alonzo, cardano-ledger-alonzo-test -, cardano-ledger-babbage, cardano-ledger-babbage-test -, cardano-ledger-conway, cardano-ledger-conway-test -, cardano-ledger-core, cardano-ledger-pretty -, cardano-ledger-shelley, cardano-ledger-shelley-ma -, cardano-ledger-shelley-ma-test, cardano-ledger-shelley-test -, cardano-protocol-tpraos, cardano-slotting -, cardano-strict-containers, containers, criterion -, data-default-class, deepseq, fetchgit, genvalidity -, genvalidity-scientific, lib, microlens, mtl, nothunks -, plutus-core, plutus-ledger-api, prettyprinter, random, scientific -, set-algebra, small-steps, small-steps-test, tasty, tasty-hunit -, tasty-quickcheck, text, time, transformers, vector, vector-map +{ mkDerivation +, QuickCheck +, aeson +, array +, base +, bytestring +, cardano-crypto-class +, cardano-data +, cardano-ledger-allegra +, cardano-ledger-alonzo +, cardano-ledger-alonzo-test +, cardano-ledger-api +, cardano-ledger-babbage +, cardano-ledger-babbage-test +, cardano-ledger-binary +, cardano-ledger-conway +, cardano-ledger-core +, cardano-ledger-mary +, cardano-ledger-pretty +, cardano-ledger-shelley +, cardano-ledger-shelley-ma-test +, cardano-ledger-shelley-test +, cardano-protocol-tpraos +, cardano-slotting +, cardano-strict-containers +, containers +, criterion +, data-default-class +, deepseq +, fetchgit +, groups +, hspec +, lib +, microlens +, mtl +, nothunks +, plutus-core +, plutus-ledger-api +, prettyprinter +, random +, set-algebra +, small-steps +, small-steps-test +, tasty +, tasty-hunit +, tasty-quickcheck +, text +, time +, transformers +, vector +, vector-map }: mkDerivation { pname = "cardano-ledger-test"; - version = "0.1.0.0"; + version = "1.1.0.0"; src = fetchgit { - url = "https://github.com/milloni/cardano-ledger"; - sha256 = "08nj6hcqj5apvb17n1irc8j7rzf10bcdh5gh1mkmhwbyw6h2d4ab"; - rev = "3aa1fd8469424778454644f0d371988fb4490b4a"; + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/libs/cardano-ledger-test/; echo source root reset to $sourceRoot"; @@ -28,31 +64,81 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - aeson array base bytestring cardano-binary cardano-crypto-class - cardano-data cardano-ledger-alonzo cardano-ledger-alonzo-test - cardano-ledger-babbage cardano-ledger-babbage-test - cardano-ledger-conway cardano-ledger-conway-test - cardano-ledger-core cardano-ledger-pretty cardano-ledger-shelley - cardano-ledger-shelley-ma cardano-ledger-shelley-ma-test - cardano-ledger-shelley-test cardano-protocol-tpraos - cardano-slotting cardano-strict-containers containers - data-default-class genvalidity genvalidity-scientific microlens mtl - nothunks plutus-core plutus-ledger-api prettyprinter QuickCheck - scientific set-algebra small-steps small-steps-test tasty - tasty-hunit tasty-quickcheck text time transformers vector + array + base + bytestring + cardano-crypto-class + cardano-data + cardano-ledger-allegra + cardano-ledger-alonzo + cardano-ledger-alonzo-test + cardano-ledger-api + cardano-ledger-babbage + cardano-ledger-babbage-test + cardano-ledger-binary + cardano-ledger-conway + cardano-ledger-core + cardano-ledger-mary + cardano-ledger-pretty + cardano-ledger-shelley + cardano-ledger-shelley-ma-test + cardano-ledger-shelley-test + cardano-protocol-tpraos + cardano-slotting + cardano-strict-containers + containers + data-default-class + groups + hspec + microlens + mtl + nothunks + plutus-core + plutus-ledger-api + prettyprinter + QuickCheck + set-algebra + small-steps + small-steps-test + tasty + tasty-hunit + tasty-quickcheck + text + time + transformers + vector vector-map ]; - testHaskellDepends = [ - base cardano-ledger-shelley-test data-default-class tasty - ]; + testHaskellDepends = [ base data-default-class tasty ]; benchmarkHaskellDepends = [ - base bytestring cardano-binary cardano-crypto-class cardano-data - cardano-ledger-alonzo cardano-ledger-alonzo-test - cardano-ledger-core cardano-ledger-shelley - cardano-ledger-shelley-ma cardano-ledger-shelley-ma-test - cardano-ledger-shelley-test containers criterion data-default-class - deepseq microlens QuickCheck random small-steps small-steps-test - tasty tasty-quickcheck text vector-map + aeson + base + bytestring + cardano-crypto-class + cardano-ledger-allegra + cardano-ledger-alonzo + cardano-ledger-alonzo-test + cardano-ledger-binary + cardano-ledger-core + cardano-ledger-mary + cardano-ledger-shelley + cardano-ledger-shelley-ma-test + cardano-ledger-shelley-test + cardano-slotting + cardano-strict-containers + containers + criterion + data-default-class + deepseq + microlens + mtl + QuickCheck + random + small-steps + small-steps-test + tasty + text + vector-map ]; enableLibraryProfiling = false; enableExecutableProfiling = false; @@ -64,4 +150,4 @@ mkDerivation { description = "Testing harness, tests and benchmarks for Shelley style cardano ledgers"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-prelude-test.nix b/pkgs/cardano-prelude-test.nix index 22841d6..248f385 100644 --- a/pkgs/cardano-prelude-test.nix +++ b/pkgs/cardano-prelude-test.nix @@ -1,8 +1,28 @@ -{ mkDerivation, QuickCheck, aeson, aeson-pretty, attoparsec, base -, base16-bytestring, bytestring, canonical-json, cardano-prelude -, containers, cryptonite, fetchzip, formatting, ghc-heap, ghc-prim -, hedgehog, hspec, lib, pretty-show, quickcheck-instances -, template-haskell, text, th-compat, time +{ mkDerivation +, QuickCheck +, aeson +, aeson-pretty +, attoparsec +, base +, base16-bytestring +, bytestring +, canonical-json +, cardano-prelude +, containers +, cryptonite +, fetchzip +, formatting +, ghc-heap +, ghc-prim +, hedgehog +, hspec +, lib +, pretty-show +, quickcheck-instances +, template-haskell +, text +, th-compat +, time }: mkDerivation { pname = "cardano-prelude-test"; @@ -15,13 +35,35 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - aeson aeson-pretty attoparsec base base16-bytestring bytestring - canonical-json cardano-prelude containers cryptonite formatting - hedgehog hspec pretty-show QuickCheck quickcheck-instances - template-haskell text th-compat time + aeson + aeson-pretty + attoparsec + base + base16-bytestring + bytestring + canonical-json + cardano-prelude + containers + cryptonite + formatting + hedgehog + hspec + pretty-show + QuickCheck + quickcheck-instances + template-haskell + text + th-compat + time ]; testHaskellDepends = [ - base bytestring cardano-prelude ghc-heap ghc-prim hedgehog text + base + bytestring + cardano-prelude + ghc-heap + ghc-prim + hedgehog + text ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -33,4 +75,4 @@ mkDerivation { description = "Utility types and functions for testing Cardano"; license = lib.licenses.mit; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-prelude.nix b/pkgs/cardano-prelude.nix index 70cde8c..f673e08 100644 --- a/pkgs/cardano-prelude.nix +++ b/pkgs/cardano-prelude.nix @@ -1,7 +1,23 @@ -{ mkDerivation, aeson, base, base16-bytestring, bytestring -, canonical-json, cborg, containers, fetchzip, formatting, ghc-heap -, ghc-prim, integer-gmp, lib, microlens, mtl, protolude, tagged -, text, time +{ mkDerivation +, aeson +, base +, base16-bytestring +, bytestring +, canonical-json +, cborg +, containers +, fetchzip +, formatting +, ghc-heap +, ghc-prim +, integer-gmp +, lib +, microlens +, mtl +, protolude +, tagged +, text +, time }: mkDerivation { pname = "cardano-prelude"; @@ -14,9 +30,23 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - aeson base base16-bytestring bytestring canonical-json cborg - containers formatting ghc-heap ghc-prim integer-gmp microlens mtl - protolude tagged text time + aeson + base + base16-bytestring + bytestring + canonical-json + cborg + containers + formatting + ghc-heap + ghc-prim + integer-gmp + microlens + mtl + protolude + tagged + text + time ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -28,4 +58,4 @@ mkDerivation { description = "A Prelude replacement for the Cardano project"; license = lib.licenses.mit; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-protocol-tpraos.nix b/pkgs/cardano-protocol-tpraos.nix index e357580..89b889d 100644 --- a/pkgs/cardano-protocol-tpraos.nix +++ b/pkgs/cardano-protocol-tpraos.nix @@ -1,18 +1,38 @@ -{ mkDerivation, base, bytestring, cardano-binary -, cardano-crypto-class, cardano-ledger-alonzo -, cardano-ledger-babbage, cardano-ledger-conway -, cardano-ledger-core, cardano-ledger-shelley -, cardano-ledger-shelley-ma, cardano-slotting, containers, deepseq -, fetchgit, lib, mtl, non-integral, nothunks, quiet, set-algebra -, small-steps, transformers +{ mkDerivation +, base +, bytestring +, cardano-crypto-class +, cardano-ledger-allegra +, cardano-ledger-alonzo +, cardano-ledger-babbage +, cardano-ledger-binary +, cardano-ledger-conway +, cardano-ledger-core +, cardano-ledger-mary +, cardano-ledger-shelley +, cardano-slotting +, cardano-strict-containers +, containers +, deepseq +, fetchgit +, generic-random +, lib +, microlens +, mtl +, non-integral +, nothunks +, quiet +, set-algebra +, small-steps +, transformers }: mkDerivation { pname = "cardano-protocol-tpraos"; - version = "0.1.0.0"; + version = "1.0.1.0"; src = fetchgit { - url = "https://github.com/milloni/cardano-ledger"; - sha256 = "08nj6hcqj5apvb17n1irc8j7rzf10bcdh5gh1mkmhwbyw6h2d4ab"; - rev = "3aa1fd8469424778454644f0d371988fb4490b4a"; + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/libs/cardano-protocol-tpraos/; echo source root reset to $sourceRoot"; @@ -20,11 +40,30 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - base bytestring cardano-binary cardano-crypto-class - cardano-ledger-alonzo cardano-ledger-babbage cardano-ledger-conway - cardano-ledger-core cardano-ledger-shelley - cardano-ledger-shelley-ma cardano-slotting containers deepseq mtl - non-integral nothunks quiet set-algebra small-steps transformers + base + bytestring + cardano-crypto-class + cardano-ledger-allegra + cardano-ledger-alonzo + cardano-ledger-babbage + cardano-ledger-binary + cardano-ledger-conway + cardano-ledger-core + cardano-ledger-mary + cardano-ledger-shelley + cardano-slotting + cardano-strict-containers + containers + deepseq + generic-random + microlens + mtl + non-integral + nothunks + quiet + set-algebra + small-steps + transformers ]; enableLibraryProfiling = false; enableExecutableProfiling = false; @@ -36,4 +75,4 @@ mkDerivation { description = "Cardano Protocol: Transitional Praos"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-slotting.nix b/pkgs/cardano-slotting.nix index 5f0dd21..4b7dac8 100644 --- a/pkgs/cardano-slotting.nix +++ b/pkgs/cardano-slotting.nix @@ -1,5 +1,17 @@ -{ mkDerivation, aeson, base, cardano-binary, deepseq, fetchgit, lib -, mmorph, nothunks, quiet, serialise, tasty, tasty-quickcheck, time +{ mkDerivation +, aeson +, base +, cardano-binary +, deepseq +, fetchgit +, lib +, mmorph +, nothunks +, quiet +, serialise +, tasty +, tasty-quickcheck +, time }: mkDerivation { pname = "cardano-slotting"; @@ -15,7 +27,14 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - aeson base cardano-binary deepseq mmorph nothunks quiet serialise + aeson + base + cardano-binary + deepseq + mmorph + nothunks + quiet + serialise time ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; @@ -29,4 +48,4 @@ mkDerivation { description = "Key slotting types for cardano libraries"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/cardano-strict-containers.nix b/pkgs/cardano-strict-containers.nix index cd618e4..332d805 100644 --- a/pkgs/cardano-strict-containers.nix +++ b/pkgs/cardano-strict-containers.nix @@ -1,5 +1,15 @@ -{ mkDerivation, aeson, base, cardano-binary, cborg, containers -, data-default-class, deepseq, fetchgit, fingertree, lib, nothunks +{ mkDerivation +, aeson +, base +, cardano-binary +, cborg +, containers +, data-default-class +, deepseq +, fetchgit +, fingertree +, lib +, nothunks , serialise }: mkDerivation { @@ -16,8 +26,16 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - aeson base cardano-binary cborg containers data-default-class - deepseq fingertree nothunks serialise + aeson + base + cardano-binary + cborg + containers + data-default-class + deepseq + fingertree + nothunks + serialise ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -29,4 +47,4 @@ mkDerivation { description = "Various strict container types"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/contra-tracer.nix b/pkgs/contra-tracer.nix index f0c50df..3a6b7d8 100644 --- a/pkgs/contra-tracer.nix +++ b/pkgs/contra-tracer.nix @@ -20,4 +20,4 @@ mkDerivation { description = "A simple interface for logging, tracing or monitoring"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/flat.nix b/pkgs/flat.nix index 6f7d60e..1723418 100644 --- a/pkgs/flat.nix +++ b/pkgs/flat.nix @@ -1,8 +1,28 @@ -{ mkDerivation, QuickCheck, array, base, bytestring, containers -, deepseq, dlist, fetchgit, filepath, ghc-prim, hashable, lib -, list-t, mono-traversable, pretty, primitive, quickcheck-text -, tasty, tasty-hunit, tasty-quickcheck, text, timeit -, unordered-containers, vector +{ mkDerivation +, QuickCheck +, array +, base +, bytestring +, containers +, deepseq +, dlist +, fetchgit +, filepath +, ghc-prim +, hashable +, lib +, list-t +, mono-traversable +, pretty +, primitive +, quickcheck-text +, tasty +, tasty-hunit +, tasty-quickcheck +, text +, timeit +, unordered-containers +, vector }: mkDerivation { pname = "flat"; @@ -17,14 +37,42 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - array base bytestring containers deepseq dlist ghc-prim hashable - list-t mono-traversable pretty primitive text unordered-containers + array + base + bytestring + containers + deepseq + dlist + ghc-prim + hashable + list-t + mono-traversable + pretty + primitive + text + unordered-containers vector ]; testHaskellDepends = [ - array base bytestring containers deepseq dlist filepath ghc-prim - list-t mono-traversable pretty QuickCheck quickcheck-text tasty - tasty-hunit tasty-quickcheck text timeit unordered-containers + array + base + bytestring + containers + deepseq + dlist + filepath + ghc-prim + list-t + mono-traversable + pretty + QuickCheck + quickcheck-text + tasty + tasty-hunit + tasty-quickcheck + text + timeit + unordered-containers vector ]; enableLibraryProfiling = true; @@ -38,4 +86,4 @@ mkDerivation { description = "Principled and efficient bit-oriented binary serialization"; license = lib.licenses.bsd3; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/goblins.nix b/pkgs/goblins.nix index e4f74d3..d5eb0d9 100644 --- a/pkgs/goblins.nix +++ b/pkgs/goblins.nix @@ -1,7 +1,26 @@ -{ mkDerivation, base, bimap, binary, bytestring, containers, extra -, fetchgit, hedgehog, lib, microlens, microlens-mtl, microlens-th -, mmorph, monad-control, moo, random, template-haskell, temporary -, th-utilities, transformers, tree-diff, typerep-map +{ mkDerivation +, base +, bimap +, binary +, bytestring +, containers +, extra +, fetchgit +, hedgehog +, lib +, microlens +, microlens-mtl +, microlens-th +, mmorph +, monad-control +, moo +, random +, template-haskell +, temporary +, th-utilities +, transformers +, tree-diff +, typerep-map }: mkDerivation { pname = "goblins"; @@ -16,9 +35,25 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - base bimap binary bytestring containers extra hedgehog microlens - microlens-mtl microlens-th mmorph monad-control moo random - template-haskell th-utilities transformers tree-diff typerep-map + base + bimap + binary + bytestring + containers + extra + hedgehog + microlens + microlens-mtl + microlens-th + mmorph + monad-control + moo + random + template-haskell + th-utilities + transformers + tree-diff + typerep-map ]; testHaskellDepends = [ base hedgehog temporary ]; enableLibraryProfiling = true; @@ -32,4 +67,4 @@ mkDerivation { description = "Genetic algorithm based randomised testing"; license = lib.licenses.bsd3; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/gray-code.nix b/pkgs/gray-code.nix index 4cf42d4..c443bcf 100644 --- a/pkgs/gray-code.nix +++ b/pkgs/gray-code.nix @@ -23,4 +23,4 @@ mkDerivation { description = "Gray code encoder/decoder"; license = lib.licenses.bsd3; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/heapwords.nix b/pkgs/heapwords.nix index 0c09b84..2eaa2e8 100644 --- a/pkgs/heapwords.nix +++ b/pkgs/heapwords.nix @@ -1,5 +1,14 @@ -{ mkDerivation, array, base, bytestring, containers, fetchgit -, ghc-prim, lib, text, time, vector +{ mkDerivation +, array +, base +, bytestring +, containers +, fetchgit +, ghc-prim +, lib +, text +, time +, vector }: mkDerivation { pname = "heapwords"; @@ -15,7 +24,14 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - array base bytestring containers ghc-prim text time vector + array + base + bytestring + containers + ghc-prim + text + time + vector ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -27,4 +43,4 @@ mkDerivation { description = "Heapwords"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/io-classes.nix b/pkgs/io-classes.nix index c7a3c8d..dbb6223 100644 --- a/pkgs/io-classes.nix +++ b/pkgs/io-classes.nix @@ -1,5 +1,17 @@ -{ mkDerivation, QuickCheck, array, async, base, bytestring, deque -, fetchgit, lib, mtl, stm, tasty, tasty-quickcheck, time +{ mkDerivation +, QuickCheck +, array +, async +, base +, bytestring +, deque +, fetchgit +, lib +, mtl +, stm +, tasty +, tasty-quickcheck +, time }: mkDerivation { pname = "io-classes"; @@ -15,7 +27,14 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - array async base bytestring deque mtl stm time + array + async + base + bytestring + deque + mtl + stm + time ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; enableLibraryProfiling = true; @@ -28,4 +47,4 @@ mkDerivation { description = "Type classes for concurrency with STM, ST and timing"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/io-sim.nix b/pkgs/io-sim.nix index 1c1d149..08c0055 100644 --- a/pkgs/io-sim.nix +++ b/pkgs/io-sim.nix @@ -1,8 +1,29 @@ -{ mkDerivation, QuickCheck, array, base, containers, contra-tracer -, criterion, deque, exceptions, fetchgit, io-classes, lib, parallel -, pretty-simple, psqueues, quiet, strict-stm, syb, tasty -, tasty-hunit, tasty-quickcheck, text, time, typed-protocols -, typed-protocols-cborg, typed-protocols-examples +{ mkDerivation +, QuickCheck +, array +, base +, containers +, contra-tracer +, criterion +, deque +, exceptions +, fetchgit +, io-classes +, lib +, parallel +, pretty-simple +, psqueues +, quiet +, strict-stm +, syb +, tasty +, tasty-hunit +, tasty-quickcheck +, text +, time +, typed-protocols +, typed-protocols-cborg +, typed-protocols-examples }: mkDerivation { pname = "io-sim"; @@ -18,16 +39,41 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - base containers deque exceptions io-classes parallel pretty-simple - psqueues QuickCheck quiet syb text time + base + containers + deque + exceptions + io-classes + parallel + pretty-simple + psqueues + QuickCheck + quiet + syb + text + time ]; testHaskellDepends = [ - array base containers io-classes parallel QuickCheck strict-stm - tasty tasty-hunit tasty-quickcheck time + array + base + containers + io-classes + parallel + QuickCheck + strict-stm + tasty + tasty-hunit + tasty-quickcheck + time ]; benchmarkHaskellDepends = [ - base contra-tracer criterion io-classes typed-protocols - typed-protocols-cborg typed-protocols-examples + base + contra-tracer + criterion + io-classes + typed-protocols + typed-protocols-cborg + typed-protocols-examples ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -39,4 +85,4 @@ mkDerivation { description = "A pure simulator for monadic concurrency with STM"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/iohk-monitoring.nix b/pkgs/iohk-monitoring.nix index 76822f5..f32bd56 100644 --- a/pkgs/iohk-monitoring.nix +++ b/pkgs/iohk-monitoring.nix @@ -1,12 +1,51 @@ -{ mkDerivation, QuickCheck, Win32-network, aeson, array, async -, async-timer, attoparsec, auto-update, base, base64-bytestring -, bytestring, clock, containers, contra-tracer, contravariant -, directory, ekg, fetchzip, filepath, katip, lib, libyaml, mtl -, network, process, random, safe, safe-exceptions, scientific -, semigroups, split, stm, tasty, tasty-hunit, tasty-quickcheck -, template-haskell, temporary, text, time, time-units -, tracer-transformers, transformers, unix, unordered-containers -, vector, void, yaml +{ mkDerivation +, QuickCheck +, Win32-network +, aeson +, array +, async +, async-timer +, attoparsec +, auto-update +, base +, base64-bytestring +, bytestring +, clock +, containers +, contra-tracer +, contravariant +, directory +, ekg +, fetchzip +, filepath +, katip +, lib +, libyaml +, mtl +, network +, process +, random +, safe +, safe-exceptions +, scientific +, semigroups +, split +, stm +, tasty +, tasty-hunit +, tasty-quickcheck +, template-haskell +, temporary +, text +, time +, time-units +, tracer-transformers +, transformers +, unix +, unordered-containers +, vector +, void +, yaml }: mkDerivation { pname = "iohk-monitoring"; @@ -19,19 +58,74 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - aeson array async async-timer attoparsec auto-update base - base64-bytestring bytestring clock containers contra-tracer - contravariant directory ekg filepath katip libyaml mtl network safe - safe-exceptions scientific stm template-haskell text time - time-units tracer-transformers transformers unix - unordered-containers vector Win32-network yaml + aeson + array + async + async-timer + attoparsec + auto-update + base + base64-bytestring + bytestring + clock + containers + contra-tracer + contravariant + directory + ekg + filepath + katip + libyaml + mtl + network + safe + safe-exceptions + scientific + stm + template-haskell + text + time + time-units + tracer-transformers + transformers + unix + unordered-containers + vector + Win32-network + yaml ]; testHaskellDepends = [ - aeson array async base bytestring clock containers contra-tracer - directory filepath libyaml mtl process QuickCheck random semigroups - split stm tasty tasty-hunit tasty-quickcheck temporary text time - time-units tracer-transformers transformers unordered-containers - vector void yaml + aeson + array + async + base + bytestring + clock + containers + contra-tracer + directory + filepath + libyaml + mtl + process + QuickCheck + random + semigroups + split + stm + tasty + tasty-hunit + tasty-quickcheck + temporary + text + time + time-units + tracer-transformers + transformers + unordered-containers + vector + void + yaml ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -43,4 +137,4 @@ mkDerivation { description = "logging, benchmarking and monitoring framework"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/measures.nix b/pkgs/measures.nix index c719dfc..6de0d26 100644 --- a/pkgs/measures.nix +++ b/pkgs/measures.nix @@ -1,5 +1,11 @@ -{ mkDerivation, QuickCheck, base, base-deriving-via, fetchgit, lib -, tasty, tasty-quickcheck +{ mkDerivation +, QuickCheck +, base +, base-deriving-via +, fetchgit +, lib +, tasty +, tasty-quickcheck }: mkDerivation { pname = "measures"; @@ -26,4 +32,4 @@ mkDerivation { description = "An abstraction for (tuples of) measured quantities"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/monoidal-containers.nix b/pkgs/monoidal-containers.nix index 202e647..21c0c77 100644 --- a/pkgs/monoidal-containers.nix +++ b/pkgs/monoidal-containers.nix @@ -1,5 +1,16 @@ -{ mkDerivation, aeson, base, containers, deepseq, hashable, lens -, lib, newtype, semialign, these, unordered-containers, witherable +{ mkDerivation +, aeson +, base +, containers +, deepseq +, hashable +, lens +, lib +, newtype +, semialign +, these +, unordered-containers +, witherable }: mkDerivation { pname = "monoidal-containers"; @@ -9,8 +20,17 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - aeson base containers deepseq hashable lens newtype semialign these - unordered-containers witherable + aeson + base + containers + deepseq + hashable + lens + newtype + semialign + these + unordered-containers + witherable ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -23,4 +43,4 @@ mkDerivation { description = "Containers with monoidal accumulation"; license = lib.licenses.bsd3; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/monoidal-synchronisation.nix b/pkgs/monoidal-synchronisation.nix index 1524716..77222ad 100644 --- a/pkgs/monoidal-synchronisation.nix +++ b/pkgs/monoidal-synchronisation.nix @@ -1,5 +1,12 @@ -{ mkDerivation, QuickCheck, base, fetchgit, io-classes, io-sim, lib -, tasty, tasty-quickcheck +{ mkDerivation +, QuickCheck +, base +, fetchgit +, io-classes +, io-sim +, lib +, tasty +, tasty-quickcheck }: mkDerivation { pname = "monoidal-synchronisation"; @@ -16,7 +23,12 @@ mkDerivation { enableSeparateDataOutput = false; libraryHaskellDepends = [ base ]; testHaskellDepends = [ - base io-classes io-sim QuickCheck tasty tasty-quickcheck + base + io-classes + io-sim + QuickCheck + tasty + tasty-quickcheck ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -27,4 +39,4 @@ mkDerivation { hyperlinkSource = false; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/moo.nix b/pkgs/moo.nix index 0abfd6a..77cf5d2 100644 --- a/pkgs/moo.nix +++ b/pkgs/moo.nix @@ -1,6 +1,19 @@ -{ mkDerivation, HUnit, MonadRandom, array, base, containers -, fetchgit, gray-code, lib, mersenne-random-pure64, mtl, parallel -, random, random-shuffle, time, vector +{ mkDerivation +, HUnit +, MonadRandom +, array +, base +, containers +, fetchgit +, gray-code +, lib +, mersenne-random-pure64 +, mtl +, parallel +, random +, random-shuffle +, time +, vector }: mkDerivation { pname = "moo"; @@ -15,12 +28,33 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - array base containers gray-code mersenne-random-pure64 MonadRandom - mtl parallel random random-shuffle time vector + array + base + containers + gray-code + mersenne-random-pure64 + MonadRandom + mtl + parallel + random + random-shuffle + time + vector ]; testHaskellDepends = [ - array base containers gray-code HUnit mersenne-random-pure64 - MonadRandom mtl parallel random random-shuffle time vector + array + base + containers + gray-code + HUnit + mersenne-random-pure64 + MonadRandom + mtl + parallel + random + random-shuffle + time + vector ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -33,4 +67,4 @@ mkDerivation { description = "Genetic algorithm library"; license = lib.licenses.bsd3; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/network-mux.nix b/pkgs/network-mux.nix index add67b6..a1912f5 100644 --- a/pkgs/network-mux.nix +++ b/pkgs/network-mux.nix @@ -1,8 +1,33 @@ -{ mkDerivation, QuickCheck, Win32-network, aeson, array, base -, binary, bytestring, cborg, containers, contra-tracer, directory -, fetchzip, io-classes, io-sim, lib, monoidal-synchronisation -, network, process, quiet, serialise, splitmix, statistics-linreg -, stm, strict-stm, tasty, tasty-quickcheck, tdigest, text, time +{ mkDerivation +, QuickCheck +, Win32-network +, aeson +, array +, base +, binary +, bytestring +, cborg +, containers +, contra-tracer +, directory +, fetchzip +, io-classes +, io-sim +, lib +, monoidal-synchronisation +, network +, process +, quiet +, serialise +, splitmix +, statistics-linreg +, stm +, strict-stm +, tasty +, tasty-quickcheck +, tdigest +, text +, time , vector }: mkDerivation { @@ -16,18 +41,56 @@ mkDerivation { isExecutable = true; enableSeparateDataOutput = false; libraryHaskellDepends = [ - array base binary bytestring containers contra-tracer io-classes - monoidal-synchronisation network process quiet statistics-linreg - strict-stm time vector + array + base + binary + bytestring + containers + contra-tracer + io-classes + monoidal-synchronisation + network + process + quiet + statistics-linreg + strict-stm + time + vector ]; executableHaskellDepends = [ - aeson base bytestring cborg contra-tracer directory io-classes - network serialise stm strict-stm tdigest text + aeson + base + bytestring + cborg + contra-tracer + directory + io-classes + network + serialise + stm + strict-stm + tdigest + text ]; testHaskellDepends = [ - base binary bytestring cborg containers contra-tracer io-classes - io-sim network process QuickCheck serialise splitmix strict-stm - tasty tasty-quickcheck time Win32-network + base + binary + bytestring + cborg + containers + contra-tracer + io-classes + io-sim + network + process + QuickCheck + serialise + splitmix + strict-stm + tasty + tasty-quickcheck + time + Win32-network ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -39,4 +102,4 @@ mkDerivation { description = "Multiplexing library"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/non-integral.nix b/pkgs/non-integral.nix index 4384709..fe3d054 100644 --- a/pkgs/non-integral.nix +++ b/pkgs/non-integral.nix @@ -1,11 +1,11 @@ { mkDerivation, QuickCheck, base, fetchgit, lib }: mkDerivation { pname = "non-integral"; - version = "0.1.0.0"; + version = "1.0.0.0"; src = fetchgit { - url = "https://github.com/milloni/cardano-ledger"; - sha256 = "08nj6hcqj5apvb17n1irc8j7rzf10bcdh5gh1mkmhwbyw6h2d4ab"; - rev = "3aa1fd8469424778454644f0d371988fb4490b4a"; + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/libs/non-integral/; echo source root reset to $sourceRoot"; @@ -23,4 +23,4 @@ mkDerivation { hyperlinkSource = false; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/nothunks.nix b/pkgs/nothunks.nix index 27dae9b..9a7a5ab 100644 --- a/pkgs/nothunks.nix +++ b/pkgs/nothunks.nix @@ -1,6 +1,19 @@ -{ mkDerivation, base, bytestring, containers, fetchgit, ghc-heap -, ghc-prim, hedgehog, lib, random, stm, tasty, tasty-hedgehog, text -, time, vector +{ mkDerivation +, base +, bytestring +, containers +, fetchgit +, ghc-heap +, ghc-prim +, hedgehog +, lib +, random +, stm +, tasty +, tasty-hedgehog +, text +, time +, vector }: mkDerivation { pname = "nothunks"; @@ -15,10 +28,24 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - base bytestring containers ghc-heap stm text time vector + base + bytestring + containers + ghc-heap + stm + text + time + vector ]; testHaskellDepends = [ - base containers ghc-prim hedgehog random stm tasty tasty-hedgehog + base + containers + ghc-prim + hedgehog + random + stm + tasty + tasty-hedgehog ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -30,4 +57,4 @@ mkDerivation { description = "Examine values for unexpected thunks"; license = lib.licenses.mit; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/ntp-client.nix b/pkgs/ntp-client.nix index b8ab832..dbabf7b 100644 --- a/pkgs/ntp-client.nix +++ b/pkgs/ntp-client.nix @@ -1,6 +1,18 @@ -{ mkDerivation, QuickCheck, Win32-network, async, base, binary -, bytestring, contra-tracer, fetchzip, lib, network, stm, tasty -, tasty-quickcheck, time +{ mkDerivation +, QuickCheck +, Win32-network +, async +, base +, binary +, bytestring +, contra-tracer +, fetchzip +, lib +, network +, stm +, tasty +, tasty-quickcheck +, time }: mkDerivation { pname = "ntp-client"; @@ -13,14 +25,29 @@ mkDerivation { isExecutable = true; enableSeparateDataOutput = false; libraryHaskellDepends = [ - async base binary bytestring contra-tracer network stm time + async + base + binary + bytestring + contra-tracer + network + stm + time Win32-network ]; executableHaskellDepends = [ - async base contra-tracer Win32-network + async + base + contra-tracer + Win32-network ]; testHaskellDepends = [ - base binary QuickCheck tasty tasty-quickcheck time + base + binary + QuickCheck + tasty + tasty-quickcheck + time ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -31,4 +58,4 @@ mkDerivation { hyperlinkSource = false; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/optparse-applicative-fork.nix b/pkgs/optparse-applicative-fork.nix index c16c39c..d10ca08 100644 --- a/pkgs/optparse-applicative-fork.nix +++ b/pkgs/optparse-applicative-fork.nix @@ -1,5 +1,14 @@ -{ mkDerivation, QuickCheck, ansi-terminal, base, fetchgit, lib -, prettyprinter, process, text, transformers, transformers-compat +{ mkDerivation +, QuickCheck +, ansi-terminal +, base +, fetchgit +, lib +, prettyprinter +, process +, text +, transformers +, transformers-compat }: mkDerivation { pname = "optparse-applicative-fork"; @@ -14,7 +23,12 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - ansi-terminal base prettyprinter process text transformers + ansi-terminal + base + prettyprinter + process + text + transformers transformers-compat ]; testHaskellDepends = [ base QuickCheck ]; @@ -29,4 +43,4 @@ mkDerivation { description = "Utilities and combinators for parsing command line options"; license = lib.licenses.bsd3; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/ouroboros-network-api.nix b/pkgs/ouroboros-network-api.nix index 26fb37e..23eb9cc 100644 --- a/pkgs/ouroboros-network-api.nix +++ b/pkgs/ouroboros-network-api.nix @@ -1,8 +1,27 @@ -{ mkDerivation, aeson, base, base16-bytestring, bytestring -, cardano-binary, cardano-slotting, cardano-strict-containers -, cborg, containers, contra-tracer, deepseq, dns, fetchgit -, io-classes, iproute, lib, network, network-mux, nothunks -, serialise, strict-stm, text, typed-protocols +{ mkDerivation +, aeson +, base +, base16-bytestring +, bytestring +, cardano-binary +, cardano-slotting +, cardano-strict-containers +, cborg +, containers +, contra-tracer +, deepseq +, dns +, fetchgit +, io-classes +, iproute +, lib +, network +, network-mux +, nothunks +, serialise +, strict-stm +, text +, typed-protocols }: mkDerivation { pname = "ouroboros-network-api"; @@ -18,10 +37,27 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cardano-binary - cardano-slotting cardano-strict-containers cborg containers - contra-tracer deepseq dns io-classes iproute network network-mux - nothunks serialise strict-stm text typed-protocols + aeson + base + base16-bytestring + bytestring + cardano-binary + cardano-slotting + cardano-strict-containers + cborg + containers + contra-tracer + deepseq + dns + io-classes + iproute + network + network-mux + nothunks + serialise + strict-stm + text + typed-protocols ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -33,4 +69,4 @@ mkDerivation { description = "A networking api shared with ouroboros-consensus"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/ouroboros-network-framework.nix b/pkgs/ouroboros-network-framework.nix index 3abe03f..8858467 100644 --- a/pkgs/ouroboros-network-framework.nix +++ b/pkgs/ouroboros-network-framework.nix @@ -1,12 +1,43 @@ -{ mkDerivation, QuickCheck, Win32-network, async, base, bytestring -, cardano-prelude, cborg, containers, contra-tracer, directory, dns -, fetchgit, hashable, io-classes, io-sim, iproute, lib -, monoidal-synchronisation, mtl, network, network-mux, nothunks -, optparse-applicative, ouroboros-network-api -, ouroboros-network-testing, pretty-simple, quickcheck-instances -, quiet, random, serialise, stm, strict-stm, tasty -, tasty-quickcheck, text, time, typed-protocols -, typed-protocols-cborg, typed-protocols-examples +{ mkDerivation +, QuickCheck +, Win32-network +, async +, base +, bytestring +, cardano-prelude +, cborg +, containers +, contra-tracer +, directory +, dns +, fetchgit +, hashable +, io-classes +, io-sim +, iproute +, lib +, monoidal-synchronisation +, mtl +, network +, network-mux +, nothunks +, optparse-applicative +, ouroboros-network-api +, ouroboros-network-testing +, pretty-simple +, quickcheck-instances +, quiet +, random +, serialise +, stm +, strict-stm +, tasty +, tasty-quickcheck +, text +, time +, typed-protocols +, typed-protocols-cborg +, typed-protocols-examples }: mkDerivation { pname = "ouroboros-network-framework"; @@ -22,25 +53,80 @@ mkDerivation { isExecutable = true; enableSeparateDataOutput = false; libraryHaskellDepends = [ - async base bytestring cardano-prelude cborg containers - contra-tracer dns hashable io-classes io-sim iproute - monoidal-synchronisation mtl network network-mux nothunks - ouroboros-network-api ouroboros-network-testing QuickCheck quiet - random stm strict-stm text typed-protocols typed-protocols-cborg + async + base + bytestring + cardano-prelude + cborg + containers + contra-tracer + dns + hashable + io-classes + io-sim + iproute + monoidal-synchronisation + mtl + network + network-mux + nothunks + ouroboros-network-api + ouroboros-network-testing + QuickCheck + quiet + random + stm + strict-stm + text + typed-protocols + typed-protocols-cborg Win32-network ]; executableHaskellDepends = [ - async base bytestring contra-tracer directory io-classes network - network-mux optparse-applicative ouroboros-network-api random - strict-stm typed-protocols typed-protocols-examples + async + base + bytestring + contra-tracer + directory + io-classes + network + network-mux + optparse-applicative + ouroboros-network-api + random + strict-stm + typed-protocols + typed-protocols-examples ]; testHaskellDepends = [ - base bytestring cborg containers contra-tracer directory dns - io-classes io-sim iproute monoidal-synchronisation network - network-mux ouroboros-network-api ouroboros-network-testing - pretty-simple QuickCheck quickcheck-instances quiet serialise - strict-stm tasty tasty-quickcheck text time typed-protocols - typed-protocols-cborg typed-protocols-examples + base + bytestring + cborg + containers + contra-tracer + directory + dns + io-classes + io-sim + iproute + monoidal-synchronisation + network + network-mux + ouroboros-network-api + ouroboros-network-testing + pretty-simple + QuickCheck + quickcheck-instances + quiet + serialise + strict-stm + tasty + tasty-quickcheck + text + time + typed-protocols + typed-protocols-cborg + typed-protocols-examples ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -51,4 +137,4 @@ mkDerivation { hyperlinkSource = false; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/ouroboros-network-mock.nix b/pkgs/ouroboros-network-mock.nix index 0708768..0883eae 100644 --- a/pkgs/ouroboros-network-mock.nix +++ b/pkgs/ouroboros-network-mock.nix @@ -1,5 +1,15 @@ -{ mkDerivation, base, bytestring, cborg, containers, fetchgit -, hashable, lib, nothunks, ouroboros-network-api, serialise, time +{ mkDerivation +, base +, bytestring +, cborg +, containers +, fetchgit +, hashable +, lib +, nothunks +, ouroboros-network-api +, serialise +, time }: mkDerivation { pname = "ouroboros-network-mock"; @@ -15,8 +25,15 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - base bytestring cborg containers hashable nothunks - ouroboros-network-api serialise time + base + bytestring + cborg + containers + hashable + nothunks + ouroboros-network-api + serialise + time ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -28,4 +45,4 @@ mkDerivation { description = "Ouroboros Network Chain for testing purposes"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/ouroboros-network-protocols.nix b/pkgs/ouroboros-network-protocols.nix index 71c34cb..09ec0ec 100644 --- a/pkgs/ouroboros-network-protocols.nix +++ b/pkgs/ouroboros-network-protocols.nix @@ -1,11 +1,35 @@ -{ mkDerivation, QuickCheck, base, bytestring -, cardano-strict-containers, cborg, containers, contra-tracer -, directory, fetchgit, filepath, io-classes, io-sim, lib, mtl -, network-mux, ouroboros-network-api, ouroboros-network-framework -, ouroboros-network-mock, ouroboros-network-testing, pipes -, process-extras, quickcheck-instances, serialise, strict-stm -, tasty, tasty-hunit, tasty-quickcheck, temporary, text -, typed-protocols, typed-protocols-cborg +{ mkDerivation +, QuickCheck +, base +, bytestring +, cardano-strict-containers +, cborg +, containers +, contra-tracer +, directory +, fetchgit +, filepath +, io-classes +, io-sim +, lib +, mtl +, network-mux +, ouroboros-network-api +, ouroboros-network-framework +, ouroboros-network-mock +, ouroboros-network-testing +, pipes +, process-extras +, quickcheck-instances +, serialise +, strict-stm +, tasty +, tasty-hunit +, tasty-quickcheck +, temporary +, text +, typed-protocols +, typed-protocols-cborg }: mkDerivation { pname = "ouroboros-network-protocols"; @@ -21,18 +45,51 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - base bytestring cardano-strict-containers cborg containers - contra-tracer io-classes io-sim network-mux ouroboros-network-api - ouroboros-network-framework ouroboros-network-mock pipes QuickCheck - quickcheck-instances serialise strict-stm tasty tasty-quickcheck - text typed-protocols typed-protocols-cborg + base + bytestring + cardano-strict-containers + cborg + containers + contra-tracer + io-classes + io-sim + network-mux + ouroboros-network-api + ouroboros-network-framework + ouroboros-network-mock + pipes + QuickCheck + quickcheck-instances + serialise + strict-stm + tasty + tasty-quickcheck + text + typed-protocols + typed-protocols-cborg ]; testHaskellDepends = [ - base bytestring cborg containers directory filepath mtl - ouroboros-network-api ouroboros-network-framework - ouroboros-network-mock ouroboros-network-testing process-extras - QuickCheck quickcheck-instances serialise tasty tasty-hunit - tasty-quickcheck temporary text typed-protocols + base + bytestring + cborg + containers + directory + filepath + mtl + ouroboros-network-api + ouroboros-network-framework + ouroboros-network-mock + ouroboros-network-testing + process-extras + QuickCheck + quickcheck-instances + serialise + tasty + tasty-hunit + tasty-quickcheck + temporary + text + typed-protocols ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -44,4 +101,4 @@ mkDerivation { description = "Ouroboros Network Protocols"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/ouroboros-network-testing.nix b/pkgs/ouroboros-network-testing.nix index 25b54e0..7a99803 100644 --- a/pkgs/ouroboros-network-testing.nix +++ b/pkgs/ouroboros-network-testing.nix @@ -1,6 +1,20 @@ -{ mkDerivation, QuickCheck, base, cborg, containers, contra-tracer -, deque, fetchgit, io-classes, io-sim, lib, network-mux, psqueues -, serialise, tasty, tasty-expected-failure, tasty-quickcheck +{ mkDerivation +, QuickCheck +, base +, cborg +, containers +, contra-tracer +, deque +, fetchgit +, io-classes +, io-sim +, lib +, network-mux +, psqueues +, serialise +, tasty +, tasty-expected-failure +, tasty-quickcheck }: mkDerivation { pname = "ouroboros-network-testing"; @@ -16,8 +30,18 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - base cborg containers contra-tracer deque io-classes io-sim - network-mux psqueues QuickCheck serialise tasty + base + cborg + containers + contra-tracer + deque + io-classes + io-sim + network-mux + psqueues + QuickCheck + serialise + tasty tasty-expected-failure ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; @@ -31,4 +55,4 @@ mkDerivation { description = "Common modules used for testing in ouroboros-network and ouroboros-consensus"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/ouroboros-network.nix b/pkgs/ouroboros-network.nix index f681a32..46f2645 100644 --- a/pkgs/ouroboros-network.nix +++ b/pkgs/ouroboros-network.nix @@ -1,14 +1,50 @@ -{ mkDerivation, QuickCheck, aeson, array, async, base, bytestring -, cardano-prelude, cardano-slotting, cardano-strict-containers -, cborg, containers, contra-tracer, directory, dns, fetchgit -, hashable, io-classes, io-sim, iproute, lib -, monoidal-synchronisation, mtl, network, network-mux, nothunks -, ouroboros-network-api, ouroboros-network-framework -, ouroboros-network-mock, ouroboros-network-protocols -, ouroboros-network-testing, pipes, pretty-simple, process -, psqueues, random, serialise, stm, strict-stm, tasty, tasty-hunit -, tasty-quickcheck, text, time, typed-protocols -, typed-protocols-examples, unix +{ mkDerivation +, QuickCheck +, aeson +, array +, async +, base +, bytestring +, cardano-prelude +, cardano-slotting +, cardano-strict-containers +, cborg +, containers +, contra-tracer +, directory +, dns +, fetchgit +, hashable +, io-classes +, io-sim +, iproute +, lib +, monoidal-synchronisation +, mtl +, network +, network-mux +, nothunks +, ouroboros-network-api +, ouroboros-network-framework +, ouroboros-network-mock +, ouroboros-network-protocols +, ouroboros-network-testing +, pipes +, pretty-simple +, process +, psqueues +, random +, serialise +, stm +, strict-stm +, tasty +, tasty-hunit +, tasty-quickcheck +, text +, time +, typed-protocols +, typed-protocols-examples +, unix }: mkDerivation { pname = "ouroboros-network"; @@ -24,28 +60,91 @@ mkDerivation { isExecutable = true; enableSeparateDataOutput = false; libraryHaskellDepends = [ - aeson async base bytestring cardano-prelude cardano-slotting - cardano-strict-containers cborg containers contra-tracer directory - dns hashable io-classes iproute monoidal-synchronisation mtl - network network-mux nothunks ouroboros-network-api - ouroboros-network-framework ouroboros-network-protocols psqueues - random strict-stm typed-protocols unix + aeson + async + base + bytestring + cardano-prelude + cardano-slotting + cardano-strict-containers + cborg + containers + contra-tracer + directory + dns + hashable + io-classes + iproute + monoidal-synchronisation + mtl + network + network-mux + nothunks + ouroboros-network-api + ouroboros-network-framework + ouroboros-network-protocols + psqueues + random + strict-stm + typed-protocols + unix ]; executableHaskellDepends = [ - async base bytestring containers contra-tracer directory - ouroboros-network-api ouroboros-network-framework - ouroboros-network-mock ouroboros-network-protocols random serialise - stm typed-protocols + async + base + bytestring + containers + contra-tracer + directory + ouroboros-network-api + ouroboros-network-framework + ouroboros-network-mock + ouroboros-network-protocols + random + serialise + stm + typed-protocols ]; testHaskellDepends = [ - aeson array base bytestring cardano-prelude cardano-slotting cborg - containers contra-tracer dns hashable io-classes io-sim iproute - monoidal-synchronisation mtl network network-mux nothunks - ouroboros-network-api ouroboros-network-framework - ouroboros-network-mock ouroboros-network-protocols - ouroboros-network-testing pipes pretty-simple process psqueues - QuickCheck random serialise strict-stm tasty tasty-hunit - tasty-quickcheck text time typed-protocols typed-protocols-examples + aeson + array + base + bytestring + cardano-prelude + cardano-slotting + cborg + containers + contra-tracer + dns + hashable + io-classes + io-sim + iproute + monoidal-synchronisation + mtl + network + network-mux + nothunks + ouroboros-network-api + ouroboros-network-framework + ouroboros-network-mock + ouroboros-network-protocols + ouroboros-network-testing + pipes + pretty-simple + process + psqueues + QuickCheck + random + serialise + strict-stm + tasty + tasty-hunit + tasty-quickcheck + text + time + typed-protocols + typed-protocols-examples ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -57,4 +156,4 @@ mkDerivation { description = "A networking layer for the Ouroboros blockchain protocol"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/plutus-core.nix b/pkgs/plutus-core.nix index 4952b36..7e8cb60 100644 --- a/pkgs/plutus-core.nix +++ b/pkgs/plutus-core.nix @@ -1,23 +1,99 @@ -{ mkDerivation, HUnit, QuickCheck, Stream, aeson, algebraic-graphs -, array, barbies, base, base64-bytestring, bifunctors, bimap, brick -, bytestring, cardano-crypto, cardano-crypto-class, cassava, cborg -, composition-prelude, containers, criterion, criterion-measurement -, cryptonite, data-default-class, deepseq, dependent-map -, dependent-sum-template, deriving-aeson, deriving-compat -, directory, dlist, dom-lt, exceptions, extra, fetchgit, filepath -, flat, free, ghc-prim, hashable, haskeline, hedgehog, hex-text -, int-cast, lazy-search, lens, lib, megaparsec, microlens -, microlens-th, mmorph, mono-traversable, monoidal-containers, mtl -, multiset, nonempty-vector, nothunks, optparse-applicative -, parser-combinators, pretty-show, prettyprinter -, prettyprinter-configurable, primitive, quickcheck-instances -, quickcheck-transformer, ral, random, recursion-schemes -, semigroupoids, semigroups, serialise, size-based, some, split -, tagged, tasty, tasty-golden, tasty-hedgehog, tasty-hunit -, tasty-quickcheck, template-haskell, test-framework -, test-framework-hunit, test-framework-quickcheck2, text -, text-zipper, th-compat, th-lift, th-lift-instances, th-utilities -, time, transformers, unordered-containers, vector, vty, witherable +{ mkDerivation +, HUnit +, QuickCheck +, Stream +, aeson +, algebraic-graphs +, array +, barbies +, base +, base64-bytestring +, bifunctors +, bimap +, brick +, bytestring +, cardano-crypto +, cardano-crypto-class +, cassava +, cborg +, composition-prelude +, containers +, criterion +, criterion-measurement +, cryptonite +, data-default-class +, deepseq +, dependent-map +, dependent-sum-template +, deriving-aeson +, deriving-compat +, directory +, dlist +, dom-lt +, exceptions +, extra +, fetchgit +, filepath +, flat +, free +, ghc-prim +, hashable +, haskeline +, hedgehog +, hex-text +, int-cast +, lazy-search +, lens +, lib +, megaparsec +, microlens +, microlens-th +, mmorph +, mono-traversable +, monoidal-containers +, mtl +, multiset +, nonempty-vector +, nothunks +, optparse-applicative +, parser-combinators +, pretty-show +, prettyprinter +, prettyprinter-configurable +, primitive +, quickcheck-instances +, quickcheck-transformer +, ral +, random +, recursion-schemes +, semigroupoids +, semigroups +, serialise +, size-based +, some +, split +, tagged +, tasty +, tasty-golden +, tasty-hedgehog +, tasty-hunit +, tasty-quickcheck +, template-haskell +, test-framework +, test-framework-hunit +, test-framework-quickcheck2 +, text +, text-zipper +, th-compat +, th-lift +, th-lift-instances +, th-utilities +, time +, transformers +, unordered-containers +, vector +, vty +, witherable , word-array }: mkDerivation { @@ -34,41 +110,161 @@ mkDerivation { isExecutable = true; enableSeparateDataOutput = false; libraryHaskellDepends = [ - aeson algebraic-graphs array barbies base base64-bytestring - bifunctors bimap bytestring cardano-crypto cardano-crypto-class - cassava cborg composition-prelude containers cryptonite - data-default-class deepseq dependent-map dependent-sum-template - deriving-aeson deriving-compat dlist dom-lt exceptions extra - filepath flat free ghc-prim hashable hedgehog int-cast lazy-search - lens megaparsec mmorph mono-traversable monoidal-containers mtl - multiset nonempty-vector nothunks optparse-applicative - parser-combinators prettyprinter prettyprinter-configurable - primitive QuickCheck quickcheck-instances quickcheck-transformer - ral recursion-schemes semigroupoids semigroups serialise size-based - some Stream tagged tasty tasty-golden tasty-hedgehog tasty-hunit - template-haskell text th-compat th-lift th-lift-instances - th-utilities time transformers unordered-containers witherable + aeson + algebraic-graphs + array + barbies + base + base64-bytestring + bifunctors + bimap + bytestring + cardano-crypto + cardano-crypto-class + cassava + cborg + composition-prelude + containers + cryptonite + data-default-class + deepseq + dependent-map + dependent-sum-template + deriving-aeson + deriving-compat + dlist + dom-lt + exceptions + extra + filepath + flat + free + ghc-prim + hashable + hedgehog + int-cast + lazy-search + lens + megaparsec + mmorph + mono-traversable + monoidal-containers + mtl + multiset + nonempty-vector + nothunks + optparse-applicative + parser-combinators + prettyprinter + prettyprinter-configurable + primitive + QuickCheck + quickcheck-instances + quickcheck-transformer + ral + recursion-schemes + semigroupoids + semigroups + serialise + size-based + some + Stream + tagged + tasty + tasty-golden + tasty-hedgehog + tasty-hunit + template-haskell + text + th-compat + th-lift + th-lift-instances + th-utilities + time + transformers + unordered-containers + witherable word-array ]; executableHaskellDepends = [ - aeson base brick bytestring cardano-crypto-class cassava containers - criterion criterion-measurement deepseq directory filepath - haskeline hedgehog lens megaparsec microlens microlens-th - mono-traversable mtl optparse-applicative prettyprinter QuickCheck - quickcheck-instances random split text text-zipper time - transformers vector vty + aeson + base + brick + bytestring + cardano-crypto-class + cassava + containers + criterion + criterion-measurement + deepseq + directory + filepath + haskeline + hedgehog + lens + megaparsec + microlens + microlens-th + mono-traversable + mtl + optparse-applicative + prettyprinter + QuickCheck + quickcheck-instances + random + split + text + text-zipper + time + transformers + vector + vty ]; testHaskellDepends = [ - aeson base bytestring cardano-crypto-class cassava containers - data-default-class filepath flat hashable hedgehog hex-text HUnit - lens mmorph mtl nonempty-vector pretty-show prettyprinter - QuickCheck quickcheck-instances serialise split tasty tasty-golden - tasty-hedgehog tasty-hunit tasty-quickcheck template-haskell - test-framework test-framework-hunit test-framework-quickcheck2 text - th-lift-instances th-utilities unordered-containers vector + aeson + base + bytestring + cardano-crypto-class + cassava + containers + data-default-class + filepath + flat + hashable + hedgehog + hex-text + HUnit + lens + mmorph + mtl + nonempty-vector + pretty-show + prettyprinter + QuickCheck + quickcheck-instances + serialise + split + tasty + tasty-golden + tasty-hedgehog + tasty-hunit + tasty-quickcheck + template-haskell + test-framework + test-framework-hunit + test-framework-quickcheck2 + text + th-lift-instances + th-utilities + unordered-containers + vector ]; benchmarkHaskellDepends = [ - base criterion nonempty-vector ral random + base + criterion + nonempty-vector + ral + random ]; enableLibraryProfiling = false; enableExecutableProfiling = false; @@ -80,4 +276,4 @@ mkDerivation { description = "Language library for Plutus Core"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/plutus-ledger-api.nix b/pkgs/plutus-ledger-api.nix index a5eb3bc..4143df0 100644 --- a/pkgs/plutus-ledger-api.nix +++ b/pkgs/plutus-ledger-api.nix @@ -1,8 +1,33 @@ -{ mkDerivation, PyF, async, barbies, base, base16-bytestring -, base64-bytestring, bytestring, cborg, containers, deepseq, extra -, fetchgit, filepath, flat, hedgehog, lens, lib, mtl, nothunks -, plutus-core, plutus-tx, prettyprinter, serialise, tagged, tasty -, tasty-hedgehog, tasty-hunit, tasty-quickcheck, text +{ mkDerivation +, PyF +, async +, barbies +, base +, base16-bytestring +, base64-bytestring +, bytestring +, cborg +, containers +, deepseq +, extra +, fetchgit +, filepath +, flat +, hedgehog +, lens +, lib +, mtl +, nothunks +, plutus-core +, plutus-tx +, prettyprinter +, serialise +, tagged +, tasty +, tasty-hedgehog +, tasty-hunit +, tasty-quickcheck +, text }: mkDerivation { pname = "plutus-ledger-api"; @@ -18,18 +43,54 @@ mkDerivation { isExecutable = true; enableSeparateDataOutput = false; libraryHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring cborg - containers deepseq extra flat lens mtl nothunks plutus-core - plutus-tx prettyprinter PyF serialise tagged text + base + base16-bytestring + base64-bytestring + bytestring + cborg + containers + deepseq + extra + flat + lens + mtl + nothunks + plutus-core + plutus-tx + prettyprinter + PyF + serialise + tagged + text ]; executableHaskellDepends = [ - async base extra filepath mtl plutus-core serialise tasty + async + base + extra + filepath + mtl + plutus-core + serialise + tasty tasty-hunit ]; testHaskellDepends = [ - barbies base bytestring containers extra hedgehog lens mtl nothunks - plutus-core plutus-tx tasty tasty-hedgehog tasty-hunit - tasty-quickcheck text + barbies + base + bytestring + containers + extra + hedgehog + lens + mtl + nothunks + plutus-core + plutus-tx + tasty + tasty-hedgehog + tasty-hunit + tasty-quickcheck + text ]; enableLibraryProfiling = false; enableExecutableProfiling = false; @@ -41,4 +102,4 @@ mkDerivation { description = "Interface to the Plutus ledger for the Cardano ledger"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/plutus-preprocessor.nix b/pkgs/plutus-preprocessor.nix index 3eae660..71c9a08 100644 --- a/pkgs/plutus-preprocessor.nix +++ b/pkgs/plutus-preprocessor.nix @@ -1,18 +1,44 @@ -{ mkDerivation, base, cardano-ledger-alonzo, fetchgit, lib }: +{ mkDerivation +, base +, bytestring +, cardano-ledger-alonzo +, cardano-ledger-core +, fetchgit +, flat +, hashable +, lib +, plutus-ledger-api +, plutus-tx +, plutus-tx-plugin +, serialise +, template-haskell +}: mkDerivation { pname = "plutus-preprocessor"; version = "0.1.0.0"; src = fetchgit { - url = "https://github.com/milloni/cardano-ledger"; - sha256 = "08nj6hcqj5apvb17n1irc8j7rzf10bcdh5gh1mkmhwbyw6h2d4ab"; - rev = "3aa1fd8469424778454644f0d371988fb4490b4a"; + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/libs/plutus-preprocessor/; echo source root reset to $sourceRoot"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = false; - executableHaskellDepends = [ base cardano-ledger-alonzo ]; + executableHaskellDepends = [ + base + bytestring + cardano-ledger-alonzo + cardano-ledger-core + flat + hashable + plutus-ledger-api + plutus-tx + plutus-tx-plugin + serialise + template-haskell + ]; enableLibraryProfiling = false; enableExecutableProfiling = false; doHaddock = false; @@ -23,4 +49,4 @@ mkDerivation { description = "A preproceesor for creating plutus scripts as bytestrings and equivalents"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/plutus-tx-plugin.nix b/pkgs/plutus-tx-plugin.nix index 538ae2c..3d0192a 100644 --- a/pkgs/plutus-tx-plugin.nix +++ b/pkgs/plutus-tx-plugin.nix @@ -1,7 +1,28 @@ -{ mkDerivation, PyF, array, base, bytestring, containers, deepseq -, either, extra, fetchgit, flat, ghc, hedgehog, lens, lib, mtl -, optparse-applicative, plutus-core, plutus-tx, prettyprinter -, tagged, tasty, tasty-hedgehog, tasty-hunit, template-haskell +{ mkDerivation +, PyF +, array +, base +, bytestring +, containers +, deepseq +, either +, extra +, fetchgit +, flat +, ghc +, hedgehog +, lens +, lib +, mtl +, optparse-applicative +, plutus-core +, plutus-tx +, prettyprinter +, tagged +, tasty +, tasty-hedgehog +, tasty-hunit +, template-haskell , text }: mkDerivation { @@ -18,15 +39,47 @@ mkDerivation { isExecutable = true; enableSeparateDataOutput = false; libraryHaskellDepends = [ - array base bytestring containers either extra flat ghc lens mtl - plutus-core plutus-tx prettyprinter PyF template-haskell text + array + base + bytestring + containers + either + extra + flat + ghc + lens + mtl + plutus-core + plutus-tx + prettyprinter + PyF + template-haskell + text ]; executableHaskellDepends = [ - base containers lens optparse-applicative prettyprinter PyF text + base + containers + lens + optparse-applicative + prettyprinter + PyF + text ]; testHaskellDepends = [ - base containers deepseq flat hedgehog lens mtl plutus-core - plutus-tx tagged tasty tasty-hedgehog tasty-hunit template-haskell + base + containers + deepseq + flat + hedgehog + lens + mtl + plutus-core + plutus-tx + tagged + tasty + tasty-hedgehog + tasty-hunit + template-haskell text ]; enableLibraryProfiling = false; @@ -39,4 +92,4 @@ mkDerivation { description = "The Plutus Tx compiler and GHC plugin"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/plutus-tx.nix b/pkgs/plutus-tx.nix index b666c89..a8edd3d 100644 --- a/pkgs/plutus-tx.nix +++ b/pkgs/plutus-tx.nix @@ -1,9 +1,38 @@ -{ mkDerivation, aeson, base, base16-bytestring, bytestring, cborg -, containers, deepseq, deriving-compat, doctest, extra, fetchgit -, filepath, flat, ghc-prim, hashable, hedgehog, hedgehog-fn, lens -, lib, memory, mtl, plutus-core, pretty-show, prettyprinter -, serialise, tagged, tasty, tasty-hedgehog, tasty-hunit -, template-haskell, text, th-abstraction, th-compat, transformers +{ mkDerivation +, aeson +, base +, base16-bytestring +, bytestring +, cborg +, containers +, deepseq +, deriving-compat +, doctest +, extra +, fetchgit +, filepath +, flat +, ghc-prim +, hashable +, hedgehog +, hedgehog-fn +, lens +, lib +, memory +, mtl +, plutus-core +, pretty-show +, prettyprinter +, serialise +, tagged +, tasty +, tasty-hedgehog +, tasty-hunit +, template-haskell +, text +, th-abstraction +, th-compat +, transformers }: mkDerivation { pname = "plutus-tx"; @@ -19,15 +48,50 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - aeson base bytestring containers deepseq deriving-compat extra - filepath flat ghc-prim hashable hedgehog lens memory mtl - plutus-core prettyprinter serialise tagged tasty tasty-hedgehog - template-haskell text th-abstraction th-compat transformers + aeson + base + bytestring + containers + deepseq + deriving-compat + extra + filepath + flat + ghc-prim + hashable + hedgehog + lens + memory + mtl + plutus-core + prettyprinter + serialise + tagged + tasty + tasty-hedgehog + template-haskell + text + th-abstraction + th-compat + transformers ]; testHaskellDepends = [ - aeson base base16-bytestring bytestring cborg filepath hedgehog - hedgehog-fn plutus-core pretty-show serialise tasty tasty-hedgehog - tasty-hunit text transformers + aeson + base + base16-bytestring + bytestring + cborg + filepath + hedgehog + hedgehog-fn + plutus-core + pretty-show + serialise + tasty + tasty-hedgehog + tasty-hunit + text + transformers ]; testToolDepends = [ doctest ]; enableLibraryProfiling = false; @@ -40,4 +104,4 @@ mkDerivation { description = "Libraries for Plutus Tx and its prelude"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/prettyprinter-configurable.nix b/pkgs/prettyprinter-configurable.nix index 377da45..a9de273 100644 --- a/pkgs/prettyprinter-configurable.nix +++ b/pkgs/prettyprinter-configurable.nix @@ -1,7 +1,21 @@ -{ mkDerivation, Cabal, QuickCheck, base, cabal-doctest, doctest -, fetchgit, lib, megaparsec, microlens, mtl, parser-combinators -, prettyprinter, quickcheck-text, tasty, tasty-hunit -, tasty-quickcheck, text +{ mkDerivation +, Cabal +, QuickCheck +, base +, cabal-doctest +, doctest +, fetchgit +, lib +, megaparsec +, microlens +, mtl +, parser-combinators +, prettyprinter +, quickcheck-text +, tasty +, tasty-hunit +, tasty-quickcheck +, text }: mkDerivation { pname = "prettyprinter-configurable"; @@ -19,8 +33,15 @@ mkDerivation { setupHaskellDepends = [ base Cabal cabal-doctest doctest ]; libraryHaskellDepends = [ base microlens mtl prettyprinter text ]; testHaskellDepends = [ - base megaparsec parser-combinators QuickCheck quickcheck-text tasty - tasty-hunit tasty-quickcheck text + base + megaparsec + parser-combinators + QuickCheck + quickcheck-text + tasty + tasty-hunit + tasty-quickcheck + text ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -31,4 +52,4 @@ mkDerivation { hyperlinkSource = false; license = "unknown"; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/quickcheck-transformer.nix b/pkgs/quickcheck-transformer.nix index 44f0212..1372345 100644 --- a/pkgs/quickcheck-transformer.nix +++ b/pkgs/quickcheck-transformer.nix @@ -18,4 +18,4 @@ mkDerivation { description = "A GenT monad transformer for QuickCheck library"; license = lib.licenses.mit; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/set-algebra.nix b/pkgs/set-algebra.nix index 04ebaab..9046103 100644 --- a/pkgs/set-algebra.nix +++ b/pkgs/set-algebra.nix @@ -1,13 +1,21 @@ -{ mkDerivation, ansi-wl-pprint, base, cardano-data, containers -, fetchgit, lib, tasty, tasty-hunit, tasty-quickcheck +{ mkDerivation +, ansi-wl-pprint +, base +, cardano-data +, containers +, fetchgit +, lib +, tasty +, tasty-hunit +, tasty-quickcheck }: mkDerivation { pname = "set-algebra"; - version = "0.1.0.0"; + version = "1.1.0.0"; src = fetchgit { - url = "https://github.com/milloni/cardano-ledger"; - sha256 = "08nj6hcqj5apvb17n1irc8j7rzf10bcdh5gh1mkmhwbyw6h2d4ab"; - rev = "3aa1fd8469424778454644f0d371988fb4490b4a"; + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/libs/set-algebra/; echo source root reset to $sourceRoot"; @@ -15,10 +23,18 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - ansi-wl-pprint base cardano-data containers + ansi-wl-pprint + base + cardano-data + containers ]; testHaskellDepends = [ - base cardano-data containers tasty tasty-hunit tasty-quickcheck + base + cardano-data + containers + tasty + tasty-hunit + tasty-quickcheck ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -31,4 +47,4 @@ mkDerivation { description = "Set Algebra"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/small-steps-test.nix b/pkgs/small-steps-test.nix index a49e66c..aaef6c7 100644 --- a/pkgs/small-steps-test.nix +++ b/pkgs/small-steps-test.nix @@ -1,16 +1,34 @@ -{ mkDerivation, QuickCheck, Unique, base, cardano-binary -, cardano-crypto-class, cardano-strict-containers, containers -, deepseq, fetchgit, hedgehog, lib, microlens, microlens-th, mtl -, nothunks, small-steps, tasty, tasty-expected-failure -, tasty-hedgehog, tasty-hunit, tasty-quickcheck, transformers +{ mkDerivation +, QuickCheck +, Unique +, base +, cardano-crypto-class +, cardano-ledger-binary +, cardano-strict-containers +, containers +, deepseq +, fetchgit +, hedgehog +, lib +, microlens +, microlens-th +, mtl +, nothunks +, small-steps +, tasty +, tasty-expected-failure +, tasty-hedgehog +, tasty-hunit +, tasty-quickcheck +, transformers }: mkDerivation { pname = "small-steps-test"; - version = "0.1.0.0"; + version = "1.0.0.0"; src = fetchgit { - url = "https://github.com/milloni/cardano-ledger"; - sha256 = "08nj6hcqj5apvb17n1irc8j7rzf10bcdh5gh1mkmhwbyw6h2d4ab"; - rev = "3aa1fd8469424778454644f0d371988fb4490b4a"; + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/libs/small-steps-test/; echo source root reset to $sourceRoot"; @@ -18,14 +36,35 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - base cardano-strict-containers deepseq hedgehog microlens - microlens-th mtl nothunks QuickCheck small-steps tasty-hunit + base + cardano-ledger-binary + cardano-strict-containers + deepseq + hedgehog + microlens + microlens-th + mtl + nothunks + QuickCheck + small-steps + tasty-hunit transformers ]; testHaskellDepends = [ - base cardano-binary cardano-crypto-class containers hedgehog mtl - QuickCheck small-steps tasty tasty-expected-failure tasty-hedgehog - tasty-hunit tasty-quickcheck Unique + base + cardano-crypto-class + cardano-ledger-binary + containers + hedgehog + mtl + QuickCheck + small-steps + tasty + tasty-expected-failure + tasty-hedgehog + tasty-hunit + tasty-quickcheck + Unique ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -38,4 +77,4 @@ mkDerivation { description = "Small step semantics testing library"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/small-steps.nix b/pkgs/small-steps.nix index dc6a2cc..e0feac4 100644 --- a/pkgs/small-steps.nix +++ b/pkgs/small-steps.nix @@ -1,14 +1,25 @@ -{ mkDerivation, aeson, base, cardano-strict-containers, containers -, data-default-class, fetchgit, free, lib, mtl, nothunks, text -, transformers, validation-selective +{ mkDerivation +, aeson +, base +, cardano-strict-containers +, containers +, data-default-class +, fetchgit +, free +, lib +, mtl +, nothunks +, text +, transformers +, validation-selective }: mkDerivation { pname = "small-steps"; - version = "0.1.0.0"; + version = "1.0.0.0"; src = fetchgit { - url = "https://github.com/milloni/cardano-ledger"; - sha256 = "08nj6hcqj5apvb17n1irc8j7rzf10bcdh5gh1mkmhwbyw6h2d4ab"; - rev = "3aa1fd8469424778454644f0d371988fb4490b4a"; + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/libs/small-steps/; echo source root reset to $sourceRoot"; @@ -16,8 +27,17 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - aeson base cardano-strict-containers containers data-default-class - free mtl nothunks text transformers validation-selective + aeson + base + cardano-strict-containers + containers + data-default-class + free + mtl + nothunks + text + transformers + validation-selective ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -30,4 +50,4 @@ mkDerivation { description = "Small step semantics"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/strict-containers.nix b/pkgs/strict-containers.nix index 26db970..14fb7d5 100644 --- a/pkgs/strict-containers.nix +++ b/pkgs/strict-containers.nix @@ -1,5 +1,15 @@ -{ mkDerivation, aeson, base, cardano-binary, cborg, containers -, data-default-class, deepseq, fetchzip, fingertree, lib, nothunks +{ mkDerivation +, aeson +, base +, cardano-binary +, cborg +, containers +, data-default-class +, deepseq +, fetchzip +, fingertree +, lib +, nothunks , serialise }: mkDerivation { @@ -13,8 +23,16 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - aeson base cardano-binary cborg containers data-default-class - deepseq fingertree nothunks serialise + aeson + base + cardano-binary + cborg + containers + data-default-class + deepseq + fingertree + nothunks + serialise ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -26,4 +44,4 @@ mkDerivation { description = "Various strict container types"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/strict-stm.nix b/pkgs/strict-stm.nix index 191ba45..079eaee 100644 --- a/pkgs/strict-stm.nix +++ b/pkgs/strict-stm.nix @@ -23,4 +23,4 @@ mkDerivation { description = "Strict STM interface polymorphic over stm implementation"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/tracer-transformers.nix b/pkgs/tracer-transformers.nix index b63a984..6d46174 100644 --- a/pkgs/tracer-transformers.nix +++ b/pkgs/tracer-transformers.nix @@ -1,5 +1,11 @@ -{ mkDerivation, base, contra-tracer, fetchzip, lib, safe-exceptions -, text, time +{ mkDerivation +, base +, contra-tracer +, fetchzip +, lib +, safe-exceptions +, text +, time }: mkDerivation { pname = "tracer-transformers"; @@ -12,7 +18,10 @@ mkDerivation { isExecutable = true; enableSeparateDataOutput = false; libraryHaskellDepends = [ - base contra-tracer safe-exceptions time + base + contra-tracer + safe-exceptions + time ]; executableHaskellDepends = [ base contra-tracer text time ]; enableLibraryProfiling = true; @@ -25,4 +34,4 @@ mkDerivation { description = "tracer transformers and examples showing their use"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/typed-protocols-cborg.nix b/pkgs/typed-protocols-cborg.nix index d44a814..9dd477e 100644 --- a/pkgs/typed-protocols-cborg.nix +++ b/pkgs/typed-protocols-cborg.nix @@ -1,4 +1,10 @@ -{ mkDerivation, base, bytestring, cborg, fetchgit, io-classes, lib +{ mkDerivation +, base +, bytestring +, cborg +, fetchgit +, io-classes +, lib , typed-protocols }: mkDerivation { @@ -15,7 +21,11 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - base bytestring cborg io-classes typed-protocols + base + bytestring + cborg + io-classes + typed-protocols ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -27,4 +37,4 @@ mkDerivation { description = "CBOR codecs for typed-protocols"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/typed-protocols-examples.nix b/pkgs/typed-protocols-examples.nix index 26d8628..d3a9047 100644 --- a/pkgs/typed-protocols-examples.nix +++ b/pkgs/typed-protocols-examples.nix @@ -1,6 +1,19 @@ -{ mkDerivation, QuickCheck, base, bytestring, cborg, contra-tracer -, fetchgit, io-classes, io-sim, lib, serialise, tasty -, tasty-quickcheck, time, typed-protocols, typed-protocols-cborg +{ mkDerivation +, QuickCheck +, base +, bytestring +, cborg +, contra-tracer +, fetchgit +, io-classes +, io-sim +, lib +, serialise +, tasty +, tasty-quickcheck +, time +, typed-protocols +, typed-protocols-cborg }: mkDerivation { pname = "typed-protocols-examples"; @@ -16,12 +29,27 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - base bytestring cborg contra-tracer io-classes serialise time - typed-protocols typed-protocols-cborg + base + bytestring + cborg + contra-tracer + io-classes + serialise + time + typed-protocols + typed-protocols-cborg ]; testHaskellDepends = [ - base bytestring contra-tracer io-classes io-sim QuickCheck tasty - tasty-quickcheck typed-protocols typed-protocols-cborg + base + bytestring + contra-tracer + io-classes + io-sim + QuickCheck + tasty + tasty-quickcheck + typed-protocols + typed-protocols-cborg ]; enableLibraryProfiling = true; enableExecutableProfiling = true; @@ -33,4 +61,4 @@ mkDerivation { description = "Examples and tests for the typed-protocols framework"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/typed-protocols.nix b/pkgs/typed-protocols.nix index 088b6e5..f3822bd 100644 --- a/pkgs/typed-protocols.nix +++ b/pkgs/typed-protocols.nix @@ -23,4 +23,4 @@ mkDerivation { description = "A framework for strongly typed protocols"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/vector-map.nix b/pkgs/vector-map.nix index 2cf6ed0..69720e7 100644 --- a/pkgs/vector-map.nix +++ b/pkgs/vector-map.nix @@ -1,15 +1,29 @@ -{ mkDerivation, QuickCheck, base, cardano-binary, containers -, criterion, deepseq, fetchgit, lib, nothunks, primitive -, quickcheck-classes-base, random, tasty, tasty-quickcheck, vector +{ mkDerivation +, QuickCheck +, aeson +, base +, containers +, criterion +, deepseq +, fetchgit +, lib +, nothunks +, primitive +, quickcheck-classes-base +, random +, tasty +, tasty-quickcheck +, tree-diff +, vector , vector-algorithms }: mkDerivation { pname = "vector-map"; - version = "0.1.0.0"; + version = "1.0.1.0"; src = fetchgit { - url = "https://github.com/milloni/cardano-ledger"; - sha256 = "08nj6hcqj5apvb17n1irc8j7rzf10bcdh5gh1mkmhwbyw6h2d4ab"; - rev = "3aa1fd8469424778454644f0d371988fb4490b4a"; + url = "https://github.com/input-output-hk/cardano-ledger"; + sha256 = "120995ssz1nf21pp52xwhmcs4cdfndzv4459l8cjvwbaygs7nvvl"; + rev = "180271602640bcac1214084b6de61d0468332f00"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/libs/vector-map/; echo source root reset to $sourceRoot"; @@ -17,11 +31,22 @@ mkDerivation { isExecutable = false; enableSeparateDataOutput = false; libraryHaskellDepends = [ - base cardano-binary containers deepseq nothunks primitive vector + aeson + base + containers + deepseq + nothunks + primitive + tree-diff + vector vector-algorithms ]; testHaskellDepends = [ - base containers QuickCheck quickcheck-classes-base tasty + base + containers + QuickCheck + quickcheck-classes-base + tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ base containers criterion random ]; @@ -36,4 +61,4 @@ mkDerivation { description = "An efficient VMap that is backed by two vectors: one for keys and another for values"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} diff --git a/pkgs/word-array.nix b/pkgs/word-array.nix index 8e8c75f..efd643c 100644 --- a/pkgs/word-array.nix +++ b/pkgs/word-array.nix @@ -1,5 +1,14 @@ -{ mkDerivation, QuickCheck, base, deepseq, fetchgit, lib -, mono-traversable, primitive, tasty, tasty-bench, tasty-quickcheck +{ mkDerivation +, QuickCheck +, base +, deepseq +, fetchgit +, lib +, mono-traversable +, primitive +, tasty +, tasty-bench +, tasty-quickcheck , vector }: mkDerivation { @@ -17,7 +26,12 @@ mkDerivation { enableSeparateDataOutput = false; libraryHaskellDepends = [ base deepseq mono-traversable ]; testHaskellDepends = [ - base mono-traversable QuickCheck tasty tasty-quickcheck vector + base + mono-traversable + QuickCheck + tasty + tasty-quickcheck + vector ]; benchmarkHaskellDepends = [ base primitive tasty-bench ]; enableLibraryProfiling = true; @@ -30,4 +44,4 @@ mkDerivation { homepage = "https://github.com/plutus"; license = lib.licenses.asl20; broken = false; -} \ No newline at end of file +} -- GitLab