From eaa9613a5654f1001f946fe73248ffcb46c28fdd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sat, 25 Jan 2020 19:56:20 +0100
Subject: [PATCH] Move environments to specific attrs

---
 default.nix                                      |  1 +
 environments/default.nix                         |  4 ++++
 .../environments => environments}/immae-eu.nix   | 16 +++++++---------
 overlays/default.nix                             |  1 -
 overlays/environments/default.nix                |  3 ---
 pkgs/default.nix                                 |  1 +
 6 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 environments/default.nix
 rename {overlays/environments => environments}/immae-eu.nix (89%)
 delete mode 100644 overlays/environments/default.nix

diff --git a/default.nix b/default.nix
index ae27e32e..3a4724bc 100644
--- 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
index 00000000..5f17eb9e
--- /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 6287a97b..787d3033 100644
--- 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 8445f27c..a46986d0 100644
--- 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
index 630b0bd1..00000000
--- 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 54868ba9..2ad79a2f 100644
--- 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 {};
-- 
2.41.0