nix: Switch doc builds to setuptools

pazz · Jul 31, 2024 · 68b6413 · 68b6413
1 parent 5bea39a
commit 68b6413
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 21 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -41,7 +41,8 @@ jobs:
       matrix:
         derivation:
           - default
-          - docs
+          - alot.doc
+          - alot.man
 
     steps:
     - name: Install Nix

diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,4 @@ docs/source/configuration/*table.rst
 tags
 .eggs
 __pycache__
+result*/
diff --git a/flake.nix b/flake.nix
@@ -32,11 +32,16 @@
       in
       {
         packages = {
-          alot-setuptools = pkgs.python3Packages.buildPythonApplication {
+          alot = pkgs.python3Packages.buildPythonApplication {
             name = "alot";
             version = "dev";
             src = self;
             pyproject = true;
+            outputs = [
+              "out"
+              "doc"
+              "man"
+            ];
             build-system = with pkgs.python3Packages; [
               setuptools
               setuptools-scm
@@ -51,26 +56,12 @@
               urwidtrees
             ];
             inherit checkPhase nativeCheckInputs;
+            nativeBuildInputs = with pkgs.python3Packages; [ sphinxHook ];
+            sphinxBuilders = [ "html" "man" ];
           };
-          alot-poetry = mkPoetryApplication (defaultArgs // {
-            nativeBuildInputs = [
-              pkgs.python3.pkgs.cffi
-            ];
-            propagatedBuildInputs = with pkgs; [
-              gpgme
-              pkgs.gpgme.dev
-              pkgs.python3.pkgs.cffi
-            ];
-            inherit checkPhase nativeCheckInputs;
-          });
-          docs = pkgs.runCommand "alot-docs" {
-            src = self;
-            nativeBuildInputs = [
-              (mkPoetryEnv (defaultArgs // { groups = ["doc"]; }))
-              pkgs.gnumake
-            ];
-          } ''make -C $src/docs html man BUILDDIR=$out'';
-          default = self.packages.${system}.alot-poetry;
+          docs = pkgs.lib.trivial.warn "The docs attribute moved to alot.doc"
+            self.packages.${system}.alot.doc;
+          default = self.packages.${system}.alot;
         };
       });
 }
diff --git a/pyproject.toml b/pyproject.toml
@@ -48,3 +48,4 @@ Documentation = "https://alot.readthedocs.io/en/latest/"
 Issues = "https://github.com/pazz/alot/issues"
 
 [tool.setuptools.packages.find]
+include = ["alot*"]