From d43479badbca6c3df82b0f52905275f3c0da7b47 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:23:41 +0100
Subject: [PATCH 01/16] mdp: 1.0.7 -> 1.0.9

---
 pkgs/applications/misc/mdp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix
index a44f4bff83e..5206feb215c 100644
--- a/pkgs/applications/misc/mdp/default.nix
+++ b/pkgs/applications/misc/mdp/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, ncurses }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.7";
+  version = "1.0.9";
   name = "mdp-${version}";
 
   src = fetchFromGitHub {
     owner = "visit1985";
     repo = "mdp";
     rev = version;
-    sha256 = "10jkv8g04vvhik42y0qqcbn05hlnfsgbljhx69hx1sfn7js2d8g4";
+    sha256 = "183flp52zfady4f8f3vgapr5f5k6cvanmj2hw293v6pw71qnafmd";
   };
 
   makeFlags = [ "PREFIX=$(out)" ];

From 95d64801995e9e1806d1dff3cc8283698df7912f Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:29:43 +0100
Subject: [PATCH 02/16] haxor-news: 0.3.1 -> 0.4.1

---
 pkgs/applications/misc/haxor-news/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix
index e4074547d78..e925885f05f 100644
--- a/pkgs/applications/misc/haxor-news/default.nix
+++ b/pkgs/applications/misc/haxor-news/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "0.3.1";
+  version = "0.4.1";
   name = "haxor-news-${version}";
 
   src = fetchurl {
-    url = "https://github.com/donnemartin/haxor-news/archive/0.3.1.tar.gz";
-    sha256 = "0jglx8fy38sjyszvvg7mvmyk66l53kyq4i09hmgdz7hb1hrm9m2m";
+    url = "https://github.com/donnemartin/haxor-news/archive/${version}.tar.gz";
+    sha256 = "0d3an7by33hjl8zg48y7ig6r258ghgbdkpp1psa9jr6n2nk2w9mr";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From 9680f12fbe8db49d34deaf5cfdeeb69b368b5214 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:31:55 +0100
Subject: [PATCH 03/16] cortex: 2014-08-01 -> 2015-08-23

---
 pkgs/applications/misc/cortex/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/cortex/default.nix b/pkgs/applications/misc/cortex/default.nix
index 777a759177c..42565ae7fa8 100644
--- a/pkgs/applications/misc/cortex/default.nix
+++ b/pkgs/applications/misc/cortex/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, python3 }:
 
 stdenv.mkDerivation {
-  name = "cortex-2014-08-01";
+  name = "cortex-2015-08-23";
 
   src = fetchgit {
     url = "https://github.com/gglucas/cortex";
-    rev = "e749de6c21aae02386f006fd0401d22b9dcca424";
-    sha256 = "d5d59c5257107344122c701eb370f3740f9957b6b898ac798d797a4f152f614c";
+    rev = "ff10ff860479fe2f50590c0f8fcfc6dc34446639";
+    sha256 = "0pa2kkkcnmf56d5d5kknv0gfahddym75xripd4kgszaj6hsib3zg";
   };
 
   buildInputs = [ stdenv python3 ];

From eb07e355549e9851d810b03ff2237a2a3ca4cf07 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:33:03 +0100
Subject: [PATCH 04/16] pipes: 1.1.0 -> 1.2.0

---
 pkgs/misc/screensavers/pipes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix
index 8ff4a1074e6..9393a978b07 100644
--- a/pkgs/misc/screensavers/pipes/default.nix
+++ b/pkgs/misc/screensavers/pipes/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pipes-${version}";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchurl {
     url = "https://github.com/pipeseroni/pipes.sh/archive/v${version}.tar.gz";
-    sha256 = "1225llbm0zfnkqykfi7qz7z5p102pwldmj22761m653jy0ahi7w2";
+    sha256 = "1v0xhgq30zkfjk9l5g8swpivh7rxfjbzhbjpr2c5c836wgn026fb";
   };
 
   buildInputs = with pkgs; [ bash ];

From be4caf3ef75158aadf85dfe2ac4fb3d498ee5c7f Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:34:23 +0100
Subject: [PATCH 05/16] sc-im: 0.2.1 -> 0.4.0

---
 pkgs/applications/misc/sc-im/default.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix
