Merge remote-tracking branch 'NixOS/master' into staging

2019-04-23 22:00:42 -04:00
parent dc552fd2ff 6088a4793f
commit 84d00355e8
395 changed files with 10057 additions and 5223 deletions
--- a/pkgs/development/python-modules/django_appconf/default.nix
+++ b/pkgs/development/python-modules/django_appconf/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {

  meta = with stdenv.lib; {
    description = "A helper class for handling configuration defaults of packaged apps gracefully";
-    homepage = http://django-appconf.readthedocs.org/;
+    homepage = https://django-appconf.readthedocs.org/;
    license = licenses.bsd2;
    maintainers = with maintainers; [ desiderius ];
  };