Update dependency: deps/uv2nix (#163)

Co-authored-by: devops <devops@runtimeverification.com>
Co-authored-by: Julian Kuners <julian.kuners@gmail.com>

Author: 3 people

deps/uv2nix

@@ -1 +1 @@
-680e2f8e637bc79b84268949d2f2b2f5e5f1d81c
+be511633027f67beee87ab499f7b16d0a2f7eceb

flake.lock

@@ -4,11 +4,14 @@
     nixpkgs.url = "nixpkgs/nixos-25.05";
     flake-utils.url = "github:numtide/flake-utils";
     uv2nix.url = "github:pyproject-nix/uv2nix/680e2f8e637bc79b84268949d2f2b2f5e5f1d81c";
-    # stale nixpkgs is missing the alias `lib.match` -> `builtins.match`
-    # therefore point uv2nix to a patched nixpkgs, which introduces this alias
-    # this is a temporary solution until nixpkgs us up-to-date again
-    uv2nix.inputs.nixpkgs.url = "github:runtimeverification/nixpkgs/libmatch";
-    # inputs.nixpkgs.follows = "nixpkgs";
+    # uv2nix requires a newer version of nixpkgs
+    # therefore, we pin uv2nix specifically to a newer version of nixpkgs
+    # until we replaced our stale version of nixpkgs with an upstream one as well
+    # but also uv2nix requires us to call it with `callPackage`, so we add stuff
+    # from the newer nixpkgs to our stale nixpkgs via an overlay
+    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
+    uv2nix.inputs.nixpkgs.follows = "nixpkgs-unstable";
+    # uv2nix.inputs.nixpkgs.follows = "nixpkgs";
     pyproject-build-systems.url = "github:pyproject-nix/build-system-pkgs/7dba6dbc73120e15b558754c26024f6c93015dd7";
     pyproject-build-systems = {
       inputs.nixpkgs.follows = "uv2nix/nixpkgs";
@@ -17,7 +20,7 @@
     };
     pyproject-nix.follows = "uv2nix/pyproject-nix";
   };
-  outputs = { self, nixpkgs, flake-utils, pyproject-nix, pyproject-build-systems, uv2nix }:
+  outputs = { self, nixpkgs, flake-utils, pyproject-nix, pyproject-build-systems, uv2nix, nixpkgs-unstable }:
   let
     pythonVer = "310";
   in flake-utils.lib.eachSystem [
@@ -27,6 +30,13 @@
       "aarch64-darwin"
     ] (system:
     let
+      pkgs-unstable = import nixpkgs-unstable {
+        inherit system;
+      };
+      # for uv2nix, remove this once we updated to a newer version of nixpkgs
+      staleNixpkgsOverlay = final: prev: {
+        inherit (pkgs-unstable) replaceVars;
+      };
       # due to the nixpkgs that we use in this flake being outdated, uv is also heavily outdated
       # we can instead use the binary release of uv provided by uv2nix for now
       uvOverlay = final: prev: {
@@ -41,6 +51,7 @@
       pkgs = import nixpkgs {
         inherit system;
         overlays = [
+          staleNixpkgsOverlay
           uvOverlay
           kriscvOverlay
         ];

flake.nix

@@ -1 +1 @@
-0.1.119
+0.1.120

package/version

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "kriscv"
-version = "0.1.119"
+version = "0.1.120"
 description = "K tooling for the RISC-V architecture"
 readme = "README.md"
 requires-python = "~=3.10"