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>

15 files changed, 27 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 = {
diff --git a/overrides/axbo/default.nix b/pkgs/axbo/default.nix
index d83e891d..d83e891d 100644
--- a/overrides/axbo/default.nix
+++ b/pkgs/axbo/default.nix
diff --git a/overrides/blop/default.nix b/pkgs/blop/default.nix
index 6f1f49c5..6f1f49c5 100644
--- a/overrides/blop/default.nix
+++ b/pkgs/blop/default.nix
diff --git a/pkgs/default.nix b/pkgs/default.nix
new file mode 100644
index 00000000..21eb04d2
--- /dev/null
+++ b/pkgs/default.nix
@@ -0,0 +1,25 @@
+{ pkgs ? import <nixpkgs> {}
+}:
+
+let
+  callPackage = pkgs.lib.callPackageWith (pkgs // self);
+
+  self = {
+    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 { };
+    };
+  };
+in { aszlig = self; }
diff --git a/overrides/fish/default.nix b/pkgs/fish/default.nix
index bc37837b..bc37837b 100644
--- a/overrides/fish/default.nix
+++ b/pkgs/fish/default.nix
diff --git a/overrides/gajim/0.16-pre.nix b/pkgs/gajim/0.16-pre.nix
index c11e0284..c11e0284 100644
--- a/overrides/gajim/0.16-pre.nix
+++ b/pkgs/gajim/0.16-pre.nix
diff --git a/overrides/gajim/config.patch b/pkgs/gajim/config.patch
index ef40284f..ef40284f 100644
--- a/overrides/gajim/config.patch
+++ b/pkgs/gajim/config.patch
diff --git a/overrides/kpatches/bfqsched.nix b/pkgs/kpatches/bfqsched.nix
index 3ba7310f..3ba7310f 100644
--- a/overrides/kpatches/bfqsched.nix
+++ b/pkgs/kpatches/bfqsched.nix
diff --git a/overrides/kpatches/bfqsched.patch b/pkgs/kpatches/bfqsched.patch
index ae400155..ae400155 100644
--- a/overrides/kpatches/bfqsched.patch
+++ b/pkgs/kpatches/bfqsched.patch
diff --git a/overrides/libcmt/default.nix b/pkgs/libcmt/default.nix
index e255ef25..e255ef25 100644
--- a/overrides/libcmt/default.nix
+++ b/pkgs/libcmt/default.nix
diff --git a/overrides/librxtx-java/default.nix b/pkgs/librxtx-java/default.nix
index 861dc43b..861dc43b 100644
--- a/overrides/librxtx-java/default.nix
+++ b/pkgs/librxtx-java/default.nix
diff --git a/overrides/lockdev/default.nix b/pkgs/lockdev/default.nix
index 52e78eb5..52e78eb5 100644
--- a/overrides/lockdev/default.nix
+++ b/pkgs/lockdev/default.nix
diff --git a/overrides/nbxmpp/default.nix b/pkgs/nbxmpp/default.nix
index fa306432..fa306432 100644
--- a/overrides/nbxmpp/default.nix
+++ b/pkgs/nbxmpp/default.nix
diff --git a/overrides/pvolctrl/default.nix b/pkgs/pvolctrl/default.nix
index 25edb27f..25edb27f 100644
--- a/overrides/pvolctrl/default.nix
+++ b/pkgs/pvolctrl/default.nix
diff --git a/overrides/tkabber-urgent-plugin/default.nix b/pkgs/tkabber-urgent-plugin/default.nix
index b39e5ea8..b39e5ea8 100644
--- a/overrides/tkabber-urgent-plugin/default.nix
+++ b/pkgs/tkabber-urgent-plugin/default.nix