Update plutarch* versions to suppot plutus-core 1.23.0.0

albertodvp · May 31, 2024 · 032c217 · 032c217
1 parent a504ef4
commit 032c217
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,4 +25,6 @@ result
 .vscode
 work/
 nohup.out
-haddocks/
+haddocks/
+.direnv
+.envrc
diff --git a/cabal.project b/cabal.project
@@ -13,27 +13,43 @@ repository cardano-haskell-packages
     c00aae8461a256275598500ea0e187588c35a5d5d7454fb57eac18d9edb86a56
     d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
 
+with-compiler: ghc-9.6.4
 index-state:
   , hackage.haskell.org 2024-04-16T12:16:29Z
   , cardano-haskell-packages 2024-04-15T08:36:34Z
 
-with-compiler: ghc-9.6.4
-
--- NOTE (j-mueller, 2024-02-19): Change back to Plutonomicon/plutarch-plutus:master
--- when plutus-1.21.0.0 is supported. Currently upstream is on 1.20.0.0
 source-repository-package
   type: git
-  location: https://github.com/j-mueller/plutarch-plutus
-  tag: 14a3aedc67de5fb0dde6b7bd62efa32feacee3da
+  -- This fork should be changed with the Plutonomicon staging branch as soon as
+  -- this PR is merged: https://github.com/Plutonomicon/plutarch-plutus/pull/672
+  location: https://github.com/albertodvp/plutarch-plutus
+  tag: 1b2b5fb684e69e3d12319608278c1f6dea6e12af
   subdir:
     .
+    plutarch-ledger-api
     plutarch-extra
 
+source-repository-package
+  type: git
+  -- This fork branch should be changed with some official branch in
+  -- input-output-hk/xsy-liqwid-libs as soons as the git workflow
+  -- is established there
+  location: https://github.com/albertodvp/xsy-liqwid-libs
+  tag: 26b37079439445b815b4bce86d80cf5dbf971f60
+  subdir:
+    plutarch-context-builder
+    plutarch-unit
+    plutarch-quickcheck
+    liqwid-plutarch-extra
+
 packages:
   src/base
-  src/node-client
-  src/wallet
-  src/mockchain
   src/coin-selection
   src/devnet
+  src/mockchain
+  src/node-client
+  src/optics
   src/plutarch
+  src/wallet
+
+documentation: true
diff --git a/flake.nix b/flake.nix
@@ -28,11 +28,13 @@
                   tools = {
                     cabal = "latest";
                     haskell-language-server = "latest";
+                    ghcide = "latest";
                   };
                 };
                 inputMap = { "https://chap.intersectmbo.org/" = CHaP; };
                 sha256map = {
-                  "https://github.com/j-mueller/plutarch-plutus"."14a3aedc67de5fb0dde6b7bd62efa32feacee3da" = "sha256-K3/nFioOzHMR5fVyQ3L292qXx+//Xf7V+k/zNZbRD2k=";
+                  "https://github.com/albertodvp/plutarch-plutus"."1b2b5fb684e69e3d12319608278c1f6dea6e12af" = "sha256-xViZbZlq5Sw9rHakS9nwcQikCOfwZClSBL8UD+5eJJ4=";
+                  "https://github.com/albertodvp/xsy-liqwid-libs"."26b37079439445b815b4bce86d80cf5dbf971f60" = "sha256-dUaqSBHXJFpzHkG6FBE8RES6drMELbALwcVCdg5S4sI=";
                 };
               };
             })