From cb2c0dd26b56601925341b014163836385be8406 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 14 Oct 2019 12:56:20 +0200
Subject: [PATCH] ma 5pkgs: debug for 19.09 release

---
 5pkgs/default.nix           |  8 +++---
 5pkgs/pico2wave/default.nix |  7 ++++++
 5pkgs/pkg2zip/default.nix   |  6 ++---
 5pkgs/shiori/default.nix    |  6 ++---
 5pkgs/shiori/deps.nix       | 50 +++++++++++++++++++++++++------------
 5 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/5pkgs/default.nix b/5pkgs/default.nix
index 1ae1045..0f87265 100644
--- a/5pkgs/default.nix
+++ b/5pkgs/default.nix
@@ -28,10 +28,10 @@ in {
     rclone = super.pkgs.stdenv.lib.overrideDerivation super.rclone (old: {
       postInstall = old.postInstall + ''
 
-            $bin/bin/rclone genautocomplete zsh _rclone
-            install -D -m644 _rclone $bin/share/zsh/vendor-completions/_rclone
-            $bin/bin/rclone genautocomplete bash _rclone
-            install -D -m644 _rclone $bin/etc/bash_completion.d/rclone
+            $out/bin/rclone genautocomplete zsh _rclone
+            install -D -m644 _rclone $out/share/zsh/vendor-completions/_rclone
+            $out/bin/rclone genautocomplete bash _rclone
+            install -D -m644 _rclone $out/etc/bash_completion.d/rclone
         '';
     });
     alsa-hdspconf = callPackage ./custom/alsa-tools { alsaToolTarget="hdspconf";};
diff --git a/5pkgs/pico2wave/default.nix b/5pkgs/pico2wave/default.nix
index 5302e8b..b2d18fe 100644
--- a/5pkgs/pico2wave/default.nix
+++ b/5pkgs/pico2wave/default.nix
@@ -41,4 +41,11 @@ stdenv.mkDerivation rec {
       --set NIX_REDIRECTS /usr/share/pico/lang=$out/share/pico/lang
   '';
 
+  meta = with stdenv.lib; {
+    description = "Text-to-speech engine";
+    homepage = https://android.googlesource.com/platform/external/svox;
+    platforms = platforms.linux;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ abbradar ];
+  };
 }
diff --git a/5pkgs/pkg2zip/default.nix b/5pkgs/pkg2zip/default.nix
index 36c3d71..9ab3f67 100644
--- a/5pkgs/pkg2zip/default.nix
+++ b/5pkgs/pkg2zip/default.nix
@@ -1,13 +1,13 @@
 { stdenv, lib, pkgs, fetchFromGitHub, ... }:
 stdenv.mkDerivation rec {
-  name = "pkg2zip-2017-12-01";
-  rev = "fccad26";
+  name = "pkg2zip-2018-06-15";
+  rev = "9222c4e00235dfe7914e9db0cc352da07e63d9f9";
 
   src = fetchFromGitHub {
     owner = "mmozeiko";
     repo = "pkg2zip";
     inherit rev;
-    sha256 = "1sq9yx5cbllmc0yyxhvb6c0yq1mkd1mn8njgkkgxz8alw9zwlarp";
+    sha256 = "1zz3vi12c2c4d48vvvkdl66fx5mdszcnv7lwwlgi4b8lfn1gvkr9";
   };
 
   installPhase = ''
diff --git a/5pkgs/shiori/default.nix b/5pkgs/shiori/default.nix
index 91e6b39..c604fbb 100644
--- a/5pkgs/shiori/default.nix
+++ b/5pkgs/shiori/default.nix
@@ -4,13 +4,13 @@ let
 in
 builder rec {
   name = "shiori-${version}";
-  version = "1.6.0-master";
+  version = "1.6.0-warc";
   goPackagePath = "github.com/go-shiori/shiori";
   src = fetchFromGitHub {
     owner = "go-shiori";
     repo = "shiori";
-    rev = "c77b17caf8fcdf336adea33d0e4ac7ab13c10bc5";
-    sha256 = "11c5yxkmawwpswk256d151ixmj1vlnhrhsbfp9xan1v5cbqpkxdm";
+    rev = "83f133dd07bf661d3c4cf03043392100da489559";
+    sha256 = "02b17hjbh4w0ip0snd8hmdjmbc2w1pv9sws9cf9r8w09c225nw2i";
   };
   goDeps = ./deps.nix;
 }
diff --git a/5pkgs/shiori/deps.nix b/5pkgs/shiori/deps.nix
index d1ee2b1..67d237f 100644
--- a/5pkgs/shiori/deps.nix
+++ b/5pkgs/shiori/deps.nix
@@ -108,6 +108,15 @@
       sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
     };
   }
