diff --git a/flake.lock b/flake.lock index a157706..234bf99 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "aux-wiki": { + "flake": false, + "locked": { + "lastModified": 1719683482, + "narHash": "sha256-WF9uI8hbuvy+zCoCJa967mVnqyCbZBf3FSth6vwDR/I=", + "ref": "refs/heads/main", + "rev": "3af79f1e4db60efba1f1b772628796b097c144ed", + "revCount": 187, + "type": "git", + "url": "https://git.auxolotl.org/auxolotl/wiki" + }, + "original": { + "type": "git", + "url": "https://git.auxolotl.org/auxolotl/wiki" + } + }, "flake-compat": { "flake": false, "locked": { @@ -71,6 +87,7 @@ }, "root": { "inputs": { + "aux-wiki": "aux-wiki", "nixpkgs": "nixpkgs", "snowfall-lib": "snowfall-lib" } diff --git a/flake.nix b/flake.nix index 30d5b06..8e6585d 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,8 @@ url = "github:snowfallorg/lib"; inputs.nixpkgs.follows = "nixpkgs"; }; + inputs.aux-wiki.url = "git+https://git.auxolotl.org/auxolotl/wiki"; + inputs.aux-wiki.flake = false; outputs = inputs: diff --git a/packages/aux-wiki/default.nix b/packages/aux-wiki/default.nix new file mode 100644 index 0000000..38e9faa --- /dev/null +++ b/packages/aux-wiki/default.nix @@ -0,0 +1,16 @@ +{ stdenvNoCC, inputs }: +stdenvNoCC.mkDerivation { + pname = "aux-wiki"; + version = "unstable"; + + src = inputs.aux-wiki; + + installPhase = '' + mkdir $out + cp *.md $out/ + cp -r agreements $out/agreements + cp -r community $out/community + cp -r contributing $out/contributing + cp -r docs $out/docs + ''; +} diff --git a/packages/md-manual/default.nix b/packages/md-manual/default.nix new file mode 100644 index 0000000..2326afc --- /dev/null +++ b/packages/md-manual/default.nix @@ -0,0 +1,14 @@ +{ stdenvNoCC, pkgs }: +stdenvNoCC.mkDerivation { + pname = "md-manual"; + version = "1.0.0"; + + src = ./.; + + installPhase = '' + mkdir $out + cp -r ${pkgs.amg.manual-assets} $out/assets + cp -r ${pkgs.amg.nixpkgs-manual} $out/Nixpkgs/ + cp -r ${pkgs.amg.aux-wiki} $out/Aux + ''; +} diff --git a/packages/nixpkgs-manual/default.nix b/packages/nixpkgs-manual/default.nix index 5a022a4..5c013b7 100644 --- a/packages/nixpkgs-manual/default.nix +++ b/packages/nixpkgs-manual/default.nix @@ -40,10 +40,6 @@ stdenvNoCC.mkDerivation { --replace-fail '@MANUAL_VERSION@' '${lib.version}' mkdir out - - mkdir out/assets - cp ${pkgs.amg.manual-assets}/* out/assets/ - mv preface.chapter.md out/index.md mv build-helpers out/build-helpers mv build-helpers.md out/build-helpers/index.md