From a70bc36ec7d8ed0e493a9e3295237a0fbc272332 Mon Sep 17 00:00:00 2001 From: Tommy Bidne Date: Fri, 1 Apr 2022 20:54:47 +1300 Subject: [PATCH] Update deps for new hello-world --- cabal-haskell.nix.project | 143 +++++++++++++++++++++++++++++++++- cabal.project | 4 +- flake.nix | 28 ++++++- hello-world/hello-world.cabal | 62 +++++++++++++++ hello-world/src/Lib.hs | 2 + 5 files changed, 233 insertions(+), 6 deletions(-) create mode 100644 hello-world/hello-world.cabal create mode 100644 hello-world/src/Lib.hs diff --git a/cabal-haskell.nix.project b/cabal-haskell.nix.project index e2dd51b1..95368a06 100644 --- a/cabal-haskell.nix.project +++ b/cabal-haskell.nix.project @@ -10,11 +10,125 @@ source-repository-package location: https://github.com/mlabs-haskell/apropos-tx tag: d5a90656ad77a48d2291748e1bb5ae072c85eaa4 +source-repository-package + type: git + location: https://github.com/input-output-hk/cardano-addresses + tag: 5a313b60ed64e4374095de65bc13cb080001e520 + subdir: + command-line + core + +source-repository-package + type: git + location: https://github.com/input-output-hk/cardano-config + tag: e9de7a2cf70796f6ff26eac9f9540184ded0e4e6 + +source-repository-package + type: git + location: https://github.com/input-output-hk/cardano-ledger + tag: 1a9ec4ae9e0b09d54e49b2a40c4ead37edadcce5 + subdir: + eras/alonzo/impl + eras/byron/chain/executable-spec + eras/byron/crypto + eras/byron/crypto/test + eras/byron/ledger/executable-spec + eras/byron/ledger/impl + eras/byron/ledger/impl/test + eras/shelley/impl + eras/shelley/test-suite + eras/shelley-ma/impl + libs/cardano-data + libs/cardano-ledger-core + libs/cardano-ledger-pretty + libs/cardano-protocol-tpraos + libs/compact-map + libs/non-integral + libs/set-algebra + libs/small-steps + libs/small-steps-test + +source-repository-package + type: git + location: https://github.com/input-output-hk/cardano-node + tag: 814df2c146f5d56f8c35a681fe75e85b905aed5d + subdir: + cardano-api + cardano-node + cardano-cli + +source-repository-package + type: git + location: https://github.com/input-output-hk/cardano-wallet + tag: a5085acbd2670c24251cf8d76a4e83c77a2679ba + subdir: + lib/cli + lib/core + lib/core-integration + lib/dbvar + lib/launcher + lib/numeric + lib/shelley + lib/strict-non-empty-containers + lib/test-utils + lib/text-class + +source-repository-package + type: git + location: https://github.com/input-output-hk/goblins + tag: cde90a2b27f79187ca8310b6549331e59595e7ba + +source-repository-package + type: git + location: https://github.com/input-output-hk/iohk-monitoring-framework + tag: 46f994e216a1f8b36fe4669b47b2a7011b0e153c + subdir: + iohk-monitoring + tracer-transformers + contra-tracer + plugins/backend-aggregation + plugins/backend-ekg + plugins/backend-monitoring + plugins/backend-trace-forwarder + plugins/scribe-systemd + +source-repository-package + type: git + location: https://github.com/input-output-hk/optparse-applicative + tag: 7497a29cb998721a9068d5725d49461f2bba0e7a + +source-repository-package + type: git + location: https://github.com/input-output-hk/ouroboros-network + tag: d2d219a86cda42787325bb8c20539a75c2667132 + subdir: + io-classes + io-sim + monoidal-synchronisation + network-mux + ntp-client + ouroboros-network + ouroboros-network-testing + ouroboros-network-framework + ouroboros-consensus + ouroboros-consensus-byron + ouroboros-consensus-cardano + ouroboros-consensus-protocol + ouroboros-consensus-shelley + strict-stm + typed-protocols + typed-protocols-cborg + typed-protocols-examples + source-repository-package type: git location: https://github.com/Plutonomicon/plutarch tag: aecc2050eb63ff0041576473aa3193070fe91314 +-- Note: The plutus dependency is limited by plutus-apps and plutarch. +-- plutus-apps is the primary bottleneck here. In particular, the latest +-- plutus-apps still relies on the plutus module Plutus.V1.Ledger.TxId that +-- was removed in 4fd86930f1dc628a816adf5f5d854b3fec578312. source-repository-package type: git location: https://github.com/input-output-hk/plutus.git @@ -26,8 +140,31 @@ source-repository-package word-array prettyprinter-configurable stubs/plutus-ghc-stub - -- Update plutus revision here! Make sure this matches `cat ./nix/sources.json | jq '.plutus.rev'` - tag: 6d8d25d1e84b2a4278da1036aab23da4161b8df8 + tag: 6c580c150b8e8afdf14e43a234fcc8db47e3c1d2 + +source-repository-package + type: git + location: https://github.com/input-output-hk/plutus-apps + tag: c4960ae14b187978bf41832313370d282f648eee + subdir: + freer-extras + playground-common + plutus-chain-index + plutus-chain-index-core + plutus-contract + plutus-ledger + plutus-ledger-constraints + plutus-pab + plutus-pab-executables + plutus-playground-server + plutus-use-cases + quickcheck-dynamic + web-ghc + +source-repository-package + type: git + location: https://github.com/input-output-hk/servant-purescript + tag: 44e7cacf109f84984cd99cd3faf185d161826963 -- The following sections are copied from the 'plutus' repository cabal.project at the revision -- given above. @@ -100,7 +237,7 @@ source-repository-package source-repository-package type: git location: https://github.com/input-output-hk/cardano-base - tag: 78b3928391b558fb1750228f63301ec371f13528 + tag: 5c1786f3a2b9b2647489862963003afdc1f27818 subdir: base-deriving-via binary diff --git a/cabal.project b/cabal.project index e293b981..c6bbe9c3 100644 --- a/cabal.project +++ b/cabal.project @@ -1,6 +1,8 @@ index-state: 2021-10-20T00:00:00Z -packages: ./dUSD.cabal +packages: + ./dUSD.cabal + hello-world -- Always build tests and benchmarks. tests: true diff --git a/flake.nix b/flake.nix index f00a2cd6..039844fa 100644 --- a/flake.nix +++ b/flake.nix @@ -58,6 +58,15 @@ }; } ]; + + pkg-def-extras = [ + (hackage: { + packages = { + random = (((hackage.random)."1.2.1").revisions).default; + }; + }) + ]; + shell = { withHoogle = true; @@ -71,6 +80,10 @@ ps.apropos ps.apropos-tx ps.plutarch + ps.plutus-contract + ps.plutus-ledger + ps.plutus-ledger-api + ps.plutus-ledger-constraints ps.sydtest ps.sydtest-hedgehog ]; @@ -79,11 +92,22 @@ "https://github.com/mlabs-haskell/apropos"."2b2c2e01f9a3d40a3db2dfcbdb24683d584f808d" = "sha256-o9bEo9LTTfM5f/yapqLzXhxFF6XVbLTUKx1GvzJmfE0="; "https://github.com/mlabs-haskell/apropos-tx"."d5a90656ad77a48d2291748e1bb5ae072c85eaa4" = "sha256-SkWvW7EyI94BoFWvzyk+MsTNd3eomRlwaBovIQtI71o="; "https://github.com/Plutonomicon/plutarch"."aecc2050eb63ff0041576473aa3193070fe91314" = "sha256-pVvSa4fBoKXCdCu/NGduoKhr1/gGESCmj/Tr9Y5l9B4="; - "https://github.com/input-output-hk/plutus.git"."6d8d25d1e84b2a4278da1036aab23da4161b8df8" = "o8m86TkI1dTo74YbE9CPPNrBfSDSrf//DMq+v2+woEY="; + "https://github.com/input-output-hk/plutus.git"."6c580c150b8e8afdf14e43a234fcc8db47e3c1d2" = "sha256-dwDHhOAGAxRksTMozocxgmBncToLb5HOSD8lKe/UCYE="; + "https://github.com/input-output-hk/plutus-apps"."c4960ae14b187978bf41832313370d282f648eee" = "sha256-6aQXgtTzrp45uErLm2Uo67Tu7vkDT5w01ebe0wdi+y8="; "https://github.com/Quid2/flat.git"."ee59880f47ab835dbd73bea0847dab7869fc20d8" = "lRFND+ZnZvAph6ZYkr9wl9VAx41pb3uSFP8Wc7idP9M="; + "https://github.com/input-output-hk/cardano-addresses"."5a313b60ed64e4374095de65bc13cb080001e520" = "sha256-K7j84d9UzUDH3aekpH5IMXyUpG1ciIfb2t2+0o9VHKI="; + "https://github.com/input-output-hk/cardano-config"."e9de7a2cf70796f6ff26eac9f9540184ded0e4e6" = "sha256-jQbwcfNJ8am7Q3W+hmTFmyo3wp3QItquEH//klNiofI="; "https://github.com/input-output-hk/cardano-crypto.git"."07397f0e50da97eaa0575d93bee7ac4b2b2576ec" = "oxIOVlgm07FAEmgGRF1C2me9TXqVxQulEOcJ22zpTRs="; - "https://github.com/input-output-hk/cardano-base"."78b3928391b558fb1750228f63301ec371f13528" = "pBUTTcenaSLMovHKGsaddJ7Jh3okRTrtu5W7Rdu6RM4="; + "https://github.com/input-output-hk/cardano-base"."5c1786f3a2b9b2647489862963003afdc1f27818" = "sha256-cMQjyQDdHQvZwc9MIJ+cPyxFW0rEPPidEytAed5IZns="; + "https://github.com/input-output-hk/cardano-ledger"."1a9ec4ae9e0b09d54e49b2a40c4ead37edadcce5" = "sha256-lRNfkGMHnpPO0T19FZY5BnuRkr0zTRZIkxZVgHH0fys="; + "https://github.com/input-output-hk/cardano-node"."814df2c146f5d56f8c35a681fe75e85b905aed5d" = "1hr00wqzmcyc3x0kp2hyw78rfmimf6z4zd4vv85b9zv3nqbjgrik"; "https://github.com/input-output-hk/cardano-prelude"."fd773f7a58412131512b9f694ab95653ac430852" = "BtbT5UxOAADvQD4qTPNrGfnjQNgbYNO4EAJwH2ZsTQo="; + "https://github.com/input-output-hk/cardano-wallet"."a5085acbd2670c24251cf8d76a4e83c77a2679ba" = "sha256-A3im2IkoumUx3NzgPooaXGC18/iYxbEooMa9ho93/6o="; + "https://github.com/input-output-hk/goblins"."cde90a2b27f79187ca8310b6549331e59595e7ba" = "sha256-z9ut0y6umDIjJIRjz9KSvKgotuw06/S8QDwOtVdGiJ0="; + "https://github.com/input-output-hk/iohk-monitoring-framework"."46f994e216a1f8b36fe4669b47b2a7011b0e153c" = "sha256-QE3QRpIHIABm+qCP/wP4epbUx0JmSJ9BMePqWEd3iMY="; + "https://github.com/input-output-hk/optparse-applicative"."7497a29cb998721a9068d5725d49461f2bba0e7a" = "sha256-uQx+SEYsCH7JcG3xAT0eJck9yq3y0cvx49bvItLLer8="; + "https://github.com/input-output-hk/ouroboros-network"."d2d219a86cda42787325bb8c20539a75c2667132" = "sha256-fZ6FfG2z6HWDxjIHycLPSQHoYtfUmWZOX7lfAUE+s6M="; + "https://github.com/input-output-hk/servant-purescript"."44e7cacf109f84984cd99cd3faf185d161826963" = "sha256-DH9ISydu5gxvN4xBuoXVv1OhYCaqGOtzWlACdJ0H64I="; "https://github.com/input-output-hk/Win32-network"."3825d3abf75f83f406c1f7161883c438dac7277d" = "Hesb5GXSx0IwKSIi42ofisVELcQNX6lwHcoZcbaDiqc="; "https://github.com/Srid/sydtest"."9c6c7678f7aabe22e075aab810a6a2e304591d24" = "sha256-P6ZwwfFeN8fpi3fziz9yERTn7BfxdE/j/OofUu+4GdA="; "https://github.com/Srid/autodocodec"."42b42a7407f33c6c74fa4e8c84906aebfed28daf" = "sha256-X1TNZlmO2qDFk3OL4Z1v/gzvd3ouoACAiMweutsYek4="; diff --git a/hello-world/hello-world.cabal b/hello-world/hello-world.cabal new file mode 100644 index 00000000..74ae4abe --- /dev/null +++ b/hello-world/hello-world.cabal @@ -0,0 +1,62 @@ +cabal-version: 3.0 +name: hello-world +version: 1.0 + +common lang + default-language: Haskell2010 + default-extensions: + NoStarIsType + BangPatterns + BinaryLiterals + ConstrainedClassMethods + ConstraintKinds + DataKinds + DeriveDataTypeable + DeriveFoldable + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + DerivingStrategies + DerivingVia + EmptyCase + ExistentialQuantification + FlexibleContexts + FlexibleInstances + GADTSyntax + GeneralisedNewtypeDeriving + HexFloatLiterals + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + NamedFieldPuns + NamedWildCards + NumericUnderscores + OverloadedStrings + PartialTypeSignatures + PatternGuards + PolyKinds + PostfixOperators + QuantifiedConstraints + RankNTypes + ScopedTypeVariables + StandaloneDeriving + StandaloneKindSignatures + TupleSections + TypeApplications + TypeFamilies + TypeOperators + ViewPatterns + +library + import: lang + exposed-modules: Lib + hs-source-dirs: src + build-depends: + , base >=4.7 && <5 + , plutus-contract + , plutus-ledger + , plutus-ledger-api + , plutus-ledger-constraints + , text diff --git a/hello-world/src/Lib.hs b/hello-world/src/Lib.hs new file mode 100644 index 00000000..2aa67d6a --- /dev/null +++ b/hello-world/src/Lib.hs @@ -0,0 +1,2 @@ +module Lib where +