Merge branch 'master' into staging

2017-11-06 13:24:06 +01:00
parent c8c6a1edb5 bc90fe1fbb
commit 1d9a8e2289
264 changed files with 4203 additions and 2400 deletions
--- a/pkgs/development/python-modules/urwid/default.nix
+++ b/pkgs/development/python-modules/urwid/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage (rec {
  patches = [
   # fix tests
   (fetchpatch {
-     url = "https://github.com/mwhudson/urwid/commit/4b0ed8b6030450e6d99909a7c683e9642e546387.patch";
+     url = "https://github.com/urwid/urwid/commit/4b0ed8b6030450e6d99909a7c683e9642e546387.patch";
     sha256 = "0azpn0ylbg8mfpr0y27n4lnq0ph75a4d4m9wdv3napnhf1vh9ahx";
   })
   # fix tests