Update cabal.project and haskell.nix

Author: sjoerdvisscher

cabal.project

@@ -12,28 +12,22 @@ benchmarks: true
 -- Plutus revision from 2021/08/16
 source-repository-package
  type: git
- location: https://github.com/input-output-hk/plutus.git
+ location: https://github.com/input-output-hk/plutus-apps.git
  subdir:
  freer-extras
  playground-common
- plutus-core
  plutus-contract
  plutus-chain-index
  plutus-ledger
- plutus-ledger-api
- plutus-tx
- plutus-tx-plugin
  plutus-pab
  plutus-use-cases
- prettyprinter-configurable
  quickcheck-dynamic
- word-array
- tag: plutus-starter-devcontainer/v1.0.10
+ tag: plutus-starter-devcontainer/v1.0.14
 
 
--- The following sections are copied from the 'plutus' repository cabal.project at the revision
+-- The following sections are copied from the 'plutus-apps' repository cabal.project at the revision
 -- given above.
--- This is necessary because the 'plutus' libraries depend on a number of other libraries which are
+-- This is necessary because the 'plutus-apps' libraries depend on a number of other libraries which are
 -- not on Hackage, and so need to be pulled in as `source-repository-package`s themselves. Make sure to
 -- re-update this section from the template when you do an upgrade.
 
@@ -48,14 +42,15 @@ benchmarks: true
 test-show-details: streaming
 
 allow-newer:
- -- Pins to an old version of Template Haskell, unclear if/when it will be updated
+ -- Copied from plutus-core
  size-based:template-haskell
  , ouroboros-consensus-byron:formatting
  , beam-core:aeson
  , beam-sqlite:aeson
  , beam-sqlite:dlist
  , beam-migrate:aeson
 
+-- Copied from plutus-core
 constraints:
  -- big breaking change here, inline-r doens't have an upper bound
  singletons < 3.0
@@ -64,10 +59,6 @@ constraints:
  -- constraint from dependent-sum-template (which is the library we actually use).
  , dependent-sum > 0.6.2.0
 
--- See the note on nix/pkgs/default.nix:agdaPackages for why this is here.
--- (NOTE this will change to ieee754 in newer versions of nixpkgs).
-extra-packages: ieee, filemanip
-
 -- These packages appear in our dependency tree and are very slow to build.
 -- Empirically, turning off optimization shaves off ~50% build time.
 -- It also mildly improves recompilation avoidance.
@@ -81,8 +72,7 @@ package ouroboros-consensus-cardano
 package cardano-api
  optimization: False
 
--- https://github.com/Quid2/flat/pull/22 fixes a potential exception
--- when decoding invalid (e.g. malicious) text literals.
+-- Copied from plutus-core
 source-repository-package
  type: git
  location: https://github.com/Quid2/flat.git
@@ -99,15 +89,17 @@ source-repository-package
  location: https://github.com/input-output-hk/servant-purescript.git
  tag: a0c7c7e37c95564061247461aef4be505a853538
 
+-- Copied from plutus-core
 source-repository-package
  type: git
  location: https://github.com/input-output-hk/cardano-crypto.git
  tag: 07397f0e50da97eaa0575d93bee7ac4b2b2576ec
 
+-- Copied from plutus-core
 source-repository-package
  type: git
  location: https://github.com/input-output-hk/cardano-base
- tag: 592aa61d657ad5935a33bace1243abce3728b643
+ tag: 4ea7e2d927c9a7f78ddc69738409a5827ab66b98
  subdir:
  base-deriving-via
  binary
@@ -120,6 +112,7 @@ source-repository-package
  slotting
  strict-containers
 
+-- Copied from plutus-core
 source-repository-package
  type: git
  location: https://github.com/input-output-hk/cardano-prelude
@@ -149,10 +142,11 @@ source-repository-package
 source-repository-package
  type: git
  location: https://github.com/input-output-hk/ouroboros-network
- tag: 5d37a927046bc7da2887830d8e35cf604622ce09
+ tag: 1f4973f36f689d6da75b5d351fb124d66ef1057d
  subdir:
  monoidal-synchronisation
  typed-protocols
+ typed-protocols-cborg
  typed-protocols-examples
  ouroboros-network
  ouroboros-network-testing
@@ -192,32 +186,31 @@ source-repository-package
 
 source-repository-package
  type: git
