From b4c92289c94497b0a89f902aafa189467cae44b0 Mon Sep 17 00:00:00 2001
From: Bruce Collie <brucecollie82@gmail.com>
Date: Fri, 21 Jun 2024 16:42:45 +0100
Subject: [PATCH] Revert "Revert "Align Pyk's nixpkgs version to the shared K
 version"" (#4467)

Reverts runtimeverification/k#4458

Co-authored-by: rv-jenkins <admin@runtimeverification.com>
---
 pyk/flake.lock | 37 ++++++++++++++++++++++++++++++-------
 pyk/flake.nix  |  5 +++--
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/pyk/flake.lock b/pyk/flake.lock
index a3df8e1333f..9dc8c707f7a 100644
--- a/pyk/flake.lock
+++ b/pyk/flake.lock
@@ -41,16 +41,17 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1698675399,
-        "narHash": "sha256-nj+LNEeVXGP31vxoL3x7HW7+oEiyoLVDqwMg30yFBMA=",
-        "owner": "NixOS",
+        "lastModified": 1716457947,
+        "narHash": "sha256-Y+exebcqeprnhEpoPJrEUZmNeO60qeOxkVHhqG/OEwQ=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7378978469efa3b2b2f97d645a2a0b0e2447da2b",
+        "rev": "69493a13eaea0dc4682fd07e8a084f17813dbeeb",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
+        "rev": "69493a13eaea0dc4682fd07e8a084f17813dbeeb",
         "type": "github"
       }
     },
@@ -85,8 +86,30 @@
           "poetry2nix",
           "flake-utils"
         ],
-        "nixpkgs": "nixpkgs",
-        "poetry2nix": "poetry2nix"
+        "nixpkgs": [
+          "rv-utils",
+          "nixpkgs"
+        ],
+        "poetry2nix": "poetry2nix",
+        "rv-utils": "rv-utils"
+      }
+    },
+    "rv-utils": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1716459074,
+        "narHash": "sha256-IpahO+EkWdGl9QP7B2YXfJWpSfghjxgpz4ab47nRJY4=",
+        "owner": "runtimeverification",
+        "repo": "rv-nix-tools",
+        "rev": "a65058865cda201de504f5546271b8e997a0be9c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "runtimeverification",
+        "repo": "rv-nix-tools",
+        "type": "github"
       }
     },
     "systems": {
diff --git a/pyk/flake.nix b/pyk/flake.nix
index 132eab4ab4d..79774de3b0d 100644
--- a/pyk/flake.nix
+++ b/pyk/flake.nix
@@ -2,7 +2,8 @@
   description = "Application packaged using poetry2nix";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs";
+    rv-utils.url = "github:runtimeverification/rv-nix-tools";
+    nixpkgs.follows = "rv-utils/nixpkgs";
     poetry2nix = {
       url =
         "github:nix-community/poetry2nix/626111646fe236cb1ddc8191a48c75e072a82b7c";
@@ -11,7 +12,7 @@
     flake-utils.follows = "poetry2nix/flake-utils";
   };
 
-  outputs = { self, nixpkgs, flake-utils, poetry2nix }:
+  outputs = { self, nixpkgs, flake-utils, rv-utils, poetry2nix }:
     {
       # Nixpkgs overlay providing the application
       overlay = final: prev: