diff --git a/horizon.dhall b/horizon.dhall index ca82199ff6ab859ba37e890689fe54b373702cc3..351455fe9682541fcc5160f487c8bedf2d38141f 100644 --- a/horizon.dhall +++ b/horizon.dhall @@ -22,17 +22,24 @@ let callCardanoBase "https://github.com/locallycompact/cardano-base" "f954aec4fbe11ba96729ddcc5e22c13ab6320b5d" +let callCardanoWallet + : H.Subdir → H.HaskellPackage.Type + = callRepository + "https://github.com/input-output-hk/cardano-wallet" + "14ab2f7b42a7805892fcb626340dce0736e9257a" + + let callCardanoLedger : H.Subdir → H.HaskellPackage.Type = callRepository "https://github.com/input-output-hk/cardano-ledger" - "81548171f2cd336714bb0425640a6553c46aa09e" + "62846d6de6464095ab7aae6d7f466c5173460937" let callCardanoNode : H.Subdir → H.HaskellPackage.Type = callRepository "https://github.com/input-output-hk/cardano-node" - "b7d70f3a54921669519e1de1ec6ed381d01b28fb" + "d6228270e9b6811ca1d00ca9ce9d0254e63c2d6c" let callIoSim : H.Subdir → H.HaskellPackage.Type @@ -69,7 +76,7 @@ let callPlutus : H.Subdir → H.HaskellPackage.Type = callRepository "https://github.com/input-output-hk/plutus" - "cfccccc8596859bfaa992100b11199301eb6d2bd" + "5efe047b034bdd1f79df6dfa64a3c5d205ffa8f8" let callTypedProtocols : H.Subdir → H.HaskellPackage.Type @@ -156,7 +163,7 @@ let packages = , cardano-node = callCardanoNode "cardano-node" , cardano-ping = callOuroborosNetwork "cardano-ping" - , cardano-slotting = callCardanoBase "cardano-slotting" + , cardano-slotting = callCHaP "cardano-slotting" "0.1.1.1" , cardano-strict-containers = callCardanoBase "cardano-strict-containers" , cardano-prelude = callCHaP "cardano-prelude" "0.1.0.1" @@ -264,7 +271,7 @@ let packages = , vector-map = callCardanoLedger "libs/vector-map" , websockets-snap = H.callHackage "websockets-snap" "0.10.3.1" , wl-pprint-text = H.callHackage "wl-pprint-text" "1.2.0.2" --- , word-array = callPlutus "word-array" + , word-array = callPlutus "word-array" }) in H.HorizonExport.MakeOverlay diff --git a/horizon.lock b/horizon.lock index 7dc1bcd456a7766b3e2bf0f24e1cddaf7cc6681f..dd48403aefd8e73627ea74a5a105f2429afcb32e 100644 --- a/horizon.lock +++ b/horizon.lock @@ -24,15 +24,15 @@ } , { mapKey = "byron-spec-chain" , mapValue = - "08ec7c6af4443a1270d0591d5d79016fd242aa9c8a5169035228a5781bc60ffc" + "3314b607158de9a45deadcf1f5eeaf9df26012dc51b7d39ddb9b1531572bf4f5" } , { mapKey = "byron-spec-ledger" , mapValue = - "23e531c3aa1ccb8a46d16f1b90f14e646a76ca1840712173637ffbc75e7fbd18" + "27dfdc24c602205c31c5b54c732c6c17713d8e811bdf63726627a506a4ea6b22" } , { mapKey = "cardano-api" , mapValue = - "6d1d5e01b1af30db1d770a67792af511ddb8a6066161dd43f4d238d580266398" + "149981e2ed26c71169a03e25a47f3bbda4d810633107653b554b34bb2a66be09" } , { mapKey = "cardano-binary" , mapValue = @@ -44,7 +44,7 @@ } , { mapKey = "cardano-cli" , mapValue = - "7ba6e8bdb16741f512ff99f6e2a2059f576559cb316c9eede87f9f3047714593" + "8f1ea2232a33b06f1b9b4c22dca73a270ce2834057892fd783c56933504e6446" } , { mapKey = "cardano-crypto" , mapValue = @@ -60,7 +60,7 @@ } , { mapKey = "cardano-crypto-test" , mapValue = - "c43c0981597342653006c4ebf00d00e56f5b49998ce7a415fc9825488f6bddcd" + "55ea608c9b3c328d5a67138405c61e8d831536e088a00ac84fdb583a2752c660" } , { mapKey = "cardano-crypto-tests" , mapValue = @@ -68,91 +68,91 @@ } , { mapKey = "cardano-crypto-wrapper" , mapValue = - "7d7b62e271eb61631af26a65262c3aeacd9a67003410347a23175d3d8a1803c8" + "0f6d72d0843e97797958d691fbbf730f08f40d0849f4b66cdb01a4b44233402f" } , { mapKey = "cardano-data" , mapValue = - "22b68e9704229c19d3ff3691ccb7512c2b0c5c961fc7308be06bc35ccd5a6536" + "ef0697942d50cfee78612797ca4809a3e2f3d77667cacd00e381e4bd31967041" } , { mapKey = "cardano-git-rev" , mapValue = - "bfbe5bc27aed8a87fb719825b781125f44b1b054fccfffd64e3e1620985cfeb3" + "8e8c6f70f0b4ea555ef4fdcb9bf4a4d91581ae28be68a4e05132a343b012114e" } , { mapKey = "cardano-ledger-allegra" , mapValue = - "7894658aa94cdbc33883665c15a7124fc17eff31c284b5087bf01abcabf50d2c" + "e847f6a7bdf6dc95dfc8de1f3b7f73f9ec60b3d6157ad002ea3ed81feb1ec408" } , { mapKey = "cardano-ledger-alonzo" , mapValue = - "45e1ae6b3cc8e5f4ed9de9c373f55d9d3bcb522c0b6b2816eb7f928827e72dcf" + "3badc3bf2cd06bea9998302266cc4d8f51323752a2516168082af2aa927d4ffe" } , { mapKey = "cardano-ledger-alonzo-test" , mapValue = - "89b24e4375f860a8ee5f8ec2dfb810eee83f31a590725e2250f43edffd4b53d3" + "80ff4748a83a945f88d8b40d34c2eaaa1bdb1e7807f34cba5179053d46451a61" } , { mapKey = "cardano-ledger-api" , mapValue = - "94e05d39a610e8788f0a1ce8bfd63176bf97b07f21f68fe385953f59ac98cc00" + "8bf7036dd18ee5392e2d5cc38b26586ad13d656b3ff9bdaab893665270d64e01" } , { mapKey = "cardano-ledger-babbage" , mapValue = - "56ad2f43eac6543d0ab14c369b3c785bb6aeaf67d04331073bedf32c9ae94e80" + "26316c3618fbfa8cf13a4c362d2fb39212b6dabb8dd4bb30942c1a71ff3366e5" } , { mapKey = "cardano-ledger-babbage-test" , mapValue = - "3177919cb096b957dd966f19a7a7d1f1f104ea527563ae819c82f13827ab514b" + "868cdb9ddceadb704f2c4ca78106c206d697431c340e3ca4e77f65890c6b393e" } , { mapKey = "cardano-ledger-binary" , mapValue = - "a5be9934f031fd0b8e83156c30bd0104475a9e2a5992643e46a1b62871889f1d" + "f1ddf643d6d25525d55eff1e07a308946945f3e5127951c91f75ac345f95e55f" } , { mapKey = "cardano-ledger-byron" , mapValue = - "cbe1c8c2d9ec717866460db3e3df98d5fa1ccafe69509c1d5d27d2599a2c050a" + "21693e787bb28c88932c6324df11fbc0b1f9579eddc4e4b3c8dfa7b5c8a7483e" } , { mapKey = "cardano-ledger-byron-test" , mapValue = - "acab2de15e944ad434c18144009cb658930c59d838ea2064839df5975fc4fc4f" + "f4c9046055426f346b6eaaeb251889e3cb99a6b83d468bd2f10c8ca0256f1700" } , { mapKey = "cardano-ledger-conway" , mapValue = - "f7155e63efe762965ab7b3f2fdd6356296b3a53b9f7371df60dee42d8a6190d7" + "9ca7abb7e003d79e5a323e386d99976203b1752b63c045fbc48adabb8cd96bdb" } , { mapKey = "cardano-ledger-conway-test" , mapValue = - "3ea8e4cc08a369ecb479abece652d6eb1954c6407dd4e779bbfbb2dbb691ad3b" + "d2c8e5b594cc550342a6390bd88355954e35a794f76ff7b9d36aa76e63949c80" } , { mapKey = "cardano-ledger-core" , mapValue = - "9a5573c9074a03c7dd965e6f544816b5d4266c6d310b41431b7158ae2e6f346c" + "00c812d0217f2e15adfe63f987dae4f2b760baf571cd2157bc2ddd4e3afcd133" } , { mapKey = "cardano-ledger-mary" , mapValue = - "8c8375c32b610c9b26debe0ac1a44eb8c2b351589a8a5f7ef01fa3cc86126671" + "1cf6d80ac1585ef5ab8034789c3d6bd0ac7e7c336e538c1ea6e76ec11a1e6a94" } , { mapKey = "cardano-ledger-pretty" , mapValue = - "dff81c1b8d83c26885e67cdfe1d676007064239741d63da25028441642f7d7ed" + "8ea7e20da57fad8396332462f2e182139e10ed8e5a447a1709973bcc22a649ba" } , { mapKey = "cardano-ledger-shelley" , mapValue = - "6eec8c526d28edae88fdd8f1acc3638988b1470c504219be656f6d47c8236064" + "dfadd8b8831ad09195c75a0cdeb6e21131e393936c7b3fd54f7686ddc43bc318" } , { mapKey = "cardano-ledger-shelley-ma" , mapValue = - "7dacabaa41f6baa5206aaccefc5e3797b7e32fdff10eadfd48ea9e8684e7ed4e" + "845bc018c31cbdf41785a35f9fc38e4360650227720c594b207b5848706ee35b" } , { mapKey = "cardano-ledger-shelley-ma-test" , mapValue = - "51d63898b02f1a8d9b96b700a8deee810aefed329bba60fa7c2971407b3cc38b" + "03bb14ab328d051e0818729e403df1cf1db46ec50828050af3ae490fe51967d3" } , { mapKey = "cardano-ledger-shelley-test" , mapValue = - "c636a6b54a159b151e841efe8c81161277299dcc5750dccae11bcaf6a6b6921d" + "857fbdfb92e3fbdff1d7c41549246effce51dd276bb29570552f5051e944fc8e" } , { mapKey = "cardano-ledger-test" , mapValue = - "abb536144920796b2e9b4a8eceb488e9759f7314838457d2a836c5ffb56ea035" + "ed67d0e14dee55a2038153d1cccadca8c0663a20f4ec04b3b08b8ba199040e75" } , { mapKey = "cardano-mempool" , mapValue = @@ -160,7 +160,7 @@ } , { mapKey = "cardano-node" , mapValue = - "9ab11c402d766cb6b11c261a62144b79858ed17c52412c846ff5886ba36ebbfd" + "59ff88f9717c123be2d8cc7b46996af1805365f8d3815690ef88bee9d3063546" } , { mapKey = "cardano-ping" , mapValue = @@ -176,11 +176,11 @@ } , { mapKey = "cardano-protocol-tpraos" , mapValue = - "b6c12d22b490665bb7bb59a2fd5a01e4693f0f39856d8ef42b76dd26635b128e" + "a452cb5d6baa8193ff66c702712b067622c4085526298d7e10237a603c12860b" } , { mapKey = "cardano-slotting" , mapValue = - "347ebe4a75c9be58ca14a84c42ad8f24591f7e96a5c7aa7fb64ecbe46fb363be" + "d58010cbfc96c4a52a288a8c0634ce0772f58c11baa95ee35e292876cae3660a" } , { mapKey = "cardano-strict-containers" , mapValue = @@ -316,7 +316,7 @@ } , { mapKey = "non-integral" , mapValue = - "8710de33d6fb3159faafcf6497e23d6b0a07be53e86c2f5360bdb7e26f88872c" + "d99c557bc35081781de5946f978b83c52c859a7cd6f8d2e70c4e075f35c987e5" } , { mapKey = "nothunks" , mapValue = @@ -372,27 +372,27 @@ } , { mapKey = "plutus-core" , mapValue = - "91753b020af70ae3215ad6fc1254031b2162d46f23537e64849ffa360f5c8a41" + "109540a3c9f0545ea3caf36db7692ca6458f05caeb2c4393747603e6f8a15e3d" } , { mapKey = "plutus-ledger-api" , mapValue = - "4cd693b76a5924dc1c6b4261a396f02b62f1edc510355b61fdca029d192ca93a" + "c5edf17782d506d329ea4909fe9c2b9ff03544a1f547778b2aaacb996cf1f28c" } , { mapKey = "plutus-preprocessor" , mapValue = - "3a4c4d5e3288ceca077c6f905965c2771719772986173a3917b42dcf293d7547" + "5dd24ff518abf85ccc2d24d4f8bb7ff9282c5f16444d6ab886f327127853e608" } , { mapKey = "plutus-tx" , mapValue = - "860395aa08e1fe2a022ead0fdf3415c1cb48d0b5089434dd1ac822b8f4f78b40" + "d5bfaa27cf83fc8e92b3191526448fb60f9c781056ca64c3ffc724aece72b19d" } , { mapKey = "plutus-tx-plugin" , mapValue = - "7f66a77037922d7119d5702bb77e59f086eb15a023e104e3ef79d70c8bf137d2" + "29af08ca2569081ef4dec2865aa8880906483c32b885526236ffcff3168366c3" } , { mapKey = "prettyprinter-configurable" , mapValue = - "5ac991c78422b3114f354fb0bcf9abe50050cc920cb1ddf6dc899949c9f29983" + "3e49a0f1390264ee03c2ccc3865b4b7a56e9a420a9033172fe9fdc0c68096d48" } , { mapKey = "pvar" , mapValue = @@ -408,7 +408,7 @@ } , { mapKey = "set-algebra" , mapValue = - "cc41316007b6048111cf7904f97a5f9c4b748ad91464e4d0cf868448aa1e0300" + "4d4302caa1bd8c7697256de0ac1e97d3d73aee08d6670207bff36aa4719298a5" } , { mapKey = "si-timers" , mapValue = @@ -416,11 +416,11 @@ } , { mapKey = "small-steps" , mapValue = - "7ce39e32c9bf75c160b12e3991b283db1d0389ee42f57eb5327aff1c320458ff" + "1150725307a90237f01349366fd368d207000681e0feea49198e75e9aa09dfa3" } , { mapKey = "small-steps-test" , mapValue = - "360f9554ab5676f1db66cf066e4a60cbd66c6ba43b9c78364d3da3b1b396c6cb" + "8f366326fb5db90ab2bfeeec61a729f685e399a6b3805ed9a579cd9984a8a83f" } , { mapKey = "strict-containers" , mapValue = @@ -436,15 +436,15 @@ } , { mapKey = "trace-dispatcher" , mapValue = - "3a41d9de7401dff392fcec316c8107207650514b2f584859961dc020be76ea8a" + "3458379da361fb3c178a947a2e7ce987905b36c8e3979f0b572bd1d00f35137c" } , { mapKey = "trace-forward" , mapValue = - "b8c2ade2e2217339e0701973200a0b579bf3d3e702ca0bff6f473139cf7481dd" + "3c617c1546f77b48065dc825554e61dfaa8844f2fe20637b834e51fa44365136" } , { mapKey = "trace-resources" , mapValue = - "a496aa4f3d7b9a8169fc9e5743509c016b0d184d754fefeff664cdcbb4cd390f" + "70eddf6b1d618012e013d147b91285a9ae691738d73c7c8b14b3c9e58074fb23" } , { mapKey = "tracer-transformers" , mapValue = @@ -468,7 +468,7 @@ } , { mapKey = "vector-map" , mapValue = - "2a7f879961d86ec6881653391cabfa726dc2c6b9b2c2c725055c2ec8021d31bb" + "efb9f5338a7df0fd8c4c28ba090d11510435349f3c997b323aa563d210de0173" } , { mapKey = "websockets-snap" , mapValue = @@ -478,4 +478,8 @@ , mapValue = "3043d774587e2579934901189f8cd202948c1f79a24045925baec457ac6dc42b" } +, { mapKey = "word-array" + , mapValue = + "7b1471286997d64148746fdbc1a039098c51daa1fa9cb75b41540ec09a7cb091" + } ] \ No newline at end of file diff --git a/overlay.nix b/overlay.nix index d8fc4ff789443fe81a64df96fac3d0ec0b6847cd..75d935a85a1fb4e8febe7f5774fb04311b47f7e3 100644 --- a/overlay.nix +++ b/overlay.nix @@ -241,4 +241,6 @@ final: prev: with pkgs.haskell.lib; { wl-pprint-text = final.callPackage (./pkgs/wl-pprint-text.nix) { }; + word-array = final.callPackage (./pkgs/word-array.nix) { }; + } diff --git a/pkgs/byron-spec-chain.nix b/pkgs/byron-spec-chain.nix index a8ddd2c2d9747b8888299622a73d6782a4a86825..619faa3c2a5bf666d45579be575152b947e3523a 100644 --- a/pkgs/byron-spec-chain.nix +++ b/pkgs/byron-spec-chain.nix @@ -8,8 +8,8 @@ mkDerivation { version = "1.0.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/byron/chain/executable-spec/; echo source root reset to $sourceRoot"; diff --git a/pkgs/byron-spec-ledger.nix b/pkgs/byron-spec-ledger.nix index 2505576423ee6217d0de7c00d5365fb0331bc683..f5da093f848561e271fcfeef9d15b9e597209f5d 100644 --- a/pkgs/byron-spec-ledger.nix +++ b/pkgs/byron-spec-ledger.nix @@ -9,8 +9,8 @@ mkDerivation { version = "1.0.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/byron/ledger/executable-spec/; echo source root reset to $sourceRoot"; diff --git a/pkgs/cardano-api.nix b/pkgs/cardano-api.nix index ad548b5c628089323a270e7970a3af73a3c9a06e..4c29bfa0464e79ef25d9ec1cd7d8e85e61ae915d 100644 --- a/pkgs/cardano-api.nix +++ b/pkgs/cardano-api.nix @@ -28,8 +28,8 @@ mkDerivation { version = "8.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-node"; - sha256 = "0wkbz2yxwaaxx6w5j2snbp8gg8imjjipw8zka3lcnrp3jx9gx1ha"; - rev = "b7d70f3a54921669519e1de1ec6ed381d01b28fb"; + sha256 = "1gzhzjdjvf4qinrkw32gglbsd7gwi7r3q4972z1z3vpbg70ky7z7"; + rev = "d6228270e9b6811ca1d00ca9ce9d0254e63c2d6c"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/cardano-api/; echo source root reset to $sourceRoot"; diff --git a/pkgs/cardano-cli.nix b/pkgs/cardano-cli.nix index cf30df76a3a64dafefa727df3c69cbd8d32736ba..dd6a618bd51328c7e8f51a18334af511e99fc48f 100644 --- a/pkgs/cardano-cli.nix +++ b/pkgs/cardano-cli.nix @@ -22,8 +22,8 @@ mkDerivation { version = "8.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-node"; - sha256 = "0wkbz2yxwaaxx6w5j2snbp8gg8imjjipw8zka3lcnrp3jx9gx1ha"; - rev = "b7d70f3a54921669519e1de1ec6ed381d01b28fb"; + sha256 = "1gzhzjdjvf4qinrkw32gglbsd7gwi7r3q4972z1z3vpbg70ky7z7"; + rev = "d6228270e9b6811ca1d00ca9ce9d0254e63c2d6c"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/cardano-cli/; echo source root reset to $sourceRoot"; diff --git a/pkgs/cardano-crypto-test.nix b/pkgs/cardano-crypto-test.nix index 8e5315489fa34722622933582f72cabdc0f76745..0c4db25152327760b0aa4b94a9e260c61f4828f5 100644 --- a/pkgs/cardano-crypto-test.nix +++ b/pkgs/cardano-crypto-test.nix @@ -7,8 +7,8 @@ mkDerivation { version = "1.5.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/byron/crypto/test/; echo source root reset to $sourceRoot"; diff --git a/pkgs/cardano-crypto-wrapper.nix b/pkgs/cardano-crypto-wrapper.nix index 91898725f1f0d082bbe15d9556bad0b2d81ffd1f..28c1f836b7c07394fc2fcdb9576ba6c0cd95c088 100644 --- a/pkgs/cardano-crypto-wrapper.nix +++ b/pkgs/cardano-crypto-wrapper.nix @@ -10,8 +10,8 @@ mkDerivation { version = "1.5.1.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/byron/crypto/; echo source root reset to $sourceRoot"; diff --git a/pkgs/cardano-data.nix b/pkgs/cardano-data.nix index 23b98045c4417516e099d9a5fb57cae2492549f1..a3562d3f50b160ade9e0550dbdd85a7f0cc5573d 100644 --- a/pkgs/cardano-data.nix +++ b/pkgs/cardano-data.nix @@ -7,8 +7,8 @@ mkDerivation { version = "1.0.1.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/libs/cardano-data/; echo source root reset to $sourceRoot"; diff --git a/pkgs/cardano-git-rev.nix b/pkgs/cardano-git-rev.nix index 55275deaee9e9e5b4430d339e54e9215d6e23035..c656111ce20fa34e24a8c7d105ee9ecb1756c022 100644 --- a/pkgs/cardano-git-rev.nix +++ b/pkgs/cardano-git-rev.nix @@ -6,8 +6,8 @@ mkDerivation { version = "0.1.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-node"; - sha256 = "0wkbz2yxwaaxx6w5j2snbp8gg8imjjipw8zka3lcnrp3jx9gx1ha"; - rev = "b7d70f3a54921669519e1de1ec6ed381d01b28fb"; + sha256 = "1gzhzjdjvf4qinrkw32gglbsd7gwi7r3q4972z1z3vpbg70ky7z7"; + rev = "d6228270e9b6811ca1d00ca9ce9d0254e63c2d6c"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/cardano-git-rev/; echo source root reset to $sourceRoot"; diff --git a/pkgs/cardano-ledger-allegra.nix b/pkgs/cardano-ledger-allegra.nix index ac9bd3c05fdeb31b48c1ee11fe5eb5a1ecabaed2..ba70fee8b7a6d5a479b0f8a09c0e39a58cfa058a 100644 --- a/pkgs/cardano-ledger-allegra.nix +++ b/pkgs/cardano-ledger-allegra.nix @@ -10,8 +10,8 @@ mkDerivation { version = "1.1.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/allegra/impl/; echo source root reset to $sourceRoot"; diff --git a/pkgs/cardano-ledger-alonzo-test.nix b/pkgs/cardano-ledger-alonzo-test.nix index 8a04938a96b4423c30606fe6cf22ef0747c0a4b8..78932eb333ba245076337ab73f8bbe71d7ca7862 100644 --- a/pkgs/cardano-ledger-alonzo-test.nix +++ b/pkgs/cardano-ledger-alonzo-test.nix @@ -14,8 +14,8 @@ mkDerivation { version = "1.1.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/alonzo/test-suite/; echo source root reset to $sourceRoot"; diff --git a/pkgs/cardano-ledger-alonzo.nix b/pkgs/cardano-ledger-alonzo.nix index f736407389ce16af284eaa08bf7a697a44663834..3dc07e9be7311a2018a911bc3ea92c3bff02226d 100644 --- a/pkgs/cardano-ledger-alonzo.nix +++ b/pkgs/cardano-ledger-alonzo.nix @@ -11,11 +11,11 @@ }: mkDerivation { pname = "cardano-ledger-alonzo"; - version = "1.1.0.0"; + version = "1.1.1.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/alonzo/impl/; echo source root reset to $sourceRoot"; diff --git a/pkgs/cardano-ledger-api.nix b/pkgs/cardano-ledger-api.nix index 11630e67170cefce555e09322eeed95ea9d9a558..8dc36305f748f37e5c92ddca65e89de9ed31efbb 100644 --- a/pkgs/cardano-ledger-api.nix +++ b/pkgs/cardano-ledger-api.nix @@ -10,8 +10,8 @@ mkDerivation { version = "1.1.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/libs/cardano-ledger-api/; echo source root reset to $sourceRoot"; diff --git a/pkgs/cardano-ledger-babbage-test.nix b/pkgs/cardano-ledger-babbage-test.nix index 1c09cda22805391c5385560d3ff2f2b5b0cee255..cb896179cb78ffc8bfcf2f6f78ce4c21e79a0223 100644 --- a/pkgs/cardano-ledger-babbage-test.nix +++ b/pkgs/cardano-ledger-babbage-test.nix @@ -13,8 +13,8 @@ mkDerivation { version = "1.1.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/babbage/test-suite/; echo source root reset to $sourceRoot"; diff --git a/pkgs/cardano-ledger-babbage.nix b/pkgs/cardano-ledger-babbage.nix index 4dd84a294cd71e13168f0495f0fb746ea1fae8e2..d153e4312655e26a84f19f9faad0fbb367165d3e 100644 --- a/pkgs/cardano-ledger-babbage.nix +++ b/pkgs/cardano-ledger-babbage.nix @@ -8,11 +8,11 @@ }: mkDerivation { pname = "cardano-ledger-babbage"; - version = "1.1.0.0"; + version = "1.1.0.1"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/babbage/impl/; echo source root reset to $sourceRoot"; diff --git a/pkgs/cardano-ledger-binary.nix b/pkgs/cardano-ledger-binary.nix index 813332f5458f884b693c07c0b3c6f9e675149287..e8bb8d5fdeb5a370dc15e327dce885cc2b282465 100644 --- a/pkgs/cardano-ledger-binary.nix +++ b/pkgs/cardano-ledger-binary.nix @@ -11,11 +11,11 @@ }: mkDerivation { pname = "cardano-ledger-binary"; - version = "1.1.0.0"; + version = "1.1.0.1"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/libs/cardano-ledger-binary/; echo source root reset to $sourceRoot"; diff --git a/pkgs/cardano-ledger-byron-test.nix b/pkgs/cardano-ledger-byron-test.nix index b6688bd0099584bb8c73ba74d587f99c0e51b01f..61aed192f052ee2a819c2de5d1dc6ef6da7a506a 100644 --- a/pkgs/cardano-ledger-byron-test.nix +++ b/pkgs/cardano-ledger-byron-test.nix @@ -12,8 +12,8 @@ mkDerivation { version = "1.5.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/byron/ledger/impl/test/; echo source root reset to $sourceRoot"; diff --git a/pkgs/cardano-ledger-byron.nix b/pkgs/cardano-ledger-byron.nix index 3c0c5afe128eab8298b44b6da8b3693ccd884b86..081cff3c901f69eca0099632b425ad38df79a5a1 100644 --- a/pkgs/cardano-ledger-byron.nix +++ b/pkgs/cardano-ledger-byron.nix @@ -14,8 +14,8 @@ mkDerivation { version = "1.0.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/byron/ledger/impl/; echo source root reset to $sourceRoot"; diff --git a/pkgs/cardano-ledger-conway-test.nix b/pkgs/cardano-ledger-conway-test.nix index 3c8f2a6bbcd28fd9a0bb132600a93b5a10fe5855..82b8f6680370da838b14a8f2b1995bb46fb47b2b 100644 --- a/pkgs/cardano-ledger-conway-test.nix +++ b/pkgs/cardano-ledger-conway-test.nix @@ -12,8 +12,8 @@ mkDerivation { version = "1.1.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/conway/test-suite/; echo source root reset to $sourceRoot"; diff --git a/pkgs/cardano-ledger-conway.nix b/pkgs/cardano-ledger-conway.nix index 0482ada99b17deaa4f29150727d76d557b01a7ea..181d55eef8d5d8c6eba84918c993626867480d68 100644 --- a/pkgs/cardano-ledger-conway.nix +++ b/pkgs/cardano-ledger-conway.nix @@ -11,8 +11,8 @@ mkDerivation { version = "1.1.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/conway/impl/; echo source root reset to $sourceRoot"; diff --git a/pkgs/cardano-ledger-core.nix b/pkgs/cardano-ledger-core.nix index f060646ec4783e0f6812453e9bdebe5edcfc8225..0e8e2baafe08b829598f41af7dcafab3551b5da6 100644 --- a/pkgs/cardano-ledger-core.nix +++ b/pkgs/cardano-ledger-core.nix @@ -13,11 +13,11 @@ }: mkDerivation { pname = "cardano-ledger-core"; - version = "1.1.0.0"; + version = "1.1.0.1"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/libs/cardano-ledger-core/; echo source root reset to $sourceRoot"; diff --git a/pkgs/cardano-ledger-mary.nix b/pkgs/cardano-ledger-mary.nix index b1f88ce31c1fe3cef1df683f9c3aaf7aa1c38796..8deebc0add54b8c471ca1c8b49ef45851020087d 100644 --- a/pkgs/cardano-ledger-mary.nix +++ b/pkgs/cardano-ledger-mary.nix @@ -10,8 +10,8 @@ mkDerivation { version = "1.1.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/mary/impl/; echo source root reset to $sourceRoot"; diff --git a/pkgs/cardano-ledger-pretty.nix b/pkgs/cardano-ledger-pretty.nix index eefd6b0152fe562dc778ca92be1432bcb17b27de..84cb7b395ce5cf52920b2f369e10c1147445cbda 100644 --- a/pkgs/cardano-ledger-pretty.nix +++ b/pkgs/cardano-ledger-pretty.nix @@ -12,8 +12,8 @@ mkDerivation { version = "1.1.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/libs/cardano-ledger-pretty/; echo source root reset to $sourceRoot"; diff --git a/pkgs/cardano-ledger-shelley-ma-test.nix b/pkgs/cardano-ledger-shelley-ma-test.nix index 95ea227bbf36d8fb7102c992e70be88e3b26feab..2bdaf01bf2008207f19d104b18e91e5d09da4556 100644 --- a/pkgs/cardano-ledger-shelley-ma-test.nix +++ b/pkgs/cardano-ledger-shelley-ma-test.nix @@ -13,8 +13,8 @@ mkDerivation { version = "1.1.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/shelley-ma/test-suite/; echo source root reset to $sourceRoot"; diff --git a/pkgs/cardano-ledger-shelley-ma.nix b/pkgs/cardano-ledger-shelley-ma.nix index 01a04c93f5db08ea7b457eb90803abf776bc9343..6d53be741659cd6d63b5703b395f9b0f2cb8b66f 100644 --- a/pkgs/cardano-ledger-shelley-ma.nix +++ b/pkgs/cardano-ledger-shelley-ma.nix @@ -6,8 +6,8 @@ mkDerivation { version = "1.1.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/shelley-ma/impl/; echo source root reset to $sourceRoot"; diff --git a/pkgs/cardano-ledger-shelley-test.nix b/pkgs/cardano-ledger-shelley-test.nix index a8106a494f7e6b0fefec06bffd943b85bb185fd3..adf49285cbcd4227c8a69e24bf15e0a09641595d 100644 --- a/pkgs/cardano-ledger-shelley-test.nix +++ b/pkgs/cardano-ledger-shelley-test.nix @@ -18,8 +18,8 @@ mkDerivation { version = "1.1.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/shelley/test-suite/; echo source root reset to $sourceRoot"; diff --git a/pkgs/cardano-ledger-shelley.nix b/pkgs/cardano-ledger-shelley.nix index b3125b418ff1d9f671d9d4e810f5e5a3ae0b3c44..34f47d090c0e3663cab36ee76c184c1641b6b254 100644 --- a/pkgs/cardano-ledger-shelley.nix +++ b/pkgs/cardano-ledger-shelley.nix @@ -9,11 +9,11 @@ }: mkDerivation { pname = "cardano-ledger-shelley"; - version = "1.1.1.0"; + version = "1.1.1.1"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/eras/shelley/impl/; echo source root reset to $sourceRoot"; diff --git a/pkgs/cardano-ledger-test.nix b/pkgs/cardano-ledger-test.nix index 20826ff3a3498cc634b2155167946d6c26bb2e60..b4b52c949c7b21811228fcb276feb3741f01ba21 100644 --- a/pkgs/cardano-ledger-test.nix +++ b/pkgs/cardano-ledger-test.nix @@ -19,8 +19,8 @@ mkDerivation { version = "1.1.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/libs/cardano-ledger-test/; echo source root reset to $sourceRoot"; diff --git a/pkgs/cardano-node.nix b/pkgs/cardano-node.nix index 798ac80c17f163ed47bf1c85e5448e9832a0d339..b4a535c7b0918be5f954d75b0f00ecfa2f7dfa27 100644 --- a/pkgs/cardano-node.nix +++ b/pkgs/cardano-node.nix @@ -26,8 +26,8 @@ mkDerivation { version = "8.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-node"; - sha256 = "0wkbz2yxwaaxx6w5j2snbp8gg8imjjipw8zka3lcnrp3jx9gx1ha"; - rev = "b7d70f3a54921669519e1de1ec6ed381d01b28fb"; + sha256 = "1gzhzjdjvf4qinrkw32gglbsd7gwi7r3q4972z1z3vpbg70ky7z7"; + rev = "d6228270e9b6811ca1d00ca9ce9d0254e63c2d6c"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/cardano-node/; echo source root reset to $sourceRoot"; diff --git a/pkgs/cardano-protocol-tpraos.nix b/pkgs/cardano-protocol-tpraos.nix index 8742ece54b31f3f61c7a1ed9ed5b119f49d6afee..320abd75bae78af37424412ac3d899a0b4f9b459 100644 --- a/pkgs/cardano-protocol-tpraos.nix +++ b/pkgs/cardano-protocol-tpraos.nix @@ -12,8 +12,8 @@ mkDerivation { version = "1.0.1.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/libs/cardano-protocol-tpraos/; echo source root reset to $sourceRoot"; diff --git a/pkgs/cardano-slotting.nix b/pkgs/cardano-slotting.nix index 41e3177d4194fcfea953ca666157c1f57499346e..9de8828de38652b4a77b928e5c52f2c25bd00764 100644 --- a/pkgs/cardano-slotting.nix +++ b/pkgs/cardano-slotting.nix @@ -1,16 +1,13 @@ -{ mkDerivation, aeson, base, cardano-binary, deepseq, fetchgit, lib +{ mkDerivation, aeson, base, cardano-binary, deepseq, fetchzip, lib , mmorph, nothunks, quiet, serialise, tasty, tasty-quickcheck, time }: mkDerivation { pname = "cardano-slotting"; - version = "0.1.1.0"; - src = fetchgit { - url = "https://github.com/locallycompact/cardano-base"; - sha256 = "0n3w1k30ivdppyidyws9riy1qyx4881gxw8v1v34sixbraj0ng5k"; - rev = "f954aec4fbe11ba96729ddcc5e22c13ab6320b5d"; - fetchSubmodules = true; + version = "0.1.1.1"; + src = fetchzip { + url = "https://input-output-hk.github.io/cardano-haskell-packages/package/cardano-slotting-0.1.1.1.tar.gz"; + sha256 = "0ylyx4xka8xm6si99dpyvwzzf5xy76kh569j3n3yci43lkd5ial6"; }; - postUnpack = "sourceRoot+=/cardano-slotting/; echo source root reset to $sourceRoot"; isLibrary = true; isExecutable = false; enableSeparateDataOutput = false; diff --git a/pkgs/non-integral.nix b/pkgs/non-integral.nix index e64bd45816c10d17bc473e5a32d37f540dfa60a0..7d0652c0f8e53eefb9ff1178ad39aaa10950a9fd 100644 --- a/pkgs/non-integral.nix +++ b/pkgs/non-integral.nix @@ -4,8 +4,8 @@ mkDerivation { version = "1.0.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/libs/non-integral/; echo source root reset to $sourceRoot"; diff --git a/pkgs/plutus-core.nix b/pkgs/plutus-core.nix index 71ffb58867c9becd6e507a960f427c5c834ac9d1..d9f1ed0845f893b2f6dae54edfb45815b0af2f23 100644 --- a/pkgs/plutus-core.nix +++ b/pkgs/plutus-core.nix @@ -1,32 +1,30 @@ { mkDerivation, HUnit, QuickCheck, Stream, aeson, algebraic-graphs -, array, barbies, base, base64-bytestring, bifunctors, bimap, brick +, array, barbies, base, base64-bytestring, bifunctors, bimap , bytestring, cardano-crypto, cardano-crypto-class, cassava, cborg , composition-prelude, containers, criterion, criterion-measurement , cryptonite, data-default-class, deepseq, dependent-map -, dependent-sum, 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 +, dependent-sum-template, deriving-aeson, deriving-compat +, directory, dlist, dom-lt, exceptions, extra, fetchgit, filepath +, flat, ghc-prim, hashable, hedgehog, hex-text, int-cast +, lazy-search, lens, lib, megaparsec, mmorph, 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, th-compat +, th-lift, th-lift-instances, th-utilities, time, transformers +, unordered-containers, vector, witherable, word-array }: mkDerivation { pname = "plutus-core"; - version = "1.5.0.0"; + version = "1.1.1.0"; src = fetchgit { url = "https://github.com/input-output-hk/plutus"; - sha256 = "13r06l98ndv9l4ph7mv4pv3djgq8iylp59m8lnm5hyfg59ypayr0"; - rev = "cfccccc8596859bfaa992100b11199301eb6d2bd"; + sha256 = "1xf2jn46rk57mq8kskp2g4ijsi69mi5awsv2jm4qnzvxvgv897da"; + rev = "5efe047b034bdd1f79df6dfa64a3c5d205ffa8f8"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/plutus-core/; echo source root reset to $sourceRoot"; @@ -37,35 +35,33 @@ mkDerivation { 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 - 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 + data-default-class deepseq dependent-map dependent-sum-template + deriving-aeson deriving-compat dlist dom-lt exceptions extra + filepath flat ghc-prim hashable hedgehog int-cast lazy-search lens + megaparsec mmorph monoidal-containers mtl multiset nonempty-vector + nothunks 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 + 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 + 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 bytestring cardano-crypto-class cassava containers + criterion criterion-measurement deepseq directory filepath flat + hedgehog lens megaparsec monoidal-containers mtl + optparse-applicative prettyprinter QuickCheck quickcheck-instances + random split text time transformers vector ]; testHaskellDepends = [ aeson base bytestring cardano-crypto-class cassava containers - data-default-class dlist filepath flat hashable hedgehog hex-text - HUnit lens mmorph mtl nonempty-vector pretty-show prettyprinter + data-default-class filepath flat hedgehog hex-text HUnit lens + megaparsec 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 + th-lift-instances th-utilities vector ]; benchmarkHaskellDepends = [ base criterion nonempty-vector ral random diff --git a/pkgs/plutus-ledger-api.nix b/pkgs/plutus-ledger-api.nix index 920522d5cfe485aebfd614d8bd8a5dcae17a61e2..fa1e55868e2023e3ceabd01cc77019da429f95e9 100644 --- a/pkgs/plutus-ledger-api.nix +++ b/pkgs/plutus-ledger-api.nix @@ -1,4 +1,4 @@ -{ mkDerivation, PyF, async, base, base16-bytestring +{ 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 @@ -6,11 +6,11 @@ }: mkDerivation { pname = "plutus-ledger-api"; - version = "1.5.0.0"; + version = "1.1.1.0"; src = fetchgit { url = "https://github.com/input-output-hk/plutus"; - sha256 = "13r06l98ndv9l4ph7mv4pv3djgq8iylp59m8lnm5hyfg59ypayr0"; - rev = "cfccccc8596859bfaa992100b11199301eb6d2bd"; + sha256 = "1xf2jn46rk57mq8kskp2g4ijsi69mi5awsv2jm4qnzvxvgv897da"; + rev = "5efe047b034bdd1f79df6dfa64a3c5d205ffa8f8"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/plutus-ledger-api/; echo source root reset to $sourceRoot"; @@ -27,8 +27,8 @@ mkDerivation { tasty-hunit ]; testHaskellDepends = [ - base bytestring containers extra hedgehog 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 tasty tasty-hedgehog tasty-hunit tasty-quickcheck text ]; enableLibraryProfiling = false; enableExecutableProfiling = false; diff --git a/pkgs/plutus-preprocessor.nix b/pkgs/plutus-preprocessor.nix index 7dc66c24fdfd01415d9e7a3ce6bc9941746c5bc7..8ca6e9de02ad9eb27cc31af0ed227ba8679b82b4 100644 --- a/pkgs/plutus-preprocessor.nix +++ b/pkgs/plutus-preprocessor.nix @@ -8,8 +8,8 @@ mkDerivation { version = "0.1.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/libs/plutus-preprocessor/; echo source root reset to $sourceRoot"; diff --git a/pkgs/plutus-tx-plugin.nix b/pkgs/plutus-tx-plugin.nix index 196c7204da533571102caf850782d7b36dea68d0..1e915b88833ee2c31cf3978d8a77823ef90da26e 100644 --- a/pkgs/plutus-tx-plugin.nix +++ b/pkgs/plutus-tx-plugin.nix @@ -6,11 +6,11 @@ }: mkDerivation { pname = "plutus-tx-plugin"; - version = "1.5.0.0"; + version = "1.1.1.0"; src = fetchgit { url = "https://github.com/input-output-hk/plutus"; - sha256 = "13r06l98ndv9l4ph7mv4pv3djgq8iylp59m8lnm5hyfg59ypayr0"; - rev = "cfccccc8596859bfaa992100b11199301eb6d2bd"; + sha256 = "1xf2jn46rk57mq8kskp2g4ijsi69mi5awsv2jm4qnzvxvgv897da"; + rev = "5efe047b034bdd1f79df6dfa64a3c5d205ffa8f8"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/plutus-tx-plugin/; echo source root reset to $sourceRoot"; diff --git a/pkgs/plutus-tx.nix b/pkgs/plutus-tx.nix index 4ccbfb81d1e9cf59a87e4fb3b84d5d48b041b5d9..9ac699e44cb3bc76c95b602ab88863df19ef832d 100644 --- a/pkgs/plutus-tx.nix +++ b/pkgs/plutus-tx.nix @@ -7,11 +7,11 @@ }: mkDerivation { pname = "plutus-tx"; - version = "1.5.0.0"; + version = "1.1.1.0"; src = fetchgit { url = "https://github.com/input-output-hk/plutus"; - sha256 = "13r06l98ndv9l4ph7mv4pv3djgq8iylp59m8lnm5hyfg59ypayr0"; - rev = "cfccccc8596859bfaa992100b11199301eb6d2bd"; + sha256 = "1xf2jn46rk57mq8kskp2g4ijsi69mi5awsv2jm4qnzvxvgv897da"; + rev = "5efe047b034bdd1f79df6dfa64a3c5d205ffa8f8"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/plutus-tx/; echo source root reset to $sourceRoot"; @@ -20,9 +20,9 @@ mkDerivation { 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 + filepath flat ghc-prim hashable lens memory mtl plutus-core + prettyprinter serialise tagged tasty template-haskell text + th-abstraction th-compat transformers ]; testHaskellDepends = [ aeson base base16-bytestring bytestring cborg filepath hedgehog diff --git a/pkgs/prettyprinter-configurable.nix b/pkgs/prettyprinter-configurable.nix index e0778a6b4da6f7420ddb9058ae1a5dbb82ded14d..7407a0dcafda636011319c7210fe341c3382a90f 100644 --- a/pkgs/prettyprinter-configurable.nix +++ b/pkgs/prettyprinter-configurable.nix @@ -8,8 +8,8 @@ mkDerivation { version = "1.1.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/plutus"; - sha256 = "13r06l98ndv9l4ph7mv4pv3djgq8iylp59m8lnm5hyfg59ypayr0"; - rev = "cfccccc8596859bfaa992100b11199301eb6d2bd"; + sha256 = "1xf2jn46rk57mq8kskp2g4ijsi69mi5awsv2jm4qnzvxvgv897da"; + rev = "5efe047b034bdd1f79df6dfa64a3c5d205ffa8f8"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/prettyprinter-configurable/; echo source root reset to $sourceRoot"; diff --git a/pkgs/set-algebra.nix b/pkgs/set-algebra.nix index fb95fc61e706de97aab530750ee7c7671e51a832..909ed35203d88326ba3c3b654000618d9c83e9d2 100644 --- a/pkgs/set-algebra.nix +++ b/pkgs/set-algebra.nix @@ -6,8 +6,8 @@ mkDerivation { version = "1.0.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/libs/set-algebra/; echo source root reset to $sourceRoot"; diff --git a/pkgs/small-steps-test.nix b/pkgs/small-steps-test.nix index b33cfe26ebce661feb4676ad2f4feb030723ef6e..5dbcfa3fd3b3e4ee0d1bc59af17cc2099fc02c31 100644 --- a/pkgs/small-steps-test.nix +++ b/pkgs/small-steps-test.nix @@ -9,8 +9,8 @@ mkDerivation { version = "1.0.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/libs/small-steps-test/; echo source root reset to $sourceRoot"; diff --git a/pkgs/small-steps.nix b/pkgs/small-steps.nix index 2f9013a52985bdc5a12357676c467232c9c7aa4f..0cd3dd5b9432975f9286be24df6c3f1315576ce7 100644 --- a/pkgs/small-steps.nix +++ b/pkgs/small-steps.nix @@ -7,8 +7,8 @@ mkDerivation { version = "1.0.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/libs/small-steps/; echo source root reset to $sourceRoot"; diff --git a/pkgs/trace-dispatcher.nix b/pkgs/trace-dispatcher.nix index 4ef6ff9d89b64470dd63d511f4e07b8ff942cca4..10e9bdcc6a48a5ee73b059668ab10f17ca8d87df 100644 --- a/pkgs/trace-dispatcher.nix +++ b/pkgs/trace-dispatcher.nix @@ -12,8 +12,8 @@ mkDerivation { version = "1.29.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-node"; - sha256 = "0wkbz2yxwaaxx6w5j2snbp8gg8imjjipw8zka3lcnrp3jx9gx1ha"; - rev = "b7d70f3a54921669519e1de1ec6ed381d01b28fb"; + sha256 = "1gzhzjdjvf4qinrkw32gglbsd7gwi7r3q4972z1z3vpbg70ky7z7"; + rev = "d6228270e9b6811ca1d00ca9ce9d0254e63c2d6c"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/trace-dispatcher/; echo source root reset to $sourceRoot"; diff --git a/pkgs/trace-forward.nix b/pkgs/trace-forward.nix index daf9aaa4f68610a0c3b1f5e8ed2818b639126a39..6da21d4e539d265c507917c3d3d407bbd3569feb 100644 --- a/pkgs/trace-forward.nix +++ b/pkgs/trace-forward.nix @@ -9,8 +9,8 @@ mkDerivation { version = "0.1.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-node"; - sha256 = "0wkbz2yxwaaxx6w5j2snbp8gg8imjjipw8zka3lcnrp3jx9gx1ha"; - rev = "b7d70f3a54921669519e1de1ec6ed381d01b28fb"; + sha256 = "1gzhzjdjvf4qinrkw32gglbsd7gwi7r3q4972z1z3vpbg70ky7z7"; + rev = "d6228270e9b6811ca1d00ca9ce9d0254e63c2d6c"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/trace-forward/; echo source root reset to $sourceRoot"; diff --git a/pkgs/trace-resources.nix b/pkgs/trace-resources.nix index e26a16411c1e5fe4caa2eb36c4792c65cb5fc711..a946b3f4f04d2853646081dcff874a0c71e28cb9 100644 --- a/pkgs/trace-resources.nix +++ b/pkgs/trace-resources.nix @@ -6,8 +6,8 @@ mkDerivation { version = "0.1.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-node"; - sha256 = "0wkbz2yxwaaxx6w5j2snbp8gg8imjjipw8zka3lcnrp3jx9gx1ha"; - rev = "b7d70f3a54921669519e1de1ec6ed381d01b28fb"; + sha256 = "1gzhzjdjvf4qinrkw32gglbsd7gwi7r3q4972z1z3vpbg70ky7z7"; + rev = "d6228270e9b6811ca1d00ca9ce9d0254e63c2d6c"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/trace-resources/; echo source root reset to $sourceRoot"; diff --git a/pkgs/vector-map.nix b/pkgs/vector-map.nix index cef4adb49d6249742d5708e26a0a291e65895225..29c9dfcf8248abf7dd2a0106da950494c783265d 100644 --- a/pkgs/vector-map.nix +++ b/pkgs/vector-map.nix @@ -8,8 +8,8 @@ mkDerivation { version = "1.0.1.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-ledger"; - sha256 = "0lfd6l3pzlwipvvv1i4v47ha25qmx0vxc1k23g71f17lzakjs4gm"; - rev = "81548171f2cd336714bb0425640a6553c46aa09e"; + sha256 = "015b386n97xlp6d26s9njs5w75wv3i82jh1iywksifqyz2539wg6"; + rev = "62846d6de6464095ab7aae6d7f466c5173460937"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/libs/vector-map/; echo source root reset to $sourceRoot"; diff --git a/pkgs/word-array.nix b/pkgs/word-array.nix index efd643c0496105e15e9436755fa1c59b599211a0..7a04a66392fec1ffe36ee5c726be72b42d82b994 100644 --- a/pkgs/word-array.nix +++ b/pkgs/word-array.nix @@ -1,14 +1,5 @@ -{ 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 { @@ -16,8 +7,8 @@ mkDerivation { version = "1.1.0.0"; src = fetchgit { url = "https://github.com/input-output-hk/plutus"; - sha256 = "0wxydqj949hi1zzybblfwmbj5j05sy51kn3byhpnizspqjjcjb07"; - rev = "b94d0e001c8f7350b5120b20cbc9d9021d377a8a"; + sha256 = "1xf2jn46rk57mq8kskp2g4ijsi69mi5awsv2jm4qnzvxvgv897da"; + rev = "5efe047b034bdd1f79df6dfa64a3c5d205ffa8f8"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/word-array/; echo source root reset to $sourceRoot"; @@ -26,16 +17,11 @@ 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; - enableExecutableProfiling = true; + enableLibraryProfiling = false; + enableExecutableProfiling = false; doHaddock = false; jailbreak = true; doCheck = false; @@ -44,4 +30,4 @@ mkDerivation { homepage = "https://github.com/plutus"; license = lib.licenses.asl20; broken = false; -} +} \ No newline at end of file