about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--labernix/pkgs/default.nix9
-rw-r--r--overrides/default.nix2
-rw-r--r--pkgs/beehive/default.nix (renamed from labernix/pkgs/beehive/default.nix)0
-rw-r--r--pkgs/beehive/godeps.nix (renamed from labernix/pkgs/beehive/godeps.nix)0
-rw-r--r--pkgs/default.nix6
5 files changed, 4 insertions, 13 deletions
diff --git a/labernix/pkgs/default.nix b/labernix/pkgs/default.nix
deleted file mode 100644
index 9ff952ed..00000000
--- a/labernix/pkgs/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs ? import <nixpkgs> {} }:
-
-let
-  callPackage = pkgs.lib.callPackageWith (pkgs // self);
-
-  self = {
-    beehive = callPackage ./beehive {};
-  };
-in self
diff --git a/overrides/default.nix b/overrides/default.nix
index 3dc74adf..be8ce52b 100644
--- a/overrides/default.nix
+++ b/overrides/default.nix
@@ -3,7 +3,7 @@ pkgs:
 with pkgs.lib;
 
 let
-  allPackages = (import ../pkgs { pkgs = everything; }).vuizvui // misc;
+  allPackages = (import ../pkgs { pkgs = everything; }) // misc;
   everything = pkgs // allPackages // drvOverrides // argOverrides;
 
   mapOverride = overrideFun: includePackages: let
diff --git a/labernix/pkgs/beehive/default.nix b/pkgs/beehive/default.nix
index 8cadb9e5..8cadb9e5 100644
--- a/labernix/pkgs/beehive/default.nix
+++ b/pkgs/beehive/default.nix
diff --git a/labernix/pkgs/beehive/godeps.nix b/pkgs/beehive/godeps.nix
index a0e7526e..a0e7526e 100644
--- a/labernix/pkgs/beehive/godeps.nix
+++ b/pkgs/beehive/godeps.nix
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