From 342ff9182b2bf4cbb26f26789847139e28e1e98a Mon Sep 17 00:00:00 2001 From: Daniel Firth <dan.firth@homotopic.tech> Date: Mon, 17 Apr 2023 18:53:39 +0000 Subject: [PATCH] plutus: 81cd1ada745c12af2c2c28afce1f6b6b28b38fdd -> b94d0e001c8f7350b5120b20cbc9d9021d377a8a --- horizon.dhall | 11 ++-- horizon.lock | 20 +++++--- overlay.nix | 4 ++ pkgs/monoidal-containers.nix | 26 ++++++++++ pkgs/plutus-core.nix | 79 +++++++++++++++-------------- pkgs/plutus-ledger-api.nix | 17 +++---- pkgs/plutus-tx-plugin.nix | 27 +++++----- pkgs/plutus-tx.nix | 14 ++--- pkgs/prettyprinter-configurable.nix | 14 ++--- pkgs/quickcheck-transformer.nix | 21 ++++++++ pkgs/word-array.nix | 12 ++--- 11 files changed, 150 insertions(+), 95 deletions(-) create mode 100644 pkgs/monoidal-containers.nix create mode 100644 pkgs/quickcheck-transformer.nix diff --git a/horizon.dhall b/horizon.dhall index eb5d3fa..aed7896 100644 --- a/horizon.dhall +++ b/horizon.dhall @@ -61,8 +61,8 @@ let callPlutusApps let callPlutus : H.Subdir → H.HaskellPackage.Type = callRepository - "https://github.com/milloni/plutus" - "81cd1ada745c12af2c2c28afce1f6b6b28b38fdd" + "https://github.com/input-output-hk/plutus" + "b94d0e001c8f7350b5120b20cbc9d9021d377a8a" let callTypedProtocols : H.Subdir → H.HaskellPackage.Type @@ -164,6 +164,7 @@ let otherLibraries = , io-sim = callIoSim "io-sim" , iohk-monitoring = callCHaP "iohk-monitoring" "0.1.11.1" , measures = callCardanoBase "measures" + , monoidal-containers = H.callHackage "monoidal-containers" "0.6.4.0" , monoidal-synchronisation = callOuroborosNetwork "monoidal-synchronisation" , moo = @@ -194,10 +195,8 @@ let otherLibraries = callOuroborosNetwork "ouroboros-network-testing" , ouroboros-network = callOuroborosNetwork "ouroboros-network" , prettyprinter-configurable = - H.callGit - "https://github.com/milloni/plutus" - "81cd1ada745c12af2c2c28afce1f6b6b28b38fdd" - (Some "prettyprinter-configurable") + callPlutus "prettyprinter-configurable" + , quickcheck-transformer = H.callHackage "quickcheck-transformer" "0.3.1.2" , set-algebra = callCardanoLedger "libs/set-algebra" , small-steps = callCardanoLedger "libs/small-steps" , small-steps-test = callCardanoLedger "libs/small-steps-test" diff --git a/horizon.lock b/horizon.lock index c7bb4a5..b4aa7d9 100644 --- a/horizon.lock +++ b/horizon.lock @@ -174,6 +174,10 @@ , mapValue = "3a4d2300de3608d700ab1e8c450bb584ece69840af1d7bddf5af370618c6c025" } +, { mapKey = "monoidal-containers" + , mapValue = + "ca96ee44399f848d6d08464a2a20770c8ef668617a884f67343ffb0ca06a1377" + } , { mapKey = "monoidal-synchronisation" , mapValue = "d54718f5a26c98d6abe81df43f0c3b36e3d3f526bbd4ac099c6d66c4d2ca48e2" @@ -228,11 +232,11 @@ } , { mapKey = "plutus-core" , mapValue = - "ea968cf76f6e044d002b5a186598b608e0c0a89715066497f816e9c30125952a" + "e4ec9f825232f7fcf0a7cf5f4e4ebe82b286beb8f68741efd8b9f4c4259c8590" } , { mapKey = "plutus-ledger-api" , mapValue = - "a7d4b2429756f2714e521ee6614e9dea36a1650fb624bb92b34a384350f65047" + "c858b2e368dc5a8361164e3c70e512e7b4869e461538ed0e80c3409416af55e5" } , { mapKey = "plutus-preprocessor" , mapValue = @@ -240,15 +244,19 @@ } , { mapKey = "plutus-tx" , mapValue = - "8255a62028f97dcd241ec55770d114c52cc10d75102d6f8a435b1a197ac234df" + "ca700bc478affcea251ec3d9c263ec79df1ea3292171158ab46d45fe5f67c8e0" } , { mapKey = "plutus-tx-plugin" , mapValue = - "0ce94b1e14c63eac93f2300adbd956bea35e9b19abb4107388ef53029ff23f52" + "276a5412ee51eb2a2a5b5d0d462041eef166df84d36b642df79c756773c9395c" } , { mapKey = "prettyprinter-configurable" , mapValue = - "defef2f748b5e3044cacab26a18b947045a853459d29d7da80c289b7aedf188b" + "3b6415054252cd46f877a56207da8c3f1cac07f1226cbdffc8c5f9a9fdb415ab" + } +, { mapKey = "quickcheck-transformer" + , mapValue = + "b7e5440c22e5219fdc6861114fa5cd178abad7135f0a0d155ead9812cbc9d368" } , { mapKey = "set-algebra" , mapValue = @@ -292,6 +300,6 @@ } , { mapKey = "word-array" , mapValue = - "85c6d54211d08c057c1828022c134659367b42426bbb7ee841917f616488b826" + "7194caf15db2079f9c089054772e5f3355ffd9af32280cb5a476906a7a25f482" } ] \ No newline at end of file diff --git a/overlay.nix b/overlay.nix index 97dac02..5cca1b4 100644 --- a/overlay.nix +++ b/overlay.nix @@ -89,6 +89,8 @@ final: prev: with pkgs.haskell.lib; { measures = final.callPackage (./pkgs/measures.nix) { }; + monoidal-containers = final.callPackage (./pkgs/monoidal-containers.nix) { }; + monoidal-synchronisation = final.callPackage (./pkgs/monoidal-synchronisation.nix) { }; moo = final.callPackage (./pkgs/moo.nix) { }; @@ -127,6 +129,8 @@ final: prev: with pkgs.haskell.lib; { prettyprinter-configurable = final.callPackage (./pkgs/prettyprinter-configurable.nix) { }; + quickcheck-transformer = final.callPackage (./pkgs/quickcheck-transformer.nix) { }; + set-algebra = final.callPackage (./pkgs/set-algebra.nix) { }; small-steps = final.callPackage (./pkgs/small-steps.nix) { }; diff --git a/pkgs/monoidal-containers.nix b/pkgs/monoidal-containers.nix new file mode 100644 index 0000000..202e647 --- /dev/null +++ b/pkgs/monoidal-containers.nix @@ -0,0 +1,26 @@ +{ mkDerivation, aeson, base, containers, deepseq, hashable, lens +, lib, newtype, semialign, these, unordered-containers, witherable +}: +mkDerivation { + pname = "monoidal-containers"; + version = "0.6.4.0"; + sha256 = "03019ebf5533dbebf70d5c60bdac52eb2409a8d057a78044f0dabe9df5234f27"; + isLibrary = true; + isExecutable = false; + enableSeparateDataOutput = false; + libraryHaskellDepends = [ + aeson base containers deepseq hashable lens newtype semialign these + unordered-containers witherable + ]; + enableLibraryProfiling = true; + enableExecutableProfiling = true; + doHaddock = false; + jailbreak = true; + doCheck = false; + doBenchmark = false; + hyperlinkSource = false; + homepage = "http://github.com/bgamari/monoidal-containers"; + description = "Containers with monoidal accumulation"; + license = lib.licenses.bsd3; + broken = false; +} \ No newline at end of file diff --git a/pkgs/plutus-core.nix b/pkgs/plutus-core.nix index 8fef6ec..4952b36 100644 --- a/pkgs/plutus-core.nix +++ b/pkgs/plutus-core.nix @@ -1,31 +1,32 @@ -{ mkDerivation, HUnit, QuickCheck, Stream, aeson, aeson-pretty -, algebraic-graphs, 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 +{ 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, ghc-prim, hashable, hedgehog, hex-text, inline-r, int-cast -, integer-gmp, 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, ral, random, recursion-schemes +, 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, th-compat -, th-lift, th-lift-instances, th-utilities, time, transformers -, unordered-containers, vector, witherable, word-array +, 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 { pname = "plutus-core"; - version = "1.0.0.0"; + version = "1.3.0.0"; src = fetchgit { - url = "https://github.com/milloni/plutus"; - sha256 = "0pzzqqbp6jvrzxp7gyi4dnnc5pg0jnr76dsaq6pzn3zgr46pgbd3"; - rev = "81cd1ada745c12af2c2c28afce1f6b6b28b38fdd"; + url = "https://github.com/input-output-hk/plutus"; + sha256 = "0wxydqj949hi1zzybblfwmbj5j05sy51kn3byhpnizspqjjcjb07"; + rev = "b94d0e001c8f7350b5120b20cbc9d9021d377a8a"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/plutus-core/; echo source root reset to $sourceRoot"; @@ -38,36 +39,36 @@ mkDerivation { 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 ghc-prim hashable hedgehog int-cast integer-gmp - lazy-search lens megaparsec mmorph monoidal-containers mtl multiset - nonempty-vector nothunks parser-combinators prettyprinter - prettyprinter-configurable primitive 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 vector witherable word-array + 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 aeson-pretty barbies base bytestring cardano-crypto-class - cassava containers criterion criterion-measurement deepseq - directory exceptions extra filepath flat hedgehog inline-r - integer-gmp lens megaparsec monoidal-containers mtl - optparse-applicative prettyprinter QuickCheck quickcheck-instances - random split text time transformers vector + 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 extra filepath flat hedgehog hex-text HUnit lens - megaparsec mmorph mtl nonempty-vector pretty-show prettyprinter + 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 transformers vector + th-lift-instances th-utilities unordered-containers vector ]; benchmarkHaskellDepends = [ - barbies base bytestring cassava criterion exceptions extra hedgehog - inline-r mmorph nonempty-vector ral random template-haskell text - vector + base criterion nonempty-vector ral random ]; enableLibraryProfiling = false; enableExecutableProfiling = false; diff --git a/pkgs/plutus-ledger-api.nix b/pkgs/plutus-ledger-api.nix index c0fc25f..a5eb3bc 100644 --- a/pkgs/plutus-ledger-api.nix +++ b/pkgs/plutus-ledger-api.nix @@ -2,16 +2,15 @@ , 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, template-haskell -, text, transformers +, tasty-hedgehog, tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "plutus-ledger-api"; - version = "1.0.0.0"; + version = "1.3.0.0"; src = fetchgit { - url = "https://github.com/milloni/plutus"; - sha256 = "0pzzqqbp6jvrzxp7gyi4dnnc5pg0jnr76dsaq6pzn3zgr46pgbd3"; - rev = "81cd1ada745c12af2c2c28afce1f6b6b28b38fdd"; + url = "https://github.com/input-output-hk/plutus"; + sha256 = "0wxydqj949hi1zzybblfwmbj5j05sy51kn3byhpnizspqjjcjb07"; + rev = "b94d0e001c8f7350b5120b20cbc9d9021d377a8a"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/plutus-ledger-api/; echo source root reset to $sourceRoot"; @@ -21,8 +20,7 @@ mkDerivation { libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring cborg containers deepseq extra flat lens mtl nothunks plutus-core - plutus-tx prettyprinter PyF serialise tagged template-haskell text - transformers + plutus-tx prettyprinter PyF serialise tagged text ]; executableHaskellDepends = [ async base extra filepath mtl plutus-core serialise tasty @@ -30,7 +28,8 @@ mkDerivation { ]; testHaskellDepends = [ barbies base bytestring containers extra hedgehog lens mtl nothunks - plutus-core tasty tasty-hedgehog tasty-hunit tasty-quickcheck text + plutus-core plutus-tx tasty tasty-hedgehog tasty-hunit + tasty-quickcheck text ]; enableLibraryProfiling = false; enableExecutableProfiling = false; diff --git a/pkgs/plutus-tx-plugin.nix b/pkgs/plutus-tx-plugin.nix index 1bbd047..538ae2c 100644 --- a/pkgs/plutus-tx-plugin.nix +++ b/pkgs/plutus-tx-plugin.nix @@ -1,16 +1,16 @@ { mkDerivation, PyF, array, base, bytestring, containers, deepseq -, either, extra, fetchgit, flat, ghc, ghc-prim, hedgehog -, integer-gmp, lens, lib, mtl, optparse-applicative, plutus-core -, plutus-tx, prettyprinter, tagged, tasty, tasty-hedgehog -, tasty-hunit, template-haskell, text, transformers +, 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 { pname = "plutus-tx-plugin"; - version = "1.0.0.0"; + version = "1.3.0.0"; src = fetchgit { - url = "https://github.com/milloni/plutus"; - sha256 = "0pzzqqbp6jvrzxp7gyi4dnnc5pg0jnr76dsaq6pzn3zgr46pgbd3"; - rev = "81cd1ada745c12af2c2c28afce1f6b6b28b38fdd"; + url = "https://github.com/input-output-hk/plutus"; + sha256 = "0wxydqj949hi1zzybblfwmbj5j05sy51kn3byhpnizspqjjcjb07"; + rev = "b94d0e001c8f7350b5120b20cbc9d9021d377a8a"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/plutus-tx-plugin/; echo source root reset to $sourceRoot"; @@ -18,17 +18,16 @@ mkDerivation { isExecutable = true; enableSeparateDataOutput = false; libraryHaskellDepends = [ - array base bytestring containers either extra flat ghc ghc-prim - lens mtl plutus-core plutus-tx prettyprinter PyF template-haskell - text transformers + 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 ]; testHaskellDepends = [ - base containers deepseq flat ghc-prim hedgehog integer-gmp lens mtl - plutus-core plutus-tx prettyprinter tagged tasty tasty-hedgehog - tasty-hunit template-haskell text + base containers deepseq flat hedgehog lens mtl plutus-core + plutus-tx tagged tasty tasty-hedgehog tasty-hunit template-haskell + text ]; enableLibraryProfiling = false; enableExecutableProfiling = false; diff --git a/pkgs/plutus-tx.nix b/pkgs/plutus-tx.nix index 427d181..b666c89 100644 --- a/pkgs/plutus-tx.nix +++ b/pkgs/plutus-tx.nix @@ -7,11 +7,11 @@ }: mkDerivation { pname = "plutus-tx"; - version = "1.0.0.0"; + version = "1.3.0.0"; src = fetchgit { - url = "https://github.com/milloni/plutus"; - sha256 = "0pzzqqbp6jvrzxp7gyi4dnnc5pg0jnr76dsaq6pzn3zgr46pgbd3"; - rev = "81cd1ada745c12af2c2c28afce1f6b6b28b38fdd"; + url = "https://github.com/input-output-hk/plutus"; + sha256 = "0wxydqj949hi1zzybblfwmbj5j05sy51kn3byhpnizspqjjcjb07"; + rev = "b94d0e001c8f7350b5120b20cbc9d9021d377a8a"; 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 lens memory mtl plutus-core - prettyprinter serialise tagged tasty template-haskell text - th-abstraction th-compat transformers + 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 diff --git a/pkgs/prettyprinter-configurable.nix b/pkgs/prettyprinter-configurable.nix index 2146789..377da45 100644 --- a/pkgs/prettyprinter-configurable.nix +++ b/pkgs/prettyprinter-configurable.nix @@ -5,22 +5,22 @@ }: mkDerivation { pname = "prettyprinter-configurable"; - version = "0.1.0.0"; + version = "1.1.0.0"; src = fetchgit { - url = "https://github.com/milloni/plutus"; - sha256 = "0pzzqqbp6jvrzxp7gyi4dnnc5pg0jnr76dsaq6pzn3zgr46pgbd3"; - rev = "81cd1ada745c12af2c2c28afce1f6b6b28b38fdd"; + url = "https://github.com/input-output-hk/plutus"; + sha256 = "0wxydqj949hi1zzybblfwmbj5j05sy51kn3byhpnizspqjjcjb07"; + rev = "b94d0e001c8f7350b5120b20cbc9d9021d377a8a"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/prettyprinter-configurable/; echo source root reset to $sourceRoot"; isLibrary = true; isExecutable = false; enableSeparateDataOutput = false; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + setupHaskellDepends = [ base Cabal cabal-doctest doctest ]; libraryHaskellDepends = [ base microlens mtl prettyprinter text ]; testHaskellDepends = [ - base doctest megaparsec parser-combinators prettyprinter 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; diff --git a/pkgs/quickcheck-transformer.nix b/pkgs/quickcheck-transformer.nix new file mode 100644 index 0000000..44f0212 --- /dev/null +++ b/pkgs/quickcheck-transformer.nix @@ -0,0 +1,21 @@ +{ mkDerivation, QuickCheck, base, lib, random, transformers }: +mkDerivation { + pname = "quickcheck-transformer"; + version = "0.3.1.2"; + sha256 = "309f57093f7fb59167d546e464ce5b63024d91d029acc966a3e351875898c61f"; + isLibrary = true; + isExecutable = false; + enableSeparateDataOutput = false; + libraryHaskellDepends = [ base QuickCheck random transformers ]; + enableLibraryProfiling = true; + enableExecutableProfiling = true; + doHaddock = false; + jailbreak = true; + doCheck = false; + doBenchmark = false; + hyperlinkSource = false; + homepage = "https://hub.darcs.net/thielema/quickcheck-transformer/"; + description = "A GenT monad transformer for QuickCheck library"; + license = lib.licenses.mit; + broken = false; +} \ No newline at end of file diff --git a/pkgs/word-array.nix b/pkgs/word-array.nix index 893c6fb..8e8c75f 100644 --- a/pkgs/word-array.nix +++ b/pkgs/word-array.nix @@ -4,20 +4,18 @@ }: mkDerivation { pname = "word-array"; - version = "0.1.0.0"; + version = "1.1.0.0"; src = fetchgit { - url = "https://github.com/milloni/plutus"; - sha256 = "0pzzqqbp6jvrzxp7gyi4dnnc5pg0jnr76dsaq6pzn3zgr46pgbd3"; - rev = "81cd1ada745c12af2c2c28afce1f6b6b28b38fdd"; + url = "https://github.com/input-output-hk/plutus"; + sha256 = "0wxydqj949hi1zzybblfwmbj5j05sy51kn3byhpnizspqjjcjb07"; + rev = "b94d0e001c8f7350b5120b20cbc9d9021d377a8a"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/word-array/; echo source root reset to $sourceRoot"; isLibrary = true; isExecutable = false; enableSeparateDataOutput = false; - libraryHaskellDepends = [ - base deepseq mono-traversable primitive - ]; + libraryHaskellDepends = [ base deepseq mono-traversable ]; testHaskellDepends = [ base mono-traversable QuickCheck tasty tasty-quickcheck vector ]; -- GitLab