Move environments to specific attrs

diff --git a/default.nix b/default.nix
index ae27e32e88df242ff0089a6d405314c1eca6a151..3a4724bc56843aae6d9dafb7bc0b868f19a51f65 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -8,4 +8,5 @@ in
   modules = import ./modules;
   overlays = import ./overlays;
   pkgs = mypkgs;
+  environments = pkgs.callPackage ./environments {};
 } // mypkgs

diff --git a/environments/default.nix b/environments/default.nix
new file mode 100644 (file)
index 0000000..5f17eb9
--- /dev/null
+++ b/environments/default.nix
@@ -0,0 +1,4 @@
+{ callPackage }:
+{
+  immae-eu = callPackage ./immae-eu.nix {};
+}

diff --git a/overlays/environments/immae-eu.nix b/environments/immae-eu.nix
similarity index 89%
rename from overlays/environments/immae-eu.nix
rename to environments/immae-eu.nix
index 6287a97b962514279728cbd796194ae76dbcacd8..787d3033ad19a02c3aa0193be46c2a0c3398abc1 100644 (file)
--- a/overlays/environments/immae-eu.nix
+++ b/environments/immae-eu.nix
@@ -1,4 +1,4 @@
-self: super: with self;
+{ pkgs }: with pkgs;
 let
   # https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh
   # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks
@@ -122,12 +122,10 @@ let
     openvpn
   ];
 in
-{
-  myEnvironments.immae-eu = buildEnv {
-    name = "immae-eu-packages";
-    inherit paths;
-    pathsToLink = [ "/bin" "/etc" "/include" "/lib" "/libexec" "/share"];
-    extraOutputsToInstall = [ "bin" "man" "doc" "info" ];
-    passthru = { packages = paths; };
-  };
+buildEnv {
+  name = "immae-eu-packages";
+  inherit paths;
+  pathsToLink = [ "/bin" "/etc" "/include" "/lib" "/libexec" "/share"];
+  extraOutputsToInstall = [ "bin" "man" "doc" "info" ];
+  passthru = { packages = paths; };
 }

diff --git a/overlays/default.nix b/overlays/default.nix
index 8445f27ccd30a07e82bfebed8a3135fcc30a90fa..a46986d03afbc9c3851932773412babc46fa1e6e 100644 (file)
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -29,4 +29,3 @@
   ympd = import ./ympd;
 }
 // import ./python-packages
-// import ./environments

diff --git a/overlays/environments/default.nix b/overlays/environments/default.nix
deleted file mode 100644 (file)
index 630b0bd..0000000
--- a/overlays/environments/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  immae-eu = import ./immae-eu.nix;
-}

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 54868ba9aaa51b593baaa931b066bd6a90f92c41..2ad79a2fd46fe9fdb9450d13712aa27a4a74aebe 100644 (file)
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -4,6 +4,7 @@ let
   mylibs = import ../lib { inherit pkgs; };
 in
 rec {
+  myEnvironments = callPackage ../environments {};
   boinctui = callPackage ../pkgs/boinctui {};
   cnagios = callPackage ../pkgs/cnagios { inherit mylibs; };
   duply = callPackage ../pkgs/duply {};