Skip to content

Commit dc25305

Browse files
Convert pyproject.toml to uv format, use uv2nix for pythonEnv
1 parent 40280e1 commit dc25305

File tree

11 files changed

+1981
-2780
lines changed

11 files changed

+1981
-2780
lines changed

flake.lock

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

flake.nix

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,16 @@
66

77
inputs = {
88

9-
nixpkgs.follows = "lowrisc-nix/nixpkgs";
10-
flake-utils.follows = "lowrisc-nix/flake-utils";
11-
12-
poetry2nix = {
13-
url = "github:nix-community/poetry2nix";
14-
inputs.nixpkgs.follows = "nixpkgs";
15-
inputs.flake-utils.follows = "flake-utils";
16-
};
9+
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
10+
flake-utils.url = "github:numtide/flake-utils";
1711

1812
mkshell-minimal.url = "github:viperML/mkshell-minimal";
1913

2014
# The input 'lowrisc-nix' contains some common dependencies that can be used
2115
# by lowRISC projects. There is also an associated public binary cache.
22-
lowrisc-nix = {
23-
# Checkout from when
24-
# url = "github:lowrisc/lowrisc-nix?ref=d7e90e450bcfbed83b6b8a2458d29c0ddd7fe58d";
25-
url = "github:lowrisc/lowrisc-nix";
26-
};
16+
lowrisc-nix.url = "github:lowrisc/lowrisc-nix";
2717

18+
# Deps for the dv/formal flow
2819
psgen = {
2920
url = "github:mndstrmr/psgen";
3021
inputs.nixpkgs.follows = "nixpkgs";
@@ -44,7 +35,24 @@
4435
# to evaluate without the appropriate credentials.
4536
# All outputs which depend on this input are suffixed '_lowrisc'
4637
lowrisc-nix-private.url = "git+ssh://git@github.com/lowRISC/lowrisc-nix-private.git";
38+
lowrisc-nix-private.inputs.nixpkgs.follows = "nixpkgs";
39+
40+
pyproject-nix.url = "github:pyproject-nix/pyproject.nix";
41+
pyproject-build-systems = {
42+
url = "github:pyproject-nix/build-system-pkgs";
43+
inputs.pyproject-nix.follows = "pyproject-nix";
44+
inputs.uv2nix.follows = "uv2nix";
45+
inputs.nixpkgs.follows = "nixpkgs";
46+
};
47+
uv2nix = {
48+
url = "github:pyproject-nix/uv2nix";
49+
inputs.pyproject-nix.follows = "pyproject-nix";
50+
inputs.nixpkgs.follows = "nixpkgs";
51+
};
52+
uv2nix_hammer_overrides.url = "github:TyberiusPrime/uv2nix_hammer_overrides";
53+
uv2nix_hammer_overrides.inputs.nixpkgs.follows = "nixpkgs";
4754

55+
# Deps for synthesis flows
4856
sv2v = {
4957
url = "github:zachjs/sv2v";
5058
flake = false;
@@ -90,8 +98,8 @@
9098
# DEPENDENCIES #
9199
################
92100

93-
# Python environment, defined in ./nix/env/pyproject.toml
94-
pythonEnv = import ./nix/env {inherit inputs pkgs;};
101+
# Python environment, as defined in ./nix/pythonEnv/pyproject.toml
102+
pythonEnv = import ./nix/pythonEnv {inherit inputs pkgs;};
95103

96104
# lowRISC fork of Spike used as a cosimulation model for Ibex Verification
97105
spike = inputs.lowrisc-nix.packages.${system}.spike-ibex-cosim;

0 commit comments

Comments
 (0)