Merge branch 'master' into ci/master-cachix-push

runtimeverification · Nov 9, 2023 · 621a30d · 621a30d
2 parents b489c03 + c1de293
commit 621a30d
Show file tree

Hide file tree

Showing 16 changed files with 137 additions and 198 deletions.
diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml
@@ -81,7 +81,7 @@ jobs:
       - name: 'Build KEVM'
         run: |
             docker exec -u github-user kontrol-ci-profile-${GITHUB_SHA} /bin/bash -c 'poetry install'
-            docker exec -u github-user kontrol-ci-profile-${GITHUB_SHA} /bin/bash -c 'CXX=clang++-14 poetry run kevm-dist --verbose build -j`nproc` plugin foundry'
+            docker exec -u github-user kontrol-ci-profile-${GITHUB_SHA} /bin/bash -c 'CXX=clang++-14 poetry run kevm-dist --verbose build -j`nproc` evm-semantics.plugin kontrol.foundry'
       - name: 'Run profiling'
         run: |
           PROF_ARGS=--numprocesses=8
@@ -113,7 +113,7 @@ jobs:
       - name: 'Build KEVM'
         run: |
             docker exec -u github-user kontrol-ci-integration-${GITHUB_SHA} /bin/bash -c 'poetry install'
-            docker exec -u github-user kontrol-ci-integration-${GITHUB_SHA} /bin/bash -c 'CXX=clang++-14 poetry run kevm-dist --verbose build -j`nproc` plugin haskell foundry'
+            docker exec -u github-user kontrol-ci-integration-${GITHUB_SHA} /bin/bash -c 'CXX=clang++-14 poetry run kevm-dist --verbose build -j`nproc` evm-semantics.plugin evm-semantics.haskell kontrol.foundry'
       - name: 'Run integration tests'
         run: |
           TEST_ARGS=--numprocesses=8

diff --git a/README.md b/README.md
@@ -30,17 +30,17 @@ poetry install
 
 In order to build `kontrol`, you need to build these specific targets:
 ```sh
-poetry run kevm-dist --verbose build -j3 plugin haskell foundry
+poetry run kevm-dist --verbose build -j3 evm-semantics.plugin evm-semantics.haskell kontrol.foundry
 ```
 
 To change the default compiler:
 ```sh
-CXX=clang++-14 poetry run kevm-dist --verbose build -j3 plugin haskell foundry
+CXX=clang++-14 poetry run kevm-dist --verbose build -j3 evm-semantics.plugin evm-semantics.haskell kontrol.foundry
 ```
 
 On Apple Silicon:
 ```sh
-APPLE_SILICON=true poetry run kevm-dist --verbose build -j3 plugin haskell foundry
+APPLE_SILICON=true poetry run kevm-dist --verbose build -j3 evm-semantics.plugin evm-semantics.haskell kontrol.foundry
 ```
 
 Targets can be cleaned with:
@@ -81,4 +81,4 @@ For more information about the [K Framework], refer to these sources:
 -   [Logical Frameworks](https://dl.acm.org/doi/10.5555/208683.208700): Discussion of logical frameworks.
 
 [K Framework]: <https://kframework.org>
-[kup package manager]: <https://github.com/runtimeverification/kup>
+[kup package manager]: <https://github.com/runtimeverification/kup>
diff --git a/deps/k_release b/deps/k_release
@@ -1 +1 @@
-6.0.174
+6.1.1
diff --git a/deps/kevm_release b/deps/kevm_release
@@ -1 +1 @@
-1.0.333
+1.0.347
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,16 +2,25 @@
   description = "Kontrol";
 
   inputs = {
-    kevm.url = "github:runtimeverification/evm-semantics/v1.0.333";
+    kevm.url = "github:runtimeverification/evm-semantics/v1.0.347";
     nixpkgs.follows = "kevm/nixpkgs";
     nixpkgs-pyk.follows = "kevm/nixpkgs-pyk";
     k-framework.follows = "kevm/k-framework";
     flake-utils.follows = "kevm/flake-utils";
     rv-utils.follows = "kevm/rv-utils";
     pyk.follows = "kevm/pyk";
     poetry2nix.follows = "kevm/poetry2nix";
-    foundry.follows = "kevm/foundry";
-    solc.follows = "kevm/solc";
+    foundry = {
+      url =
+        "github:shazow/foundry.nix/monthly"; # Use monthly branch for permanent releases
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+    };
+    solc = {
+      url = "github:hellwolf/solc.nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+    };
   };
   outputs = { self, k-framework, nixpkgs, flake-utils, poetry2nix, kevm
     , rv-utils, pyk, foundry, solc, ... }@inputs:
@@ -93,16 +102,13 @@
                   prev.lib.optionalString
                   (prev.stdenv.isAarch64 && prev.stdenv.isDarwin)
                   "APPLE_SILICON=true"
-                } kevm-dist build -j4 foundry
+                } kevm-dist build kontrol.foundry
               '';
 
               installPhase = ''
                 mkdir -p $out
                 cp -r ./kdist-*/* $out/
-                ln -s ${prev.kevm}/haskell $out/haskell
-                ln -s ${prev.kevm}/haskell-standalone $out/haskell-standalone
-                ln -s ${prev.kevm}/llvm $out/llvm
-                ln -s ${prev.kevm}/plugin $out/plugin
+                ln -s ${prev.kevm}/evm-semantics $out/evm-semantics
                 mkdir -p $out/bin
                 makeWrapper ${
                   (kontrol-pyk { inherit solc_version; })

diff --git a/package/version b/package/version
@@ -1 +1 @@
-0.1.50
+0.1.55