From f3a0b3cd8f1adb95c9bd1756d4bb045f52549a54 Mon Sep 17 00:00:00 2001 From: Marty Stumpf Date: Wed, 5 Jan 2022 07:58:58 -0800 Subject: [PATCH] updateMaterialized. --- .../materialized-darwin/.plan.nix/plutus-core.nix | 9 --------- nix/pkgs/haskell/materialized-darwin/default.nix | 3 --- .../haskell/materialized-linux/.plan.nix/plutus-core.nix | 9 --------- nix/pkgs/haskell/materialized-linux/default.nix | 3 --- .../materialized-windows/.plan.nix/plutus-core.nix | 9 --------- nix/pkgs/haskell/materialized-windows/default.nix | 3 --- 6 files changed, 36 deletions(-) diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-core.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-core.nix index 90edb4e3dec..fbb03ae7fe2 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-core.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-core.nix @@ -102,10 +102,6 @@ (hsPkgs."word-array" or (errorHandler.buildDepError "word-array")) (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) ]; - build-tools = [ - (hsPkgs.buildPackages.alex.components.exes.alex or (pkgs.buildPackages.alex or (errorHandler.buildToolDepError "alex:alex"))) - (hsPkgs.buildPackages.happy.components.exes.happy or (pkgs.buildPackages.happy or (errorHandler.buildToolDepError "happy:happy"))) - ]; buildable = true; modules = [ "PlutusCore/Analysis/Definitions" @@ -136,10 +132,6 @@ "PlutusCore/Generators/Internal/TypeEvalCheck" "PlutusCore/Generators/Internal/TypedBuiltinGen" "PlutusCore/Generators/Internal/Utils" - "PlutusCore/Parsable" - "PlutusCore/Parser/Internal" - "PlutusCore/Parser/Lexer" - "PlutusCore/Parser/Type" "PlutusCore/Parser/ParserCommon" "PlutusCore/Pretty/Classic" "PlutusCore/Pretty/ConfigName" @@ -228,7 +220,6 @@ "PlutusCore/Generators/NEAT/Term" "PlutusCore/Generators/NEAT/Type" "PlutusCore/Generators/Test" - "PlutusCore/Lexer" "PlutusCore/Mark" "PlutusCore/MkPlc" "PlutusCore/Name" diff --git a/nix/pkgs/haskell/materialized-darwin/default.nix b/nix/pkgs/haskell/materialized-darwin/default.nix index 634133377e6..d7ae499f785 100644 --- a/nix/pkgs/haskell/materialized-darwin/default.nix +++ b/nix/pkgs/haskell/materialized-darwin/default.nix @@ -134,8 +134,6 @@ "th-extras".revision = (((hackage."th-extras")."0.0.0.4").revisions).default; "th-extras".flags.base4 = true; "quickcheck-io".revision = (((hackage."quickcheck-io")."0.2.0").revisions).default; - "alex".revision = (((hackage."alex")."3.2.6").revisions).default; - "alex".flags.small_base = true; "tasty-hunit".revision = (((hackage."tasty-hunit")."0.10.0.3").revisions).default; "megaparsec".revision = (((hackage."megaparsec")."9.2.0").revisions).default; "megaparsec".flags.dev = false; @@ -784,7 +782,6 @@ "dense-linear-algebra".components.library.planned = lib.mkOverride 900 true; "unix".components.library.planned = lib.mkOverride 900 true; "charset".components.library.planned = lib.mkOverride 900 true; - "alex".components.exes."alex".planned = lib.mkOverride 900 true; "constraints-extras".components.library.planned = lib.mkOverride 900 true; "text".components.library.planned = lib.mkOverride 900 true; "plutus-benchmark".components.tests."plutus-benchmark-nofib-tests".planned = lib.mkOverride 900 true; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-core.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-core.nix index 90edb4e3dec..fbb03ae7fe2 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-core.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-core.nix @@ -102,10 +102,6 @@ (hsPkgs."word-array" or (errorHandler.buildDepError "word-array")) (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) ]; - build-tools = [ - (hsPkgs.buildPackages.alex.components.exes.alex or (pkgs.buildPackages.alex or (errorHandler.buildToolDepError "alex:alex"))) - (hsPkgs.buildPackages.happy.components.exes.happy or (pkgs.buildPackages.happy or (errorHandler.buildToolDepError "happy:happy"))) - ]; buildable = true; modules = [ "PlutusCore/Analysis/Definitions" @@ -136,10 +132,6 @@ "PlutusCore/Generators/Internal/TypeEvalCheck" "PlutusCore/Generators/Internal/TypedBuiltinGen" "PlutusCore/Generators/Internal/Utils" - "PlutusCore/Parsable" - "PlutusCore/Parser/Internal" - "PlutusCore/Parser/Lexer" - "PlutusCore/Parser/Type" "PlutusCore/Parser/ParserCommon" "PlutusCore/Pretty/Classic" "PlutusCore/Pretty/ConfigName" @@ -228,7 +220,6 @@ "PlutusCore/Generators/NEAT/Term" "PlutusCore/Generators/NEAT/Type" "PlutusCore/Generators/Test" - "PlutusCore/Lexer" "PlutusCore/Mark" "PlutusCore/MkPlc" "PlutusCore/Name" diff --git a/nix/pkgs/haskell/materialized-linux/default.nix b/nix/pkgs/haskell/materialized-linux/default.nix index 634133377e6..d7ae499f785 100644 --- a/nix/pkgs/haskell/materialized-linux/default.nix +++ b/nix/pkgs/haskell/materialized-linux/default.nix @@ -134,8 +134,6 @@ "th-extras".revision = (((hackage."th-extras")."0.0.0.4").revisions).default; "th-extras".flags.base4 = true; "quickcheck-io".revision = (((hackage."quickcheck-io")."0.2.0").revisions).default; - "alex".revision = (((hackage."alex")."3.2.6").revisions).default; - "alex".flags.small_base = true; "tasty-hunit".revision = (((hackage."tasty-hunit")."0.10.0.3").revisions).default; "megaparsec".revision = (((hackage."megaparsec")."9.2.0").revisions).default; "megaparsec".flags.dev = false; @@ -784,7 +782,6 @@ "dense-linear-algebra".components.library.planned = lib.mkOverride 900 true; "unix".components.library.planned = lib.mkOverride 900 true; "charset".components.library.planned = lib.mkOverride 900 true; - "alex".components.exes."alex".planned = lib.mkOverride 900 true; "constraints-extras".components.library.planned = lib.mkOverride 900 true; "text".components.library.planned = lib.mkOverride 900 true; "plutus-benchmark".components.tests."plutus-benchmark-nofib-tests".planned = lib.mkOverride 900 true; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-core.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-core.nix index 90edb4e3dec..fbb03ae7fe2 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-core.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-core.nix @@ -102,10 +102,6 @@ (hsPkgs."word-array" or (errorHandler.buildDepError "word-array")) (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) ]; - build-tools = [ - (hsPkgs.buildPackages.alex.components.exes.alex or (pkgs.buildPackages.alex or (errorHandler.buildToolDepError "alex:alex"))) - (hsPkgs.buildPackages.happy.components.exes.happy or (pkgs.buildPackages.happy or (errorHandler.buildToolDepError "happy:happy"))) - ]; buildable = true; modules = [ "PlutusCore/Analysis/Definitions" @@ -136,10 +132,6 @@ "PlutusCore/Generators/Internal/TypeEvalCheck" "PlutusCore/Generators/Internal/TypedBuiltinGen" "PlutusCore/Generators/Internal/Utils" - "PlutusCore/Parsable" - "PlutusCore/Parser/Internal" - "PlutusCore/Parser/Lexer" - "PlutusCore/Parser/Type" "PlutusCore/Parser/ParserCommon" "PlutusCore/Pretty/Classic" "PlutusCore/Pretty/ConfigName" @@ -228,7 +220,6 @@ "PlutusCore/Generators/NEAT/Term" "PlutusCore/Generators/NEAT/Type" "PlutusCore/Generators/Test" - "PlutusCore/Lexer" "PlutusCore/Mark" "PlutusCore/MkPlc" "PlutusCore/Name" diff --git a/nix/pkgs/haskell/materialized-windows/default.nix b/nix/pkgs/haskell/materialized-windows/default.nix index ff26f7a2228..15a5422093b 100644 --- a/nix/pkgs/haskell/materialized-windows/default.nix +++ b/nix/pkgs/haskell/materialized-windows/default.nix @@ -132,8 +132,6 @@ "th-extras".revision = (((hackage."th-extras")."0.0.0.4").revisions).default; "th-extras".flags.base4 = true; "quickcheck-io".revision = (((hackage."quickcheck-io")."0.2.0").revisions).default; - "alex".revision = (((hackage."alex")."3.2.6").revisions).default; - "alex".flags.small_base = true; "tasty-hunit".revision = (((hackage."tasty-hunit")."0.10.0.3").revisions).default; "megaparsec".revision = (((hackage."megaparsec")."9.2.0").revisions).default; "megaparsec".flags.dev = false; @@ -757,7 +755,6 @@ "constraints-extras".components.exes."readme".planned = lib.mkOverride 900 true; "dense-linear-algebra".components.library.planned = lib.mkOverride 900 true; "charset".components.library.planned = lib.mkOverride 900 true; - "alex".components.exes."alex".planned = lib.mkOverride 900 true; "constraints-extras".components.library.planned = lib.mkOverride 900 true; "text".components.library.planned = lib.mkOverride 900 true; "plutus-benchmark".components.tests."plutus-benchmark-nofib-tests".planned = lib.mkOverride 900 true;