Merge pull request #233 from mlabs-haskell/szg251/tx-info-lbr-bump

Bump plutus-ledger-api version
mlabs-haskell · Jun 25, 2024 · 401f8a9 · 401f8a9
2 parents 9ae3705 + bbe80eb
commit 401f8a9
Show file tree

Hide file tree

Showing 14 changed files with 7,036 additions and 40,028 deletions.
diff --git a/experimental/build.nix b/experimental/build.nix
@@ -1,44 +1,19 @@
 _: {
   perSystem = { pkgs, config, inputs', ... }:
-    let
-      hpkgs = pkgs.haskellPackages.override {
-        overrides = hself: hsuper: {
-          # Can add/override packages here
-          logict_0_8_0_0 =
-            pkgs.haskell.lib.overrideCabal hsuper.logict {
-              version = "0.8.0.0";
-              sha256 = "sha256-/pJt8pW8Q995Qkc2DnoKDf3HeLzphviq26mP5SIo+1Y=";
-            };
-          unification-fd = # pkgs.haskell.lib.unmarkBroken hsuper.unification-fd;
-            pkgs.haskell.lib.overrideCabal hsuper.unification-fd (_: {
-              libraryHaskellDepends = [
-                hsuper.base
-                hsuper.containers
-                hself.logict_0_8_0_0
-                hsuper.mtl
-              ];
-              broken = false;
-            });
-        };
-      };
-    in
     {
       devShells.dev-experimental = pkgs.mkShell {
         name = "experimental-env";
         buildInputs = [
           pkgs.dhall
-          # TODO(bladyjoker): error: Package ‘dhall-lsp-server-1.1.3’ in /nix/store/p7iz0r8gs6ppkhj83zjmwyd21k8b7v3y-source/pkgs/development/haskell-modules/hackage-packages.nix:84957 is marked as broken, refusing to evaluate.
-          # pkgs.dhall-lsp-server
           pkgs.dhall-json
 
-          (hpkgs.ghcWithPackages (hsPkgs: [
+          (pkgs.haskellPackages.ghcWithPackages (hsPkgs: [
             hsPkgs.text
-            hsPkgs.unification-fd
             hsPkgs.HUnit
           ]))
 
           pkgs.protobuf
-          hpkgs.haskell-language-server
+          pkgs.haskellPackages.haskell-language-server
         ]
         ++ (pkgs.lib.optionals pkgs.stdenv.isLinux [ pkgs.swiPrologWithGui ])
         ++ config.settings.shell.tools;

diff --git a/extras/lbf-nix/lbf-rust.nix b/extras/lbf-nix/lbf-rust.nix
@@ -86,7 +86,8 @@ let
     {
       num-bigint = "~0.4";
       serde_json = { version = "^1.0"; features = [ "arbitrary_precision" ]; };
-      plutus-ledger-api = { path = "../plutus-ledger-api-0.1.0"; features = [ "lbf" ]; };
+      plutus-ledger-api = { version = "0.2.1"; features = [ "lbf" ]; };
+      lbr-prelude = { version = "0.1.1"; };
     };
 
   crateVersions = opts: with (lbfRustOpts opts);