From 50179d011bc47ef243485afa2471d0f40568c710 Mon Sep 17 00:00:00 2001 From: zeme Date: Mon, 29 May 2023 10:02:16 +0200 Subject: [PATCH] Bump to ghc927 --- e2e-tests/e2e-tests.cabal | 1 - flake.lock | 6 +++--- flake.nix | 4 ++-- nix/haskell-project.nix | 4 ---- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/e2e-tests/e2e-tests.cabal b/e2e-tests/e2e-tests.cabal index fbb4072..fa86ce5 100644 --- a/e2e-tests/e2e-tests.cabal +++ b/e2e-tests/e2e-tests.cabal @@ -95,7 +95,6 @@ common lang , text , time , transformers-except - , unlift , unliftio , unordered-containers diff --git a/flake.lock b/flake.lock index b73cf98..f8738ed 100644 --- a/flake.lock +++ b/flake.lock @@ -564,11 +564,11 @@ "sphinxcontrib-haddock": "sphinxcontrib-haddock" }, "locked": { - "lastModified": 1685048285, - "narHash": "sha256-3BID3wjMy/X0lU2vvAauS+D9RTkhPD5iucZqaPFBxok=", + "lastModified": 1685347302, + "narHash": "sha256-l7F5sNaWcq9cwz8ErhTOrgJrWDSupCq1BNpmd/tKT7c=", "owner": "zeme-wana", "repo": "iogx", - "rev": "e364993361bfb9d0de3a48e280c2449d759e280c", + "rev": "fd6e15c49ce88772b6902d03e981c201922ed593", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0b2666f..5ac894c 100644 --- a/flake.nix +++ b/flake.nix @@ -12,8 +12,8 @@ repoRoot = ./.; flakeOutputsPrefix = ""; systems = [ "x86_64-darwin" "x86_64-linux" ]; - haskellCompilers = [ "ghc8107" ]; - defaultHaskellCompiler = "ghc8107"; + haskellCompilers = [ "ghc927" ]; + defaultHaskellCompiler = "ghc927"; haskellCrossSystem = null; haskellProjectFile = ./nix/haskell-project.nix; perSystemOutputsFile = null; diff --git a/nix/haskell-project.nix b/nix/haskell-project.nix index 8a5849b..5569c60 100644 --- a/nix/haskell-project.nix +++ b/nix/haskell-project.nix @@ -16,15 +16,11 @@ let packages = { # Things that need plutus-tx-plugin freer-extras.package.buildable = !isCross; - cardano-node-emulator.package.buildable = !isCross; - cardano-streaming.package.buildable = !isCross; e2e-tests.package.buildable = !isCross; # These need R plutus-core.components.benchmarks.cost-model-test.buildable = lib.mkForce (!isCross); plutus-core.components.benchmarks.update-cost-model.buildable = lib.mkForce (!isCross); - plutus-pab-executables.components.tests.plutus-pab-test-full-long-running.buildable = lib.mkForce (!isDarwin); - e2e-tests.doHaddock = deferPluginErrors; e2e-tests.flags.defer-plugin-errors = deferPluginErrors;