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, 66 deletions

diff --git a/pkgs/webapps/yourls/default.nix b/pkgs/webapps/yourls/default.nix
deleted file mode 100644
index d940c54..0000000
--- a/pkgs/webapps/yourls/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ yourls_config ? "/etc/yourls/config.php", mylibs, callPackage, lib, stdenv }:
-let
-  pluginNames = [ "ldap" ];
-  allPlugins = lib.attrsets.genAttrs pluginNames
-    (name: callPackage (./plugins + "/${name}") { inherit mylibs; });
-  toPassthru = pkg: plugins: {
-    inherit plugins allPlugins;
-    withPlugins = withPlugins pkg;
-  };
-  withPlugins = pkg: toPlugins:
-    let
-      plugins = toPlugins allPlugins;
-      toInstallPlugin = n: "ln -s ${n} $out/user/plugins/${n.pluginName}";
-      newYourls = pkg.overrideAttrs(old: {
-        installPhase = old.installPhase + "\n" + builtins.concatStringsSep "\n" (map toInstallPlugin plugins);
-        passthru = toPassthru newYourls (pkg.plugins ++ plugins);
-      });
-    in newYourls;
-  package = stdenv.mkDerivation (mylibs.fetchedGithub ./yourls.json // rec {
-    installPhase = ''
-      mkdir -p $out
-      cp -a */ *.php $out/
-      cp sample-robots.txt $out/robots.txt
-      ln -sf ${yourls_config} $out/includes/config.php
-    '';
-    passthru = toPassthru package [];
-  });
-in package
diff --git a/pkgs/webapps/yourls/plugins/ldap/default.nix b/pkgs/webapps/yourls/plugins/ldap/default.nix
deleted file mode 100644
index 01dc6fb..0000000
--- a/pkgs/webapps/yourls/plugins/ldap/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ stdenv, mylibs }:
-stdenv.mkDerivation (mylibs.fetchedGithub ./ldap.json // rec {
-  installPhase = ''
-    mkdir -p $out
-    cp plugin.php $out
-    '';
-  passthru.pluginName = "ldap";
-})
diff --git a/pkgs/webapps/yourls/plugins/ldap/ldap.json b/pkgs/webapps/yourls/plugins/ldap/ldap.json
deleted file mode 100644
index 9411e4a..0000000
--- a/pkgs/webapps/yourls/plugins/ldap/ldap.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "tag": "2a3cb03-master",
-  "meta": {
-    "name": "yourls-ldap-plugin",
-    "url": "https://github.com/k3a/yourls-ldap-plugin",
-    "branch": "master"
-  },
-  "github": {
-    "owner": "k3a",
-    "repo": "yourls-ldap-plugin",
-    "rev": "2a3cb0334b8a6b81b284a7196e614bbd2b2b1615",
-    "sha256": "0cchbnli77d295lzf7kjmn4dcxj2bmdqa9qc3f8l8qgmp4n5n0gh",
-    "fetchSubmodules": true
-  }
-}
diff --git a/pkgs/webapps/yourls/yourls.json b/pkgs/webapps/yourls/yourls.json
deleted file mode 100644
index 0a79b18..0000000
--- a/pkgs/webapps/yourls/yourls.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "tag": "1.7.3",
-  "meta": {
-    "name": "yourls",
-    "url": "https://github.com/YOURLS/YOURLS",
-    "branch": "refs/tags/1.7.3"
-  },
-  "github": {
-    "owner": "YOURLS",
-    "repo": "YOURLS",
-    "rev": "077018822d3594229daa8343310d0b40804b9ddc",
-    "sha256": "1av6h619rwqn0yn0kjn2s2h3gmrhmxaaa9hd5ns4ralxgg731imd",
-    "fetchSubmodules": true
-  }
-}