hosting/selfhostblocks
1
0
Fork 0
Code Issues Activity

switch to original nmd repo and fix declared by link

Browse source
This commit is contained in:
ibizaman 2023-11-30 13:14:01 -08:00
parent 4960034d52
commit 1b61aa6ebb
2 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
flake.lock
View file

@ -81,19 +81,20 @@
"type": "github" "type": "github"
} }
}, },
"nmd": { "nmdsrc": {
"flake": false,
"locked": { "locked": {
"lastModified": 1672240039, "lastModified": 1687627428,
"narHash": "sha256-lmct89fYDOr9YdWVvdJgklv/7WttRSiDAkoi2cvvAW4=", "narHash": "sha256-7zGfXuNS5RHqhpEdz2fwrtqvF86JRo5U1hrxZSYgcm8=",
"owner": "gvolpe", "ref": "refs/heads/master",
"repo": "nmd", "rev": "824a380546b5d0d0eb701ff8cd5dbafb360750ff",
"rev": "a59e840c2e8d54415485f349760e1350cb80d911", "revCount": 63,
"type": "github" "type": "git",
"url": "https://git.sr.ht/~rycee/nmd"
}, },
"original": { "original": {
"owner": "gvolpe", "type": "git",
"repo": "nmd", "url": "https://git.sr.ht/~rycee/nmd"
"type": "github"
} }
}, },
"root": { "root": {
@ -101,7 +102,7 @@
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nix-flake-tests": "nix-flake-tests", "nix-flake-tests": "nix-flake-tests",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nmd": "nmd", "nmdsrc": "nmdsrc",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
} }
}, },

21
flake.nix
View file

@ -6,16 +6,20 @@
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
nix-flake-tests.url = "github:antifuchs/nix-flake-tests"; nix-flake-tests.url = "github:antifuchs/nix-flake-tests";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
nmd.url = "github:gvolpe/nmd"; nmdsrc = {
url = "git+https://git.sr.ht/~rycee/nmd";
flake = false;
};
}; };
outputs = { nixpkgs, nix-flake-tests, flake-utils, nmd, ... }: flake-utils.lib.eachDefaultSystem (system: outputs = { nixpkgs, nix-flake-tests, flake-utils, nmdsrc, ... }: flake-utils.lib.eachDefaultSystem (system:
let let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
overlays = [ nmd.overlays.default ];
}; };
nmd = import nmdsrc { inherit pkgs; };
allModules = [ allModules = [
modules/blocks/authelia.nix modules/blocks/authelia.nix
modules/blocks/backup.nix modules/blocks/backup.nix
@ -45,19 +49,19 @@
# Inspiration from https://github.com/nix-community/nix-on-droid/blob/039379abeee67144d4094d80bbdaf183fb2eabe5/docs/default.nix#L22 # Inspiration from https://github.com/nix-community/nix-on-droid/blob/039379abeee67144d4094d80bbdaf183fb2eabe5/docs/default.nix#L22
packages.manualHtml = let packages.manualHtml = let
setupModule = { setupModule = {
_module.args.pkgs = pkgs.lib.mkForce (pkgs.nmd.scrubDerivations "pkgs" pkgs); _module.args.pkgs = pkgs.lib.mkForce (nmd.scrubDerivations "pkgs" pkgs);
_module.check = false; _module.check = false;
}; };
modulesDocs = pkgs.nmd.buildModulesDocs { modulesDocs = nmd.buildModulesDocs {
modules = allModules ++ [ setupModule ]; modules = allModules ++ [ setupModule ];
moduleRootPaths = [ ../. ]; moduleRootPaths = [ ./. ];
mkModuleUrl = path: "https://github.com/ibizaman/selfhostblocks/blob/master//${path}"; mkModuleUrl = path: "https://github.com/ibizaman/selfhostblocks/blob/main/${path}";
channelName = "selfhostblocks"; channelName = "selfhostblocks";
docBook = { id = "selfhostblocks-options"; optionIdPrefix = "shb-opt"; }; docBook = { id = "selfhostblocks-options"; optionIdPrefix = "shb-opt"; };
}; };
manual = pkgs.nmd.buildDocBookDocs { manual = nmd.buildDocBookDocs {
pathName = "selfhostblocks"; pathName = "selfhostblocks";
modulesDocs = [ modulesDocs ]; modulesDocs = [ modulesDocs ];
documentsDirectory = ./docs; documentsDirectory = ./docs;
@ -65,6 +69,7 @@
<toc> <toc>
<d:tocentry xmlns:d="http://docbook.org/ns/docbook" linkend="book-manual"> <d:tocentry xmlns:d="http://docbook.org/ns/docbook" linkend="book-manual">
<?dbhtml filename="index.html"?> <?dbhtml filename="index.html"?>
<d:tocentry linkend="ch-options"><?dbhtml filename="selfhostblocks-options.html"?></d:tocentry>
</d:tocentry> </d:tocentry>
</toc> </toc>
''; '';