Merge remote-tracking branch 'origin/master' into release

.github/workflows/update-version.yml

@@ -54,7 +54,6 @@ jobs:
           BKP_VERSION=$(cat deps/blockchain-k-plugin_release)
           sed -i 's!    k-framework.url = "github:runtimeverification/k/[v0-9\.]*"!    k-framework.url = "github:runtimeverification/k/'"${K_VERSION}"'"!' flake.nix
           sed -i 's!        "github:runtimeverification/blockchain-k-plugin/[0-9a-f]*"!        "github:runtimeverification/blockchain-k-plugin/'"${BKP_VERSION}"'"!' flake.nix
-          sed -i 's!    pyk.url = "github:runtimeverification/k/[v0-9\.]*?dir=pyk"!    pyk.url = "github:runtimeverification/k/'"${K_VERSION}"'?dir=pyk"!' flake.nix
           nix run .#update-from-submodules
           nix flake update
           git add flake.nix flake.lock && git commit -m 'flake.{nix,lock}: update Nix derivations' || true

deps/k_release

@@ -1 +1 @@
-7.1.125
+7.1.131

flake.nix

@@ -2,13 +2,11 @@
   description = "A flake for the KEVM Semantics";
 
   inputs = {
-    k-framework.url = "github:runtimeverification/k/v7.1.125";
+    k-framework.url = "github:runtimeverification/k/v7.1.131";
     nixpkgs.follows = "k-framework/nixpkgs";
     flake-utils.follows = "k-framework/flake-utils";
     rv-utils.follows = "k-framework/rv-utils";
-    pyk.url = "github:runtimeverification/k/v7.1.125?dir=pyk";
-    nixpkgs-pyk.follows = "pyk/nixpkgs";
-    poetry2nix.follows = "pyk/poetry2nix";
+    poetry2nix.follows = "k-framework/poetry2nix";
     blockchain-k-plugin = {
       url =
         "github:runtimeverification/blockchain-k-plugin/300c9cf567eba4c8c88675ff67ebd859795ee169";
@@ -18,15 +16,15 @@
     haskell-backend.follows = "k-framework/haskell-backend";
   };
   outputs = { self, k-framework, haskell-backend, nixpkgs, flake-utils
-    , blockchain-k-plugin, rv-utils, pyk, ... }@inputs:
+    , blockchain-k-plugin, rv-utils, ... }@inputs:
     let
       nixLibs = pkgs:
         with pkgs;
         "-I${openssl.dev}/include -L${openssl.out}/lib -I${secp256k1}/include -L${secp256k1}/lib";
       buildInputs = pkgs:
         with pkgs;
         [
-          k-framework.packages.${pkgs.system}.k
+          k
           llvm-backend
           autoconf
           automake
@@ -38,21 +36,16 @@
           mpfr
           openssl.dev
           pkg-config
-          python310-pyk
+          python310
           time
           secp256k1
         ] ++ lib.optional (!stdenv.isDarwin) elfutils;
 
       overlay = final: prev:
         let
-          nixpkgs-pyk = import inputs.nixpkgs-pyk {
-            system = prev.system;
-            overlays = [ pyk.overlay ];
-          };
           poetry2nix =
-            inputs.poetry2nix.lib.mkPoetry2Nix { pkgs = nixpkgs-pyk; };
+            inputs.poetry2nix.lib.mkPoetry2Nix { pkgs = prev; };
         in {
-          python310-pyk = nixpkgs-pyk.python310;
           kevm = prev.stdenv.mkDerivation {
             pname = "kevm";
             version = self.rev or "dirty";
@@ -132,27 +125,18 @@
           };
 
           kevm-pyk = poetry2nix.mkPoetryApplication {
-            python = nixpkgs-pyk.python310;
+            python = prev.python310;
             projectDir = ./kevm-pyk;
             overrides = poetry2nix.overrides.withDefaults
               (finalPython: prevPython: {
-                kframework = nixpkgs-pyk.pyk-python310;
-                pygments = prevPython.pygments.overridePythonAttrs (old: {
-                  buildInputs = (old.buildInputs or [ ])
-                    ++ [ prevPython.hatchling ];
-                });
-                xdg-base-dirs = prevPython.xdg-base-dirs.overridePythonAttrs
-                  (old: {
-                    propagatedBuildInputs = (old.propagatedBuildInputs or [ ])
-                      ++ [ finalPython.poetry ];
-                  });
+                kframework = prev.pyk-python310;
               });
             groups = [ ];
             # We remove `"dev"` from `checkGroups`, so that poetry2nix does not try to resolve dev dependencies.
             checkGroups = [ ];
             postInstall = ''
-              mkdir -p $out/${nixpkgs-pyk.python310.sitePackages}/kevm_pyk/kproj/plugin
-              cp -r ${prev.blockchain-k-plugin-src}/* $out/${nixpkgs-pyk.python310.sitePackages}/kevm_pyk/kproj/plugin/
+              mkdir -p $out/${prev.python310.sitePackages}/kevm_pyk/kproj/plugin
+              cp -r ${prev.blockchain-k-plugin-src}/* $out/${prev.python310.sitePackages}/kevm_pyk/kproj/plugin/
             '';
           };