|
12 | 12 | url = "git+https://codeberg.org/HU90m/mdutils.git"; |
13 | 13 | inputs.nixpkgs.follows = "nixpkgs"; |
14 | 14 | }; |
15 | | - poetry2nix = { |
16 | | - url = "github:nix-community/poetry2nix"; |
| 15 | + uv2nix = { |
| 16 | + url = "github:pyproject-nix/uv2nix"; |
| 17 | + inputs.pyproject-nix.follows = "pyproject-nix"; |
17 | 18 | inputs.nixpkgs.follows = "nixpkgs"; |
18 | | - inputs.flake-utils.follows = "flake-utils"; |
| 19 | + }; |
| 20 | + pyproject-nix = { |
| 21 | + url = "github:pyproject-nix/pyproject.nix"; |
| 22 | + inputs.nixpkgs.follows = "nixpkgs"; |
| 23 | + }; |
| 24 | + pyproject-build-systems = { |
| 25 | + url = "github:pyproject-nix/build-system-pkgs"; |
| 26 | + inputs.nixpkgs.follows = "nixpkgs"; |
| 27 | + inputs.pyproject-nix.follows = "pyproject-nix"; |
| 28 | + inputs.uv2nix.follows = "uv2nix"; |
19 | 29 | }; |
20 | 30 | zermio = { |
21 | 31 | url = "github:engdoreis/zermio?ref=v0.2.0"; |
|
52 | 62 | inherit (pkgs.lib) fileset getExe; |
53 | 63 | zermio-cli = inputs.zermio.packages.${system}.default; |
54 | 64 |
|
55 | | - pythonEnv = let |
56 | | - poetry2nix = inputs.poetry2nix.lib.mkPoetry2Nix {inherit pkgs;}; |
57 | | - poetryOverrides = lowrisc-nix.lib.poetryOverrides {inherit pkgs;}; |
58 | | - in |
59 | | - poetry2nix.mkPoetryEnv { |
60 | | - projectDir = ./.; |
| 65 | + workspace = inputs.uv2nix.lib.workspace.loadWorkspace {workspaceRoot = ./.;}; |
| 66 | + overlay = workspace.mkPyprojectOverlay { |
| 67 | + sourcePreference = "wheel"; |
| 68 | + }; |
| 69 | + |
| 70 | + pythonSet = |
| 71 | + (pkgs.callPackage inputs.pyproject-nix.build.packages { |
61 | 72 | python = pkgs.python310; |
62 | | - overrides = [ |
63 | | - poetryOverrides |
64 | | - poetry2nix.defaultPoetryOverrides |
65 | | - ]; |
66 | | - }; |
| 73 | + }).overrideScope |
| 74 | + ( |
| 75 | + pkgs.lib.composeManyExtensions [ |
| 76 | + inputs.pyproject-build-systems.overlays.default |
| 77 | + overlay |
| 78 | + (lowrisc-nix.lib.pyprojectOverrides {inherit pkgs;}) |
| 79 | + ] |
| 80 | + ); |
| 81 | + |
| 82 | + pythonEnv = pythonSet.mkVirtualEnv "python-env" workspace.deps.default; |
67 | 83 |
|
68 | 84 | sonata-documentation = lrDoc.buildMdbookSite { |
69 | 85 | version = ""; |
|
183 | 199 | gtkwave |
184 | 200 | openfpgaloader |
185 | 201 | openocd |
| 202 | + uv |
186 | 203 | ]) |
187 | 204 | ++ cheriotPkgs |
188 | 205 | ++ (with lrPkgs; [ |
|
0 commit comments