mirror of
https://github.com/NixOS/nix.dev.git
synced 2024-10-18 14:32:43 -04:00
Bump Sphinx and theme
Requires bumping nixpkgs, poetry2nix and associated overrides. This is all so that our footer can stick to the bottom of the page.
This commit is contained in:
parent
5c3c1000b0
commit
5ef714faec
40
flake.lock
40
flake.lock
|
@ -1,33 +1,35 @@
|
||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
|
"inputs": {
|
||||||
|
"systems": "systems"
|
||||||
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1656065134,
|
"lastModified": 1681202837,
|
||||||
"narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=",
|
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c",
|
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"ref": "master",
|
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1656265786,
|
"lastModified": 1685272473,
|
||||||
"narHash": "sha256-A9RkoGrxzsmMm0vily18p92Rasb+MbdDMaSnzmywXKw=",
|
"narHash": "sha256-oHNi6BgcGquKDkVN1/awsh+KLBey+Nj3ejTVH585upU=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "cd90e773eae83ba7733d2377b6cdf84d45558780",
|
"rev": "a7adeadc7d4033048592fac7c87ca888d2a99d31",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-22.05",
|
"ref": "nixos-23.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -42,16 +44,15 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1655482677,
|
"lastModified": 1685057602,
|
||||||
"narHash": "sha256-IGTwio1b4C7Etn4gBb76NILDS+8BsOmDlG8+dhfZL40=",
|
"narHash": "sha256-9C2Zh1MOyu6hkyYhZOanwZ0utHxFMx2HS23OIjszYu0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "poetry2nix",
|
"repo": "poetry2nix",
|
||||||
"rev": "ea3bd4eb70a3f9ead0dd88dab23e42c542e69c07",
|
"rev": "6ad5ea833729b1c794f2b3ccb73f2413b80f4bb4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "master",
|
|
||||||
"repo": "poetry2nix",
|
"repo": "poetry2nix",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -62,6 +63,21 @@
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"poetry2nix": "poetry2nix"
|
"poetry2nix": "poetry2nix"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"systems": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681028828,
|
||||||
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|
22
flake.nix
22
flake.nix
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
description = "nix.dev static website";
|
description = "nix.dev static website";
|
||||||
|
|
||||||
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05";
|
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
|
||||||
inputs.flake-utils.url = "github:numtide/flake-utils/master";
|
inputs.flake-utils.url = "github:numtide/flake-utils";
|
||||||
inputs.poetry2nix = {
|
inputs.poetry2nix = {
|
||||||
inputs.flake-utils.follows = "flake-utils";
|
inputs.flake-utils.follows = "flake-utils";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
url = "github:nix-community/poetry2nix/master";
|
url = "github:nix-community/poetry2nix";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, flake-utils, poetry2nix }:
|
outputs = { self, nixpkgs, flake-utils, poetry2nix }:
|
||||||
|
@ -25,18 +25,30 @@
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
sphinx-design = super.sphinx-design.overridePythonAttrs (
|
sphinx = super.sphinx.overridePythonAttrs (
|
||||||
old: {
|
old: {
|
||||||
buildInputs = (old.buildInputs or [ ]) ++ [ self.flit-core ];
|
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 {
|
packages = flake-utils.lib.flattenTree {
|
||||||
nix-dev-pyenv = pkgs.poetry2nix.mkPoetryEnv {
|
nix-dev-pyenv = pkgs.poetry2nix.mkPoetryEnv {
|
||||||
projectDir = self;
|
projectDir = self;
|
||||||
python = pkgs.python39;
|
python = pkgs.python39;
|
||||||
overrides = [
|
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
|
pkgs.poetry2nix.defaultPoetryOverrides
|
||||||
poetryOverrides
|
poetryOverrides
|
||||||
];
|
];
|
||||||
|
|
1577
poetry.lock
generated
1577
poetry.lock
generated
File diff suppressed because it is too large
Load diff
|
@ -11,7 +11,7 @@ python = "^3.7"
|
||||||
livereload = "*"
|
livereload = "*"
|
||||||
myst-parser = {version = "*", extras = ["linkify"]}
|
myst-parser = {version = "*", extras = ["linkify"]}
|
||||||
sphinx = "*"
|
sphinx = "*"
|
||||||
sphinx-book-theme = "^0.2.0"
|
sphinx-book-theme = "^1.0.0"
|
||||||
sphinx-copybutton = "*"
|
sphinx-copybutton = "*"
|
||||||
sphinx-design = "^0.3.0"
|
sphinx-design = "^0.3.0"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue