diff --git a/pkgs/build-support/skaware/build-skaware-man-pages.nix b/pkgs/development/skaware-packages/build-skaware-man-pages.nix similarity index 100% rename from pkgs/build-support/skaware/build-skaware-man-pages.nix rename to pkgs/development/skaware-packages/build-skaware-man-pages.nix diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/development/skaware-packages/build-skaware-package.nix similarity index 100% rename from pkgs/build-support/skaware/build-skaware-package.nix rename to pkgs/development/skaware-packages/build-skaware-package.nix diff --git a/pkgs/build-support/skaware/clean-packaging.nix b/pkgs/development/skaware-packages/clean-packaging.nix similarity index 100% rename from pkgs/build-support/skaware/clean-packaging.nix rename to pkgs/development/skaware-packages/clean-packaging.nix diff --git a/pkgs/data/documentation/execline-man-pages/default.nix b/pkgs/development/skaware-packages/execline-man-pages/default.nix similarity index 100% rename from pkgs/data/documentation/execline-man-pages/default.nix rename to pkgs/development/skaware-packages/execline-man-pages/default.nix diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/development/skaware-packages/execline/default.nix similarity index 100% rename from pkgs/tools/misc/execline/default.nix rename to pkgs/development/skaware-packages/execline/default.nix diff --git a/pkgs/tools/misc/execline/execlineb-wrapper.c b/pkgs/development/skaware-packages/execline/execlineb-wrapper.c similarity index 100% rename from pkgs/tools/misc/execline/execlineb-wrapper.c rename to pkgs/development/skaware-packages/execline/execlineb-wrapper.c diff --git a/pkgs/os-specific/linux/mdevd/default.nix b/pkgs/development/skaware-packages/mdevd/default.nix similarity index 100% rename from pkgs/os-specific/linux/mdevd/default.nix rename to pkgs/development/skaware-packages/mdevd/default.nix diff --git a/pkgs/development/libraries/nsss/default.nix b/pkgs/development/skaware-packages/nsss/default.nix similarity index 100% rename from pkgs/development/libraries/nsss/default.nix rename to pkgs/development/skaware-packages/nsss/default.nix diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/development/skaware-packages/s6-dns/default.nix similarity index 100% rename from pkgs/tools/networking/s6-dns/default.nix rename to pkgs/development/skaware-packages/s6-dns/default.nix diff --git a/pkgs/os-specific/linux/s6-linux-init/default.nix b/pkgs/development/skaware-packages/s6-linux-init/default.nix similarity index 100% rename from pkgs/os-specific/linux/s6-linux-init/default.nix rename to pkgs/development/skaware-packages/s6-linux-init/default.nix diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/development/skaware-packages/s6-linux-utils/default.nix similarity index 100% rename from pkgs/os-specific/linux/s6-linux-utils/default.nix rename to pkgs/development/skaware-packages/s6-linux-utils/default.nix diff --git a/pkgs/data/documentation/s6-man-pages/default.nix b/pkgs/development/skaware-packages/s6-man-pages/default.nix similarity index 100% rename from pkgs/data/documentation/s6-man-pages/default.nix rename to pkgs/development/skaware-packages/s6-man-pages/default.nix diff --git a/pkgs/data/documentation/s6-networking-man-pages/default.nix b/pkgs/development/skaware-packages/s6-networking-man-pages/default.nix similarity index 100% rename from pkgs/data/documentation/s6-networking-man-pages/default.nix rename to pkgs/development/skaware-packages/s6-networking-man-pages/default.nix diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/development/skaware-packages/s6-networking/default.nix similarity index 100% rename from pkgs/tools/networking/s6-networking/default.nix rename to pkgs/development/skaware-packages/s6-networking/default.nix diff --git a/pkgs/data/documentation/s6-portable-utils-man-pages/default.nix b/pkgs/development/skaware-packages/s6-portable-utils-man-pages/default.nix similarity index 100% rename from pkgs/data/documentation/s6-portable-utils-man-pages/default.nix rename to pkgs/development/skaware-packages/s6-portable-utils-man-pages/default.nix diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/development/skaware-packages/s6-portable-utils/default.nix similarity index 100% rename from pkgs/tools/misc/s6-portable-utils/default.nix rename to pkgs/development/skaware-packages/s6-portable-utils/default.nix diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/development/skaware-packages/s6-rc/default.nix similarity index 100% rename from pkgs/tools/system/s6-rc/default.nix rename to pkgs/development/skaware-packages/s6-rc/default.nix diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/development/skaware-packages/s6/default.nix similarity index 100% rename from pkgs/tools/system/s6/default.nix rename to pkgs/development/skaware-packages/s6/default.nix diff --git a/pkgs/os-specific/linux/sdnotify-wrapper/default.nix b/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix similarity index 100% rename from pkgs/os-specific/linux/sdnotify-wrapper/default.nix rename to pkgs/development/skaware-packages/sdnotify-wrapper/default.nix diff --git a/pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c b/pkgs/development/skaware-packages/sdnotify-wrapper/sdnotify-wrapper.c similarity index 100% rename from pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c rename to pkgs/development/skaware-packages/sdnotify-wrapper/sdnotify-wrapper.c diff --git a/pkgs/development/libraries/skalibs/2_10.nix b/pkgs/development/skaware-packages/skalibs/2_10.nix similarity index 100% rename from pkgs/development/libraries/skalibs/2_10.nix rename to pkgs/development/skaware-packages/skalibs/2_10.nix diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/skaware-packages/skalibs/default.nix similarity index 100% rename from pkgs/development/libraries/skalibs/default.nix rename to pkgs/development/skaware-packages/skalibs/default.nix diff --git a/pkgs/development/libraries/utmps/default.nix b/pkgs/development/skaware-packages/utmps/default.nix similarity index 100% rename from pkgs/development/libraries/utmps/default.nix rename to pkgs/development/skaware-packages/utmps/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 280a19e09888..5e55b57c40d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13,23 +13,22 @@ with pkgs; { # A module system style type tag # - # Allows the nixpkgs fixpoint, usually known as `pkgs` - # to be distinguished nominally. + # Allows the nixpkgs fixpoint, usually known as `pkgs` to be distinguished + # nominally. # # pkgs._type == "pkgs" # pkgs.pkgsStatic._type == "pkgs" # # Design note: - # While earlier stages of nixpkgs fixpoint construction - # are supertypes of this stage, they're generally not - # usable in places where a `pkgs` is expected. - # (earlier stages being the various `super` variables - # that precede all-packages.nix) + # While earlier stages of nixpkgs fixpoint construction are supertypes of this + # stage, they're generally not usable in places where a `pkgs` is expected. + # (earlier stages being the various `super` variables that precede + # all-packages.nix) _type = "pkgs"; - # A stdenv capable of building 32-bit binaries. On x86_64-linux, - # it uses GCC compiled with multilib support; on i686-linux, it's - # just the plain stdenv. + # A stdenv capable of building 32-bit binaries. + # On x86_64-linux, it uses GCC compiled with multilib support; on i686-linux, + # it's just the plain stdenv. stdenv_32bit = lowPrio (if stdenv.hostPlatform.is32bit then stdenv else multiStdenv); stdenvNoCC = stdenv.override ( @@ -39,8 +38,8 @@ with pkgs; # TODO: This is a hack to use stdenvNoCC to produce a CF when cross # compiling. It's not very sound. The cross stdenv has: # extraBuildInputs = [ targetPackages.darwin.apple_sdks.frameworks.CoreFoundation ] - # and uses stdenvNoCC. In order to make this not infinitely recursive, we need to exclude - # this extraBuildInput. + # and uses stdenvNoCC. In order to make this not infinitely recursive, we + # need to exclude this extraBuildInput. extraBuildInputs = []; } ); @@ -84,7 +83,6 @@ with pkgs; # For convenience, allow callers to get the path to Nixpkgs. path = ../..; - ### Helper functions. inherit lib config overlays; @@ -6384,8 +6382,6 @@ with pkgs; boost = if stdenv.isDarwin then boost else boost15x; }; - execline = skawarePackages.execline; - executor = with python3Packages; toPythonApplication executor; exif = callPackage ../tools/graphics/exif { }; @@ -9459,10 +9455,6 @@ with pkgs; netselect = callPackage ../tools/networking/netselect { }; - nettee = callPackage ../tools/networking/nettee { - inherit (skawarePackages) cleanPackaging; - }; - networkmanager = callPackage ../tools/networking/networkmanager { }; networkmanager-iodine = callPackage ../tools/networking/networkmanager/iodine { }; @@ -11058,16 +11050,6 @@ with pkgs; s5cmd = callPackage ../tools/networking/s5cmd { }; - s6-dns = skawarePackages.s6-dns; - - s6-linux-init = skawarePackages.s6-linux-init; - - s6-linux-utils = skawarePackages.s6-linux-utils; - - s6-networking = skawarePackages.s6-networking; - - s6-portable-utils = skawarePackages.s6-portable-utils; - sacad = callPackage ../tools/misc/sacad { }; sad = callPackage ../tools/text/sad { }; @@ -21313,8 +21295,6 @@ with pkgs; nss_wrapper = callPackage ../development/libraries/nss_wrapper { }; - nsss = skawarePackages.nsss; - ntbtls = callPackage ../development/libraries/ntbtls { }; ntk = callPackage ../development/libraries/audio/ntk { }; @@ -22073,8 +22053,6 @@ with pkgs; SDL2_ttf_2_0_15 = callPackage ../development/libraries/SDL2_ttf/2.0.15.nix { }; - sdnotify-wrapper = skawarePackages.sdnotify-wrapper; - sdrplay = callPackage ../applications/radio/sdrplay {}; sdrpp = callPackage ../applications/radio/sdrpp { @@ -22144,45 +22122,71 @@ with pkgs; skjold = callPackage ../development/tools/skjold { }; - skalibs = skawarePackages.skalibs; - skalibs_2_10 = skawarePackages.skalibs_2_10; - skawarePackages = recurseIntoAttrs rec { - cleanPackaging = callPackage ../build-support/skaware/clean-packaging.nix { }; - buildPackage = callPackage ../build-support/skaware/build-skaware-package.nix { + buildManPages = callPackage ../development/skaware-packages/build-skaware-man-pages.nix { }; + buildPackage = callPackage ../development/skaware-packages/build-skaware-package.nix { inherit cleanPackaging; }; - buildManPages = callPackage ../build-support/skaware/build-skaware-man-pages.nix { }; + cleanPackaging = callPackage ../development/skaware-packages/clean-packaging.nix { }; - skalibs = callPackage ../development/libraries/skalibs { }; - skalibs_2_10 = callPackage ../development/libraries/skalibs/2_10.nix { }; - execline = callPackage ../tools/misc/execline { }; - - execline-man-pages = callPackage ../data/documentation/execline-man-pages { + execline = callPackage ../development/skaware-packages/execline { }; + execline-man-pages = callPackage ../development/skaware-packages/execline-man-pages { inherit buildManPages; }; - s6 = callPackage ../tools/system/s6 { }; - s6-dns = callPackage ../tools/networking/s6-dns { }; - s6-linux-init = callPackage ../os-specific/linux/s6-linux-init { }; - 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 { }; - s6-man-pages = callPackage ../data/documentation/s6-man-pages { - inherit buildManPages; - }; - s6-networking-man-pages = callPackage ../data/documentation/s6-networking-man-pages { - inherit buildManPages; - }; - s6-portable-utils-man-pages = callPackage ../data/documentation/s6-portable-utils-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 { }; - mdevd = callPackage ../os-specific/linux/mdevd { }; - nsss = callPackage ../development/libraries/nsss { }; - utmps = callPackage ../development/libraries/utmps { }; - sdnotify-wrapper = callPackage ../os-specific/linux/sdnotify-wrapper { }; + 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; + }; + }; + + inherit (skawarePackages) + execline + execline-man-pages + mdevd + nsss + s6 + s6-dns + s6-linux-init + s6-linux-utils + s6-man-pages + s6-networking + s6-networking-man-pages + s6-portable-utils + s6-portable-utils-man-pages + s6-rc + sdnotify-wrapper + skalibs + skalibs_2_10 + utmps; + + kgt = callPackage ../development/tools/kgt { + inherit (skawarePackages) cleanPackaging; + }; + + nettee = callPackage ../tools/networking/nettee { + inherit (skawarePackages) cleanPackaging; }; slang = callPackage ../development/libraries/slang { }; @@ -22586,8 +22590,6 @@ with pkgs; uthenticode = callPackage ../development/libraries/uthenticode { }; - utmps = skawarePackages.utmps; - ucommon = callPackage ../development/libraries/ucommon { }; v8 = darwin.apple_sdk_11_0.callPackage ../development/libraries/v8 { }; @@ -24259,10 +24261,6 @@ with pkgs; roon-server = callPackage ../servers/roon-server { }; - s6 = skawarePackages.s6; - - s6-rc = skawarePackages.s6-rc; - supervise = callPackage ../tools/system/supervise { }; spamassassin = callPackage ../servers/mail/spamassassin { }; @@ -25196,8 +25194,6 @@ with pkgs; mdadm = mdadm4; mdadm4 = callPackage ../os-specific/linux/mdadm { }; - inherit (skawarePackages) mdevd; - metastore = callPackage ../os-specific/linux/metastore { }; mingetty = callPackage ../os-specific/linux/mingetty { }; @@ -26106,8 +26102,6 @@ with pkgs; envypn-font = callPackage ../data/fonts/envypn-font { }; - execline-man-pages = skawarePackages.execline-man-pages; - ezra-sil = callPackage ../data/fonts/ezra-sil { }; fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {}; @@ -26744,12 +26738,6 @@ with pkgs; open-fonts = callPackage ../data/fonts/open-fonts { }; - s6-man-pages = skawarePackages.s6-man-pages; - - s6-networking-man-pages = skawarePackages.s6-networking-man-pages; - - s6-portable-utils-man-pages = skawarePackages.s6-portable-utils-man-pages; - scientifica = callPackage ../data/fonts/scientifica { }; siji = callPackage ../data/fonts/siji { }; @@ -29553,10 +29541,6 @@ with pkgs; kexi = libsForQt514.callPackage ../applications/office/kexi { }; - kgt = callPackage ../development/tools/kgt { - inherit (skawarePackages) cleanPackaging; - }; - khronos = callPackage ../applications/office/khronos { }; keyfinder = libsForQt5.callPackage ../applications/audio/keyfinder { };