diff options
-rw-r--r-- | nixops/modules/websites/default.nix | 3 | ||||
-rw-r--r-- | pkgs/composer-env/default.nix (renamed from nixops/modules/websites/commons/composer-env.nix) | 0 | ||||
-rw-r--r-- | pkgs/default.nix | 1 |
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 | } |