Upgrade makerpkgs to use latest solcs + forcing specific dapp version for dapp create

Author: gbalabasquer

dapp2.nix

@@ -1,4 +1,4 @@
-{ solidityPackage, solc, dapp2 }:
+{ solidityPackage, solc }:
 
 let
   inherit (builtins) map listToAttrs attrNames attrValues length fromJSON readFile;
@@ -11,14 +11,13 @@ let
 
   defaults = {
     inherit solc;
-    test-hevm = dapp2.test-hevm;
-    doCheck = true;
+    doCheck = false;
   };
 
   package = spec: let
     spec' = defaults // (removeAttrs spec [ "repo" "repo'" "src'" ]);
     deps = map (spec:
-      package (spec // { inherit (spec') solc test-hevm doCheck; })
+      package (spec // { inherit (spec') solc doCheck; })
     ) (attrValues spec'.deps);
   in solidityPackage (spec' // { inherit deps; });
 

default.nix

@@ -58,6 +58,10 @@ let
 in makerScriptPackage {
   name = "dss-deploy-scripts";
 
+  extraBins = [
+    dappPkgsVersions.hevm-0_43_1.dapp
+  ];
+
   # Specify files to add to build environment
   src = lib.sourceByRegex ./. [
     "bin" "bin/.*"

lib/common.sh

@@ -101,12 +101,16 @@ copy() {
     copyMeta "$lib"
 }
 
+# shellcheck disable=SC2001
+dapp0_31_1="$(echo "$PATH" | sed 's/.*\:\(.*\)dapp-0.31.1\(.*\)/\1/')dapp-0.31.1/bin/dapp"
+export dapp0_31_1
+
 dappCreate() {
     set -e
     local lib; lib=$1
     local class; class=$2
     ETH_NONCE=$(cat "$NONCE_TMP_FILE")
-    DAPP_OUT="$DAPP_LIB/$lib/out" ETH_NONCE="$ETH_NONCE" dapp create "$class" "${@:3}"
+    DAPP_OUT="$DAPP_LIB/$lib/out" ETH_NONCE="$ETH_NONCE" "$dapp0_31_1" create "$class" "${@:3}"
     echo $((ETH_NONCE + 1)) > "$NONCE_TMP_FILE"
     copy "$lib"
 }

nix/srcs.nix

@@ -2,7 +2,7 @@ rec {
   # Default import pinned pkgs
   makerpkgs = fetchGit {
     url = "https://github.com/makerdao/makerpkgs";
-    rev = "4d71760d27e88e244f9b5fe4d064b4c207b9b92d";
+    rev = "1a4820a5a4438046c0acbff3375570fe1d060bc4";
     ref = "master";
   };
 }