summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-03-07 23:24:31 +0100
committertv <tv@krebsco.de>2017-03-07 23:24:46 +0100
commitc432c6646159569088452cc4caea1d3820ebe0f7 (patch)
treee52326480a5a27940236247a8c40723cd71397f1
parent490cee4a2f941efa5a45c0ba87daa5cc35636cc3 (diff)
tv: stockholm dependencies are default
-rw-r--r--tv/1systems/wu.nix6
-rw-r--r--tv/1systems/xu.nix5
-rw-r--r--tv/1systems/zu.nix6
-rw-r--r--tv/2configs/default.nix2
4 files changed, 2 insertions, 17 deletions
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 4cde8b903..328e71fdc 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -19,12 +19,6 @@ with import <stockholm/lib>;
../2configs/xserver
{
environment.systemPackages = with pkgs; [
-
- # stockholm
- gnumake
- hashPassword
- parallel
-
# root
cryptsetup
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index 2bab0f4b0..8cf6146b5 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -20,11 +20,6 @@ with import <stockholm/lib>;
{
environment.systemPackages = with pkgs; [
- # stockholm
- gnumake
- hashPassword
- #haskellPackages.lentil
- parallel
# root
cryptsetup
diff --git a/tv/1systems/zu.nix b/tv/1systems/zu.nix
index cabe7f6a5..b1b2d58ce 100644
--- a/tv/1systems/zu.nix
+++ b/tv/1systems/zu.nix
@@ -25,12 +25,6 @@ with import <stockholm/lib>;
{
environment.systemPackages = with pkgs; [
- # stockholm
- gnumake
- hashPassword
- haskellPackages.lentil
- parallel
-
# root
cryptsetup
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index e170156a4..4c10b2a28 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -38,6 +38,8 @@ with import <stockholm/lib>;
# stockholm dependencies
environment.systemPackages = with pkgs; [
git
+ gnumake
+ hashPassword
populate
];
}