move documentation pinning to nix flake inputs

This commit is contained in:
Markus Schmidl 2022-10-04 20:31:27 +02:00
parent d0b618213a
commit 7805286c4f
3 changed files with 27 additions and 7 deletions

View File

@ -112,6 +112,22 @@
"type": "github" "type": "github"
} }
}, },
"documentation-src": {
"flake": false,
"locked": {
"lastModified": 1664745127,
"narHash": "sha256-kq0qvmXz/gaJPtU4O43chNZulP4haXRXunjJF2gpKZk=",
"owner": "dump-dvb",
"repo": "documentation",
"rev": "be20b49cc2b25e2b77c3d9ac25044121d7d4dfe0",
"type": "github"
},
"original": {
"owner": "dump-dvb",
"repo": "documentation",
"type": "github"
}
},
"dump-dvb": { "dump-dvb": {
"inputs": { "inputs": {
"click": "click", "click": "click",
@ -377,6 +393,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"documentation-src": "documentation-src",
"dump-dvb": "dump-dvb", "dump-dvb": "dump-dvb",
"microvm": "microvm", "microvm": "microvm",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",

View File

@ -16,6 +16,11 @@
url = github:Mic92/sops-nix; url = github:Mic92/sops-nix;
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
documentation-src = {
url = github:dump-dvb/documentation;
flake = false;
};
}; };
outputs = outputs =
@ -24,6 +29,7 @@
, microvm , microvm
, nixpkgs , nixpkgs
, sops-nix , sops-nix
, documentation-src
, ... , ...
}: }:
let let
@ -40,6 +46,7 @@
nixpkgs.overlays = [ nixpkgs.overlays = [
dump-dvb.overlays.default dump-dvb.overlays.default
(final: prev: { (final: prev: {
inherit documentation-src;
options-docs = (pkgs.nixosOptionsDoc { options-docs = (pkgs.nixosOptionsDoc {
options = self.nixosConfigurations.data-hoarder.options.dump-dvb; options = self.nixosConfigurations.data-hoarder.options.dump-dvb;
}).optionsCommonMark; }).optionsCommonMark;
@ -122,6 +129,7 @@
staging-microvm = self.nixosConfigurations.staging-data-hoarder.config.microvm.declaredRunner; staging-microvm = self.nixosConfigurations.staging-data-hoarder.config.microvm.declaredRunner;
data-hoarder-microvm = self.nixosConfigurations.data-hoarder.config.microvm.declaredRunner; data-hoarder-microvm = self.nixosConfigurations.data-hoarder.config.microvm.declaredRunner;
docs = pkgs.callPackage ./pkgs/documentation.nix { docs = pkgs.callPackage ./pkgs/documentation.nix {
inherit documentation-src;
options-docs = (pkgs.nixosOptionsDoc { options-docs = (pkgs.nixosOptionsDoc {
options = self.nixosConfigurations.data-hoarder.options.dump-dvb; options = self.nixosConfigurations.data-hoarder.options.dump-dvb;
}).optionsCommonMark; }).optionsCommonMark;

View File

@ -1,14 +1,9 @@
{ pkgs, lib, stdenv, mdbook-mermaid, mdbook, options-docs, fetchFromGitHub }: { pkgs, lib, stdenv, mdbook-mermaid, mdbook, documentation-src, options-docs, fetchFromGitHub }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "dvb-dump-docs"; pname = "dvb-dump-docs";
version = "0.1.0"; version = "0.1.0";
src = pkgs.fetchFromGitHub { src = documentation-src;
owner = "dump-dvb";
repo = "documentation";
rev = "8393cd4a965aa6b75f3e0fff6f82ba1365515290"; #TODO: use tag
sha256 = "sha256-HppCT0UfshDxm3UNXACilpHTdvtjFs2vqpH8vbLmHTg=";
};
nativeBuildInputs = [ mdbook mdbook-mermaid ]; nativeBuildInputs = [ mdbook mdbook-mermaid ];