Use patched version of HEVM which allows flattening of DSS

Author: Christopher Fredén

.dapp.json

@@ -432,17 +432,17 @@
         "url": "https://github.com/makerdao/token-faucet"
       }
     },
-    "vote-proxy_3c4f8dd": {
+    "vote-proxy_6fdbee3": {
       "deps": {
         "ds-chief": "ds-chief_ea05ee0",
         "ds-test": "ds-test_a4e4005",
         "ds-token": "ds-token_cee36a1"
       },
       "name": "vote-proxy",
       "repo": {
-        "name": "vote-proxy-3c4f8dd",
+        "name": "vote-proxy-6fdbee3",
         "ref": "HEAD",
-        "rev": "3c4f8ddc815d047019518fb8dce14d6997c63f3f",
+        "rev": "6fdbee3ac48bb915e715668374c1deba95cdb6f6",
         "url": "https://github.com/makerdao/vote-proxy"
       }
     }
@@ -458,7 +458,7 @@
       "scd-mcd-migration": "scd-mcd-migration_dfe6473",
       "testchain-medians": "testchain-medians_1d01e6a",
       "token-faucet": "token-faucet_d7349d1",
-      "vote-proxy": "vote-proxy_3c4f8dd"
+      "vote-proxy": "vote-proxy_6fdbee3"
     },
     "name": "dss-deploy-scripts"
   },

default.nix

@@ -1,7 +1,13 @@
 # Default import pinned pkgs
 { pkgsSrc ? (import ./nix/pkgs.nix {}).pkgsSrc
 , pkgs ? (import ./nix/pkgs.nix { inherit pkgsSrc dapptoolsOverrides; }).pkgs
-, dapptoolsOverrides ? {}
+, dapptoolsOverrides ? {
+  current = fetchGit {
+    url = "https://github.com/icetan/dapptools";
+    ref = "nix-solpkg-flatten";
+    rev = "f34c2b30bce5e28ff8fbf9d1d16ef58f03127497";
+  };
+}
 , dss-deploy ? null
 , doCheck ? false
 , githubAuthToken ? null
@@ -44,7 +50,7 @@ let
         flatten = true;
       })
   ) deps);
-  
+
   dss-proxy-actions-optimized = package (deps.dss-proxy-actions // {
     inherit doCheck;
     name = "dss-proxy-actions-optimized";

shell.nix

@@ -10,8 +10,8 @@ let
   tdds = import ./. args;
   dapp2nix = import (fetchGit {
     url = "https://github.com/icetan/dapp2nix";
-    ref = "v2.1.3";
-    rev = "a82d8b06341a2fd53419831c6464006ecb8c8190";
+    ref = "v2.1.5";
+    rev = "23089a53e49170c6751e724ee00c1e140e3fd6c0";
   }) {};
 in mkShell {
   buildInputs = tdds.bins ++ [