From 1f14476a0ffa3dcf0576121edc914b15cfb971b9 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 1 May 2017 22:52:59 +0200
Subject: netcup: tv -> krebs

---
 krebs/5pkgs/netcup/default.nix | 32 ++++++++++++++++++++++++++++++++
 tv/5pkgs/netcup/default.nix    | 32 --------------------------------
 2 files changed, 32 insertions(+), 32 deletions(-)
 create mode 100644 krebs/5pkgs/netcup/default.nix
 delete mode 100644 tv/5pkgs/netcup/default.nix

diff --git a/krebs/5pkgs/netcup/default.nix b/krebs/5pkgs/netcup/default.nix
new file mode 100644
index 00000000..d1f46299
--- /dev/null
+++ b/krebs/5pkgs/netcup/default.nix
@@ -0,0 +1,32 @@
+{ coreutils, curl, fetchgit, gawk, gnugrep, gnused, jq, stdenv, w3m, ... }:
+with import <stockholm/lib>;
+let
+  readJSON = path: fromJSON (readFile path);
+  sed.escape = replaceChars ["/"] ["\\/"]; # close enough
+  PATH = makeBinPath [
+    coreutils
+    curl
+    gawk
+    gnugrep
+    gnused
+    jq
+    w3m
+  ];
+in
+stdenv.mkDerivation {
+  name = "netcup-1.0.0";
+  src = fetchgit {
+    url = "http://cgit.ni.krebsco.de/netcup";
+    rev = "refs/tags/v1.0.0";
+    sha256 = "1rn7bncfhjw0bqjbvj38m7lks4nyf5qcvkj9dg0zr99ba6dylzx5";
+  };
+  phases = [ "unpackPhase" "patchPhase" "installPhase" ];
+  patchPhase = ''
+    path=${shell.escape (sed.escape PATH)}
+    sed -i "1s/.*/&\nPATH=$path/" vcp
+  '';
+  installPhase = ''
+    mkdir -p $out/bin
+    cp vcp $out/bin
+  '';
+}
diff --git a/tv/5pkgs/netcup/default.nix b/tv/5pkgs/netcup/default.nix
deleted file mode 100644
index d1f46299..00000000
--- a/tv/5pkgs/netcup/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ coreutils, curl, fetchgit, gawk, gnugrep, gnused, jq, stdenv, w3m, ... }:
-with import <stockholm/lib>;
-let
-  readJSON = path: fromJSON (readFile path);
-  sed.escape = replaceChars ["/"] ["\\/"]; # close enough
-  PATH = makeBinPath [
-    coreutils
-    curl
-    gawk
-    gnugrep
-    gnused
-    jq
-    w3m
-  ];
-in
-stdenv.mkDerivation {
-  name = "netcup-1.0.0";
-  src = fetchgit {
-    url = "http://cgit.ni.krebsco.de/netcup";
-    rev = "refs/tags/v1.0.0";
-    sha256 = "1rn7bncfhjw0bqjbvj38m7lks4nyf5qcvkj9dg0zr99ba6dylzx5";
-  };
-  phases = [ "unpackPhase" "patchPhase" "installPhase" ];
-  patchPhase = ''
-    path=${shell.escape (sed.escape PATH)}
-    sed -i "1s/.*/&\nPATH=$path/" vcp
-  '';
-  installPhase = ''
-    mkdir -p $out/bin
-    cp vcp $out/bin
-  '';
-}
-- 
cgit v1.2.3


From 7e1516cc0de48c169a27a07f43930b940d6a9004 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 2 May 2017 14:14:38 +0200
Subject: l 2 nixpkgs: aa03833 -> ce00ce2

---
 lass/2configs/nixpkgs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix
index 4f1347b8..bbded5fa 100644
--- a/lass/2configs/nixpkgs.nix
+++ b/lass/2configs/nixpkgs.nix
@@ -3,6 +3,6 @@
 {
   krebs.build.source.nixpkgs.git = {
     url = https://cgit.lassul.us/nixpkgs;
-    ref = "aa03833";
+    ref = "ce00ce2";
   };
 }
-- 
cgit v1.2.3


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(-)

diff --git a/krebs/5pkgs/goify/default.nix b/krebs/5pkgs/goify/default.nix
index e2849b5c..9c44aaee 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 2b7b0ca955a4051fbd2761c71a4c180c61c09ff0 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 2 May 2017 20:12:17 +0200
Subject: l 2 git: add news repo

---
 lass/2configs/git.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix
