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

Author: rv-auditor

deps/k_release

@@ -1 +1 @@
-7.1.268
+7.1.273

flake.lock

@@ -5,11 +5,13 @@
     rv-nix-tools.url = "github:runtimeverification/rv-nix-tools/854d4f05ea78547d46e807b414faad64cea10ae4";
     nixpkgs.follows = "rv-nix-tools/nixpkgs";
 
-    k-framework.url = "github:runtimeverification/k/v7.1.268";
+    k-framework.url = "github:runtimeverification/k/v7.1.273";
     k-framework.inputs.nixpkgs.follows = "nixpkgs";
     flake-utils.follows = "k-framework/flake-utils";
-    poetry2nix.follows = "k-framework/poetry2nix";
-    poetry2nix.inputs.nixpkgs.follows = "nixpkgs";
+    poetry2nix = {
+      url = "github:nix-community/poetry2nix/2024.9.219347";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     blockchain-k-plugin = {
       url =
         "github:runtimeverification/blockchain-k-plugin/f159396d0f16b88c86c557c47f7ae36ffc59dc53";
@@ -139,10 +141,71 @@
                 "/src/kevm_pyk/kproj/plugin"
               ] ./kevm-pyk/.
             );
-            overrides = poetry2nix.overrides.withDefaults
-              (finalPython: prevPython: {
-                kframework = prev.pyk-python310;
-              });
+            overrides = poetry2nix.overrides.withDefaults (finalPython: prevPython: {
+              click = prevPython.click.overridePythonAttrs (
+                old: {
+                  buildInputs = (old.buildInputs or [ ]) ++ [ finalPython.flit-core ];
+                  patches = (old.patches or [ ]) ++ [
+                    ./nix/resources/click-pyproject.toml.patch
+                  ];
+                }
+              );
+              typing-extensions = prevPython.typing-extensions.overridePythonAttrs (
+                old: {
+                  patches = (old.patches or [ ]) ++ [
+                    ./nix/resources/typing-extensions-pyproject.toml.patch
+                  ];
+                }
+              );
+              types-python-dateutil = prevPython.types-python-dateutil.overridePythonAttrs (
+                old: {
+                  patches = (old.patches or [ ]) ++ [
+                    ./nix/resources/types-python-dateutil-pyproject.toml.patch
+                  ];
+                }
+              );
+              zipp = prevPython.zipp.overridePythonAttrs (
+                old: {
+                  patches = (old.patches or [ ]) ++ [
+                    ./nix/resources/zipp-pyproject.toml.patch
+                  ];
+                }
+              );
+              urllib3 = prevPython.urllib3.overridePythonAttrs (
+                old: {
+                  buildInputs = (old.buildInputs or [ ]) ++ [ finalPython.hatch-vcs ];
+                  patches = (old.patches or [ ]) ++ [
+                    ./nix/resources/urllib3-pyproject.toml.patch
+                  ];
+                }
+              );
+              attrs = prevPython.attrs.overridePythonAttrs (
+                old: {
+                  patches = (old.patches or [ ]) ++ [
+                    ./nix/resources/attrs-pyproject.toml.patch
+                  ];
+                }
+              );
+              hypothesis = prevPython.hypothesis.overridePythonAttrs (
+                old: {
+                  patches = (old.patches or [ ]) ++ [
+                    ./nix/resources/hypothesis-pyproject.toml.patch
+                  ];
+                }
+              );
+              graphviz = prevPython.graphviz.overridePythonAttrs (
+                old: {
+                  patches = (old.patches or [ ]) ++ [
+                    ./nix/resources/graphviz-pyproject.toml.patch
+                  ];
+                }
+              );
+              kframework = prevPython.kframework.overridePythonAttrs (
+                old: {
+                  buildInputs = (old.buildInputs or [ ]) ++ [ finalPython.hatchling ];
+                }
+              );
+            });
             groups = [ ];
             # We remove `"dev"` from `checkGroups`, so that poetry2nix does not try to resolve dev dependencies.
             checkGroups = [ ];