Merge remote-tracking branch 'origin/master' into _update-deps/runtimeverification/k

Author: bbyalcinkaya

.github/workflows/update-version.yml

@@ -32,8 +32,8 @@ jobs:
           install_url: https://releases.nixos.org/nix/nix-2.30.1/install
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
-            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=
+            substituters = http://cache.nixos.org 
+            trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= 
       - name: 'Install Cachix'
         uses: cachix/cachix-action@v14
         with:

deps/pyproject-build-systems

@@ -1 +1 @@
-7dba6dbc73120e15b558754c26024f6c93015dd7
+795a980d25301e5133eca37adae37283ec3c8e66

deps/uv2nix

@@ -1 +1 @@
-680e2f8e637bc79b84268949d2f2b2f5e5f1d81c
+c8cf711802cb00b2e05d5c54d3486fce7bfc8f7c

deps/uv_release

@@ -1 +1 @@
-0.7.2
+0.9.9

flake.lock

@@ -10,13 +10,16 @@
 
     flake-utils.follows = "k-framework/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";
+    uv2nix.url = "github:pyproject-nix/uv2nix/c8cf711802cb00b2e05d5c54d3486fce7bfc8f7c";
+    # 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.url = "github:pyproject-nix/build-system-pkgs/795a980d25301e5133eca37adae37283ec3c8e66";
     pyproject-build-systems = {
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.uv2nix.follows = "uv2nix";
@@ -34,11 +37,19 @@
       uv2nix,
       pyproject-nix,
       pyproject-build-systems,
+      nixpkgs-unstable,
       ... }:
   let
     pythonVer = "310";
   in flake-utils.lib.eachDefaultSystem (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;
+      };
       uvOverlay = final: prev: {
         uv = uv2nix.packages.${final.system}.uv-bin;
       };
@@ -65,6 +76,7 @@
       pkgs = import nixpkgs {
         inherit system;
         overlays = [
+          staleNixpkgsOverlay
           uvOverlay
           kOverlay
           kwasmOverlay

flake.nix

@@ -1 +1 @@
-0.1.136
+0.1.141

package/version

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pykwasm"
-version = "0.1.136"
+version = "0.1.141"
 description = ""
 readme = "README.md"
 requires-python = "~=3.10"