about summary refs log tree commit diff
path: root/pkgs/default.nix
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2014-07-14 14:46:18 +0200
committeraszlig <aszlig@redmoonstudios.org>2014-07-14 15:20:23 +0200
commitd7b4a0e115bb46309706285e6005a64eae122568 (patch)
tree7d13afd3b0893ea12ccf3b47d43f07ec18d29ad3 /pkgs/default.nix
parent0aad7f1b85b854feea09308d32c046f68eb45e6b (diff)
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>
Diffstat (limited to 'pkgs/default.nix')
-rw-r--r--pkgs/default.nix25
1 files changed, 25 insertions, 0 deletions
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; }