Move composer-env to pkgs

diff --git a/nixops/modules/websites/default.nix b/nixops/modules/websites/default.nix
index 6a0a19fe32f8ebcacee0032b9ead1c0442c00ad2..028f60bf5232e2792d59684d360f56b061196252 100644 (file)
--- a/nixops/modules/websites/default.nix
+++ b/nixops/modules/websites/default.nix
@@ -190,9 +190,6 @@ in
         #   '';
       });
       phpPackages = super.php72Packages.override { inherit php; };
-      composerEnv = import ./commons/composer-env.nix {
-        inherit (self) stdenv writeTextFile fetchurl php unzip;
-      };
     }) ];
 
     services.myWebsites.tools.databases.enable = true;

diff --git a/nixops/modules/websites/commons/composer-env.nix b/pkgs/composer-env/default.nix
similarity index 100%
rename from nixops/modules/websites/commons/composer-env.nix
rename to pkgs/composer-env/default.nix

diff --git a/pkgs/default.nix b/pkgs/default.nix
index c407a75622b9edaaeae3adeeb63bae043e71dce4..8a991eb30f9d9cff1e8f5a59e371f6929fe98a86 100644 (file)
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -36,5 +36,6 @@ in
 
   bitlbee-mastodon = callPackage ./bitlbee-mastodon {};
 
+  composerEnv = callPackage ./composer-env {};
   webapps = callPackage ./webapps { inherit mylibs; };
 }