Move new packages from overrides/ into pkgs/.

Those packages aren't actually overrides and thus it doesn't make sense
to categorize them into "overrides".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

1 files changed, 2 insertions, 24 deletions

diff --git a/overrides/default.nix b/overrides/default.nix
index e14af6a0..ca5cad86 100644
--- a/overrides/default.nix
+++ b/overrides/default.nix
@@ -3,11 +3,9 @@ pkgs:
 with pkgs.lib;
 
 let
-  allPackages = newPackages // misc;
+  allPackages = (import ../pkgs { pkgs = everything; }).aszlig // misc;
   everything = pkgs // allPackages // drvOverrides // argOverrides;
 
-  callPackage = callPackageWith everything;
-
   mapOverride = overrideFun: includePackages: let
     packages = pkgs // allPackages // includePackages;
     overrideName = name: overrideFun (getAttr name packages);
@@ -55,7 +53,7 @@ let
   '';
 
   gajimPatch = everything.substituteAll {
-    src = ./gajim/config.patch;
+    src = ../pkgs/gajim/config.patch;
     nix_config = everything.writeText "gajim.config"
       (import ../cfgfiles/gajim.nix);
   };
@@ -83,26 +81,6 @@ let
     };
   };
 
-  # new packages
-  newPackages = {
-    axbo = callPackage ./axbo { };
-    blop = callPackage ./blop { };
-    fish = callPackage ./fish { };
-    gajim = callPackage ./gajim/0.16-pre.nix {
-      inherit (pkgs.xlibs) libX11;
-    };
-    libCMT = callPackage ./libcmt { };
-    librxtx_java = callPackage ./librxtx-java { };
-    lockdev = callPackage ./lockdev { };
-    nbxmpp = callPackage ./nbxmpp { };
-    pvolctrl = callPackage ./pvolctrl { };
-    tkabber_urgent_plugin = callPackage ./tkabber-urgent-plugin { };
-
-    aszligKernelPatches = {
-      bfqsched = callPackage ./kpatches/bfqsched.nix { };
-    };
-  };
-
   # misc
   misc = {
     kernelSourceAszlig = {