Merge pull request NixOS#576 from NixOS/bump-deps

Bump Sphinx and theme
zolodev · Jun 1, 2023 · bfd57a6 · bfd57a6
2 parents 0bd24f7 + 2af240a
commit bfd57a6
Show file tree

Hide file tree

Showing 5 changed files with 578 additions and 465 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,12 +1,12 @@
 {
   description = "nix.dev static website";
 
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05";
-  inputs.flake-utils.url = "github:numtide/flake-utils/master";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+  inputs.flake-utils.url = "github:numtide/flake-utils";
   inputs.poetry2nix = {
     inputs.flake-utils.follows = "flake-utils";
     inputs.nixpkgs.follows = "nixpkgs";
-    url = "github:nix-community/poetry2nix/master";
+    url = "github:nix-community/poetry2nix";
   };
 
   outputs = { self, nixpkgs, flake-utils, poetry2nix }:
@@ -25,18 +25,30 @@
             }
           );
 
-          sphinx-design = super.sphinx-design.overridePythonAttrs (
+          sphinx = super.sphinx.overridePythonAttrs (
             old: {
               buildInputs = (old.buildInputs or [ ]) ++ [ self.flit-core ];
             }
           );
+
+          accessible-pygments = super.accessible-pygments.overridePythonAttrs (
+            old: {
+              buildInputs = (old.buildInputs or [ ]) ++ [ super.setuptools ];
+            }
+          );
+
         };
-      in rec {
+      in
+      rec {
         packages = flake-utils.lib.flattenTree {
           nix-dev-pyenv = pkgs.poetry2nix.mkPoetryEnv {
             projectDir = self;
             python = pkgs.python39;
             overrides = [
+              (self: super: {
+                pydata-sphinx-theme = super.pydata-sphinx-theme.override { preferWheel = true; };
+                sphinx-book-theme = super.sphinx-book-theme.override { preferWheel = true; };
+              })
               pkgs.poetry2nix.defaultPoetryOverrides
               poetryOverrides
             ];