From e5079ea634c5af3036655b2205feec8f3f373027 Mon Sep 17 00:00:00 2001 From: Jack Hodgkinson <30505104+jhodgdev@users.noreply.github.com> Date: Tue, 15 Feb 2022 15:51:34 +0000 Subject: [PATCH] Couldn't resolve plutus extra or plutus ledger --- agora.cabal | 4 +--- flake.lock | 20 +------------------- flake.nix | 8 +------- 3 files changed, 3 insertions(+), 29 deletions(-) diff --git a/agora.cabal b/agora.cabal index d85a4b0..8abd4e9 100644 --- a/agora.cabal +++ b/agora.cabal @@ -86,7 +86,7 @@ common deps build-depends: , aeson , ansi-terminal - , base >=4.14 && <5 + , base >=4.14 && <5 , base-compat , bytestring , cardano-prelude @@ -95,8 +95,6 @@ common deps , data-default-class , plutarch , plutus-core - -- , plutus-extra - -- , plutus-ledger , plutus-ledger-api , plutus-tx , pprelude diff --git a/flake.lock b/flake.lock index 99b4960..60a377d 100644 --- a/flake.lock +++ b/flake.lock @@ -852,23 +852,6 @@ "type": "github" } }, - "plutus-extra": { - "flake": false, - "locked": { - "lastModified": 1643739251, - "narHash": "sha256-L7WSXvGWxfuqSP4ZNdbuT2AdW89mAJsE6+3mxO+1dx8=", - "owner": "Liqwid-Labs", - "repo": "plutus-extra", - "rev": "bfeb0d2bb1bc18f147e58c200db2022f5c75eb60", - "type": "github" - }, - "original": { - "owner": "Liqwid-Labs", - "repo": "plutus-extra", - "rev": "bfeb0d2bb1bc18f147e58c200db2022f5c75eb60", - "type": "github" - } - }, "pre-commit-hooks-nix": { "flake": false, "locked": { @@ -929,8 +912,7 @@ "nixpkgs" ], "nixpkgs-2111": "nixpkgs-2111", - "plutarch": "plutarch", - "plutus-extra": "plutus-extra" + "plutarch": "plutarch" } }, "sized-functors": { diff --git a/flake.nix b/flake.nix index 9d0ab88..5897c9c 100644 --- a/flake.nix +++ b/flake.nix @@ -4,10 +4,6 @@ inputs.nixpkgs.follows = "plutarch/nixpkgs"; inputs.haskell-nix.follows = "plutarch/haskell-nix"; - inputs.plutus-extra.url = - "github:Liqwid-Labs/plutus-extra?rev=bfeb0d2bb1bc18f147e58c200db2022f5c75eb60"; - inputs.plutus-extra.flake = false; # Could we set this to true? - # temporary fix for nix versions that have the transitive follows bug # see https://github.com/NixOS/nix/issues/6013 inputs.nixpkgs-2111 = { url = "github:NixOS/nixpkgs/nixpkgs-21.11-darwin"; }; @@ -47,9 +43,7 @@ extraSources = plutarch.extraSources ++ [{ src = inputs.plutarch; subdirs = [ "." ]; - } - - ]; + }]; modules = [ (plutarch.haskellModule system) ]; shell = { withHoogle = true;