+  {
+    goPackagePath = "github.com/go-shiori/dom";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-shiori/dom";
+      rev = "6867c1fcf154";
+      sha256 = "10lhp58qy798vs5mazkhpxq4s5g42j2hps61y7c1npabp17k7zfm";
+    };
+  }
   {
     goPackagePath = "github.com/go-shiori/go-readability";
     fetch = {
@@ -117,6 +126,15 @@
       sha256 = "1bhr5chria90v0iwr4rwgvid7cr6aj5r458cmv9f6idpylx5dxl3";
     };
   }
+  {
+    goPackagePath = "github.com/go-shiori/warc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-shiori/warc";
+      rev = "7b3c5582fd83";
+      sha256 = "0cgwfbiv83mswl1sxqrycn9fsrc3z8ms2q5rm6mvr7rsp3v1m6g4";
+    };
+  }
   {
     goPackagePath = "github.com/go-sql-driver/mysql";
     fetch = {
@@ -401,8 +419,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/stretchr/testify";
-      rev = "v1.3.0";
-      sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
+      rev = "v1.4.0";
+      sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb";
     };
   }
   {
@@ -410,8 +428,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/tdewolff/parse";
-      rev = "v2.3.7";
-      sha256 = "014y2r3pf7x091x4hsclczmn734hpnn8f5lkaspq72jl3p21icj4";
+      rev = "v2.3.4";
+      sha256 = "00hclphbjgc5vjrqgnclp72v8c45k35vmj84d2a0f7bw8cc88zcd";
     };
   }
   {
@@ -419,8 +437,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/tdewolff/test";
-      rev = "v1.0.0";
-      sha256 = "10vyp4bhanzg3yl9k8zqfdrxpsmx8yc53xv4lqxfymd7jjyqgssj";
+      rev = "v1.0.5";
+      sha256 = "1f53nzfbs5gmn5bvqj3rzi15r9mxn8vq3f850rq3amwlfz927v9a";
     };
   }
   {
@@ -455,8 +473,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "4def268fd1a4";
-      sha256 = "1bfsnari529gw34cz0zqk3d9mrkcj1ay35kangri8kbgll0ss5a6";
+      rev = "f99c8df09eb5";
+      sha256 = "0jwi6c6366999mnpzwx3a2kr7hzvdx97qfwiphx0r7cy0mpf28hf";
     };
   }
   {
@@ -473,8 +491,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "ca1201d0de80";
-      sha256 = "16j9xyby1vfl4ch6wqzafxxxnxvcp8vhzknpchwabci1f2zcsn6i";
+      rev = "d98b1b443823";
+      sha256 = "1vzwpy56g056dsq304xga3d55jg2cxx89bijpfwjlhwyqyskybsz";
     };
   }
   {
@@ -491,8 +509,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "51ab0e2deafa";
-      sha256 = "0xdhpckbql3bsqkpc2k5b1cpnq3q1qjqjjq2j3p707rfwb8nm91a";
+      rev = "c178f38b412c";
+      sha256 = "1r6v8xnvb4z5vdckbj6vd08kn6h4ivr9hvdpgq4drj6l1mp79rf7";
     };
   }
   {
@@ -509,8 +527,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/tools";
-      rev = "6d4652c779c4";
-      sha256 = "0dh2q4pkq2l3682d2win7wp9aahcm669s7aa77hqk9my8hdqskqs";
+      rev = "72853e10c5a3";
+      sha256 = "06v42k857lcivcar3fq8yjc782hny0m5yf20sb7ij5jva0gab026";
     };
   }
   {
@@ -527,8 +545,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/golang/appengine";
-      rev = "v1.6.1";
-      sha256 = "0zxlvwzxwkwz4bs4h9zc9979dx76y4xf9ks4d22bclg47dv59yry";
+      rev = "v1.6.4";
+      sha256 = "07r8zj9wk5w33bpmi808xgindqnfpvi4hf7glgcpimlg6n66lsrp";
     };
   }
   {