about summary refs log tree commit diff
path: root/pkgs/development/skaware-packages/nsss
diff options
context:
space:
mode:
authorProfpatsch <mail@profpatsch.de>2024-03-04 01:34:38 +0100
committerProfpatsch <mail@profpatsch.de>2024-03-24 14:52:19 +0100
commit7cadc175919016d329c868915f1f1c42fc8fb817 (patch)
treeaae9ab2adea6b8bfe7bcacce4e86445149b77fe7 /pkgs/development/skaware-packages/nsss
parent70cef84833bd3c91a52983f296eb56270ffcdbfa (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/nsss')
-rw-r--r--pkgs/development/skaware-packages/nsss/default.nix6
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/skaware-packages/nsss/default.nix b/pkgs/development/skaware-packages/nsss/default.nix
index 3f81c0e66b3fc..6171a36f11478 100644
--- a/pkgs/development/skaware-packages/nsss/default.nix
+++ b/pkgs/development/skaware-packages/nsss/default.nix
@@ -1,8 +1,6 @@
-{ skawarePackages }:
+{ skawarePackages, skalibs }:
 
-with skawarePackages;
-
-buildPackage {
+skawarePackages.buildPackage {
   pname = "nsss";
   version = "0.2.0.4";
   sha256 = "ObUE+FvY9rUj0zTlz6YsAqOV2zWZG3XyBt8Ku9Z2Gq0=";