diff options
| author | Profpatsch <mail@profpatsch.de> | 2018-09-02 17:37:44 +0200 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2018-09-06 11:53:22 +0200 |
| commit | 57b431590b3c555469f4ebeffa2dc524ef806293 (patch) | |
| tree | 57cd824bfc32acda47bb636c804f9655ad88fc85 | |
| parent | ec7d4a80893c1337f53008135acdd044bf5d0257 (diff) | |
| download | nixlib-57b431590b3c555469f4ebeffa2dc524ef806293.tar nixlib-57b431590b3c555469f4ebeffa2dc524ef806293.tar.gz nixlib-57b431590b3c555469f4ebeffa2dc524ef806293.tar.bz2 nixlib-57b431590b3c555469f4ebeffa2dc524ef806293.tar.lz nixlib-57b431590b3c555469f4ebeffa2dc524ef806293.tar.xz nixlib-57b431590b3c555469f4ebeffa2dc524ef806293.tar.zst nixlib-57b431590b3c555469f4ebeffa2dc524ef806293.zip | |
skaware: bundle all skaware packages into an attrset
They are normally updated in lockstep, this makes maintenance more convenient.
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38755b611e54..dccad6918ca5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2385,7 +2385,7 @@ with pkgs; exempi = callPackage ../development/libraries/exempi { }; - execline = callPackage ../tools/misc/execline { }; + execline = skawarePackages.execline; exif = callPackage ../tools/graphics/exif { }; @@ -5066,13 +5066,13 @@ with pkgs; s3gof3r = callPackage ../tools/networking/s3gof3r { }; - s6-dns = callPackage ../tools/networking/s6-dns { }; + s6-dns = skawarePackages.s6-dns; - s6-linux-utils = callPackage ../os-specific/linux/s6-linux-utils { }; + s6-linux-utils = skawarePackages.s6-linux-utils; - s6-networking = callPackage ../tools/networking/s6-networking { }; + s6-networking = skawarePackages.s6-networking; - s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { }; + s6-portable-utils = skawarePackages.s6-portable-utils; sablotron = callPackage ../tools/text/xml/sablotron { }; @@ -12003,7 +12003,19 @@ with pkgs; shibboleth-sp = callPackage ../development/libraries/shibboleth-sp { }; - skalibs = callPackage ../development/libraries/skalibs { }; + skalibs = skawarePackages.skalibs; + + skawarePackages = recurseIntoAttrs { + skalibs = callPackage ../development/libraries/skalibs { }; + execline = callPackage ../tools/misc/execline { }; + + s6 = callPackage ../tools/system/s6 { }; + s6-dns = callPackage ../tools/networking/s6-dns { }; + s6-linux-utils = callPackage ../os-specific/linux/s6-linux-utils { }; + s6-networking = callPackage ../tools/networking/s6-networking { }; + s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { }; + s6-rc = callPackage ../tools/system/s6-rc { }; + }; skydive = callPackage ../tools/networking/skydive { }; @@ -13415,9 +13427,9 @@ with pkgs; boost = boost159; }; - s6 = callPackage ../tools/system/s6 { }; + s6 = skawarePackages.s6; - s6-rc = callPackage ../tools/system/s6-rc { }; + s6-rc = skawarePackages.s6-rc; supervise = callPackage ../tools/system/supervise { }; |