top-level/all-packages: my proposal for splitting the all packages

kalbasit · Nov 21, 2018 · e3ebdcd · e3ebdcd
1 parent ebe6575
commit e3ebdcd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/pkgs/applications/default.nix b/pkgs/applications/default.nix
@@ -0,0 +1,7 @@
+{ pkgs }:
+
+with pkgs;
+
+{
+  archiver = callPackage ./misc/archiver { };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -136,8 +136,6 @@ with pkgs;
 
   dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh;
 
-  archiver = callPackage ../applications/misc/archiver { };
-
   digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { };
 
   dockerTools = callPackage ../build-support/docker { };
@@ -15667,6 +15665,9 @@ with pkgs;
 
   ### APPLICATIONS
 
+  # TODO; merge the attrs of applications into the global scope
+  applications = recurseIntoAttrs (callPackage ../applications { inherit pkgs; });
+
   _2bwm = callPackage ../applications/window-managers/2bwm {
     patches = config."2bwm".patches or [];
   };