- location: https://github.com/raduom/cardano-ledger-specs
- tag: ef6bb99782d61316da55470620c7da994cc352b2
+ location: https://github.com/input-output-hk/cardano-ledger-specs
+ tag: bf008ce028751cae9fb0b53c3bef20f07c06e333
  subdir:
- byron/chain/executable-spec
- byron/crypto
- byron/crypto/test
- byron/ledger/executable-spec
  byron/ledger/impl
- byron/ledger/impl/test
- semantics/executable-spec
+ cardano-ledger-core
  cardano-protocol-tpraos
+ eras/alonzo/impl
+ eras/byron/chain/executable-spec
+ eras/byron/crypto
+ eras/byron/crypto/test
+ eras/byron/ledger/executable-spec
+ eras/byron/ledger/impl/test
+ eras/shelley/impl
+ eras/shelley-ma/impl
+ libs/non-integral
+ libs/small-steps
  semantics/small-steps-test
- shelley/chain-and-ledger/dependencies/non-integer
- shelley/chain-and-ledger/executable-spec
- shelley/chain-and-ledger/shelley-spec-ledger-test
- shelley-ma/impl
- cardano-ledger-core
- alonzo/impl
 
--- A lot of plutus dependencies have to be synchronized with the dependencies of
+-- A lot of plutus-apps dependencies have to be synchronized with the dependencies of
 -- cardano-node. If you update cardano-node, please make sure that all dependencies
 -- of cardano-node are also updated.
 source-repository-package
  type: git
  location: https://github.com/input-output-hk/cardano-node.git
- tag: ed7fdbf65f40f8e194850b87dd8c631fe26154e6
+ tag: b6ca519f97a0e795611a63174687e6bb70c9f752
  subdir:
  cardano-api
  cardano-node
@@ -236,10 +229,21 @@ source-repository-package
 
 source-repository-package
  type: git
- location: https://github.com/input-output-hk/hedgehog-extras
- tag: edf6945007177a638fbeb8802397f3a6f4e47c14
+ location: https://github.com/input-output-hk/goblins
+ tag: cde90a2b27f79187ca8310b6549331e59595e7ba
 
+-- A lot of plutus-apps dependencies have to be syncronized with the dependencies of
+-- plutus. If you update plutus, please make sure that all dependencies of plutus
+-- are also updated
 source-repository-package
  type: git
- location: https://github.com/input-output-hk/goblins
- tag: cde90a2b27f79187ca8310b6549331e59595e7ba
+ location: https://github.com/input-output-hk/plutus
+ tag: 3f089ccf0ca746b399c99afe51e063b0640af547
+ subdir:
+ plutus-core
+ plutus-ledger-api
+ plutus-tx
+ plutus-tx-plugin
+ word-array
+ prettyprinter-configurable
+ stubs/plutus-ghc-stub

nix/pkgs/haskell/haskell.nix