index cb18278d1ed..75d08ec8188 100644
--- a/pkgs/applications/misc/sc-im/default.nix
+++ b/pkgs/applications/misc/sc-im/default.nix
@@ -1,26 +1,23 @@
-{ stdenv, fetchFromGitHub, yacc, ncurses, libxml2 }:
+{ stdenv, fetchFromGitHub, yacc, ncurses, libxml2, pkgconfig }:
 
-let
-  version = "0.2.1";
-in
 stdenv.mkDerivation rec {
-
+  version = "0.4.0";
   name = "sc-im-${version}";
 
   src = fetchFromGitHub {
     owner = "andmarti1424";
     repo = "sc-im";
     rev = "v${version}";
-    sha256 = "0v6b8xksvd12vmz198vik2ranyr5mhnp85hl9yxh9svibs7jxsbb";
+    sha256 = "1v1cfmfqs5997bqlirp6p7smc3qrinq8dvsi33sk09r33zkzyar0";
   };
 
-  buildInputs = [ yacc ncurses libxml2 ];
+  buildInputs = [ yacc ncurses libxml2 pkgconfig ];
 
   buildPhase = ''
     cd src
 
-    sed "s,prefix=/usr,prefix=$out," Makefile
-    sed "s,-I/usr/include/libxml2,-I$libxml2," Makefile
+    sed -i "s,prefix=/usr,prefix=$out," Makefile
+    sed -i "s,-I/usr/include/libxml2,-I$libxml2," Makefile
 
     make
     export DESTDIR=$out

From 8c2e6df52d8006c457764bc076ee216399f96f34 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:37:17 +0100
Subject: [PATCH 06/16] cli-visualizer: 2016-06-02 -> 1.5

---
 pkgs/applications/misc/cli-visualizer/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix
index 1c7fd62f8ec..cdde212275d 100644
--- a/pkgs/applications/misc/cli-visualizer/default.nix
+++ b/pkgs/applications/misc/cli-visualizer/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchgit, fftw, ncurses, libpulseaudio }:
+{ stdenv, fetchFromGitHub, fftw, ncurses, libpulseaudio }:
 
 stdenv.mkDerivation rec {
-  version = "2016-06-02";
+  version = "1.5";
   name = "cli-visualizer-${version}";
 
-  src = fetchgit {
-    url = "https://github.com/dpayne/cli-visualizer.git";
-    rev = "bc0104eb57e7a0b3821510bc8f93cf5d1154fa8e";
-    sha256 = "16768gyi85mkizfn874q2q9xf32knw08z27si3k5bk99492dxwzw";
+  src = fetchFromGitHub {
+    owner = "dpayne";
+    repo = "cli-visualizer";
+    rev = version;
+    sha256 = "18qv4ya64qmczq94dnynrnzn7pwhmzbn14r05qcvbbwv7r8gclzs";
   };
 
   postPatch = ''

From 71c247b3ad27f982312de7f858ffc31ec8593e26 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 4 Jan 2017 16:25:59 +0100
Subject: [PATCH 07/16] mailcap-fix: init at 1.0.1

---
 pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a0141729e30..85226883193 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -30047,6 +30047,24 @@ EOF
     };
   };
 
