Merge branch 'master' into openssl-1.1

... to avoid the accidental gnupatch rebuild

pkgs/development/python-modules/pynamodb/default.nix

@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, botocore
+, fetchPypi
+, mock
+, mypy
+, python-dateutil
+, pytest
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "pynamodb";
+  version = "3.4.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1cwgqvpqn59y3zq4wv35m1v4jrh3ih6zbyv30g5nxbw13vddxr92";
+  };
+
+  propagatedBuildInputs = [ python-dateutil botocore ];
+  checkInputs = [ requests mock pytest mypy ];
+
+  meta = with lib; {
+    description = "A Pythonic interface for Amazon’s DynamoDB that supports Python 2 and 3.";
+    longDescription = ''
+      DynamoDB is a great NoSQL service provided by Amazon, but the API is
+      verbose. PynamoDB presents you with a simple, elegant API.
+    '';
+    homepage = "http://jlafon.io/pynamodb.html";
+    license = licenses.mit;
+  };
+}

pkgs/development/python-modules/redis/default.nix

@@ -1,18 +1,20 @@
-{ fetchPypi, buildPythonPackage }:
+{ lib, fetchPypi, buildPythonPackage }:
+
 buildPythonPackage rec {
   pname = "redis";
-  version = "3.1.0";
+  version = "3.3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7ba8612bbfd966dea8c62322543fed0095da2834dbd5a7c124afbc617a156aa7";
+    sha256 = "18n6k113izfqsm8yysrw1a5ba6kv0vsgfz6ab5n0k6k65yvr690z";
   };
 
   # tests require a running redis
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     description = "Python client for Redis key-value store";
     homepage = "https://pypi.python.org/pypi/redis/";
+    license = with licenses; [ mit ];
   };
 }