From 9af077bf268d02db3bb8147ba2fd4de5a449acaa Mon Sep 17 00:00:00 2001
From: Julian Kuners <julian.kuners@gmail.com>
Date: Tue, 27 May 2025 12:49:39 +0200
Subject: [PATCH 1/2] adapt nix flake inputs for `rv-nix-tools` and `nixpkgs`

---
 flake.lock | 13 +++++++------
 flake.nix  |  5 +++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/flake.lock b/flake.lock
index 28f0979c6..10b8ba3ef 100644
--- a/flake.lock
+++ b/flake.lock
@@ -106,30 +106,31 @@
         "fmt-src": "fmt-src",
         "immer-src": "immer-src",
         "nixpkgs": [
-          "rv-utils",
+          "rv-nix-tools",
           "nixpkgs"
         ],
         "pybind11-src": "pybind11-src",
         "rapidjson-src": "rapidjson-src",
-        "rv-utils": "rv-utils",
+        "rv-nix-tools": "rv-nix-tools",
         "utils": "utils"
       }
     },
-    "rv-utils": {
+    "rv-nix-tools": {
       "inputs": {
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1716459074,
-        "narHash": "sha256-IpahO+EkWdGl9QP7B2YXfJWpSfghjxgpz4ab47nRJY4=",
+        "lastModified": 1726497185,
+        "narHash": "sha256-iN+5eLmDm/rLuIZezS5ZqiW1BtBpwrrM9CPPP7Z5Tog=",
         "owner": "runtimeverification",
         "repo": "rv-nix-tools",
-        "rev": "a65058865cda201de504f5546271b8e997a0be9c",
+        "rev": "854d4f05ea78547d46e807b414faad64cea10ae4",
         "type": "github"
       },
       "original": {
         "owner": "runtimeverification",
         "repo": "rv-nix-tools",
+        "rev": "854d4f05ea78547d46e807b414faad64cea10ae4",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index 4720f174a..b62b4b69f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,9 +2,10 @@
   description = "K Kore Language LLVM Backend";
 
   inputs = {
+    rv-nix-tools.url = "github:runtimeverification/rv-nix-tools/854d4f05ea78547d46e807b414faad64cea10ae4";
+    nixpkgs.follows = "rv-nix-tools/nixpkgs";
+
     utils.url = "github:numtide/flake-utils";
-    rv-utils.url = "github:runtimeverification/rv-nix-tools";
-    nixpkgs.follows = "rv-utils/nixpkgs";
 
     fmt-src.url =
       "github:fmtlib/fmt/9.1.0";

From 8a5aee7b074695d38cbcf96ab050380d8fc050a6 Mon Sep 17 00:00:00 2001
From: Julian Kuners <julian.kuners@gmail.com>
Date: Tue, 27 May 2025 12:49:46 +0200
Subject: [PATCH 2/2] adapt `update-version.yml` workflow for `rv-nix-tools`

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

diff --git a/.github/workflows/update-deps.yml b/.github/workflows/update-deps.yml
index a3702c35e..d87e43fb7 100644
--- a/.github/workflows/update-deps.yml
+++ b/.github/workflows/update-deps.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - '_update-deps/runtimeverification/scala-kore'
+      - '_update-deps/runtimeverification/rv-nix-tools'
   workflow_dispatch:
 # Stop in progress workflows on the same branch and same workflow to use latest committed code
 concurrency:
@@ -25,8 +26,23 @@ jobs:
           git config user.name devops
           git config user.email devops@runtimeverification.com
 
+      - name: 'Install Nix'
+        uses: cachix/install-nix-action@v22
+        with:
+          install_url: https://releases.nixos.org/nix/nix-2.13.3/install
+          extra_nix_config: |
+            substituters = http://cache.nixos.org https://hydra.iohk.io
+            trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=
+
       - name: 'Update scala-kore release tag'
         run: ./scripts/update-scala-kore.sh
 
+      - name: 'Update Nix flake inputs'
+        run: |
+          RV_NIX_TOOLS_VERSION=$(cat deps/rv-nix-tools)
+          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
+
       - name: 'Push updates'
         run: git push
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