about summary refs log tree commit diff
path: root/pkgs/default.nix
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-03-18 15:02:01 +0100
committeraszlig <aszlig@redmoonstudios.org>2015-03-18 15:02:01 +0100
commit9302553cf551b1dc81ee5eab5d198d3476ae7aa8 (patch)
tree914966925b818738b3e9c85fd72ec722c93bff92 /pkgs/default.nix
parent57634b99c1b836d29af878071d4b9afb0be7c1ca (diff)
Merge labernix packages into vuizvui pkgs.
It's currently only BeeHive, but our goal is to dissolve labernix step
by step until nothing is left.

Also, we're now no longer namespace the pkgs with vuizvui directly in
the package list. Before it wasn't even namespaced correctly (except for
inside pkgs/ directly) and we did override the packages using the dirty
approach in overrides/.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/default.nix')
-rw-r--r--pkgs/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 2e6b3550..9ec483a2 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,5 +1,4 @@
-{ pkgs ? import <nixpkgs> {}
-}:
+{ pkgs ? import <nixpkgs> {} }:
 
 let
   callPackage = pkgs.lib.callPackageWith (pkgs // self);
@@ -7,6 +6,7 @@ let
   self = {
     aacolorize = callPackage ./aacolorize { };
     axbo = callPackage ./axbo { };
+    beehive = callPackage ./beehive { };
     blop = callPackage ./blop { };
     grandpa = callPackage ./grandpa { };
     nixops = callPackage ./nixops { };
@@ -23,4 +23,4 @@ let
       bfqsched = callPackage ./kpatches/bfqsched.nix { };
     };
   };
-in { vuizvui = self; }
+in self