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

13 files changed, 0 insertions, 184 deletions

diff --git a/pkgs/webapps/ttrss/default.nix b/pkgs/webapps/ttrss/default.nix
deleted file mode 100644
index aeb573c..0000000
--- a/pkgs/webapps/ttrss/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ ttrss_config ? "/etc/ttrss/config.php"
-, varDir ? "/var/lib/ttrss"
-, stdenv, lib, callPackage, sources }:
-let
-  pluginNames = [ "auth_ldap" "af_feedmod" "feediron" "ff_instagram" "tumblr_gdpr_ua" ];
-  allPlugins = lib.attrsets.genAttrs pluginNames
-    (name: callPackage (./plugins + "/${name}") {});
-  toPassthru = pkg: plugins: {
-    inherit plugins allPlugins;
-    withPlugins = withPlugins pkg;
-  };
-  withPlugins = pkg: toPlugins:
-    let
-      plugins = toPlugins allPlugins;
-      toInstallPlugin = n:
-        "ln -sf ${n} $out/plugins/${n.pluginName}";
-      newTtrss = pkg.overrideAttrs(old: {
-        installPhase = old.installPhase + "\n" + builtins.concatStringsSep "\n" (map toInstallPlugin plugins);
-        passthru = toPassthru newTtrss (pkg.plugins ++ plugins);
-      });
-    in newTtrss;
-  package = stdenv.mkDerivation rec {
-    pname = "tt-rss";
-    version = sources.webapps-ttrss.version;
-    name = "${pname}-${version}";
-    src = sources.webapps-ttrss;
-    buildPhase = ''
-      rm -rf lock feed-icons cache
-      ln -sf ${varDir}/{lock,feed-icons,cache} .
-    '';
-    installPhase = ''
-      cp -a . $out
-      ln -s ${ttrss_config} $out/config.php
-    '';
-    passthru = toPassthru package [];
-  };
-in package
diff --git a/pkgs/webapps/ttrss/plugins/af_feedmod/af_feedmod.json b/pkgs/webapps/ttrss/plugins/af_feedmod/af_feedmod.json
deleted file mode 100644
index e57fcce..0000000
--- a/pkgs/webapps/ttrss/plugins/af_feedmod/af_feedmod.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "tag": "0ea2092-master",
-  "meta": {
-    "name": "ttrss-af_feedmod",
-    "url": "https://github.com/mbirth/ttrss_plugin-af_feedmod",
-    "branch": "master"
-  },
-  "github": {
-    "owner": "mbirth",
-    "repo": "ttrss_plugin-af_feedmod",
-    "rev": "0ea2092dd34067ecd898802cfca3570023d1ecfe",
-    "sha256": "02ibf47zcrsc2rr45wsix8gxyyf371davj8n8i0gj1zdq95klvnv",
-    "fetchSubmodules": true
-  }
-}
diff --git a/pkgs/webapps/ttrss/plugins/af_feedmod/default.nix b/pkgs/webapps/ttrss/plugins/af_feedmod/default.nix
deleted file mode 100644
index 8512be3..0000000
--- a/pkgs/webapps/ttrss/plugins/af_feedmod/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ patched ? false, stdenv, mylibs, lib }:
-stdenv.mkDerivation (mylibs.fetchedGithub ./af_feedmod.json // {
-  patches = lib.optionals patched [ ./type_replace.patch ];
-  installPhase = ''
-    mkdir $out
-    cp init.php $out
-    '';
-  passthru.pluginName = "af_feedmod";
-})
diff --git a/pkgs/webapps/ttrss/plugins/af_feedmod/type_replace.patch b/pkgs/webapps/ttrss/plugins/af_feedmod/type_replace.patch
deleted file mode 100644
index d622577..0000000
--- a/pkgs/webapps/ttrss/plugins/af_feedmod/type_replace.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/init.php  2014-06-16 14:21:06.995480038 +0200
-+++ b/init.php  2014-06-16 14:22:00.151027654 +0200
-@@ -147,6 +147,9 @@
-                         }
-                     }
-                     break;
-+                case 'replace':
-+                    $article['content'] = preg_replace("/".$config['pattern']."/",$config['replacement'],$article['content']);
-+                    break;
- 
-                 default:
-                     // unknown type or invalid config
diff --git a/pkgs/webapps/ttrss/plugins/auth_ldap/auth-ldap.json b/pkgs/webapps/ttrss/plugins/auth_ldap/auth-ldap.json
deleted file mode 100644
index c8aaab5..0000000
--- a/pkgs/webapps/ttrss/plugins/auth_ldap/auth-ldap.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "tag": "4d751b0-master",
-  "meta": {
-    "name": "ttrss-auth-ldap",
-    "url": "https://github.com/hydrian/TTRSS-Auth-LDAP",
-    "branch": "master"
-  },
-  "github": {
-    "owner": "hydrian",
-    "repo": "TTRSS-Auth-LDAP",
-    "rev": "4d751b095c29a8dbe2dc7bb07777742956136e94",
-    "sha256": "0b9fl86acrzpcv41r7pj3bl8b3n72hpkdywzx9zjyfqv5pskxyim",
-    "fetchSubmodules": true
-  }
-}
diff --git a/pkgs/webapps/ttrss/plugins/auth_ldap/default.nix b/pkgs/webapps/ttrss/plugins/auth_ldap/default.nix
deleted file mode 100644
index 424a9f7..0000000
--- a/pkgs/webapps/ttrss/plugins/auth_ldap/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ stdenv, mylibs }:
-stdenv.mkDerivation (mylibs.fetchedGithub ./auth-ldap.json // {
-  installPhase = ''
-    mkdir $out
-    cp plugins/auth_ldap/init.php $out
-    '';
-  passthru.pluginName = "auth_ldap";
-})
diff --git a/pkgs/webapps/ttrss/plugins/feediron/default.nix b/pkgs/webapps/ttrss/plugins/feediron/default.nix
deleted file mode 100644
index 80bfda4..0000000
--- a/pkgs/webapps/ttrss/plugins/feediron/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ patched ? false, stdenv, mylibs, lib }:
-stdenv.mkDerivation (mylibs.fetchedGithub ./feediron.json // {
-  patches = lib.optionals patched [ ./json_reformat.patch ];
-  installPhase = ''
-    mkdir $out
-    cp -a . $out
-    '';
-  passthru.pluginName = "feediron";
-})
diff --git a/pkgs/webapps/ttrss/plugins/feediron/feediron.json b/pkgs/webapps/ttrss/plugins/feediron/feediron.json
deleted file mode 100644
index 5dbec92..0000000
--- a/pkgs/webapps/ttrss/plugins/feediron/feediron.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "tag": "407168c-master",
-  "meta": {
-    "name": "ttrss-feediron",
-    "url": "https://github.com/m42e/ttrss_plugin-feediron",
-    "branch": "master"
-  },
-  "github": {
-    "owner": "m42e",
-    "repo": "ttrss_plugin-feediron",
-    "rev": "407168c628880b5ced572cc549db6d50e866d3c8",
-    "sha256": "17b95ifpcph6m03hjd1mhi8gi1hw9yd3fnffmw66fqr5c9l3zd9r",
-    "fetchSubmodules": true
-  }
-}
diff --git a/pkgs/webapps/ttrss/plugins/feediron/json_reformat.patch b/pkgs/webapps/ttrss/plugins/feediron/json_reformat.patch
deleted file mode 100644
index e1c44d9..0000000
--- a/pkgs/webapps/ttrss/plugins/feediron/json_reformat.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/init.php b/init.php
-index 3c0f2f9..1aad146 100644
---- a/init.php
-+++ b/init.php
-@@ -600,10 +600,11 @@ class Feediron extends Plugin implements IHandler
-                        return false;
-                }
- 
--               $this->host->set($this, 'json_conf', Feediron_Json::format($json_conf));
-+                $new_conf = json_encode(json_decode($json_conf), JSON_PRETTY_PRINT);
-+                $this->host->set($this, 'json_conf', $new_conf);
-                $json_reply['success'] = true;
-                $json_reply['message'] = __('Configuration saved.');
--               $json_reply['json_conf'] = Feediron_Json::format($json_conf);
-+                $json_reply['json_conf'] = $new_conf;
-                echo json_encode($json_reply);
-        }
- 
diff --git a/pkgs/webapps/ttrss/plugins/ff_instagram/default.nix b/pkgs/webapps/ttrss/plugins/ff_instagram/default.nix
deleted file mode 100644
index 3540f73..0000000
--- a/pkgs/webapps/ttrss/plugins/ff_instagram/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ stdenv, mylibs }:
-stdenv.mkDerivation (mylibs.fetchedGithub ./ff_instagram.json // {
-  installPhase = ''
-    mkdir $out
-    cp -a . $out
-    '';
-  passthru.pluginName = "ff_instagram";
-})
diff --git a/pkgs/webapps/ttrss/plugins/ff_instagram/ff_instagram.json b/pkgs/webapps/ttrss/plugins/ff_instagram/ff_instagram.json
deleted file mode 100644
index 1f241b9..0000000
--- a/pkgs/webapps/ttrss/plugins/ff_instagram/ff_instagram.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "tag": "0366ffb-master",
-  "meta": {
-    "name": "ttrss-ff_instagram",
-    "url": "https://github.com/wltb/ff_instagram",
-    "branch": "master"
-  },
-  "github": {
-    "owner": "wltb",
-    "repo": "ff_instagram",
-    "rev": "0366ffb18c4d490c8fbfba2f5f3367a5af23cfe8",
-    "sha256": "0vvzl6wi6jmrqknsfddvckjgsgfizz1d923d1nyrpzjfn6bda1vk",
-    "fetchSubmodules": true
-  }
-}
diff --git a/pkgs/webapps/ttrss/plugins/tumblr_gdpr_ua/default.nix b/pkgs/webapps/ttrss/plugins/tumblr_gdpr_ua/default.nix
deleted file mode 100644
index 2cf3e05..0000000
--- a/pkgs/webapps/ttrss/plugins/tumblr_gdpr_ua/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ stdenv, mylibs }:
-stdenv.mkDerivation (mylibs.fetchedGithub ./tumblr_gdpr_ua.json // {
-  installPhase = ''
-    mkdir $out
-    cp -a . $out
-    '';
-  passthru.pluginName = "tumblr_gdpr_ua";
-})
diff --git a/pkgs/webapps/ttrss/plugins/tumblr_gdpr_ua/tumblr_gdpr_ua.json b/pkgs/webapps/ttrss/plugins/tumblr_gdpr_ua/tumblr_gdpr_ua.json
deleted file mode 100644
index eafbcfe..0000000
--- a/pkgs/webapps/ttrss/plugins/tumblr_gdpr_ua/tumblr_gdpr_ua.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "tag": "287c584-master",
-  "meta": {
-    "name": "ttrss-tumblr_gdpr_ua",
-    "url": "https://github.com/hkockerbeck/ttrss-tumblr-gdpr-ua",
-    "branch": "master"
-  },
-  "github": {
-    "owner": "hkockerbeck",
-    "repo": "ttrss-tumblr-gdpr-ua",
-    "rev": "287c584e68845d524f920156bff0b2eaa6f65117",
-    "sha256": "1fviawgcclqky4k4xv1sqzvpb8i74w9f0pclm09m78s8l85wh9py",
-    "fetchSubmodules": true
-  }
-}