From 1a7d62733ca6d49114d5a19eeb6052d51a7c19b2 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 2 May 2017 20:10:36 +0200
Subject: k 5 goify: fix extra space bug

---
 krebs/5pkgs/goify/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/goify/default.nix b/krebs/5pkgs/goify/default.nix
index e2849b5c7..9c44aaeeb 100644
--- a/krebs/5pkgs/goify/default.nix
+++ b/krebs/5pkgs/goify/default.nix
@@ -1,17 +1,18 @@
 { pkgs, ... }:
 
-pkgs.writeDashBin "goify" ''
+pkgs.writeBashBin "goify" ''
   set -euf
 
   GO_HOST=''${GO_HOST:-go}
 
   while read line; do
-    echo "$line" | sed -E 's|https?://\S*|\n&\n|g' | while read word; do
-      if echo "$word" | grep -Eq ^https?:; then
-        ${pkgs.curl}/bin/curl -Ss -F uri="$word" http://"$GO_HOST" | tr -d '\r'
+    echo "$line" | sed 's|https\?://\S*|\n&\n|g' | while read word; do
+      if echo "$word" | grep -q '^https\?:'; then
+        ${pkgs.curl}/bin/curl -Ss -F uri="$word" http://"$GO_HOST" \
+          | tr -d '\r'
       else
-        echo "$word";
-      fi;
-    done | sed '/^$/d' | tr '\n' ' '; echo;
+        echo "$word"
+      fi
+    done | grep . | tr '\n' ' '; echo
   done
 ''
-- 
cgit v1.2.3


From e48425770fe42617d244909497867ec800cc691e Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 2 May 2017 22:52:19 +0200
Subject: youtube-dl: init at 2017.04.28

---
 krebs/5pkgs/youtube-dl/default.nix | 58 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 krebs/5pkgs/youtube-dl/default.nix

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/youtube-dl/default.nix b/krebs/5pkgs/youtube-dl/default.nix
new file mode 100644
index 000000000..b0c449d49
--- /dev/null
+++ b/krebs/5pkgs/youtube-dl/default.nix
@@ -0,0 +1,58 @@
+{ stdenv, fetchurl, pkgs
+, zip, ffmpeg, rtmpdump, atomicparsley, pandoc
+# Pandoc is required to build the package's man page. Release tarballs contain a
+# formatted man page already, though, it will still be installed. We keep the
+# manpage argument in place in case someone wants to use this derivation to
+# build a Git version of the tool that doesn't have the formatted man page
+# included.
+, generateManPage ? false
+, ffmpegSupport ? true
+, rtmpSupport ? true
+, makeWrapper }:
+
+with stdenv.lib;
+let
+  buildPythonApplication = args: pkgs.pythonPackages.buildPythonPackage ({namePrefix="";} // args );
+in buildPythonApplication rec {
+
+  name = "youtube-dl-${version}";
+  version = "2017.04.28";
+
+  src = fetchurl {
+    url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
+    sha256 = "0d3mgf8qxb07b7bjf79ppaxhcl4f47q0zjpshp6y2q0lalfskh3j";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ zip ] ++ optional generateManPage pandoc;
+
+  # Ensure ffmpeg is available in $PATH for post-processing & transcoding support.
+  # rtmpdump is required to download files over RTMP
+  # atomicparsley for embedding thumbnails
+  postInstall = let
+    packagesToBinPath =
+    [ atomicparsley ]
+    ++ optional ffmpegSupport ffmpeg
+    ++ optional rtmpSupport rtmpdump;
+  in ''
+    wrapProgram $out/bin/youtube-dl --prefix PATH : "${makeBinPath packagesToBinPath}"
+  '';
+
+  # Requires network
+  doCheck = false;
+
+  meta = {
+    homepage = http://rg3.github.io/youtube-dl/;
+    repositories.git = https://github.com/rg3/youtube-dl.git;
+    description = "Command-line tool to download videos from YouTube.com and other sites";
+    longDescription = ''
+      youtube-dl is a small, Python-based command-line program
+      to download videos from YouTube.com and a few more sites.
+      youtube-dl is released to the public domain, which means
+      you can modify it, redistribute it or use it however you like.
+    '';
+    license = licenses.publicDomain;
+    platforms = with platforms; linux ++ darwin;
+    maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fuuzetsu fpletz ];
+  };
+}
-- 
cgit v1.2.3


