Merge pull request #10 from dolphin-emu/uv-conversion

Project: Convert to uv and update nixpkgs to 25.05

Author: OatmealDome

.github/workflows/run-tests.yml

@@ -9,44 +9,24 @@ permissions:
   contents: read
 
 jobs:
-  # Inspiration taken from https://jacobian.org/til/github-actions-poetry/
   run-tests:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
 
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v3
+    - name: Set up Python
+      uses: actions/setup-python@v5
       with:
-        python-version: "3.10"
+        python-version-file: "pyproject.toml"
 
-    - name: Cache Poetry install
-      uses: actions/cache@v4
-      with:
-        path: ~/.local
-        key: poetry-1.3.0-0
-
-    - uses: snok/install-poetry@v1
-      with:
-        version: 1.3.0
-        virtualenvs-create: true
-        virtualenvs-in-project: true
-
-    - name: Cache dependencies
-      uses: actions/cache@v4
-      with:
-        path: .venv
-        key: pydeps-${{ hashFiles('**/poetry.lock') }}
-
-    - name: Install dependencies (if uncached)
-      run: poetry install --no-interaction --no-root
-      if: steps.cache-deps.outputs.cache-hit != 'true'
+    - name: Install uv
+      uses: astral-sh/setup-uv@v6
 
-    - name: Install central
-      run: poetry install --no-interaction
+    - name: Sync dependencies
+      run: uv sync --locked --all-extras --dev
 
     - name: Run unit tests
-      run: poetry run pytest
+      run: uv run pytest
 
     - name: Check coding style
-      run: poetry run black --check .
+      run: uv run black --check .

README.md

@@ -22,8 +22,8 @@ $ nix run
 
 ```bash
 $ nix develop
-$ poetry install
-$ poetry run black --check .
-$ poetry run pytest
-$ poetry run central
+$ uv sync
+$ uv run black --check .
+$ uv run pytest
+$ uv run central
 ```

flake.lock

@@ -2,35 +2,54 @@
   description = "Central, Dolphin's CI/CD plumbing infrastructure";
 
   inputs.flake-utils.url = "github:numtide/flake-utils";
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
-  inputs.poetry2nix.url = "github:nix-community/poetry2nix";
-  inputs.poetry2nix.inputs.nixpkgs.follows = "nixpkgs";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
 
-  outputs = { self, nixpkgs, flake-utils, poetry2nix }: {
-    overlay = nixpkgs.lib.composeManyExtensions [
-      poetry2nix.overlays.default
-      (final: prev: {
-        central = prev.poetry2nix.mkPoetryApplication {
-          projectDir = ./.;
-          overrides = prev.poetry2nix.defaultPoetryOverrides.extend (self: super: {
-            pypeul = super.pypeul.overridePythonAttrs (old: { buildInputs = (old.buildInputs or []) ++ [ super.poetry-core ]; });
-          });
+  inputs.uv2nix.url = "github:pyproject-nix/uv2nix";
+  inputs.uv2nix.inputs.nixpkgs.follows = "nixpkgs";
+  inputs.uv2nix.inputs.pyproject-nix.follows = "pyproject-nix";
+
+  inputs.pyproject-nix.url = "github:pyproject-nix/pyproject.nix";
+  inputs.pyproject-nix.inputs.nixpkgs.follows = "nixpkgs";
+
+  inputs.pyproject-build-systems.url = "github:pyproject-nix/build-system-pkgs";
+  inputs.pyproject-build-systems.inputs.nixpkgs.follows = "nixpkgs";
+  inputs.pyproject-build-systems.inputs.pyproject-nix.follows = "pyproject-nix";
+
+  outputs = { self, nixpkgs, flake-utils, uv2nix, pyproject-nix, pyproject-build-systems }:
+  let
+    perSystem = flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = import nixpkgs { inherit system; };
+        workspace = uv2nix.lib.workspace.loadWorkspace { workspaceRoot = ./.; };
+        overlay = workspace.mkPyprojectOverlay {
+          sourcePreference = "wheel";
         };
-      })
-    ];
-  } // (flake-utils.lib.eachDefaultSystem (system:
-    let
-      pkgs = import nixpkgs {
-        inherit system;
-        overlays = [ self.overlay ];
-      };
-    in rec {
-      packages.central = pkgs.central;
-      defaultPackage = pkgs.central;
+        python = pkgs.python310;
+        pythonSet =
+          (pkgs.callPackage pyproject-nix.build.packages { inherit python; })
+          .overrideScope (pkgs.lib.composeManyExtensions [
+            pyproject-build-systems.overlays.default
+            overlay
+          ]);
+        venv = pythonSet.mkVirtualEnv "central-env" workspace.deps.default;
+      in {
+        packages.central = venv;
+        packages.default = venv;
 
-      devShells.default = with pkgs; mkShell {
-        buildInputs = [ poetry ];
+        apps.default = {
+          type = "app";
+          program = "${venv}/bin/central";
+        };
+
+        devShells.default = pkgs.mkShell {
+          packages = [ pkgs.uv ];
+        };
+      });
+  in
+    perSystem // {
+      overlays.default = final: prev: {
+        central = self.packages.${final.system}.central;
       };
-    }
-  ));
+      overlay = self.overlays.default;
+    };
 }