Merge branch 'master' into staging

* master: (36 commits)
  libipt: set platforms to unix
  licenses: refer to curl using spdx
  qhull: specify spdx license
  ocamlPackages.spacetime_lib: 0.1.0 -> 0.3.0
  ocamlPackages.owee: 0.2 -> 0.3
  nixFlakes: 2.4pre20190913_a25c022 -> 2.4pre20190922_382aa05
  daemon: init at 0.6.4
  k9s: 0.7.13 -> 0.8.4
  cask: Use generated src/version from Melpa
  python.pkgs.flask_oauthlib: remove
  radeon-profile: 20170714 -> 20190903
  radeon-profile: use Qt mkDerivation
  afew: propagate setuptools
  pythonPackages.flask-jwt-extended: 3.17.0 -> 3.23.0
  mutt: 1.12.1 -> 1.12.2
  unit: 1.10.0 -> 1.11.0
  emacsPackages: Update elpa
  emacsPackages: Update melpa
  cask: Fix cask usage
  git-lfs: use buildGoPackage
  ...
This commit is contained in:
Orivej Desh
2019-09-22 21:33:00 +00:00
37 changed files with 2208 additions and 1508 deletions

View File

@@ -1,15 +1,15 @@
{ stdenv, buildPythonPackage, fetchPypi, flask, pyjwt, werkzeug, pytest }:
{ stdenv, buildPythonPackage, fetchPypi, dateutil, flask, pyjwt, werkzeug, pytest }:
buildPythonPackage rec {
pname = "Flask-JWT-Extended";
version = "3.17.0";
version = "3.23.0";
src = fetchPypi {
inherit pname version;
sha256 = "97c66f197b4b175173bf955b9a845d03d62e521e512e88f6abff707e6859e7c3";
sha256 = "05nf94dp80i68gs61pf67qj1y6i56jgdxmibqmns5wz6z33fi7wj";
};
propagatedBuildInputs = [ flask pyjwt werkzeug ];
propagatedBuildInputs = [ dateutil flask pyjwt werkzeug ];
checkInputs = [ pytest ];
checkPhase = ''

View File

@@ -1,29 +0,0 @@
{ stdenv, buildPythonPackage, fetchFromGitHub
, flask, oauthlib, requests_oauthlib, flask_sqlalchemy
, mock, nose}:
buildPythonPackage rec {
pname = "Flask-OAuthlib";
version = "0.9.5";
src = fetchFromGitHub {
owner = "lepture";
repo = "flask-oauthlib";
rev = "v${version}";
sha256 = "1l82niwrpm7411xvwh65bj263si90kcbrbfg5fa52mpixhxcp40f";
};
buildInputs = [ mock nose ];
propagatedBuildInputs = [
flask flask_sqlalchemy oauthlib requests_oauthlib
];
checkPhase = "nosetests -d";
doCheck = false; # request mocking fails
meta = with stdenv.lib; {
description = "OAuthlib implementation for Flask";
license = licenses.mit;
maintainers = [ maintainers.mic92 ];
homepage = https://github.com/lepture/flask-oauthlib;
};
}