Refactor websites

diff --git a/pkgs/default.nix b/pkgs/default.nix
index b02c63ec2c7d3e0837ad873f4a5044125bd40a0b..14d3ed6f87c3213c9d4f6764fd05a20a4ae7fbb8 100644 (file)
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -45,7 +45,7 @@ rec {
   bitlbee-mastodon = callPackage ./bitlbee-mastodon {};
 
   composerEnv = callPackage ./composer-env {};
-  webapps = callPackage ./webapps { inherit mylibs composerEnv private; };
+  webapps = callPackage ./webapps { inherit mylibs composerEnv; };
 
   monitoring-plugins = callPackage ./monitoring-plugins {};
   naemon = callPackage ./naemon { inherit mylibs monitoring-plugins; };
@@ -54,10 +54,6 @@ rec {
   simp_le_0_17 = callPackage ./simp_le {};
   certbot = callPackage ./certbot {};
 
-  private = if builtins.pathExists (./. + "/private")
-    then import ./private { inherit pkgs; }
-    else { webapps = {}; };
-
   python3PackagesPlus = callPackage ./python-packages {
     python = python3;
     inherit mylibs;

diff --git a/pkgs/webapps/default.nix b/pkgs/webapps/default.nix
index 2f4d73965d5f07b0fa238e1d5b6a3f558b779854..8cc252df96083a932ffaba49f76025075d74dac9 100644 (file)
--- a/pkgs/webapps/default.nix
+++ b/pkgs/webapps/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, mylibs, composerEnv, lib, private }:
+{ callPackage, mylibs, composerEnv, lib }:
 rec {
   adminer = callPackage ./adminer {};
   apache-theme = callPackage ./apache-theme {};
@@ -113,4 +113,4 @@ rec {
   in
     lib.attrsets.genAttrs names
       (name: callPackage (./yourls/plugins + "/${name}") { inherit mylibs; });
-} // private.webapps
+}