Bump nixpkgs and hevm dependencies

.github/workflows/build.yml

@@ -18,12 +18,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
-      # v12
       - uses: cachix/[email protected]
         with:
           # https://discourse.nixos.org/t/understanding-binutils-darwin-wrapper-nix-support-bad-substitution/11475/2
           nix_path: nixpkgs=channel:nixos-unstable
-      # v8
       - uses: cachix/cachix-action@v10
         with:
           name: dapp

.github/workflows/release.yml

@@ -5,117 +5,17 @@ on:
       - '[a-z]+/[0-9]+.[0-9]+.[0-9]+'
 
 jobs:
-  macosRelease:
-    runs-on: ${{ matrix.os }}
-    name: macosRelease
-    strategy:
-      matrix:
-        os:
-          - macos-latest
-        include:
-          - os: macos-latest
-            brew: automake
-
-    steps:
-      - name: Workaround for actions/cache#403
-        if: runner.os == 'macOS'
-        run: |
-          brew install gnu-tar
-          echo PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH" >> $GITHUB_ENV
-
-      - name: Get Packages
-        uses: mstksg/get-package@v1
-        with:
-          brew: ${{ matrix.brew }}
-          apt-get: ${{ matrix.apt-get }}
-
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Cache Local
-        id: cache-local
-        uses: actions/cache@v1
-        with:
-          path: ~/.local/
-          key: ${{ runner.os }}-local-v3
-
-      - name: Cache Stack
-        id: cache-stack
-        uses: actions/cache@v1
-        with:
-          path: ~/.stack
-          key: ${{ runner.os }}-stack-v3
-
-      - name: Build Binaries
-        run: |
-          .github/scripts/install-solc.sh
-          .github/scripts/install-z3.sh
-          .github/scripts/install-cvc4.sh
-        env:
-          HOST_OS: ${{ runner.os }}
-
-      - name: Build Libraries
-        run: |
-          .github/scripts/install-libsecp256k1.sh
-          .github/scripts/install-libff.sh
-        env:
-          HOST_OS: ${{ runner.os }}
-
-      - name: Build Dependencies
-        run: |
-          cd src/hevm && stack build --ghc-options="-Werror" --extra-include-dirs=$HOME/.local/include --extra-lib-dirs=$HOME/.local/lib --only-dependencies && cd ../..
-
-      - name: Build and install hevm
-        run: |
-          cd src/hevm && stack install --extra-include-dirs=$HOME/.local/include --extra-lib-dirs=$HOME/.local/lib && cd ../..
-
-      - name: Test
-        run: |
-          export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$HOME/.local/lib"
-          export PATH="${PATH}:$HOME/.local/bin"
-
-          cp "$HOME/.local/bin/solc-0.8.6" "$HOME/.local/bin/solc"
-          cd src/hevm && stack test --extra-include-dirs=$HOME/.local/include --extra-lib-dirs=$HOME/.local/lib && cd ../..
-
-      - name: Amend and compress binaries (macOS)
-        if: runner.os == 'macOS'
-        run: .github/scripts/build-macos-release.sh
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v1
-        with:
-          name: hevm-${{ runner.os }}
-          path: hevm.tar.gz
-
-  linuxRelease:
+  release:
     name: Create Release
-    needs: macosRelease
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      # v12
       - uses: cachix/[email protected]
-      # v8
       - uses: cachix/cachix-action@v10
         with:
           name: dapp
           signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
-      - run: nix-build -A hevmUnwrapped --out-link hevmLinux
-
-      - uses: actions/download-artifact@master
-        with:
-          name: hevm-macOS
-          path: hevm-macOS
-
-      - name: Rename macOS artifact
-        run: |
-          mv ./hevm-macOS/hevm.tar.gz ./hevm-macOS/hevm-macOS.tar.gz
-
       - name: Release
         uses: softprops/action-gh-release@v1
-        with:
-          files: |
-            ./hevmLinux/bin/hevm
-            ./hevm-macOS/hevm-macOS.tar.gz
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -29,7 +29,7 @@ curl https://dapp.tools/install | sh
 
 This configures the dapphub binary cache and installs the `dapp`, `solc`, `seth` and `hevm` executables.
 
-**NOTE:** Arm support in the GHC haskell compiiler is still fairly bleeding edge, until this
+**NOTE:** Arm support in the GHC haskell compiler is still fairly bleeding edge, until this
 situation stabilises, users of M1 macs must run dapptools (and the installer!) under rosetta 2 (i.e.
 as an emulated x86 program). Make sure `/etc/nix/nix.conf` contains `system = x86_64-darwin`.
 

default.nix

@@ -1,11 +1,11 @@
 { system ? builtins.currentSystem , ... }:
 
 let
-  rev = "aa576357673d609e618d87db43210e49d4bb1789";
+  rev = "d17a56d90ecbd1b8fc908d49598fb854ef188461";
   nixpkgs = builtins.fetchTarball {
-    name = "nixpkgs-release-21.05";
+    name = "nixpkgs-2022.05-2022-06-20";
     url = "https://github.com/nixos/nixpkgs/tarball/${rev}";
-    sha256 = "1868s3mp0lwg1jpxsgmgijzddr90bjkncf6k6zhdjqihf0i1n2np";
+    sha256 = "04a9ry0kk4qzy622mk3izh4azdp7plf1847mfp3zkn9gk0innswg";
   };
 in
   # Now return the Nixpkgs configured to use our overlay.