Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix

1 files changed, 21 insertions, 8 deletions

diff --git a/nixpkgs/pkgs/development/python-modules/flask-api/default.nix b/nixpkgs/pkgs/development/python-modules/flask-api/default.nix
index 841b11a1a831..9b4a398f7f79 100644
--- a/nixpkgs/pkgs/development/python-modules/flask-api/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-api/default.nix
@@ -1,22 +1,35 @@
-{ lib, buildPythonPackage, pythonOlder, fetchPypi, flask, markdown }:
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, flask
+, markdown
+}:
 
 buildPythonPackage rec {
   pname = "Flask-API";
-  version = "3.0.post1";
+  version = "3.1";
+  format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1khw0f9ywn1mbdlcl0xspacqjz2pxq00m4g73bksbc1k0i88j61k";
+  src = fetchFromGitHub {
+    owner = "flask-api";
+    repo = "flask-api";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-nHgeI5FLKkDp4uWO+0eaT4YSOMkeQ0wE3ffyJF+WzTM=";
   };
 
-  propagatedBuildInputs = [ flask markdown ];
+  propagatedBuildInputs = [
+    flask
+    markdown
+  ];
 
   meta = with lib; {
-    homepage = "https://github.com/miracle2k/flask-assets";
+    homepage = "https://github.com/flask-api/flask-api";
+    changelog = "https://github.com/flask-api/flask-api/releases/tag/v${version}";
     description = "Browsable web APIs for Flask";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ nickcao ];
   };
 }