diff --git a/flake.lock b/flake.lock index 4e58287..fccf777 100644 --- a/flake.lock +++ b/flake.lock @@ -283,6 +283,27 @@ "type": "github" } }, + "drv-parts": { + "inputs": { + "flake-compat": "flake-compat", + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1678124524, + "narHash": "sha256-+Yj4sRYZpi43hvzWkvgq+k1W4VNjnbMhTZNREfyUVm4=", + "owner": "roberth", + "repo": "drv-parts", + "rev": "85cd18b7ba4028bf236317fb7070f4a79eb2f5f2", + "type": "github" + }, + "original": { + "owner": "roberth", + "ref": "docs", + "repo": "drv-parts", + "type": "github" + } + }, "ema": { "inputs": { "check-flake": [ @@ -332,7 +353,7 @@ "inputs": { "check-flake": "check-flake", "ema": "ema", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "flake-root": "flake-root", "haskell-flake": "haskell-flake", "nixpkgs": [ @@ -394,6 +415,22 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -419,6 +456,23 @@ "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, + "locked": { + "lastModified": 1675933616, + "narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "47478a4a003e745402acf63be7f9a092d51b83d7", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, "locked": { "lastModified": 1671710971, "narHash": "sha256-YZdt5IJrfsdUTtVB94EMsBvaJbK9ve6QaZyzRuup+sY=", @@ -433,9 +487,9 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_4": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" + "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { "lastModified": 1677714448, @@ -450,9 +504,9 @@ "type": "indirect" } }, - "flake-parts_4": { + "flake-parts_5": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" + "nixpkgs-lib": "nixpkgs-lib_4" }, "locked": { "lastModified": 1673362319, @@ -467,7 +521,7 @@ "type": "indirect" } }, - "flake-parts_5": { + "flake-parts_6": { "inputs": { "nixpkgs-lib": [ "hercules-ci-effects", @@ -680,9 +734,9 @@ }, "hercules-ci-agent": { "inputs": { - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_6", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "pre-commit-hooks-nix": "pre-commit-hooks-nix" }, "locked": { @@ -700,9 +754,9 @@ }, "hercules-ci-effects": { "inputs": { - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_5", "hercules-ci-agent": "hercules-ci-agent", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1676558019, @@ -903,18 +957,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1672262501, - "narHash": "sha256-ZNXqX9lwYo1tOFAqrVtKTLcJ2QMKCr3WuIvpN8emp7I=", + "lastModified": 1676569297, + "narHash": "sha256-2n4C4H3/U+3YbDrQB6xIw7AaLdFISCCFwOkcETAigqU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e182da8622a354d44c39b3d7a542dc12cd7baa5f", + "rev": "ac1f5b72a9e95873d1de0233fddcb56f99884b37", "type": "github" }, "original": { - "owner": "NixOS", + "id": "nixpkgs", "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "indirect" } }, "nixpkgs-140774-workaround": { @@ -933,6 +986,24 @@ } }, "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1675183161, + "narHash": "sha256-Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib_2": { "locked": { "dir": "lib", "lastModified": 1671359686, @@ -950,7 +1021,7 @@ "type": "github" } }, - "nixpkgs-lib_2": { + "nixpkgs-lib_3": { "locked": { "dir": "lib", "lastModified": 1677407201, @@ -968,7 +1039,7 @@ "type": "github" } }, - "nixpkgs-lib_3": { + "nixpkgs-lib_4": { "locked": { "dir": "lib", "lastModified": 1672350804, @@ -1003,6 +1074,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1672262501, + "narHash": "sha256-ZNXqX9lwYo1tOFAqrVtKTLcJ2QMKCr3WuIvpN8emp7I=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e182da8622a354d44c39b3d7a542dc12cd7baa5f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1673760129, "narHash": "sha256-m8JdWtElEMd4TY5eUUTbw+3yEjImsE9ifo/UVSbdU7g=", @@ -1017,7 +1104,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1678092163, "narHash": "sha256-IahTmPEA2N9je9Ic9QvFU+rESSrm4EpJShJN7xXxMCA=", @@ -1032,7 +1119,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1675940568, "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=", @@ -1048,7 +1135,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1675545634, "narHash": "sha256-TbQeQcM5TA/wIho6xtzG+inUfiGzUXi8ewwttiQWYJE=", @@ -1192,7 +1279,7 @@ }, "pre-commit-hooks-nix_2": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_3", "gitignore": "gitignore", "nixpkgs": [ @@ -1266,13 +1353,14 @@ "inputs": { "devshell": "devshell", "dream2nix": "dream2nix", + "drv-parts": "drv-parts", "emanote": "emanote", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_4", "haskell-flake": "haskell-flake_2", "hercules-ci-effects": "hercules-ci-effects", "mission-control": "mission-control", "nix-cargo-integration": "nix-cargo-integration", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "pre-commit-hooks-nix": "pre-commit-hooks-nix_2", "proc-flake": "proc-flake", "process-compose-flake": "process-compose-flake", @@ -1334,7 +1422,7 @@ ], "n2c": "n2c", "nixago": "nixago", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "paisano": "paisano", "paisano-tui": "paisano-tui", "yants": "yants" @@ -1376,7 +1464,7 @@ }, "treefmt-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1677433127, diff --git a/flake.nix b/flake.nix index e610c03..c61c584 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,7 @@ dream2nix.inputs.pre-commit-hooks.follows = "pre-commit-hooks-nix"; dream2nix.inputs.nixpkgs.follows = "nixpkgs"; dream2nix.url = "github:nix-community/dream2nix"; + drv-parts.url = "github:roberth/drv-parts/docs"; emanote.url = "github:srid/emanote"; emanote.inputs.nixpkgs.follows = "nixpkgs"; haskell-flake.url = "github:srid/haskell-flake"; @@ -72,6 +73,15 @@ ''; }; + drv-parts = { + title = "drv-parts"; + baseUrl = "https://github.com/roberth/drv-parts/blob/docs"; + attributePath = [ "flakeModule" ]; + intro = '' + A new way to define packages. Experimental. + ''; + }; + emanote = { baseUrl = "https://github.com/srid/emanote/blob/master"; intro = '' diff --git a/render/render-module.nix b/render/render-module.nix index cbfb8f1..f16f3ab 100644 --- a/render/render-module.nix +++ b/render/render-module.nix @@ -276,7 +276,9 @@ in inherit (config) sourceName baseUrl sourcePath; inherit coreOptDecls; }; - warningsAreErrors = true; # not sure if feasible long term + # FIXME: restore: + # warningsAreErrors = true; # not sure if feasible long term + warningsAreErrors = false; markdownByDefault = true; }; rendered = pkgs.runCommand "option-doc-${config.sourceName}" diff --git a/site/src/SUMMARY.md b/site/src/SUMMARY.md index d35e841..b6ed447 100644 --- a/site/src/SUMMARY.md +++ b/site/src/SUMMARY.md @@ -14,6 +14,7 @@ - [`easyOverlay`](./options/flake-parts-easyOverlay.md) - [`devshell`](./options/devshell.md) - [`dream2nix beta`](./options/dream2nix.md) + - [`drv-parts`](./options/drv-parts.md) - [`emanote`](./options/emanote.md) - [`haskell-flake`](./options/haskell-flake.md) - [`hercules-ci-effects`](./options/hercules-ci-effects.md)