From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Sun, 5 May 2019 23:46:58 +0000 (+0200)
Subject: Move composer-env to pkgs
X-Git-Tag: nur_publish~68
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=commitdiff_plain;h=1017ce8ed4eb5eef826bf7a55a132923439cd978

Move composer-env to pkgs
---

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
         #   '';
       });
       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 c407a75..8a991eb 100644
--- 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; };
 }