From 5ea02e5164d6be1eba8e7b2341105205ead98a87 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sat, 18 Apr 2020 16:10:56 +0200
Subject: [PATCH] Refactor websites

---
 pkgs/default.nix         | 6 +-----
 pkgs/webapps/default.nix | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/default.nix b/pkgs/default.nix
index b02c63ec..14d3ed6f 100644
--- 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 2f4d7396..8cc252df 100644
--- 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
+}
-- 
2.41.0