+  mailcap-fix = buildPythonPackage rec {
+    name = "mailcap-fix-${version}";
+    version = "1.0.1";
+
+    disabled = isPy36; # this fix is merged into python 3.6
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/m/mailcap-fix/${name}.tar.gz";
+      sha256 = "02lijkq6v379r8zkqg9q2srin3i80m4wvwik3hcbih0s14v0ng0i";
+    };
+
+    meta = with stdenv.lib; {
+      description = "A patched mailcap module that conforms to RFC 1524";
+      homepage = "https://github.com/michael-lazar/mailcap_fix";
+      license = licenses.unlicense;
+    };
+  };
+
   maildir-deduplicate = buildPythonPackage rec {
     name = "maildir-deduplicate-${version}";
     version = "1.0.2";

From a52ac0a5c6f5a1eba62a1bc01d92f7bcf672089c Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:38:45 +0100
Subject: [PATCH 08/16] rtv: 1.10.0 -> 1.13.0

---
 pkgs/applications/misc/rtv/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index 8488a8e6842..e2af415e60a 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -1,17 +1,19 @@
 { stdenv, fetchFromGitHub, pkgs, lib, python, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "1.10.0";
+  version = "1.13.0";
   name = "rtv-${version}";
 
   src = fetchFromGitHub {
     owner = "michael-lazar";
     repo = "rtv";
     rev = "v${version}";
-    sha256 = "1gm5jyqqssf69lfx0svhzsb9m0dffm6zsf9jqnwh6gjihfz25a45";
+    sha256 = "0rxncbzb4a7zlfxmnn5jm6yvwviaaj0v220vwv82hkjiwcdjj8jf";
   };
 
   propagatedBuildInputs = with pythonPackages; [
+    beautifulsoup4
+    mailcap-fix
     tornado
     requests2
     six

From 6587d6bf1d9bcbbcbc5c27ac2082ff8980b55392 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:39:33 +0100
Subject: [PATCH 09/16] buku: 2.5 -> 2.7

---
 pkgs/applications/misc/buku/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix
index 85d3c4e49f9..a0414786ba4 100644
--- a/pkgs/applications/misc/buku/default.nix
+++ b/pkgs/applications/misc/buku/default.nix
@@ -2,14 +2,14 @@
 }:
 
 with pythonPackages; buildPythonApplication rec {
-  version = "2.5";
+  version = "2.7";
   name = "buku-${version}";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "buku";
     rev = "v${version}";
-    sha256 = "0m6km37zylinsblwm2p8pm760xlsf9m82xyws3762xs8zxbnfmsd";
+    sha256 = "1hb5283xaz1ll3iv5542i6f9qshrdgg33dg7gvghz0fwdh8i0jbk";
   };
 
   buildInputs = [

From 91a248009c1f76b8569368476cfe5f1318342425 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:40:48 +0100
Subject: [PATCH 10/16] gotty: 0.0.10 -> 0.0.13

---
 pkgs/servers/gotty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix
index 28ca858440b..ccab31ce225 100644
--- a/pkgs/servers/gotty/default.nix
+++ b/pkgs/servers/gotty/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "gotty-${version}";
-  version = "0.0.10";
+  version = "0.0.13";
   rev = "v${version}";
 
   goPackagePath = "github.com/yudai/gotty";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "yudai";
     repo = "gotty";
-    sha256 = "0gvnbr61d5si06ik2j075jg00r9b94ryfgg06nqxkf10dp8lgi09";
+    sha256 = "1hsfjyjjzr1zc9m8bnhid1ag6ipcbx59111y9p7k8az8jiyr112g";
   };
 
   goDeps = ./deps.nix;

From b5c7ce015f61547721c8bbf6e03a4a5944fcfe76 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:41:51 +0100
Subject: [PATCH 11/16] http-prompt: 0.2.0 -> 0.8.0

---
 pkgs/tools/networking/http-prompt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix
index ba9b8b2d771..55ba6b9db55 100644
--- a/pkgs/tools/networking/http-prompt/default.nix
+++ b/pkgs/tools/networking/http-prompt/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, pythonPackages, httpie }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "0.2.0";
+  version = "0.8.0";
   name = "http-prompt";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     repo = "http-prompt";
     owner = "eliangcs";
-    sha256 = "0hgw3kx9rfdg394darms3vqcjm6xw6qrm8gnz54nahmyxnhrxnpp";
+    sha256 = "0zvkmdc6mhc5kk7cbrgzxsl8n2d02gnxy1sppm83mhwx6s1dkz30";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From 52d95487dd389edf88a260a8a2cfa14ff45de5c0 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:44:52 +0100
Subject: [PATCH 12/16] fava: Fix github source (owner)

---
 pkgs/applications/office/fava/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix
index 5ed7d25667e..76c4b047cea 100644
--- a/pkgs/applications/office/fava/default.nix
+++ b/pkgs/applications/office/fava/default.nix
@@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec {
   name = "fava-${version}";
 
   src = fetchFromGitHub {
-    owner = "aumayr";
+    owner = "beancount";
     repo = "fava";
     rev = "v${version}";
     sha256 = "0dm4x6z80m04r9qa55psvz7f41qnh13hnj2qhvxkrk22yqmkqrka";

From cc0a5d589ddf1f6a4fb72a5b4daed8852b65e34a Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 14:43:04 +0100
Subject: [PATCH 13/16] fava: 1.0 -> 1.2

---
 pkgs/applications/office/fava/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix
index 76c4b047cea..a246c7290a5 100644
--- a/pkgs/applications/office/fava/default.nix
+++ b/pkgs/applications/office/fava/default.nix
@@ -1,19 +1,17 @@
 { stdenv, pkgs, fetchurl, python3Packages, fetchFromGitHub, fetchzip, python3, beancount }:
 
 python3Packages.buildPythonApplication rec {
-  version = "1.0";
+  version = "1.2";
   name = "fava-${version}";
 
-  src = fetchFromGitHub {
-    owner = "beancount";
-    repo = "fava";
-    rev = "v${version}";
-    sha256 = "0dm4x6z80m04r9qa55psvz7f41qnh13hnj2qhvxkrk22yqmkqrka";
+  src = fetchurl {
+    url = "https://github.com/beancount/fava/archive/v${version}.tar.gz";
+    sha256 = "0sykx054w4cvr0pgbqph0lmkxffafl83k5ir252gl5znxgcvg6yw";
   };
 
   assets = fetchzip {
-    url = "https://github.com/aumayr/fava/releases/download/v${version}/beancount-fava-${version}.tar.gz";
-    sha256 = "1vvidwfn5882dslz6qqkkd84m7w52kd34x10qph8yhipyjv1dimc";
+    url = "https://github.com/beancount/fava/releases/download/v${version}/beancount-fava-${version}.tar.gz";
+    sha256 = "1lk6s3s6xvvwbcbkr1qpr9bqdgwspk3vms25zjd6xcs21s3hchmp";
   };
 
   buildInputs = with python3Packages; [ pytest_30 ];

From b1f4c1dffe7090014ebfcda76a6b78f655e5f7ed Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 14:46:06 +0100
Subject: [PATCH 14/16] beancount: 2.0b12 -> 2.0b13

---
 pkgs/applications/office/beancount/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/beancount/default.nix b/pkgs/applications/office/beancount/default.nix
index 2034c832294..72f6c5de8a1 100644
--- a/pkgs/applications/office/beancount/default.nix
+++ b/pkgs/applications/office/beancount/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchhg, pkgs, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "2.0b12";
+  version = "2.0b13";
   name = "beancount-${version}";
   namePrefix = "";
 
   src = pkgs.fetchurl {
     url = "mirror://pypi/b/beancount/${name}.tar.gz";
-    sha256 = "0n0wyi2yhmf8l46l5z68psk4rrzqkgqaqn93l0wnxsmp1nmqly9z";
+    sha256 = "16gkcq28bwd015b1qhdr5d7vhxid8xfn6ia4n9n8dnl5n448yqkm";
   };
 
   buildInputs = with pythonPackages; [ nose ];

From d359101891708c3ce3ffaa645c30666fa7d0b521 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 14:47:13 +0100
Subject: [PATCH 15/16] bean-add: 2016-10-03 -> 2016-12-02

---
 pkgs/applications/office/beancount/bean-add.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix
index 3afb7ce4b10..4e73a305ea4 100644
--- a/pkgs/applications/office/beancount/bean-add.nix
+++ b/pkgs/applications/office/beancount/bean-add.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, python3Packages }:
 
 stdenv.mkDerivation rec {
-  name = "bean-add-2016-10-03";
+  name = "bean-add-2016-12-02";
 
   src = fetchFromGitHub {
     owner = "simon-v";
     repo = "bean-add";
-    rev = "41deacc09b992db5eede34fefbfb2c0faeba1652";
-    sha256 = "09xdsskk5rc3xsf1v1vq7nkdxrxy8w2fixx2vdv8c97ak6a4hrca";
+    rev = "8038dabf5838c880c8e750c0e65cf0da4faf40b9";
+    sha256 = "016ybq570xicj90x4kxrbxhzdvkjh0d6v3r6s3k3qfzz2c5vwh09";
   };
 
   propagatedBuildInputs = with python3Packages; [ python ];

From a3d42f3999da04246d4d25bcc2dd16df53847c93 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 14:49:29 +0100
Subject: [PATCH 16/16] weather: 2.0 -> 2.3

---
 pkgs/applications/misc/weather/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix
index 192e4406b6d..a184d31233c 100644
--- a/pkgs/applications/misc/weather/default.nix
+++ b/pkgs/applications/misc/weather/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pythonPackages }:
 
 stdenv.mkDerivation rec {
-    version = "2.0";
+    version = "2.3";
     name = "weather-${version}";
 
     src = fetchurl {
         url = "http://fungi.yuggoth.org/weather/src/${name}.tar.xz";
-        sha256 = "0yil363y9iyr4mkd7xxq0p2260wh50f9i5p0map83k9i5l0gyyl0";
+        sha256 = "0inij30prqqcmzjwcmfzjjn0ya5klv18qmajgxipz1jr3lpqs546";
     };
 
     nativeBuildInputs = [ pythonPackages.wrapPython ];