aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-05-06 01:46:58 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-05-06 01:46:58 +0200
commit1017ce8ed4eb5eef826bf7a55a132923439cd978 (patch)
tree36eb3eaa6f7ce482c954bca7f388549d22d38120
parent5dbe7ba1ad4a46c71cbf0e189de3f3436a530c0d (diff)
downloadNix-1017ce8ed4eb5eef826bf7a55a132923439cd978.tar.gz
Nix-1017ce8ed4eb5eef826bf7a55a132923439cd978.tar.zst
Nix-1017ce8ed4eb5eef826bf7a55a132923439cd978.zip
Move composer-env to pkgs
-rw-r--r--nixops/modules/websites/default.nix3
-rw-r--r--pkgs/composer-env/default.nix (renamed from nixops/modules/websites/commons/composer-env.nix)0
-rw-r--r--pkgs/default.nix1
3 files changed, 1 insertions, 3 deletions
diff --git a/nixops/modules/websites/default.nix b/nixops/modules/websites/default.nix
index 6a0a19f..028f60b 100644
--- a/nixops/modules/websites/default.nix
+++ b/nixops/modules/websites/default.nix
@@ -190,9 +190,6 @@ in
190 # ''; 190 # '';
191 }); 191 });
192 phpPackages = super.php72Packages.override { inherit php; }; 192 phpPackages = super.php72Packages.override { inherit php; };
193 composerEnv = import ./commons/composer-env.nix {
194 inherit (self) stdenv writeTextFile fetchurl php unzip;
195 };
196 }) ]; 193 }) ];
197 194
198 services.myWebsites.tools.databases.enable = true; 195 services.myWebsites.tools.databases.enable = true;
diff --git a/nixops/modules/websites/commons/composer-env.nix b/pkgs/composer-env/default.nix
index 416a61c..416a61c 100644
--- a/nixops/modules/websites/commons/composer-env.nix
+++ b/pkgs/composer-env/default.nix
diff --git a/pkgs/default.nix b/pkgs/default.nix
index c407a75..8a991eb 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -36,5 +36,6 @@ in
36 36
37 bitlbee-mastodon = callPackage ./bitlbee-mastodon {}; 37 bitlbee-mastodon = callPackage ./bitlbee-mastodon {};
38 38
39 composerEnv = callPackage ./composer-env {};
39 webapps = callPackage ./webapps { inherit mylibs; }; 40 webapps = callPackage ./webapps { inherit mylibs; };
40} 41}