index 72866c06..5f686e26 100644
--- a/lass/2configs/git.nix
+++ b/lass/2configs/git.nix
@@ -30,6 +30,10 @@ let
   rules = concatMap make-rules (attrValues repos);
 
   public-repos = mapAttrs make-public-repo {
+    news = {
+      cgit.desc = "take a rss feed and a timeout and print it to stdout";
+      cgit.section = "software";
+    };
     stockholm = {
       cgit.desc = "take all the computers hostage, they'll love you!";
       cgit.section = "configuration";
-- 
cgit v1.2.3


From 82604967207b190089f5dca8ab6c07e05aad9272 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 2 May 2017 20:12:45 +0200
Subject: l 1 iso: never use prism as binary cache

---
 lass/1systems/iso.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lass/1systems/iso.nix b/lass/1systems/iso.nix
index 99399550..30fc674b 100644
--- a/lass/1systems/iso.nix
+++ b/lass/1systems/iso.nix
@@ -7,7 +7,6 @@ with import <stockholm/lib>;
     ../../krebs
     ../3modules
     ../5pkgs
-    ../2configs/binary-cache/client.nix
     ../2configs/mc.nix
     ../2configs/nixpkgs.nix
     ../2configs/vim.nix
-- 
cgit v1.2.3


From e050a2b19d2730a050d8ac6dbf64588689cf7a7c Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 2 May 2017 20:13:07 +0200
Subject: l 2: add goify to pkgs

---
 lass/2configs/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index e33514ee..ffed5bb7 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -150,6 +150,7 @@ with import <stockholm/lib>;
     untilport
     usbutils
     logify
+    goify
 
   #unpack stuff
     p7zip
-- 
cgit v1.2.3


From 8006120256a2e126bfe768ed173ca1df8a99bf4f Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 2 May 2017 22:07:50 +0200
Subject: haskellPackages.irc: init at 1.0.0

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

diff --git a/krebs/5pkgs/haskell-overrides/irc.nix b/krebs/5pkgs/haskell-overrides/irc.nix
new file mode 100644
index 00000000..b2088557
--- /dev/null
+++ b/krebs/5pkgs/haskell-overrides/irc.nix
@@ -0,0 +1,18 @@
+{ mkDerivation, async, base, bytestring, fetchgit, network
+, optparse-applicative, stdenv, text
+}:
+mkDerivation {
+  pname = "irc";
+  version = "1.0.0";
+  src = fetchgit {
+    url = "http://cgit.krebsco.de/irc";
+    sha256 = "174ywhvidybg49m4b43q2304izwbx3s7bvipk9g399zjyb392r8f";
+    rev = "7225d47e9c1f4c7032ad55fbe1d9f33ff205549c";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  executableHaskellDepends = [
+    async base bytestring network optparse-applicative text
+  ];
+  license = stdenv.lib.licenses.mit;
+}
-- 
cgit v1.2.3


From 42be2ee9219b85fc64d89849843d2fef62d4c666 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 2 May 2017 22:11:50 +0200
Subject: tv git: irc -> kirk

---
 tv/2configs/git.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix
index d45321cd..293a00e7 100644
--- a/tv/2configs/git.nix
+++ b/tv/2configs/git.nix
@@ -36,8 +36,8 @@ let {
     htgen = {
       cgit.desc = "toy HTTP server";
     };
-    irc = {
-      cgit.desc = "toy IRC client";
+    kirk = {
+      cgit.desc = "IRC tools";
     };
     load-env = {};
     loldns = {
-- 
cgit v1.2.3


From 9457f3fe8e9a35ee19b5a60e3aef3cc1c51dd344 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 2 May 2017 22:14:17 +0200
Subject: haskellPackages: irc -> kirk

---
 krebs/5pkgs/haskell-overrides/irc.nix  | 18 ------------------
 krebs/5pkgs/haskell-overrides/kirk.nix | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 krebs/5pkgs/haskell-overrides/irc.nix
 create mode 100644 krebs/5pkgs/haskell-overrides/kirk.nix

diff --git a/krebs/5pkgs/haskell-overrides/irc.nix b/krebs/5pkgs/haskell-overrides/irc.nix
deleted file mode 100644
index b2088557..00000000
--- a/krebs/5pkgs/haskell-overrides/irc.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ mkDerivation, async, base, bytestring, fetchgit, network
-, optparse-applicative, stdenv, text
-}:
-mkDerivation {
-  pname = "irc";
-  version = "1.0.0";
-  src = fetchgit {
-    url = "http://cgit.krebsco.de/irc";
-    sha256 = "174ywhvidybg49m4b43q2304izwbx3s7bvipk9g399zjyb392r8f";
-    rev = "7225d47e9c1f4c7032ad55fbe1d9f33ff205549c";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  executableHaskellDepends = [
-    async base bytestring network optparse-applicative text
-  ];
-  license = stdenv.lib.licenses.mit;
-}
diff --git a/krebs/5pkgs/haskell-overrides/kirk.nix b/krebs/5pkgs/haskell-overrides/kirk.nix
new file mode 100644
index 00000000..2cd6bb13
--- /dev/null
+++ b/krebs/5pkgs/haskell-overrides/kirk.nix
@@ -0,0 +1,18 @@
+{ mkDerivation, async, base, bytestring, fetchgit, network
+, optparse-applicative, stdenv, text
+}:
+mkDerivation {
+  pname = "kirk";
+  version = "1.0.0";
+  src = fetchgit {
+    url = "http://cgit.krebsco.de/kirk";
+    sha256 = "0w4drg2lyyw45abfn3g55zd6m7pl7yqxql5rpyy6qqdbvnyak94w";
+    rev = "c78f3c62c0ba76465e39d1570073f867aa2d4240";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  executableHaskellDepends = [
+    async base bytestring network optparse-applicative text
+  ];
+  license = stdenv.lib.licenses.mit;
+}
-- 
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

diff --git a/krebs/5pkgs/youtube-dl/default.nix b/krebs/5pkgs/youtube-dl/default.nix
new file mode 100644
index 00000000..b0c449d4
--- /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 a2963c5bc25a8d1320fe87865005a0533aa22fe0 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Wed, 3 May 2017 15:11:35 +0200
Subject: l 2 newsbot-js: update newsfeeds

---
 lass/2configs/newsbot-js.nix | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/lass/2configs/newsbot-js.nix b/lass/2configs/newsbot-js.nix
index d38af211..070795d1 100644
--- a/lass/2configs/newsbot-js.nix
+++ b/lass/2configs/newsbot-js.nix
@@ -3,19 +3,17 @@
 let
   newsfile = pkgs.writeText "feeds" ''
     aje|http://www.aljazeera.com/Services/Rss/?PostingId=2007731105943979989|#news
-    aktuelle_themen|http://bundestag.de/service/rss/Bundestag_Aktuelle_Themen.rss|#news #bundestag
     allafrica|http://allafrica.com/tools/headlines/rdf/latest/headlines.rdf|#news
-    anon|http://anoninsiders.net/feed/|#news
     antirez|http://antirez.com/rss|#news
     arbor|http://feeds2.feedburner.com/asert/|#news
     archlinux|http://www.archlinux.org/feeds/news/|#news
     ars|http://feeds.arstechnica.com/arstechnica/index?format=xml|#news
     augustl|http://augustl.com/atom.xml|#news
     bbc|http://feeds.bbci.co.uk/news/rss.xml|#news
+    bdt_aktuelle_themen|http://www.bundestag.de/blueprint/servlet/service/de/14154/asFeed/index.rss|#news
     bdt_drucksachen|http://www.bundestag.de/dip21rss/bundestag_drucksachen.rss|#news #bundestag
     bdt_plenarproto|http://www.bundestag.de/rss_feeds/plenarprotokolle.rss|#news #bundestag
-    bdt_pressemitteilungen|http://bundestag.de/service/rss/Bundestag_Presse.rss|#news #bundestag
-    bdt_wd|http://bundestag.de/service/rss/Bundestag_WD.rss|#news #bundestag
+    bdt_pressemitteilungen|http://www.bundestag.de/blueprint/servlet/service/de/273112/asFeed/index.rss|#news
     bitcoinpakistan|https://bitcoinspakistan.com/feed/|#news #financial
     c|http://www.tempolimit-lichtgeschwindigkeit.de/news.xml|#news
     cancer|http://feeds.feedburner.com/ncinewsreleases?format=xml|#news
@@ -30,9 +28,7 @@ let
     chan_b|https://boards.4chan.org/b/index.rss|#brainfuck
     chan_biz|https://boards.4chan.org/biz/index.rss|#news #brainfuck
     chan_int|https://boards.4chan.org/int/index.rss|#news #brainfuck
-    cna|http://www.channelnewsasia.com/starterkit/servlet/cna/rss/home.xml|#news
     coinspotting|http://coinspotting.com/rss|#news #financial
-    cryptanalysis|https://cryptanalys.is/rss.php|#news
     cryptocoinsnews|http://www.cryptocoinsnews.com/feed/|#news #financial
     cryptogon|http://www.cryptogon.com/?feed=rss2|#news
     csm|http://rss.csmonitor.com/feeds/csm|#news
@@ -52,12 +48,9 @@ let
     fars|http://www.farsnews.com/rss.php|#news #test
     faz_feui|http://www.faz.net/rss/aktuell/feuilleton/|#news
     faz_politik|http://www.faz.net/rss/aktuell/politik/|#news
-    faz_wirtschaft|http://www.faz.net/rss/aktuell/wirtschaft/|#news #financial
-    fbi|http://www.fbi.gov/homepage/RSS|#news #bullerei
-    fbi_news|http://www.fbi.gov/news/news_blog/rss.xml|#news
-    fbi_press|http://www.fbi.gov/news/current/rss.xml|#news #bullerei
-    fbi_stories|http://www.fbi.gov/news/stories/all-stories/rss.xml|#news #bullerei
-    fedreserve|http://www.federalreserve.gov/feeds/press_all.xml|#news #financial
+    faz_wirtschaft|http://www.faz.net/rss/aktuell/wirtschaft/|#news
+    fbi|https://www.fbi.gov/news/rss.xml|#news
+    fedreserve|http://www.federalreserve.gov/feeds/press_all.xml|#news
     fefe|http://blog.fefe.de/rss.xml|#news
     forbes|http://www.forbes.com/forbes/feed2/|#news
     forbes_realtime|http://www.forbes.com/real-time/feed2/|#news
@@ -65,18 +58,18 @@ let
     geheimorganisation|http://geheimorganisation.org/feed/|#news
     GerForPol|http://www.german-foreign-policy.com/de/news/rss-2.0|#news
     gmanet|http://www.gmanetwork.com/news/rss/news|#news
-    golem|http://www.golem.de/rss.php?feed=RSS1.0|#news
+    golem|https://rss.golem.de/rss.php|#news
     google|http://news.google.com/?output=rss|#news
     greenpeace|http://feeds.feedburner.com/GreenpeaceNews|#news
     guardian_uk|http://feeds.theguardian.com/theguardian/uk-news/rss|#news
     gulli|http://ticker.gulli.com/rss/|#news
     handelsblatt|http://www.handelsblatt.com/contentexport/feed/schlagzeilen|#news #financial
-    heise|http://heise.de.feedsportal.com/c/35207/f/653902/index.rss|#news
+    heise|https://www.heise.de/newsticker/heise-atom.xml|#news
     hindu_business|http://www.thehindubusinessline.com/?service=rss|#news #financial
     hindu|http://www.thehindu.com/?service=rss|#news
     ign|http://feeds.ign.com/ign/all|#news
     independent|http://www.independent.com/rss/headlines/|#news
-    indymedia|http://de.indymedia.org/RSS/newswire.xml|#news
+    indymedia|https://de.indymedia.org/rss.xml|#news
     info_libera|http://www.informationliberation.com/rss.xml|#news
     klagen-gegen-rundfuckbeitrag|http://klagen-gegen-rundfunkbeitrag.blogspot.com/feeds/posts/default|#news
     korea_herald|http://www.koreaherald.com/rss_xml.php|#news
@@ -123,11 +116,11 @@ let
     sec-db|http://feeds.security-database.com/SecurityDatabaseToolsWatch|#news
     shackspace|http://shackspace.de/?feed=rss2|#news
     shz_news|http://www.shz.de/nachrichten/newsticker/rss|#news
-    sky_busi|http://news.sky.com/feeds/rss/business.xml|#news
-    sky_pol|http://news.sky.com/feeds/rss/politics.xml|#news
-    sky_strange|http://news.sky.com/feeds/rss/strange.xml|#news
-    sky_tech|http://news.sky.com/feeds/rss/technology.xml|#news
-    sky_world|http://news.sky.com/feeds/rss/world.xml|#news
+    sky_busi|http://feeds.skynews.com/feeds/rss/business.xml|#news
+    sky_pol|http://feeds.skynews.com/feeds/rss/politics.xml|#news
+    sky_strange|http://feeds.skynews.com/feeds/rss/strange.xml|#news
+    sky_tech|http://feeds.skynews.com/feeds/rss/technology.xml|#news
+    sky_world|http://feeds.skynews.com/feeds/rss/world.xml|#news
     slashdot|http://rss.slashdot.org/Slashdot/slashdot|#news
     slate|http://feeds.slate.com/slate|#news
     spiegel_eil|http://www.spiegel.de/schlagzeilen/eilmeldungen/index.rss|#news
@@ -138,7 +131,7 @@ let
     stz|http://www.stuttgarter-zeitung.de/rss/topthemen.rss.feed|#news
     sz_politik|http://rss.sueddeutsche.de/rss/Politik|#news
     sz_wirtschaft|http://rss.sueddeutsche.de/rss/Wirtschaft|#news #financial
-    sz_wissen|http://suche.sueddeutsche.de/rss/Wissen|#news
+    sz_wissen|http://rss.sueddeutsche.de/rss/Wissen|#news
     tagesschau|http://www.tagesschau.de/newsticker.rdf|#news
     taz|http://taz.de/Themen-des-Tages/!p15;rss/|#news
     telegraph_finance|http://www.telegraph.co.uk/finance/rss|#news #financial
-- 
cgit v1.2.3


From 60a897ce6b44e0f5901deb7f6da5bd6683e4bd0a Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Sun, 7 May 2017 13:51:17 +0200
Subject: l 1 prism: connect Reaktor to #germany

---
 lass/1systems/prism.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index c897ab65..01cfe541 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -256,7 +256,7 @@ in {
     {
       krebs.Reaktor.coders = {
         nickname = "Reaktor|lass";
-        channels = [ "#coders" ];
+        channels = [ "#coders" "#germany" ];
         extraEnviron = {
           REAKTOR_HOST = "irc.hackint.org";
         };
-- 
cgit v1.2.3


From b9f38d2d7665cf34bed1c064a23d58ac259f19f3 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Mon, 8 May 2017 15:44:06 +0200
Subject: l 2 nixpkgs: ce00ce2 -> 11b82a9

---
 lass/2configs/nixpkgs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix
index bbded5fa..86b7d6d2 100644
--- a/lass/2configs/nixpkgs.nix
+++ b/lass/2configs/nixpkgs.nix
@@ -3,6 +3,6 @@
 {
   krebs.build.source.nixpkgs.git = {
     url = https://cgit.lassul.us/nixpkgs;
-    ref = "ce00ce2";
+    ref = "11b82a9";
   };
 }
-- 
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

diff --git a/krebs/5pkgs/youtube-dl/default.nix b/krebs/5pkgs/youtube-dl/default.nix
deleted file mode 100644
index b0c449d4..00000000
--- 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 45fdcfa841c34b794640e863d7c613ce5bed8274 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 9 May 2017 20:40:11 +0200
Subject: l 2 ircd: relax throttle

---
 lass/2configs/ircd.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lass/2configs/ircd.nix b/lass/2configs/ircd.nix
index 4d2c134b..b72e2b08 100644
--- a/lass/2configs/ircd.nix
+++ b/lass/2configs/ircd.nix
@@ -94,6 +94,8 @@
       general {
         #maybe we want ident someday?
         disable_auth = yes;
+        throttle_duration = 1;
+        throttle_count = 1000;
       };
     '';
   };
-- 
cgit v1.2.3


From b297822294329f83f6a3ef6c93709ab369da6ffc Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 9 May 2017 20:40:58 +0200
Subject: l 2 radio: add suggest plugin

---
 lass/2configs/radio.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix
index 6e96f884..1e14e31b 100644
--- a/lass/2configs/radio.nix
+++ b/lass/2configs/radio.nix
@@ -145,6 +145,12 @@ in {
         script = "${print_current}/bin/print_current";
         pattern = "^current$";
       })
+      (buildSimpleReaktorPlugin "suggest" {
+        script = "${pkgs.writeDash "suggest" ''
+          echo "$@" >> $HOME/playlist_suggest
+        ''}";
+        pattern = "^suggest: (?P<args>.*)$";
+      })
     ];
   };
   services.nginx.virtualHosts."lassul.us".locations."/the_playlist".extraConfig = let
-- 
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

diff --git a/krebs/5pkgs/haskell-overrides/news.nix b/krebs/5pkgs/haskell-overrides/news.nix
new file mode 100644
index 00000000..ba5e7a5e
--- /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 b75c7f570ccbffe774c3517cb21edcf71bc5816a Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 9 May 2017 21:48:49 +0200
Subject: l 1 helios: add mpv to pkgs

---
 lass/1systems/helios.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lass/1systems/helios.nix b/lass/1systems/helios.nix
index 298c9083..99760dfd 100644
--- a/lass/1systems/helios.nix
+++ b/lass/1systems/helios.nix
@@ -48,6 +48,7 @@ with import <stockholm/lib>;
         maven
         arandr
         libreoffice
+        mpv
       ];
     }
     #{
-- 
cgit v1.2.3


From f83a90fd7d7c83f71ed4f5c86cf10985cbe605f9 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 9 May 2017 22:45:16 +0200
Subject: k 3 l: add sokrateslaptop

---
 krebs/3modules/lass/default.nix | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix
index ec5811d8..cd8238dc 100644
--- a/krebs/3modules/lass/default.nix
+++ b/krebs/3modules/lass/default.nix
@@ -302,6 +302,27 @@ with import <stockholm/lib>;
     iso = {
       cores = 1;
     };
+    sokrateslaptop = {
+      nets = {
+        retiolum = {
+          ip4.addr = "10.243.142.104";
+          ip6.addr = "42:f8a1:044d:0f75:9d73:56d8:f432:c6cc";
+          aliases = [
+            "sokrateslaptop.r"
+          ];
+          tinc.pubkey = ''
+            -----BEGIN RSA PUBLIC KEY-----
+            MIIBCgKCAQEA0EMbBv5NCSns4V/VR/NJHhwe2qNLUYjWWtCDY4zDuoiJdm3JNZJ2
+            t0iKNxFwd6Mmg3ahAlndsH4FOjOBGBQCgBG25VRnQgli1sypI/gYTsSgIWHVIRoZ
+            rgrng0K3oyJ6FuTP+nH1rd7UAYkrOQolXQBY+LqAbxOVjiJl+DpbAXIxCIs5TBeW
+            egtBiXZ1S53Lv5EGFXug716XlgZLHjw7PzRLJXSlvUAIRZj0Sjq4UD9VrhazM9s5
+            aDuxJIdknccEEXm6NK7a51hU/o8L+T0IUpZxhaXOdi6fvO/y3TbffKb1yRTbN0/V
+            VBjBh18Le7h0SmAEED5tz7NOCrAjMZQtJQIDAQAB
+            -----END RSA PUBLIC KEY-----
+          '';
+        };
+      };
+    };
   };
   users = {
     lass = {
-- 
cgit v1.2.3


From e84124d6c0a175be907f8dad1c37647e163978a9 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 9 May 2017 22:45:49 +0200
Subject: l 2 websites lass: serve /etc/hosts

---
 lass/2configs/websites/lassulus.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix
index 3a897942..9d5f2645 100644
--- a/lass/2configs/websites/lassulus.nix
+++ b/lass/2configs/websites/lassulus.nix
@@ -80,6 +80,9 @@ in {
     locations."= /retiolum-hosts.tar.bz2".extraConfig = ''
       alias ${config.krebs.tinc.retiolum.hostsArchive};
     '';
+    locations."= /retiolum.hosts".extraConfig = ''
+      alias /etc/hosts;
+    '';
     locations."/tinc".extraConfig = ''
       alias ${config.krebs.tinc_graphs.workingDir}/external;
     '';
-- 
cgit v1.2.3


From 7587f91b743d120de8191a1af2245686d361d83a Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 9 May 2017 22:49:54 +0200
Subject: l 2 wine: users.extraUsers -> users.users

---
 lass/2configs/wine.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lass/2configs/wine.nix b/lass/2configs/wine.nix
index 8d55da7f..8674559c 100644
--- a/lass/2configs/wine.nix
+++ b/lass/2configs/wine.nix
@@ -7,7 +7,7 @@ in {
   environment.systemPackages = with pkgs; [
     wineUnstable
   ];
-  users.extraUsers = {
+  users.users= {
     wine = {
       name = "wine";
       description = "user for running wine";
-- 
cgit v1.2.3


From 689399546d38b6dc5a643cc2efad9c1d0ae76058 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 9 May 2017 22:50:16 +0200
Subject: l 2 wine: systemPackages -> per-user

---
 lass/2configs/wine.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lass/2configs/wine.nix b/lass/2configs/wine.nix
index 8674559c..ee688e18 100644
--- a/lass/2configs/wine.nix
+++ b/lass/2configs/wine.nix
@@ -4,7 +4,7 @@ let
   mainUser = config.users.extraUsers.mainUser;
 
 in {
-  environment.systemPackages = with pkgs; [
+  krebs.per-user.wine.packages = with pkgs; [
     wineUnstable
   ];
   users.users= {
-- 
cgit v1.2.3