From f8891425d6b918237656201a1256e81605983546 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Mon, 8 May 2017 21:08:13 +0200
Subject: youtube-dl: remove because upstream catched up

---
 krebs/5pkgs/youtube-dl/default.nix | 58 --------------------------------------
 1 file changed, 58 deletions(-)
 delete mode 100644 krebs/5pkgs/youtube-dl/default.nix

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/youtube-dl/default.nix b/krebs/5pkgs/youtube-dl/default.nix
deleted file mode 100644
index b0c449d49..000000000
--- a/krebs/5pkgs/youtube-dl/default.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{ stdenv, fetchurl, pkgs
-, zip, ffmpeg, rtmpdump, atomicparsley, pandoc
-# Pandoc is required to build the package's man page. Release tarballs contain a
-# formatted man page already, though, it will still be installed. We keep the
-# manpage argument in place in case someone wants to use this derivation to
-# build a Git version of the tool that doesn't have the formatted man page
-# included.
-, generateManPage ? false
-, ffmpegSupport ? true
-, rtmpSupport ? true
-, makeWrapper }:
-
-with stdenv.lib;
-let
-  buildPythonApplication = args: pkgs.pythonPackages.buildPythonPackage ({namePrefix="";} // args );
-in buildPythonApplication rec {
-
-  name = "youtube-dl-${version}";
-  version = "2017.04.28";
-
-  src = fetchurl {
-    url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "0d3mgf8qxb07b7bjf79ppaxhcl4f47q0zjpshp6y2q0lalfskh3j";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ zip ] ++ optional generateManPage pandoc;
-
-  # Ensure ffmpeg is available in $PATH for post-processing & transcoding support.
-  # rtmpdump is required to download files over RTMP
-  # atomicparsley for embedding thumbnails
-  postInstall = let
-    packagesToBinPath =
-    [ atomicparsley ]
-    ++ optional ffmpegSupport ffmpeg
-    ++ optional rtmpSupport rtmpdump;
-  in ''
-    wrapProgram $out/bin/youtube-dl --prefix PATH : "${makeBinPath packagesToBinPath}"
-  '';
-
-  # Requires network
-  doCheck = false;
-
-  meta = {
-    homepage = http://rg3.github.io/youtube-dl/;
-    repositories.git = https://github.com/rg3/youtube-dl.git;
-    description = "Command-line tool to download videos from YouTube.com and other sites";
-    longDescription = ''
-      youtube-dl is a small, Python-based command-line program
-      to download videos from YouTube.com and a few more sites.
-      youtube-dl is released to the public domain, which means
-      you can modify it, redistribute it or use it however you like.
-    '';
-    license = licenses.publicDomain;
-    platforms = with platforms; linux ++ darwin;
-    maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fuuzetsu fpletz ];
-  };
-}
-- 
cgit v1.2.3


From 41841469b36bf26cafaa6741fdcb9a0c36982dc3 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 9 May 2017 21:38:45 +0200
Subject: news: init at 1.0.0

