overrides: Move kernel/hetzner/rdwarf to ../envs.

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

2 files changed, 28 insertions, 28 deletions

diff --git a/envs/default.nix b/envs/default.nix
index eba7f174..20e498b1 100644
--- a/envs/default.nix
+++ b/envs/default.nix
@@ -14,4 +14,32 @@ with pkgs;
       collection = import ../collections/aszlig.nix pkgs;
     in lib.mapAttrsToList genAszligEnv collection;
   };
+
+  kernelEnv = myEnvFun {
+    name = "kernel";
+    extraCmds = ''
+      export NIX_LDFLAGS="$NIX_LDFLAGS -lncurses"
+    '';
+    buildInputs = [
+      stdenv ncurses
+    ];
+  };
+
+  hetznerEnv = myEnvFun {
+    name = "hetzner";
+    buildInputs = [
+      stdenv python
+      pythonPackages.pexpect
+    ];
+  };
+
+  rdwarfEnv = myEnvFun {
+    name = "rdwarf";
+    buildInputs = [
+      stdenv python
+      pythonPackages.numpy
+      pythonPackages.pyaudio
+      pythonPackages.curses
+    ];
+  };
 }
diff --git a/overrides/default.nix b/overrides/default.nix
index f70853ab..77046301 100644
--- a/overrides/default.nix
+++ b/overrides/default.nix
@@ -84,16 +84,6 @@ rec {
     checksumType = "mhash";
   };
 
-  kernelEnv = myEnvFun {
-    name = "kernel";
-    extraCmds = ''
-      export NIX_LDFLAGS="$NIX_LDFLAGS -lncurses"
-    '';
-    buildInputs = [
-      stdenv ncurses
-    ];
-  };
-
   testChromiumBuild = let
     buildChannels = [ "stable" "beta" "dev" ];
     buildChromium = chan: chromium.override {
@@ -131,24 +121,6 @@ rec {
     ];
   };
 
-  hetznerEnv = myEnvFun {
-    name = "hetzner";
-    buildInputs = [
-      stdenv python
-      pythonPackages.pexpect
-    ];
-  };
-
-  rdwarfEnv = myEnvFun {
-    name = "rdwarf";
-    buildInputs = [
-      stdenv python
-      pythonPackages.numpy
-      pythonPackages.pyaudio
-      pythonPackages.curses
-    ];
-  };
-
   pvolctrl = stdenv.mkDerivation rec {
     name = "pvolctrl-0.23";