diff --git a/pkgs/development/skaware-packages/build-skaware-package.nix b/pkgs/development/skaware-packages/build-skaware-package.nix index 24a1465e690a..56bbe6bec51b 100644 --- a/pkgs/development/skaware-packages/build-skaware-package.nix +++ b/pkgs/development/skaware-packages/build-skaware-package.nix @@ -6,6 +6,8 @@ , version # : string , sha256 ? lib.fakeSha256 + # : drv | null +, manpages ? null # : string , description # : list Platform @@ -63,7 +65,15 @@ stdenv.mkDerivation { inherit sha256; }; - inherit outputs; + outputs = + if manpages == null + then outputs + else + assert (lib.assertMsg (!lib.elem "man" outputs) "If you pass `manpages` to `skawarePackages.buildPackage`, you cannot have a `man` output already!"); + # insert as early as posible, but keep the first element + if lib.length outputs > 0 + then [(lib.head outputs) "man"] ++ lib.tail outputs + else ["man"]; dontDisableStatic = true; enableParallelBuilding = true; @@ -97,6 +107,13 @@ stdenv.mkDerivation { docFiles = commonMetaFiles; }} $doc/share/doc/${pname} + ${if manpages == null + then ''echo "no manpages for this package"'' + else '' + echo "copying manpages" + cp -vr ${manpages} $man + ''} + ${postInstall} ''; @@ -104,6 +121,8 @@ stdenv.mkDerivation { ${cleanPackaging.checkForRemainingFiles} ''; + passthru = passthru // (if manpages == null then {} else { inherit manpages; }); + meta = { homepage = "https://skarnet.org/software/${pname}/"; inherit description platforms; @@ -112,6 +131,4 @@ stdenv.mkDerivation { [ pmahoney Profpatsch qyliss ] ++ maintainers; }; - inherit passthru; - } diff --git a/pkgs/development/skaware-packages/default.nix b/pkgs/development/skaware-packages/default.nix index 798ae11df5cb..4800b6e6a854 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; }) diff --git a/pkgs/development/skaware-packages/execline-man-pages/default.nix b/pkgs/development/skaware-packages/execline-man-pages/default.nix deleted file mode 100644 index 6cb4ff659bac..000000000000 --- a/pkgs/development/skaware-packages/execline-man-pages/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ lib, buildManPages }: - -buildManPages { - pname = "execline-man-pages"; - version = "2.9.3.0.5"; - sha256 = "0fcjrj4xp7y7n1c55k45rxr5m7zpv6cbhrkxlxymd4j603i9jh6d"; - description = "Port of the documentation for the execline suite to mdoc"; - maintainers = [ lib.maintainers.sternenseemann ]; -} diff --git a/pkgs/development/skaware-packages/execline/default.nix b/pkgs/development/skaware-packages/execline/default.nix index caa9a8030a94..80bef5feb512 100644 --- a/pkgs/development/skaware-packages/execline/default.nix +++ b/pkgs/development/skaware-packages/execline/default.nix @@ -1,29 +1,30 @@ -{ fetchFromGitHub, skawarePackages }: +{ lib, fetchFromGitHub, skawarePackages, skalibs }: -with skawarePackages; let version = "2.9.4.0"; +in skawarePackages.buildPackage { + inherit version; + + pname = "execline"; + # ATTN: also check whether there is a new manpages version + sha256 = "mrVdVhU536dv9Kl5BvqZX8SiiOPeUiXLGp2PqenrxJs="; + # Maintainer of manpages uses following versioning scheme: for every # upstream $version he tags manpages release as ${version}.1, and, # in case of extra fixes to manpages, new tags in form ${version}.2, # ${version}.3 and so on are created. - manpages = fetchFromGitHub { - owner = "flexibeast"; - repo = "execline-man-pages"; - rev = "v2.9.1.0.1"; - sha256 = "nZzzQFMUPmIgPS3aAIgcORr/TSpaLf8UtzBUFD7blt8="; + manpages = skawarePackages.buildManPages { + pname = "execline-man-pages"; + version = "2.9.3.0.5"; + sha256 = "0fcjrj4xp7y7n1c55k45rxr5m7zpv6cbhrkxlxymd4j603i9jh6d"; + description = "Port of the documentation for the execline suite to mdoc"; + maintainers = [ lib.maintainers.sternenseemann ]; }; -in buildPackage { - inherit version; - - pname = "execline"; - sha256 = "mrVdVhU536dv9Kl5BvqZX8SiiOPeUiXLGp2PqenrxJs="; - description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; - outputs = [ "bin" "man" "lib" "dev" "doc" "out" ]; + outputs = [ "bin" "lib" "dev" "doc" "out" ]; # TODO: nsss support configureFlags = [ @@ -62,7 +63,5 @@ in buildPackage { -o "$bin/bin/execlineb" \ ${./execlineb-wrapper.c} \ -lskarnet - mkdir -p $man/share/ - cp -vr ${manpages}/man* $man/share ''; } diff --git a/pkgs/development/skaware-packages/mdevd/default.nix b/pkgs/development/skaware-packages/mdevd/default.nix index 9f4caa4ed025..0e78d112c8bb 100644 --- a/pkgs/development/skaware-packages/mdevd/default.nix +++ b/pkgs/development/skaware-packages/mdevd/default.nix @@ -1,8 +1,6 @@ -{ lib, skawarePackages }: +{ lib, skawarePackages, skalibs }: -with skawarePackages; - -buildPackage { +skawarePackages.buildPackage { pname = "mdevd"; version = "0.1.6.3"; sha256 = "9uzw73zUjQTvx1rLLa2WfYULyIFb2wCY8cnvBDOU1DA="; diff --git a/pkgs/development/skaware-packages/nsss/default.nix b/pkgs/development/skaware-packages/nsss/default.nix index 3f81c0e66b3f..6171a36f1147 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="; diff --git a/pkgs/development/skaware-packages/s6-dns/default.nix b/pkgs/development/skaware-packages/s6-dns/default.nix index b4229d2c216f..1393a2c15634 100644 --- a/pkgs/development/skaware-packages/s6-dns/default.nix +++ b/pkgs/development/skaware-packages/s6-dns/default.nix @@ -1,8 +1,6 @@ -{ skawarePackages }: +{ skawarePackages, skalibs }: -with skawarePackages; - -buildPackage { +skawarePackages.buildPackage { pname = "s6-dns"; version = "2.3.7.1"; sha256 = "zwJYV07H1itlTgwq14r0x9Z6xMnLN/eBSA9ZflSzD20="; diff --git a/pkgs/development/skaware-packages/s6-linux-init/default.nix b/pkgs/development/skaware-packages/s6-linux-init/default.nix index a60216559286..fdb92aa3e2c6 100644 --- a/pkgs/development/skaware-packages/s6-linux-init/default.nix +++ b/pkgs/development/skaware-packages/s6-linux-init/default.nix @@ -1,8 +1,6 @@ -{ lib, skawarePackages }: +{ lib, skawarePackages, skalibs, execline, s6 }: -with skawarePackages; - -buildPackage { +skawarePackages.buildPackage { pname = "s6-linux-init"; version = "1.1.2.0"; sha256 = "sha256-Ea4I0KZiELXla2uu4Pa5sbafvtsF/aEoWxFaMcpGx38="; diff --git a/pkgs/development/skaware-packages/s6-linux-utils/default.nix b/pkgs/development/skaware-packages/s6-linux-utils/default.nix index 9a6871b9f487..b3c52edc7e73 100644 --- a/pkgs/development/skaware-packages/s6-linux-utils/default.nix +++ b/pkgs/development/skaware-packages/s6-linux-utils/default.nix @@ -1,8 +1,6 @@ -{ lib, skawarePackages }: +{ lib, skawarePackages, skalibs }: -with skawarePackages; - -buildPackage { +skawarePackages.buildPackage { pname = "s6-linux-utils"; version = "2.6.2.0"; sha256 = "j5RGM8qH09I+DwPJw4PRUC1QjJusFtOMP79yOl6rK7c="; diff --git a/pkgs/development/skaware-packages/s6-man-pages/default.nix b/pkgs/development/skaware-packages/s6-man-pages/default.nix deleted file mode 100644 index c21da0e17ae2..000000000000 --- a/pkgs/development/skaware-packages/s6-man-pages/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ lib, buildManPages }: - -buildManPages { - pname = "s6-man-pages"; - version = "2.12.0.2.1"; - sha256 = "sha256-fFU+cRwXb4SwHsI/r0ghuzCf6hEK/muPPp2XMvD8VtQ="; - description = "Port of the documentation for the s6 supervision suite to mdoc"; - maintainers = [ lib.maintainers.sternenseemann ]; -} diff --git a/pkgs/development/skaware-packages/s6-networking-man-pages/default.nix b/pkgs/development/skaware-packages/s6-networking-man-pages/default.nix deleted file mode 100644 index fb63030e62df..000000000000 --- a/pkgs/development/skaware-packages/s6-networking-man-pages/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ lib, buildManPages }: - -buildManPages { - pname = "s6-networking-man-pages"; - version = "2.5.1.3.3"; - sha256 = "02ba5jyfpbib402mfl42pbbdxyjy2vhpiz1b2qdg4ax58yr4jzqk"; - description = "Port of the documentation for the s6-networking suite to mdoc"; - maintainers = [ lib.maintainers.sternenseemann ]; -} diff --git a/pkgs/development/skaware-packages/s6-networking/default.nix b/pkgs/development/skaware-packages/s6-networking/default.nix index 1b8cd4e88fea..f9078351fdcd 100644 --- a/pkgs/development/skaware-packages/s6-networking/default.nix +++ b/pkgs/development/skaware-packages/s6-networking/default.nix @@ -1,11 +1,10 @@ -{ lib, skawarePackages +{ lib, skawarePackages, skalibs, execline, s6, s6-dns # Whether to build the TLS/SSL tools and what library to use # acceptable values: "bearssl", "libressl", false , sslSupport ? "bearssl" , libressl, bearssl }: -with skawarePackages; let sslSupportEnabled = sslSupport != false; sslLibs = { @@ -17,11 +16,19 @@ in assert sslSupportEnabled -> sslLibs ? ${sslSupport}; -buildPackage { +skawarePackages.buildPackage { pname = "s6-networking"; version = "2.7.0.2"; sha256 = "wzxvGyvhb4miGvlGz9BiQqEvmBhMiYt1XdskM4ZxzrE="; + manpages = skawarePackages.buildManPages { + pname = "s6-networking-man-pages"; + version = "2.5.1.3.3"; + sha256 = "02ba5jyfpbib402mfl42pbbdxyjy2vhpiz1b2qdg4ax58yr4jzqk"; + description = "Port of the documentation for the s6-networking suite to mdoc"; + maintainers = [ lib.maintainers.sternenseemann ]; + }; + description = "A suite of small networking utilities for Unix systems"; outputs = [ "bin" "lib" "dev" "doc" "out" ]; diff --git a/pkgs/development/skaware-packages/s6-portable-utils-man-pages/default.nix b/pkgs/development/skaware-packages/s6-portable-utils-man-pages/default.nix deleted file mode 100644 index 0a537ea2f9b3..000000000000 --- a/pkgs/development/skaware-packages/s6-portable-utils-man-pages/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ lib, buildManPages }: - -buildManPages { - pname = "s6-portable-utils-man-pages"; - version = "2.3.0.2.2"; - sha256 = "0zbxr6jqrx53z1gzfr31nm78wjfmyjvjx7216l527nxl9zn8nnv1"; - description = "Port of the documentation for the s6-portable-utils suite to mdoc"; - maintainers = [ lib.maintainers.somasis ]; -} diff --git a/pkgs/development/skaware-packages/s6-portable-utils/default.nix b/pkgs/development/skaware-packages/s6-portable-utils/default.nix index b02628ad806e..816b5cd3cdf7 100644 --- a/pkgs/development/skaware-packages/s6-portable-utils/default.nix +++ b/pkgs/development/skaware-packages/s6-portable-utils/default.nix @@ -1,12 +1,18 @@ -{ skawarePackages }: +{ lib, skawarePackages, skalibs }: -with skawarePackages; - -buildPackage { +skawarePackages.buildPackage { pname = "s6-portable-utils"; version = "2.3.0.3"; sha256 = "PkSSBV0WDCX7kBU/DvwnfX1Sv5gbvj6i6d/lHEk1Yf8="; + manpages = skawarePackages.buildManPages { + pname = "s6-portable-utils-man-pages"; + version = "2.3.0.2.2"; + sha256 = "0zbxr6jqrx53z1gzfr31nm78wjfmyjvjx7216l527nxl9zn8nnv1"; + description = "Port of the documentation for the s6-portable-utils suite to mdoc"; + maintainers = [ lib.maintainers.somasis ]; + }; + description = "A set of tiny general Unix utilities optimized for simplicity and small size"; outputs = [ "bin" "dev" "doc" "out" ]; diff --git a/pkgs/development/skaware-packages/s6-rc-man-pages/default.nix b/pkgs/development/skaware-packages/s6-rc-man-pages/default.nix deleted file mode 100644 index e919746fccdb..000000000000 --- a/pkgs/development/skaware-packages/s6-rc-man-pages/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ lib, buildManPages }: - -buildManPages { - pname = "s6-rc-man-pages"; - version = "0.5.4.2.1"; - sha256 = "Ywke3FG/xhhUd934auDB+iFRDCvy8IJs6IkirP6O/As="; - description = "mdoc(7) versions of the documentation for the s6-rc service manager"; - maintainers = [ lib.maintainers.qyliss ]; -} diff --git a/pkgs/development/skaware-packages/s6-rc/default.nix b/pkgs/development/skaware-packages/s6-rc/default.nix index 586f04ddff94..edfc12f23271 100644 --- a/pkgs/development/skaware-packages/s6-rc/default.nix +++ b/pkgs/development/skaware-packages/s6-rc/default.nix @@ -1,12 +1,18 @@ -{ lib, stdenv, skawarePackages, targetPackages }: +{ lib, stdenv, skawarePackages, targetPackages, skalibs, execline, s6 }: -with skawarePackages; - -buildPackage { +skawarePackages.buildPackage { pname = "s6-rc"; version = "0.5.4.2"; sha256 = "AL36WW+nFhUS6XLskoKiq9j9DjHwkXe616K8PY8oOYI="; + manpages = skawarePackages.buildManPages { + pname = "s6-rc-man-pages"; + version = "0.5.4.2.1"; + sha256 = "Ywke3FG/xhhUd934auDB+iFRDCvy8IJs6IkirP6O/As="; + description = "mdoc(7) versions of the documentation for the s6-rc service manager"; + maintainers = [ lib.maintainers.qyliss ]; + }; + description = "A service manager for s6-based systems"; platforms = lib.platforms.unix; diff --git a/pkgs/development/skaware-packages/s6/default.nix b/pkgs/development/skaware-packages/s6/default.nix index f16e3dacc10a..b60659593648 100644 --- a/pkgs/development/skaware-packages/s6/default.nix +++ b/pkgs/development/skaware-packages/s6/default.nix @@ -1,12 +1,18 @@ -{ skawarePackages }: +{ lib, skawarePackages, skalibs, execline }: -with skawarePackages; - -buildPackage { +skawarePackages.buildPackage { pname = "s6"; version = "2.12.0.3"; sha256 = "gA0xIm9sJc3T7AtlJA+AtWzl7BNzQdCo0VTndjjlgQM="; + manpages = skawarePackages.buildManPages { + pname = "s6-man-pages"; + version = "2.12.0.2.1"; + sha256 = "sha256-fFU+cRwXb4SwHsI/r0ghuzCf6hEK/muPPp2XMvD8VtQ="; + description = "Port of the documentation for the s6 supervision suite to mdoc"; + maintainers = [ lib.maintainers.sternenseemann ]; + }; + description = "skarnet.org's small & secure supervision software suite"; # NOTE lib: cannot split lib from bin at the moment, diff --git a/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix b/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix index e86f6ab12679..e28e77989939 100644 --- a/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix +++ b/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix @@ -1,6 +1,4 @@ -{ stdenv, lib, runCommandCC, skawarePackages }: - -with skawarePackages; +{ stdenv, lib, runCommandCC, skawarePackages, skalibs }: let # From https://skarnet.org/software/misc/sdnotify-wrapper.c, diff --git a/pkgs/development/skaware-packages/skalibs/default.nix b/pkgs/development/skaware-packages/skalibs/default.nix index aecbceda7506..49d0363e8582 100644 --- a/pkgs/development/skaware-packages/skalibs/default.nix +++ b/pkgs/development/skaware-packages/skalibs/default.nix @@ -4,9 +4,7 @@ , pkgs }: -with skawarePackages; - -buildPackage { +skawarePackages.buildPackage { pname = "skalibs"; version = "2.14.1.1"; sha256 = "trebgW9LoLaAFnaw7UF5tZyMeAnu/+JttnLkBGNr78M="; diff --git a/pkgs/development/skaware-packages/tipidee/default.nix b/pkgs/development/skaware-packages/tipidee/default.nix index 942d37e525f9..342fe2749843 100644 --- a/pkgs/development/skaware-packages/tipidee/default.nix +++ b/pkgs/development/skaware-packages/tipidee/default.nix @@ -1,8 +1,6 @@ -{ skawarePackages }: +{ skawarePackages, skalibs }: -with skawarePackages; - -buildPackage { +skawarePackages.buildPackage { pname = "tipidee"; version = "0.0.3.0"; sha256 = "0dk6k86UKgJ2ioX5H2Xoga9S+SwMy9NFrK2KEKoNxCA="; diff --git a/pkgs/development/skaware-packages/utmps/default.nix b/pkgs/development/skaware-packages/utmps/default.nix index 406635e06168..97ea0f7ed7ce 100644 --- a/pkgs/development/skaware-packages/utmps/default.nix +++ b/pkgs/development/skaware-packages/utmps/default.nix @@ -1,8 +1,6 @@ -{ skawarePackages }: +{ skawarePackages, skalibs }: -with skawarePackages; - -buildPackage { +skawarePackages.buildPackage { pname = "utmps"; version = "0.1.2.2"; sha256 = "sha256-9/+jcUxllzu5X7zxUBwG/AR42TpRzqGzc+xoEcJCX1I=";