summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--default.nix1
-rw-r--r--environments/default.nix4
-rw-r--r--environments/immae-eu.nix (renamed from overlays/environments/immae-eu.nix)16
-rw-r--r--overlays/default.nix1
-rw-r--r--overlays/environments/default.nix3
-rw-r--r--pkgs/default.nix1
6 files changed, 13 insertions, 13 deletions
diff --git a/default.nix b/default.nix
index ae27e32e..3a4724bc 100644
--- a/default.nix
+++ b/default.nix
@@ -8,4 +8,5 @@ in
8 modules = import ./modules; 8 modules = import ./modules;
9 overlays = import ./overlays; 9 overlays = import ./overlays;
10 pkgs = mypkgs; 10 pkgs = mypkgs;
11 environments = pkgs.callPackage ./environments {};
11} // mypkgs 12} // 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 @@
1{ callPackage }:
2{
3 immae-eu = callPackage ./immae-eu.nix {};
4}
diff --git a/overlays/environments/immae-eu.nix b/environments/immae-eu.nix
index 6287a97b..787d3033 100644
--- a/overlays/environments/immae-eu.nix
+++ b/environments/immae-eu.nix
@@ -1,4 +1,4 @@
1self: super: with self; 1{ pkgs }: with pkgs;
2let 2let
3 # https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh 3 # https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh
4 # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks 4 # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks
@@ -122,12 +122,10 @@ let
122 openvpn 122 openvpn
123 ]; 123 ];
124in 124in
125{ 125buildEnv {
126 myEnvironments.immae-eu = buildEnv { 126 name = "immae-eu-packages";
127 name = "immae-eu-packages"; 127 inherit paths;
128 inherit paths; 128 pathsToLink = [ "/bin" "/etc" "/include" "/lib" "/libexec" "/share"];
129 pathsToLink = [ "/bin" "/etc" "/include" "/lib" "/libexec" "/share"]; 129 extraOutputsToInstall = [ "bin" "man" "doc" "info" ];
130 extraOutputsToInstall = [ "bin" "man" "doc" "info" ]; 130 passthru = { packages = paths; };
131 passthru = { packages = paths; };
132 };
133} 131}
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 @@
29 ympd = import ./ympd; 29 ympd = import ./ympd;
30} 30}
31// import ./python-packages 31// import ./python-packages
32// 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 @@
1{
2 immae-eu = import ./immae-eu.nix;
3}
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
4 mylibs = import ../lib { inherit pkgs; }; 4 mylibs = import ../lib { inherit pkgs; };
5in 5in
6rec { 6rec {
7 myEnvironments = callPackage ../environments {};
7 boinctui = callPackage ../pkgs/boinctui {}; 8 boinctui = callPackage ../pkgs/boinctui {};
8 cnagios = callPackage ../pkgs/cnagios { inherit mylibs; }; 9 cnagios = callPackage ../pkgs/cnagios { inherit mylibs; };
9 duply = callPackage ../pkgs/duply {}; 10 duply = callPackage ../pkgs/duply {};