Merge branch 'master' into staging

Fixed conflicts:
- lib/systems/for-meta.nix: in favor of staging
- pkgs/os-specific/darwin/xcode/default.nix: in favor of master

1 files changed, 20 insertions, 0 deletions

diff --git a/pkgs/development/python-modules/django-gravatar2/default.nix b/pkgs/development/python-modules/django-gravatar2/default.nix
new file mode 100644
index 000000000000..5712ed4193fe
--- /dev/null
+++ b/pkgs/development/python-modules/django-gravatar2/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "django-gravatar2";
+  name = "${pname}-${version}";
+  version = "1.4.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1qsv40xywbqsf4mkrmsswrpzqd7nfljxpfiim9an2z3dykn5rka6";
+  };
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Essential Gravatar support for Django";
+    homepage = https://github.com/twaddington/django-gravatar;
+    license = licenses.mit;
+  };
+}