From e80c54d03ccaa9a0b629ebb9af0b4718bdef3911 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Tue, 12 Oct 2021 23:43:22 +1300 Subject: [PATCH] Update materialization --- .../materialized-darwin/.plan.nix/plutus-contract.nix | 1 + .../materialized-ghcjs-build/.plan.nix/plutus-contract.nix | 1 + .../materialized-ghcjs/.plan.nix/plutus-contract.nix | 1 + nix/pkgs/haskell/materialized-ghcjs/default.nix | 6 ++++-- .../materialized-linux/.plan.nix/plutus-contract.nix | 1 + .../materialized-windows/.plan.nix/plutus-contract.nix | 1 + 6 files changed, 9 insertions(+), 2 deletions(-) diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-contract.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-contract.nix index 97843a955e4..61f8f76a0b4 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-contract.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-contract.nix @@ -76,6 +76,7 @@ (hsPkgs."IntervalMap" or (errorHandler.buildDepError "IntervalMap")) (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) (hsPkgs."openapi3" or (errorHandler.buildDepError "openapi3")) + (hsPkgs."plutus-tx-plugin" or (errorHandler.buildDepError "plutus-tx-plugin")) ] ++ (pkgs.lib).optionals (!(compiler.isGhcjs && true || system.isGhcjs || system.isWindows)) [ (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) diff --git a/nix/pkgs/haskell/materialized-ghcjs-build/.plan.nix/plutus-contract.nix b/nix/pkgs/haskell/materialized-ghcjs-build/.plan.nix/plutus-contract.nix index 97843a955e4..61f8f76a0b4 100644 --- a/nix/pkgs/haskell/materialized-ghcjs-build/.plan.nix/plutus-contract.nix +++ b/nix/pkgs/haskell/materialized-ghcjs-build/.plan.nix/plutus-contract.nix @@ -76,6 +76,7 @@ (hsPkgs."IntervalMap" or (errorHandler.buildDepError "IntervalMap")) (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) (hsPkgs."openapi3" or (errorHandler.buildDepError "openapi3")) + (hsPkgs."plutus-tx-plugin" or (errorHandler.buildDepError "plutus-tx-plugin")) ] ++ (pkgs.lib).optionals (!(compiler.isGhcjs && true || system.isGhcjs || system.isWindows)) [ (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) diff --git a/nix/pkgs/haskell/materialized-ghcjs/.plan.nix/plutus-contract.nix b/nix/pkgs/haskell/materialized-ghcjs/.plan.nix/plutus-contract.nix index 97843a955e4..61f8f76a0b4 100644 --- a/nix/pkgs/haskell/materialized-ghcjs/.plan.nix/plutus-contract.nix +++ b/nix/pkgs/haskell/materialized-ghcjs/.plan.nix/plutus-contract.nix @@ -76,6 +76,7 @@ (hsPkgs."IntervalMap" or (errorHandler.buildDepError "IntervalMap")) (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) (hsPkgs."openapi3" or (errorHandler.buildDepError "openapi3")) + (hsPkgs."plutus-tx-plugin" or (errorHandler.buildDepError "plutus-tx-plugin")) ] ++ (pkgs.lib).optionals (!(compiler.isGhcjs && true || system.isGhcjs || system.isWindows)) [ (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) diff --git a/nix/pkgs/haskell/materialized-ghcjs/default.nix b/nix/pkgs/haskell/materialized-ghcjs/default.nix index c54af2c1e7c..e5e62145901 100644 --- a/nix/pkgs/haskell/materialized-ghcjs/default.nix +++ b/nix/pkgs/haskell/materialized-ghcjs/default.nix @@ -329,8 +329,6 @@ "sop-core".revision = (((hackage."sop-core")."0.5.0.1").revisions).default; "data-fix".revision = (((hackage."data-fix")."0.3.2").revisions).default; "typed-process".revision = (((hackage."typed-process")."0.2.6.1").revisions).default; - "mersenne-random-pure64".revision = (((hackage."mersenne-random-pure64")."0.2.2.0").revisions).default; - "mersenne-random-pure64".flags.small_base = false; "dense-linear-algebra".revision = (((hackage."dense-linear-algebra")."0.1.0.0").revisions).default; "logict".revision = (((hackage."logict")."0.7.0.3").revisions).default; "contravariant".revision = (((hackage."contravariant")."1.5.5").revisions).default; @@ -806,6 +804,7 @@ freer-extras = ./.plan.nix/freer-extras.nix; cardano-ledger-byron-test = ./.plan.nix/cardano-ledger-byron-test.nix; plutus-tx = ./.plan.nix/plutus-tx.nix; + mersenne-random-pure64 = ./.plan.nix/mersenne-random-pure64.nix; hedgehog-extras = ./.plan.nix/hedgehog-extras.nix; cardano-wallet-test-utils = ./.plan.nix/cardano-wallet-test-utils.nix; fake-pab = ./.plan.nix/fake-pab.nix; @@ -995,6 +994,9 @@ flags = { "development" = lib.mkOverride 900 false; }; }; "plutus-tx" = { flags = {}; }; + "mersenne-random-pure64" = { + flags = { "small_base" = lib.mkOverride 900 false; }; + }; "hedgehog-extras" = { flags = {}; }; "cardano-wallet-test-utils" = { flags = { "release" = lib.mkOverride 900 false; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-contract.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-contract.nix index 97843a955e4..61f8f76a0b4 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-contract.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-contract.nix @@ -76,6 +76,7 @@ (hsPkgs."IntervalMap" or (errorHandler.buildDepError "IntervalMap")) (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) (hsPkgs."openapi3" or (errorHandler.buildDepError "openapi3")) + (hsPkgs."plutus-tx-plugin" or (errorHandler.buildDepError "plutus-tx-plugin")) ] ++ (pkgs.lib).optionals (!(compiler.isGhcjs && true || system.isGhcjs || system.isWindows)) [ (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-contract.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-contract.nix index 97843a955e4..61f8f76a0b4 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-contract.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-contract.nix @@ -76,6 +76,7 @@ (hsPkgs."IntervalMap" or (errorHandler.buildDepError "IntervalMap")) (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) (hsPkgs."openapi3" or (errorHandler.buildDepError "openapi3")) + (hsPkgs."plutus-tx-plugin" or (errorHandler.buildDepError "plutus-tx-plugin")) ] ++ (pkgs.lib).optionals (!(compiler.isGhcjs && true || system.isGhcjs || system.isWindows)) [ (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit"))