skawarePackages: refactor
This way, the skawarePackages live inside its own directory, with a huge inherit to bring them to top-level.
This commit is contained in:
parent
79ea4b7e49
commit
4ff9ef84c7
2 changed files with 34 additions and 38 deletions
33
pkgs/development/skaware-packages/default.nix
Normal file
33
pkgs/development/skaware-packages/default.nix
Normal file
|
@ -0,0 +1,33 @@
|
|||
{ lib, pkgs }:
|
||||
|
||||
lib.makeScope pkgs.newScope (self:
|
||||
let
|
||||
inherit (self) callPackage;
|
||||
in {
|
||||
buildManPages = callPackage ./build-skaware-man-pages.nix { };
|
||||
buildPackage = callPackage ./build-skaware-package.nix { };
|
||||
cleanPackaging = callPackage ./clean-packaging.nix { };
|
||||
|
||||
execline = callPackage ./execline { };
|
||||
execline-man-pages = callPackage ./execline-man-pages { };
|
||||
|
||||
mdevd = callPackage ./mdevd { };
|
||||
nsss = callPackage ./nsss { };
|
||||
sdnotify-wrapper = callPackage ./sdnotify-wrapper { };
|
||||
utmps = callPackage ./utmps { };
|
||||
|
||||
skalibs = callPackage ./skalibs { };
|
||||
skalibs_2_10 = callPackage ./skalibs/2_10.nix { };
|
||||
|
||||
s6 = callPackage ./s6 { };
|
||||
s6-dns = callPackage ./s6-dns { };
|
||||
s6-linux-init = callPackage ./s6-linux-init { };
|
||||
s6-linux-utils = callPackage ./s6-linux-utils { };
|
||||
s6-networking = callPackage ./s6-networking { };
|
||||
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 { };
|
||||
})
|
|
@ -22490,44 +22490,7 @@ with pkgs;
|
|||
|
||||
skjold = callPackage ../development/tools/skjold { };
|
||||
|
||||
skawarePackages = recurseIntoAttrs rec {
|
||||
buildManPages = callPackage ../development/skaware-packages/build-skaware-man-pages.nix { };
|
||||
buildPackage = callPackage ../development/skaware-packages/build-skaware-package.nix {
|
||||
inherit cleanPackaging;
|
||||
};
|
||||
cleanPackaging = callPackage ../development/skaware-packages/clean-packaging.nix { };
|
||||
|
||||
execline = callPackage ../development/skaware-packages/execline { };
|
||||
execline-man-pages = callPackage ../development/skaware-packages/execline-man-pages {
|
||||
inherit buildManPages;
|
||||
};
|
||||
|
||||
mdevd = callPackage ../development/skaware-packages/mdevd { };
|
||||
nsss = callPackage ../development/skaware-packages/nsss { };
|
||||
sdnotify-wrapper = callPackage ../development/skaware-packages/sdnotify-wrapper { };
|
||||
utmps = callPackage ../development/skaware-packages/utmps { };
|
||||
|
||||
skalibs = callPackage ../development/skaware-packages/skalibs { };
|
||||
skalibs_2_10 = callPackage ../development/skaware-packages/skalibs/2_10.nix { };
|
||||
|
||||
s6 = callPackage ../development/skaware-packages/s6 { };
|
||||
s6-dns = callPackage ../development/skaware-packages/s6-dns { };
|
||||
s6-linux-init = callPackage ../development/skaware-packages/s6-linux-init { };
|
||||
s6-linux-utils = callPackage ../development/skaware-packages/s6-linux-utils { };
|
||||
s6-networking = callPackage ../development/skaware-packages/s6-networking { };
|
||||
s6-portable-utils = callPackage ../development/skaware-packages/s6-portable-utils { };
|
||||
s6-rc = callPackage ../development/skaware-packages/s6-rc { };
|
||||
|
||||
s6-man-pages = callPackage ../development/skaware-packages/s6-man-pages {
|
||||
inherit buildManPages;
|
||||
};
|
||||
s6-networking-man-pages = callPackage ../development/skaware-packages/s6-networking-man-pages {
|
||||
inherit buildManPages;
|
||||
};
|
||||
s6-portable-utils-man-pages = callPackage ../development/skaware-packages/s6-portable-utils-man-pages {
|
||||
inherit buildManPages;
|
||||
};
|
||||
};
|
||||
skawarePackages = recurseIntoAttrs (callPackage ../development/skaware-packages { });
|
||||
|
||||
inherit (skawarePackages)
|
||||
execline
|
||||
|
|
Loading…
Reference in a new issue