Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1525828
2019-06-18 09:41:36 +02:00
parent 7adbdd9758 03acdd20be
commit 0aa9f35a99
855 changed files with 1664 additions and 1409 deletions
--- a/pkgs/development/python-modules/ipython/5.nix
+++ b/pkgs/development/python-modules/ipython/5.nix
@@ -2,7 +2,6 @@
 , stdenv
 , buildPythonPackage
 , fetchPypi
-, fetchpatch
 # Build dependencies
 , glibcLocales
 # Test dependencies