diff options
author | Profpatsch <mail@profpatsch.de> | 2024-03-04 01:34:38 +0100 |
---|---|---|
committer | Profpatsch <mail@profpatsch.de> | 2024-03-24 14:52:19 +0100 |
commit | 7cadc175919016d329c868915f1f1c42fc8fb817 (patch) | |
tree | aae9ab2adea6b8bfe7bcacce4e86445149b77fe7 /pkgs/development/skaware-packages/default.nix | |
parent | 70cef84833bd3c91a52983f296eb56270ffcdbfa (diff) |
skawarePackages: add manpages to their respective packages
For a while now, we’ve had these separate derivations for the skaware manpages. That was fine in the beginning, because it was not entirely clear whether the manpage project would be long-lived. Given that the collection of third-party manpages is now extensive and updated regularly, plus it is sanctioned by skarnet, we can remove this additional hurdle to using skaware. The buildManPage structure is kept, instead of building them in a separate `default.nix`, we add a field `manpages` to `skawarePackages.buildPackage`, which adds the `"man"` output and copies everything from the manpages output. For backwards-compat, the manpage derivation is exposed in the `passthru` and referenced by the `*-man-pages` attributes. ~~~ The `with skawarePackages;` scope is removed from all packages, and used explicitly for all functions, while packages get added to the package import header.
Diffstat (limited to 'pkgs/development/skaware-packages/default.nix')
-rw-r--r-- | pkgs/development/skaware-packages/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/skaware-packages/default.nix b/pkgs/development/skaware-packages/default.nix index 798ae11df5cbb..4800b6e6a854c 100644 --- a/pkgs/development/skaware-packages/default.nix +++ b/pkgs/development/skaware-packages/default.nix @@ -10,7 +10,6 @@ lib.makeScope pkgs.newScope (self: # execline execline = callPackage ./execline { }; - execline-man-pages = callPackage ./execline-man-pages { }; # servers & tools mdevd = callPackage ./mdevd { }; @@ -32,8 +31,10 @@ lib.makeScope pkgs.newScope (self: s6-portable-utils = callPackage ./s6-portable-utils { }; s6-rc = callPackage ./s6-rc { }; - s6-man-pages = callPackage ./s6-man-pages { }; - s6-networking-man-pages = callPackage ./s6-networking-man-pages { }; - s6-portable-utils-man-pages = callPackage ./s6-portable-utils-man-pages { }; - s6-rc-man-pages = callPackage ./s6-rc-man-pages { }; + # manpages (DEPRECATED, they are added directly to the packages now) + execline-man-pages = self.execline.passthru.manpages; + s6-man-pages = self.s6.passthru.manpages; + s6-networking-man-pages = self.s6-networking.passthru.manpages; + s6-portable-utils-man-pages = self.s6-portable-utils.passthru.manpages; + s6-rc-man-pages = self.s6-rc.passthru.manpages; }) |