about summary refs log tree commit diff
path: root/modules/module-list.nix
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2017-06-22 01:59:35 +0200
committeraszlig <aszlig@redmoonstudios.org>2017-06-22 02:05:37 +0200
commit5990a4d62f2d3146ddd03ec2461d45b2102e5f42 (patch)
tree67fbf88a7db5f6d214bd211bba3450ea83ef2cc3 /modules/module-list.nix
parenta911f4231c6c0a4c7d7621873ae452a37d12faf4 (diff)
devhell: Mergo overrides/pkgs into vuizvui
This introduces another profile module called "packages", which contains
all the package configuration (including overrides) of all the machines
in the devhell namespace.

The machine-specific configuration is now merged into the machine
configurations the same way as we've done previously with the services.

One major difference here is that the haskellPackages workaround is no
longer needed in the package configuration, as it is handled by vuizvui.

Tested this by evaluating all machines and all evaluations succeeded.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @devhell
Diffstat (limited to 'modules/module-list.nix')
-rw-r--r--modules/module-list.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/module-list.nix b/modules/module-list.nix
index fbd5334c..52c61249 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -30,6 +30,7 @@
   ./user/aszlig/services/vlock
   ./user/aszlig/system/kernel.nix
   ./user/devhell/profiles/base.nix
+  ./user/devhell/profiles/packages.nix
   ./user/devhell/profiles/services.nix
   ./user/openlab/base.nix
   ./user/openlab/labtops.nix