From 5990a4d62f2d3146ddd03ec2461d45b2102e5f42 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 22 Jun 2017 01:59:35 +0200 Subject: 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 Cc: @devhell --- modules/module-list.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/module-list.nix') 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 -- cgit 1.4.1