Squash changes containing private information

There were a lot of changes since the previous commit, but a lot of them
contained personnal information about users. All thos changes got
stashed into a single commit (history is kept in a different place) and
private information was moved in a separate private repository

4 files changed, 0 insertions, 103 deletions

diff --git a/pkgs/webapps/dokuwiki/default.nix b/pkgs/webapps/dokuwiki/default.nix
deleted file mode 100644
index 874f0d8..0000000
--- a/pkgs/webapps/dokuwiki/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ varDir ? "/var/lib/dokuwiki", preload ? "", lib, callPackage, stdenv, mylibs, writeText }:
-let
-  preloadFile = plugins: let preloads = [preload]
-      ++ builtins.concatMap (p: lib.optional (lib.hasAttr "preload" p) (p.preload p)) plugins;
-    in writeText "preload.php" (''
-      <?php
-      '' + builtins.concatStringsSep "\n" preloads
-    );
-  pluginNames = [ "farmer" "todo" ];
-  allPlugins = lib.attrsets.genAttrs pluginNames
-    (name: callPackage (./plugins + "/${name}.nix") {});
-  toPassthru = pkg: plugins: {
-    inherit plugins varDir allPlugins;
-    withPlugins = withPlugins pkg;
-  };
-  withPlugins = pkg: toPlugins:
-    let
-      plugins = toPlugins allPlugins;
-      toInstallPlugin = n:
-        "ln -sf ${n} $out/lib/plugins/${n.pluginName}";
-      newDokuwiki = pkg.overrideAttrs(old: {
-        installPhase = old.installPhase + "\n" + builtins.concatStringsSep "\n" (map toInstallPlugin plugins);
-        installPreloadPhase = ''
-          cp ${preloadFile (pkg.plugins ++ plugins)} $out/inc/preload.php
-        '';
-        passthru = toPassthru newDokuwiki (pkg.plugins ++ plugins);
-      });
-    in newDokuwiki;
-  package = stdenv.mkDerivation (mylibs.fetchedGithub ./dokuwiki.json // rec {
-    phases = "unpackPhase buildPhase installPhase installPreloadPhase fixupPhase";
-    buildPhase = ''
-      mv conf conf.dist
-      mv data data.dist
-    '';
-    installPhase = ''
-      cp -a . $out
-      ln -sf ${varDir}/{conf,data} $out/
-      ln -sf ${varDir}/conf/.htaccess $out/
-    '';
-    installPreloadPhase = ''
-      cp ${preloadFile []} $out/inc/preload.php
-      '';
-    passthru = toPassthru package [];
-  });
-in package
diff --git a/pkgs/webapps/dokuwiki/dokuwiki.json b/pkgs/webapps/dokuwiki/dokuwiki.json
deleted file mode 100644
index fc03252..0000000
--- a/pkgs/webapps/dokuwiki/dokuwiki.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "tag": "release_stable_2018-04-22b",
-  "meta": {
-    "name": "dokuwiki",
-    "url": "https://github.com/splitbrain/dokuwiki",
-    "branch": "refs/tags/release_stable_2018-04-22b"
-  },
-  "github": {
-    "owner": "splitbrain",
-    "repo": "dokuwiki",
-    "rev": "871dae1320b40211626c7ec665f5e6d5290aca95",
-    "sha256": "1syvd5dvv3v75swf8ig7dxqs0g5xikb0f6vlcy7g4c4ghldkw7nz",
-    "fetchSubmodules": true
-  }
-}
diff --git a/pkgs/webapps/dokuwiki/plugins/farmer.nix b/pkgs/webapps/dokuwiki/plugins/farmer.nix
deleted file mode 100644
index b737b2d..0000000
--- a/pkgs/webapps/dokuwiki/plugins/farmer.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
-  version = "72b8577-master";
-  name = "dokuwiki-plugin-farmer-${version}";
-  src = fetchFromGitHub {
-    owner = "cosmocode";
-    repo = "dokuwiki-plugin-farmer";
-    rev = "72b857734fd164bf79cc6e17abe56491d55c1072";
-    sha256 = "1c9vc1z7yvzjz4p054kshb9yd00a4bb52s43k9zav0lvwvjij9l0";
-  };
-  installPhase = ''
-    mkdir $out
-    cp -a * $out
-    '';
-  passthru = {
-    pluginName = "farmer";
-    preload = out: ''
-      # farm setup by farmer plugin
-      if (file_exists('${out}/DokuWikiFarmCore.php'))
-      {
-        include('${out}/DokuWikiFarmCore.php');
-      }
-    '';
-  };
-}
diff --git a/pkgs/webapps/dokuwiki/plugins/todo.nix b/pkgs/webapps/dokuwiki/plugins/todo.nix
deleted file mode 100644
index a3e03fb..0000000
--- a/pkgs/webapps/dokuwiki/plugins/todo.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
-  version = "49068ec-master";
-  name = "dokuwiki-plugin-todo-${version}";
-  src = fetchFromGitHub {
-    owner = "leibler";
-    repo = "dokuwiki-plugin-todo";
-    rev = "49068ecea455ea997d1e4a7adab171ccaf8228e8";
-    sha256 = "1jaq623kp14fyhamsas5mk9ryqlk4q6x6znijrb5xhcdg3r83gmq";
-  };
-  installPhase = ''
-    mkdir $out
-    cp -a * $out
-    '';
-  passthru = {
-    pluginName = "todo";
-  };
-}