Skip to content

Commit cc92ff6

Browse files
rv-jenkinsrv-auditorjuliankuners
authored
Update dependency: deps/uv2nix (#2800)
* deps/uv2nix: Set Version be511633027f67beee87ab499f7b16d0a2f7eceb * Sync uv version: uv 0.8.22 * kevm-pyk/: sync uv files pyk version 7.1.288 * flake.{nix,lock}: update Nix derivations * introduce `nixpkgs-unstable` temporarily for `uv2nix` --------- Co-authored-by: devops <devops@runtimeverification.com> Co-authored-by: Julian Kuners <julian.kuners@gmail.com>
1 parent a84488b commit cc92ff6

File tree

5 files changed

+359
-273
lines changed

5 files changed

+359
-273
lines changed

deps/uv2nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
680e2f8e637bc79b84268949d2f2b2f5e5f1d81c
1+
be511633027f67beee87ab499f7b16d0a2f7eceb

deps/uv_release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.7.2
1+
0.8.22

flake.lock

Lines changed: 27 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,15 @@
1515
inputs.nixpkgs.follows = "nixpkgs";
1616
};
1717
haskell-backend.follows = "k-framework/haskell-backend";
18-
uv2nix.url = "github:pyproject-nix/uv2nix/680e2f8e637bc79b84268949d2f2b2f5e5f1d81c";
19-
# stale nixpkgs is missing the alias `lib.match` -> `builtins.match`
20-
# therefore point uv2nix to a patched nixpkgs, which introduces this alias
21-
# this is a temporary solution until nixpkgs us up-to-date again
22-
uv2nix.inputs.nixpkgs.url = "github:runtimeverification/nixpkgs/libmatch";
23-
# inputs.nixpkgs.follows = "nixpkgs";
18+
uv2nix.url = "github:pyproject-nix/uv2nix/be511633027f67beee87ab499f7b16d0a2f7eceb";
19+
# uv2nix requires a newer version of nixpkgs
20+
# therefore, we pin uv2nix specifically to a newer version of nixpkgs
21+
# until we replaced our stale version of nixpkgs with an upstream one as well
22+
# but also uv2nix requires us to call it with `callPackage`, so we add stuff
23+
# from the newer nixpkgs to our stale nixpkgs via an overlay
24+
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
25+
uv2nix.inputs.nixpkgs.follows = "nixpkgs-unstable";
26+
# uv2nix.inputs.nixpkgs.follows = "nixpkgs";
2427
pyproject-build-systems.url = "github:pyproject-nix/build-system-pkgs/7dba6dbc73120e15b558754c26024f6c93015dd7";
2528
pyproject-build-systems = {
2629
inputs.nixpkgs.follows = "uv2nix/nixpkgs";
@@ -40,12 +43,20 @@
4043
uv2nix,
4144
pyproject-build-systems,
4245
pyproject-nix,
46+
nixpkgs-unstable,
4347
... }:
4448
let
4549
pythonVer = "310";
4650
nixLibs = pkgs: with pkgs; "-I${openssl.dev}/include -L${openssl.out}/lib -I${secp256k1}/include -L${secp256k1}/lib";
4751
in flake-utils.lib.eachDefaultSystem (system:
4852
let
53+
pkgs-unstable = import nixpkgs-unstable {
54+
inherit system;
55+
};
56+
# for uv2nix, remove this once we updated to a newer version of nixpkgs
57+
staleNixpkgsOverlay = final: prev: {
58+
inherit (pkgs-unstable) replaceVars;
59+
};
4960
uvOverlay = final: prev: {
5061
uv = uv2nix.packages.${final.system}.uv-bin;
5162
};
@@ -74,6 +85,7 @@
7485
pkgs = import nixpkgs {
7586
inherit system;
7687
overlays = [
88+
staleNixpkgsOverlay
7789
uvOverlay
7890
kOverlay
7991
haskellBackendOverlay

0 commit comments

Comments
 (0)