From 1017ce8ed4eb5eef826bf7a55a132923439cd978 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Mon, 6 May 2019 01:46:58 +0200 Subject: [PATCH] Move composer-env to pkgs --- nixops/modules/websites/default.nix | 3 --- .../commons/composer-env.nix => pkgs/composer-env/default.nix | 0 pkgs/default.nix | 1 + 3 files changed, 1 insertion(+), 3 deletions(-) rename nixops/modules/websites/commons/composer-env.nix => pkgs/composer-env/default.nix (100%) 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; }; } -- 2.41.0