@@ -19,23 +19,24 @@ let
  inherit compiler-nix-name;
 
  sha256map = {
- "https://github.com/input-output-hk/plutus.git"."plutus-starter-devcontainer/v1.0.10" = "06c3jhsbjmzqv951yi1spq1jihija48vss2b8gx9b1fqnz50dbnm";
+ "https://github.com/input-output-hk/plutus-apps.git"."plutus-starter-devcontainer/v1.0.14" = "0j3hphj4b21vwdj900233d67qsaj91mppwsx1vv0ichnmnw2bmir";
  "https://github.com/Quid2/flat.git"."ee59880f47ab835dbd73bea0847dab7869fc20d8" = "1lrzknw765pz2j97nvv9ip3l1mcpf2zr4n56hwlz0rk7wq7ls4cm";
  "https://github.com/input-output-hk/purescript-bridge.git"."6a92d7853ea514be8b70bab5e72077bf5a510596" = "13j64vv116in3c204qsl1v0ajphac9fqvsjp7x3zzfr7n7g61drb";
  "https://github.com/input-output-hk/servant-purescript.git"."a0c7c7e37c95564061247461aef4be505a853538" = "177na04jf6wf18kandzsah40lw3xswmmccpr3hkb8wb4hypcffnf";
- "https://github.com/input-output-hk/cardano-base"."592aa61d657ad5935a33bace1243abce3728b643" = "1bgq3a2wfdz24jqfwylcc6jjg5aji8dpy5gjkhpnmkkvgcr2rkyb";
+ "https://github.com/input-output-hk/cardano-base"."4ea7e2d927c9a7f78ddc69738409a5827ab66b98" = "0n0hxbr0l95cdc25jmmgs7apmmw17i91chhj5rzzv1k7f3iymf6d";
  "https://github.com/input-output-hk/cardano-crypto.git"."07397f0e50da97eaa0575d93bee7ac4b2b2576ec" = "06sdx5ndn2g722jhpicmg96vsrys89fl81k8290b3lr6b1b0w4m3";
- "https://github.com/raduom/cardano-ledger-specs"."ef6bb99782d61316da55470620c7da994cc352b2" = "0z2818kwiwv7smz0ff8wr4zb405pymgd12zm32asas0mp5bqxkin";
+ "https://github.com/input-output-hk/cardano-ledger-specs"."bf008ce028751cae9fb0b53c3bef20f07c06e333" = "0my3801w1vinc0kf5yh9lxl6saqxgwm6ccg0vvzi104pafcwwcqx";
  "https://github.com/input-output-hk/cardano-prelude"."fd773f7a58412131512b9f694ab95653ac430852" = "02jddik1yw0222wd6q0vv10f7y8rdgrlqaiy83ph002f9kjx7mh6";
  "https://github.com/input-output-hk/goblins"."cde90a2b27f79187ca8310b6549331e59595e7ba" = "17c88rbva3iw82yg9srlxjv2ia5wjb9cyqw44hik565f5v9svnyg";
  "https://github.com/input-output-hk/iohk-monitoring-framework"."46f994e216a1f8b36fe4669b47b2a7011b0e153c" = "1il8fx3misp3650ryj368b3x95ksz01zz3x0z9k00807j93d0ka0";
  "https://github.com/input-output-hk/optparse-applicative"."7497a29cb998721a9068d5725d49461f2bba0e7a" = "1gvsrg925vynwgqwplgjmp53vj953qyh3wbdf34pw21c8r47w35r";
- "https://github.com/input-output-hk/ouroboros-network"."5d37a927046bc7da2887830d8e35cf604622ce09" = "1620zcnivgm1wp1kq3vqc44g77lv7dalzgywc96qsblf1sv9fw3p";
- "https://github.com/input-output-hk/cardano-node.git"."ed7fdbf65f40f8e194850b87dd8c631fe26154e6" = "0ivvqnw6fflfbzywychfsyyjd6jn3pg1r0vv63m1rdwp04v59kh5";
+ "https://github.com/input-output-hk/ouroboros-network"."1f4973f36f689d6da75b5d351fb124d66ef1057d" = "186056rvzdzy4jhvamjjbcmjyr94hs5hcyr8x6a0ch21hv5f014p";
+ "https://github.com/input-output-hk/cardano-node.git"."b6ca519f97a0e795611a63174687e6bb70c9f752" = "0z5lpmqc98fwg3xzpzxkfslbxdjwfyyw8bn8yq0574sf4942vqdn";
  "https://github.com/input-output-hk/Win32-network"."3825d3abf75f83f406c1f7161883c438dac7277d" = "19wahfv726fa3mqajpqdqhnl9ica3xmf68i254q45iyjcpj1psqx";
  "https://github.com/input-output-hk/hedgehog-extras"."edf6945007177a638fbeb8802397f3a6f4e47c14" = "0wc7qzkc7j4ns2rz562h6qrx2f8xyq7yjcb7zidnj7f6j0pcd0i9";
  "https://github.com/input-output-hk/cardano-wallet"."ae7569293e94241ef6829139ec02bd91abd069df" = "1mv1dhpkdj9ridm1fvq6jc85qs6zvbp172228rq72gyawjwrgvi6";
  "https://github.com/input-output-hk/cardano-addresses"."d2f86caa085402a953920c6714a0de6a50b655ec" = "0p6jbnd7ky2yf7bwb1350k8880py8dgqg39k49q02a6ij4ld01ay";
+ "https://github.com/input-output-hk/plutus"."3f089ccf0ca746b399c99afe51e063b0640af547" = "1nx8xmdgwmnsla4qg4k67f5md8vm3p1p9i25ndalrqdg40z90486";
  };
 
  modules = [