From 51b467b23007640a66206ee82bae624e4d00b125 Mon Sep 17 00:00:00 2001
From: Julian Kuners <julian.kuners@gmail.com>
Date: Mon, 26 May 2025 10:49:43 +0200
Subject: [PATCH 1/2] adapt nix flake inputs for `rv-nix-tools` and `nixpkgs`

---
 flake.lock | 44 +++++++++++++++++++++++++++++++++++++-------
 flake.nix  |  9 ++++++---
 2 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index f1c8471f1..026539121 100644
--- a/flake.lock
+++ b/flake.lock
@@ -212,8 +212,6 @@
         "haskell-backend": "haskell-backend",
         "llvm-backend": "llvm-backend",
         "nixpkgs": [
-          "k-framework",
-          "llvm-backend",
           "nixpkgs"
         ],
         "poetry2nix": "poetry2nix",
@@ -324,6 +322,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1716457947,
+        "narHash": "sha256-Y+exebcqeprnhEpoPJrEUZmNeO60qeOxkVHhqG/OEwQ=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "69493a13eaea0dc4682fd07e8a084f17813dbeeb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "69493a13eaea0dc4682fd07e8a084f17813dbeeb",
+        "type": "github"
+      }
+    },
     "poetry2nix": {
       "inputs": {
         "flake-utils": "flake-utils_2",
@@ -399,20 +413,36 @@
         "k-framework": "k-framework",
         "libff": "libff",
         "nixpkgs": [
-          "k-framework",
+          "rv-nix-tools",
           "nixpkgs"
         ],
         "poetry2nix": [
           "k-framework",
           "poetry2nix"
         ],
-        "rv-utils": [
-          "k-framework",
-          "rv-utils"
-        ],
+        "rv-nix-tools": "rv-nix-tools",
         "xbyak": "xbyak"
       }
     },
+    "rv-nix-tools": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1726497185,
+        "narHash": "sha256-iN+5eLmDm/rLuIZezS5ZqiW1BtBpwrrM9CPPP7Z5Tog=",
+        "owner": "runtimeverification",
+        "repo": "rv-nix-tools",
+        "rev": "854d4f05ea78547d46e807b414faad64cea10ae4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "runtimeverification",
+        "repo": "rv-nix-tools",
+        "rev": "854d4f05ea78547d46e807b414faad64cea10ae4",
+        "type": "github"
+      }
+    },
     "rv-utils": {
       "inputs": {
         "nixpkgs": "nixpkgs"
diff --git a/flake.nix b/flake.nix
index 786daa3bb..204542734 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,11 +2,14 @@
   description = "Blockchain K plugin";
 
   inputs = {
+    rv-nix-tools.url = "github:runtimeverification/rv-nix-tools/854d4f05ea78547d46e807b414faad64cea10ae4";
+    nixpkgs.follows = "rv-nix-tools/nixpkgs";
+
     k-framework.url = "github:runtimeverification/k/v7.1.257";
-    nixpkgs.follows = "k-framework/nixpkgs";
+    k-framework.inputs.nixpkgs.follows = "nixpkgs";
     flake-utils.follows = "k-framework/flake-utils";
-    rv-utils.follows = "k-framework/rv-utils";
     poetry2nix.follows = "k-framework/poetry2nix";
+    poetry2nix.inputs.nixpkgs.follows = "nixpkgs";
 
     cpp-httplib = {
       url =
@@ -39,7 +42,7 @@
       flake = false;
     };
   };
-  outputs = { self, nixpkgs, k-framework, poetry2nix, flake-utils, rv-utils
+  outputs = { self, nixpkgs, k-framework, poetry2nix, flake-utils, rv-nix-tools
     , cpp-httplib, cryptopp, libff, ate-pairing, xbyak
     , ckzg4844, blst, ... }@inputs:
     let

From 70de2948e5fd2f2c89a15c5baa32e620146e6c18 Mon Sep 17 00:00:00 2001
From: Julian Kuners <julian.kuners@gmail.com>
Date: Mon, 26 May 2025 10:50:04 +0200
Subject: [PATCH 2/2] adapt `update-version.yml` workflow for `rv-nix-tools`

---
 .github/workflows/update-version.yml | 3 +++
 deps/rv-nix-tools                    | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 deps/rv-nix-tools

diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml
index f6ba4495d..d32627e72 100644
--- a/.github/workflows/update-version.yml
+++ b/.github/workflows/update-version.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - '_update-deps/runtimeverification/k'
+      - '_update-deps/runtimeverification/rv-nix-tools'
   workflow_dispatch:
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -42,7 +43,9 @@ jobs:
       - name: 'Update Nix flake inputs'
         run: |
           K_VERSION=v"$(cat deps/k_release)"
+          RV_NIX_TOOLS_VERSION=$(cat deps/rv-nix-tools)
           sed -i 's!    k-framework.url = "github:runtimeverification/k/v[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+"!    k-framework.url = "github:runtimeverification/k/'"${K_VERSION}"'"!' flake.nix
+          sed -i 's!    rv-nix-tools.url = "github:runtimeverification/rv-nix-tools/[a-z0-9\.]*"!    rv-nix-tools.url = "github:runtimeverification/rv-nix-tools/'"${RV_NIX_TOOLS_VERSION}"'"!' flake.nix
           nix flake update
           git add flake.nix flake.lock && git commit -m 'flake.{nix,lock}: update Nix derivations' || true
 
diff --git a/deps/rv-nix-tools b/deps/rv-nix-tools
new file mode 100644
index 000000000..c8863974d
--- /dev/null
+++ b/deps/rv-nix-tools
@@ -0,0 +1 @@
+854d4f05ea78547d46e807b414faad64cea10ae4
\ No newline at end of file