Skip to content

Commit 401f8a9

Browse files
authored
Merge pull request #233 from mlabs-haskell/szg251/tx-info-lbr-bump
Bump plutus-ledger-api version
2 parents 9ae3705 + bbe80eb commit 401f8a9

File tree

14 files changed

+7036
-40028
lines changed

14 files changed

+7036
-40028
lines changed

experimental/build.nix

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,19 @@
11
_: {
22
perSystem = { pkgs, config, inputs', ... }:
3-
let
4-
hpkgs = pkgs.haskellPackages.override {
5-
overrides = hself: hsuper: {
6-
# Can add/override packages here
7-
logict_0_8_0_0 =
8-
pkgs.haskell.lib.overrideCabal hsuper.logict {
9-
version = "0.8.0.0";
10-
sha256 = "sha256-/pJt8pW8Q995Qkc2DnoKDf3HeLzphviq26mP5SIo+1Y=";
11-
};
12-
unification-fd = # pkgs.haskell.lib.unmarkBroken hsuper.unification-fd;
13-
pkgs.haskell.lib.overrideCabal hsuper.unification-fd (_: {
14-
libraryHaskellDepends = [
15-
hsuper.base
16-
hsuper.containers
17-
hself.logict_0_8_0_0
18-
hsuper.mtl
19-
];
20-
broken = false;
21-
});
22-
};
23-
};
24-
in
253
{
264
devShells.dev-experimental = pkgs.mkShell {
275
name = "experimental-env";
286
buildInputs = [
297
pkgs.dhall
30-
# 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.
31-
# pkgs.dhall-lsp-server
328
pkgs.dhall-json
339

34-
(hpkgs.ghcWithPackages (hsPkgs: [
10+
(pkgs.haskellPackages.ghcWithPackages (hsPkgs: [
3511
hsPkgs.text
36-
hsPkgs.unification-fd
3712
hsPkgs.HUnit
3813
]))
3914

4015
pkgs.protobuf
41-
hpkgs.haskell-language-server
16+
pkgs.haskellPackages.haskell-language-server
4217
]
4318
++ (pkgs.lib.optionals pkgs.stdenv.isLinux [ pkgs.swiPrologWithGui ])
4419
++ config.settings.shell.tools;

extras/lbf-nix/lbf-rust.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ let
8686
{
8787
num-bigint = "~0.4";
8888
serde_json = { version = "^1.0"; features = [ "arbitrary_precision" ]; };
89-
plutus-ledger-api = { path = "../plutus-ledger-api-0.1.0"; features = [ "lbf" ]; };
89+
plutus-ledger-api = { version = "0.2.1"; features = [ "lbf" ]; };
90+
lbr-prelude = { version = "0.1.1"; };
9091
};
9192

9293
crateVersions = opts: with (lbfRustOpts opts);

0 commit comments

Comments
 (0)