---
 krebs/5pkgs/haskell-overrides/news.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 krebs/5pkgs/haskell-overrides/news.nix

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/haskell-overrides/news.nix b/krebs/5pkgs/haskell-overrides/news.nix
new file mode 100644
index 000000000..ba5e7a5e1
--- /dev/null
+++ b/krebs/5pkgs/haskell-overrides/news.nix
@@ -0,0 +1,18 @@
+{ mkDerivation, base, bloomfilter, bytestring, feed, fetchgit, lens
+, stdenv, wreq
+}:
+mkDerivation {
+  pname = "news";
+  version = "1.0.0";
+  src = fetchgit {
+    url = "http://cgit.lassul.us/news";
+    sha256 = "1n3ffr2a5irr5aly0y7qsafag3kxvyyh077ayk0vdwbd0s9hvnjs";
+    rev = "c3eb2c0a1a34fc41e18d0bc99b1c4dc73aa6eb20";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  executableHaskellDepends = [
+    base bloomfilter bytestring feed lens wreq
+  ];
+  license = stdenv.lib.licenses.mit;
+}
-- 
cgit v1.2.3


From ddc78797c290044ebbe593eca66e731d15b3b288 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Fri, 12 May 2017 19:24:41 +0200
Subject: k 5 R sed: make pep80 happy

---
 krebs/5pkgs/Reaktor/scripts/sed-plugin.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/Reaktor/scripts/sed-plugin.py b/krebs/5pkgs/Reaktor/scripts/sed-plugin.py
index 22b48e59d..f96b849e2 100644
--- a/krebs/5pkgs/Reaktor/scripts/sed-plugin.py
+++ b/krebs/5pkgs/Reaktor/scripts/sed-plugin.py
@@ -3,15 +3,17 @@
 # Usage:
 # _from=krebs state_dir=. python sed-plugin.py 'dick butt'
 # _from=krebs state_dir=. python sed-plugin.py 's/t/l/g'
-## dick bull
+# > dick bull
 import shelve
 from os import environ
 from os.path import join
 from sys import argv
-d = shelve.open(join(environ['state_dir'],'sed-plugin.shelve'),writeback=True)
-usr = environ['_from']
 import re
 
+d = shelve.open(join(environ['state_dir'], 'sed-plugin.shelve'), writeback=True)
+usr = environ['_from']
+
+
 def is_regex(line):
     myre = re.compile(r'^s/(?:\\/|[^/])+/(?:\\/|[^/])*/[ig]?$')
     return myre.match(line)
@@ -19,11 +21,11 @@ def is_regex(line):
 line = argv[1]
 
 if is_regex(line):
-    last = d.get(usr,None)
+    last = d.get(usr, None)
     if last:
-        from subprocess import Popen,PIPE
-        p = Popen(['sed',line],stdin=PIPE,stdout=PIPE)
-        so,se = p.communicate(bytes("{}\n".format(last),"UTF-8"))
+        from subprocess import Popen, PIPE
+        p = Popen(['sed', line], stdin=PIPE, stdout=PIPE)
+        so, se = p.communicate(bytes("{}\n".format(last), "UTF-8"))
         if p.returncode:
             print("something went wrong when trying to process your regex: {}".format(se.decode()))
         ret = so.decode()
-- 
cgit v1.2.3


From d04f5af71e0861210a6a307aa8d3289abed2ada8 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Fri, 12 May 2017 19:25:39 +0200
Subject: k 5 R sed: write english

---
 krebs/5pkgs/Reaktor/scripts/sed-plugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/Reaktor/scripts/sed-plugin.py b/krebs/5pkgs/Reaktor/scripts/sed-plugin.py
index f96b849e2..da8e2f726 100644
--- a/krebs/5pkgs/Reaktor/scripts/sed-plugin.py
+++ b/krebs/5pkgs/Reaktor/scripts/sed-plugin.py
@@ -29,7 +29,7 @@ if is_regex(line):
         if p.returncode:
             print("something went wrong when trying to process your regex: {}".format(se.decode()))
         ret = so.decode()
-        print("\x1b[1m{}\x1b[0m meinte: {}".format(usr,ret.strip()))
+        print("\x1b[1m{}\x1b[0m meant: {}".format(usr, ret.strip()))
         if ret:
             d[usr] = ret
 
-- 
cgit v1.2.3


From 44cc54eef16e1b309eff1b17dbb2cfe8ac76948d Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Mon, 15 May 2017 23:38:50 +0200
Subject: weechat: 1.7.1 -> 1.8

---
 krebs/5pkgs/weechat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/weechat/default.nix b/krebs/5pkgs/weechat/default.nix
index f5dc6a8d4..c703ca8bf 100644
--- a/krebs/5pkgs/weechat/default.nix
+++ b/krebs/5pkgs/weechat/default.nix
@@ -21,12 +21,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "1.7.1";
+  version = "1.8";
   name = "weechat-${version}";
 
   src = fetchurl {
     url = "http://weechat.org/files/src/weechat-${version}.tar.bz2";
-    sha256 = "1020m1lsm8lg9n0dlxgp2wbn9b0r11g8r0namnzi2x6gvxn7iyf0";
+    sha256 = "10km0437lg9ms6f16h20s89l2w9f9g597rykybxb16s95ql48z08";
   };
 
   outputs = [ "out" "doc" ];
-- 
cgit v1.2.3