diff --git a/pkgs/development/python-modules/aiopg/default.nix b/pkgs/development/python-modules/aiopg/default.nix
index 314931af7ded..fb49bba0f4ab 100644
--- a/pkgs/development/python-modules/aiopg/default.nix
+++ b/pkgs/development/python-modules/aiopg/default.nix
@@ -8,14 +8,16 @@
 
 buildPythonPackage rec {
   pname = "aiopg";
-  version = "1.3.5";
-  disabled = pythonOlder "3.6";
+  version = "1.4.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-ZHfwuDtQm7SlLX3sAoYONgCIWnafOj/L8bXjAdwYDKI=";
+    hash = "sha256-GD5lRSUjASTwBk5vEK8v3xD8eNyxpwSrO3HHvtwubmk=";
   };
 
   propagatedBuildInputs = [
@@ -31,7 +33,9 @@ buildPythonPackage rec {
   # Tests requires a PostgreSQL Docker instance
   doCheck = false;
 
-  pythonImportsCheck = [ "aiopg" ];
+  pythonImportsCheck = [
+    "aiopg"
+  ];
 
   meta = with lib; {
     description = "Python library for accessing a PostgreSQL database";
diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix
index 8ebba4b01788..72c0514225c0 100644
--- a/pkgs/development/python-modules/psycopg2/default.nix
+++ b/pkgs/development/python-modules/psycopg2/default.nix
@@ -12,8 +12,8 @@
 
 buildPythonPackage rec {
   pname = "psycopg2";
-  version = "2.9.3";
-  outputs = [ "out" "doc" ];
+  version = "2.9.5";
+  format = "setuptools";
 
   # Extension modules don't work well with PyPy. Use psycopg2cffi instead.
   # c.f. https://github.com/NixOS/nixpkgs/pull/104151#issuecomment-729750892
@@ -21,9 +21,11 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8e841d1bf3434da985cc5ef13e6f75c8981ced601fd70cc6bf33351b91562981";
+    sha256 = "sha256-pSRtLmg6ly4hh6hxS1ws+BVsBkYp+amxqHPBcw2eJFo=";
   };
 
+  outputs = [ "out" "doc" ];
+
   nativeBuildInputs = [
     postgresql
     sphinxHook
@@ -36,15 +38,17 @@ buildPythonPackage rec {
 
   sphinxRoot = "doc/src";
 
-  # requires setting up a postgresql database
+  # Requires setting up a PostgreSQL database
   doCheck = false;
 
-  pythonImportsCheck = [ "psycopg2" ];
+  pythonImportsCheck = [
+    "psycopg2"
+  ];
 
   meta = with lib; {
     description = "PostgreSQL database adapter for the Python programming language";
     homepage = "https://www.psycopg.org";
-    license = with licenses; [ lgpl3 zpl20 ];
+    license = with licenses; [ lgpl3Plus zpl20 ];
     maintainers = with maintainers; [ ];
   };
 }