Merge pull request #324 from ethereum/cabal-multi

Author: d-xo

flake.lock

@@ -17,12 +17,16 @@
       url = "github:ethereum/tests/v12.2";
       flake = false;
     };
+    cabal-head = {
+      url = "github:haskell/cabal";
+      flake = false;
+    };
   };
 
-  outputs = { self, nixpkgs, flake-utils, solidity, ethereum-tests, foundry, ... }:
+  outputs = { self, nixpkgs, flake-utils, solidity, ethereum-tests, foundry, cabal-head, ... }:
     flake-utils.lib.eachDefaultSystem (system:
       let
-        pkgs = nixpkgs.legacyPackages.${system};
+        pkgs = (import nixpkgs { inherit system; config = { allowBroken = true; }; });
         testDeps = with pkgs; [
           go-ethereum
           solc
@@ -32,6 +36,44 @@
           foundry.defaultPackage.${system}
         ];
 
+        # custom package set capable of building latest (unreleased) `cabal-install`.
+        # This gives us support for multiple home units in cabal repl
+        cabal-multi-pkgs = pkgs.haskell.packages.ghc94.override {
+          overrides = with pkgs.haskell.lib; self: super: rec {
+            cabal-install = dontCheck (self.callCabal2nix "cabal-install" "${cabal-head}/cabal-install" {});
+            cabal-install-solver = dontCheck (self.callCabal2nix "cabal-install-solver" "${cabal-head}/cabal-install-solver" {});
+            Cabal-described = dontCheck (self.callCabal2nix "Cabal-described" "${cabal-head}/Cabal-described" {});
+            Cabal-QuickCheck = dontCheck (self.callCabal2nix "Cabal-QuickCheck" "${cabal-head}/Cabal-QuickCheck" {});
+            Cabal-tree-diff = dontCheck (self.callCabal2nix "Cabal-tree-diff" "${cabal-head}/Cabal-tree-diff" {});
+            Cabal-syntax = dontCheck (self.callCabal2nix "Cabal-syntax" "${cabal-head}/Cabal-syntax" {});
+            Cabal = dontCheck (self.callCabal2nix "Cabal" "${cabal-head}/Cabal" {});
+            unix = dontCheck (doJailbreak super.unix_2_8_1_1);
+            filepath = dontCheck (doJailbreak super.filepath_1_4_100_3);
+            process = dontCheck (doJailbreak super.process_1_6_17_0);
+            directory = dontCheck (doJailbreak (super.directory_1_3_7_1));
+            tasty = dontCheck (doJailbreak super.tasty);
+            QuickCheck = dontCheck (doJailbreak super.QuickCheck);
+            hashable = dontCheck (doJailbreak super.hashable);
+            async = dontCheck (doJailbreak super.async);
+            hspec-meta = dontCheck (doJailbreak super.hspec-meta);
+            hpc = dontCheck (doJailbreak super.hpc);
+            ghci = dontCheck (doJailbreak super.ghci);
+            ghc-boot = dontCheck (doJailbreak super.ghc-boot);
+            setenv = dontCheck (doJailbreak super.setenv);
+            vector = dontCheck (doJailbreak super.vector);
+            network-uri = dontCheck (doJailbreak super.network-uri);
+            aeson = dontCheck (doJailbreak super.aeson);
+            th-compat = dontCheck (doJailbreak super.th-compat);
+            safe-exceptions = dontCheck (doJailbreak super.safe-exceptions);
+            bifunctors = dontCheck (doJailbreak super.bifunctors);
+            base-compat-batteries = dontCheck (doJailbreak super.base-compat-batteries);
+            distributative = dontCheck (doJailbreak super.distributative);
+            semialign = dontCheck (doJailbreak super.semialign);
+            semigroupoids = dontCheck (doJailbreak super.semigroupoids);
+            hackage-security = dontCheck (doJailbreak super.hackage-security);
+          };
+        };
+
         secp256k1-static = stripDylib (pkgs.secp256k1.overrideAttrs (attrs: {
           configureFlags = attrs.configureFlags ++ [ "--enable-static" ];
         }));
@@ -144,9 +186,11 @@
           in haskellPackages.shellFor {
             packages = _: [ hevmUnwrapped ];
             buildInputs = [
+              # cabal from nixpkgs
+              # haskellPackages.cabal-install
+              cabal-multi-pkgs.cabal-install
               mdbook
               yarn
-              haskellPackages.cabal-install
               haskellPackages.eventlog2html
               haskellPackages.haskell-language-server
             ] ++ testDeps;

flake.nix

@@ -24,22 +24,7 @@ build-type:
   Simple
 extra-source-files:
   CHANGELOG.md
-  bench/contracts/erc20.sol
-  test/contracts/lib/test.sol
-  test/contracts/lib/erc20.sol
-  test/contracts/pass/trivial.sol
-  test/contracts/pass/abstract.sol
-  test/contracts/pass/cheatCodes.sol
-  test/contracts/pass/constantinople.sol
-  test/contracts/pass/dsProvePass.sol
-  test/contracts/pass/invariants.sol
-  test/contracts/pass/libraries.sol
-  test/contracts/pass/loops.sol
-  test/contracts/pass/rpc.sol
-  test/contracts/fail/trivial.sol
-  test/contracts/fail/cheatCodes.sol
-  test/contracts/fail/dsProveFail.sol
-  test/contracts/fail/invariantFail.sol
+  bench/contracts/*.sol
   test/scripts/convert_trace_to_json.sh
 
 flag ci