From 40290511094531f2932f7954fd5159861de2ada3 Mon Sep 17 00:00:00 2001 From: Alexander Sosedkin Date: Wed, 6 Mar 2024 01:51:02 +0100 Subject: [PATCH] flake.nix, docs: band-aid docs generation using nixpkgs-23.05 --- docs/default.nix | 1 + flake.lock | 19 ++++++++++++++++++- flake.nix | 8 +++++--- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/docs/default.nix b/docs/default.nix index 3df0cf60..1b11db10 100644 --- a/docs/default.nix +++ b/docs/default.nix @@ -11,6 +11,7 @@ let _module.args.pkgs = pkgs.lib.mkForce (nmd.scrubDerivations "pkgs" pkgs); system.stateVersion = "19.09"; + home-manager.sharedModules = [ (_: { home.stateVersion = "24.05"; }) ]; }; modules = import ../modules/module-list.nix { diff --git a/flake.lock b/flake.lock index 86a41b78..7e25b076 100644 --- a/flake.lock +++ b/flake.lock @@ -57,6 +57,22 @@ "type": "github" } }, + "nixpkgs-docs": { + "locked": { + "lastModified": 1705957679, + "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9a333eaa80901efe01df07eade2c16d183761fa3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-for-bootstrap": { "locked": { "lastModified": 1708105575, @@ -92,7 +108,7 @@ "nmd_2": { "inputs": { "nixpkgs": [ - "nixpkgs" + "nixpkgs-docs" ], "scss-reset": "scss-reset" }, @@ -131,6 +147,7 @@ "home-manager": "home-manager", "nix-formatter-pack": "nix-formatter-pack", "nixpkgs": "nixpkgs", + "nixpkgs-docs": "nixpkgs-docs", "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap", "nmd": "nmd_2" } diff --git a/flake.nix b/flake.nix index 9f341f1d..b0a2365c 100644 --- a/flake.nix +++ b/flake.nix @@ -19,13 +19,15 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + nixpkgs-docs.url = "github:NixOS/nixpkgs/release-23.05"; + nmd = { url = "sourcehut:~rycee/nmd"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "nixpkgs-docs"; }; }; - outputs = { self, nixpkgs, nixpkgs-for-bootstrap, home-manager, nix-formatter-pack, nmd }: + outputs = { self, nixpkgs, nixpkgs-for-bootstrap, home-manager, nix-formatter-pack, nmd, nixpkgs-docs }: let forEachSystem = nixpkgs.lib.genAttrs [ "aarch64-linux" "x86_64-linux" ]; @@ -119,7 +121,7 @@ docs = import ./docs { inherit home-manager; - pkgs = nixpkgs.legacyPackages.${system}; + pkgs = nixpkgs-docs.legacyPackages.${system}; nmdSrc = nmd; }; in