Skip to content

Commit 36f1af6

Browse files
rv-jenkinsrv-auditorjuliankuners
authored
Update dependency: deps/uv2nix (#4865)
Co-authored-by: devops <devops@runtimeverification.com> Co-authored-by: Julian Kuners <julian.kuners@gmail.com>
1 parent 46ae51f commit 36f1af6

6 files changed

Lines changed: 51 additions & 35 deletions

File tree

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: 25 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,14 @@
1515

1616
flake-utils.follows = "llvm-backend/utils";
1717

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";
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";
2326
# uv2nix.inputs.nixpkgs.follows = "nixpkgs";
2427
pyproject-build-systems.url = "github:pyproject-nix/build-system-pkgs/7dba6dbc73120e15b558754c26024f6c93015dd7";
2528
pyproject-build-systems = {
@@ -31,7 +34,7 @@
3134
};
3235

3336
outputs = { self, nixpkgs, flake-utils, rv-nix-tools, haskell-backend
34-
, llvm-backend, pyproject-nix, pyproject-build-systems , uv2nix }:
37+
, llvm-backend, pyproject-nix, pyproject-build-systems, uv2nix, nixpkgs-unstable }:
3538
let
3639
# due to the nixpkgs that we use in this flake being outdated, uv is also heavily outdated
3740
# we can instead use the binary release of uv provided by uv2nix for now
@@ -190,6 +193,13 @@
190193
"aarch64-darwin"
191194
] (system:
192195
let
196+
pkgs-unstable = import nixpkgs-unstable {
197+
inherit system;
198+
};
199+
# for uv2nix, remove this once we updated to a newer version of nixpkgs
200+
staleNixpkgsOverlay = final: prev: {
201+
inherit (pkgs-unstable) replaceVars;
202+
};
193203
pkgs = nixpkgs.lib.trivial.warnIf (llvm-backend.inputs.nixpkgs.rev
194204
!= haskell-backend.inputs.nixpkgs.rev)
195205
"The version of nixpkgs in Haskell backend and LLVM backend has diverged!"
@@ -200,7 +210,10 @@
200210
config.allowBroken = system == "aarch64-darwin";
201211
overlays =
202212
[ (final: prev: { llvm-backend-build-type = "FastBuild"; }) ]
203-
++ allOverlays;
213+
++ allOverlays
214+
++ [
215+
staleNixpkgsOverlay
216+
];
204217
};
205218

206219
in rec {

pyk/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name = "kframework"
77
version = "7.1.0"
88
description = ""
99
readme = "README.md"
10-
requires-python = "~=3.10"
10+
requires-python = ">=3.10"
1111
dependencies = [
1212
"coloredlogs>=15.0.1,<16",
1313
"cookiecutter>=2.6.0,<3",

pyk/uv.lock

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

0 commit comments

Comments
 (0)