Merge pull request #62258 from marsam/fix-flexget

flexget: fix build
This commit is contained in:
worldofpeace 2019-06-02 16:50:10 -04:00 committed by GitHub
commit 43311f45c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 28 deletions

View File

@ -24,16 +24,20 @@ with python'.pkgs;
buildPythonApplication rec {
pname = "FlexGet";
version = "2.20.22";
version = "2.21.2";
src = fetchPypi {
inherit pname version;
sha256 = "1bk1ab7ivb6fikqw4v1f9df6brplgg4ybbn8d3vzgjabm5ic21nd";
sha256 = "3c11fd7c4bb7e1e9203acd4d452ae51d34843e65066a18c7c72445d7db28122a";
};
postPatch = ''
# remove dependency constraints
sed 's/==\([0-9]\.\?\)\+//' -i requirements.txt
# "zxcvbn-python" was renamed to "zxcvbn", and we don't have the former in
# nixpkgs. See: https://github.com/NixOS/nixpkgs/issues/62110
substituteInPlace requirements.txt --replace "zxcvbn-python" "zxcvbn"
'';
# ~400 failures
@ -50,7 +54,7 @@ buildPythonApplication rec {
cherrypy flask flask-restful
flask-restplus flask-compress
flask_login flask-cors
pyparsing zxcvbn-python future
pyparsing zxcvbn future
progressbar
# Optional requirements
deluge-client

View File

@ -1,24 +0,0 @@
{ lib, buildPythonPackage, fetchFromGitHub
, pytest_3 }:
buildPythonPackage rec {
pname = "zxcvbn-python";
version = "4.4.27";
src = fetchFromGitHub {
owner = "dwolfhub";
repo = pname;
rev = "v${version}";
sha256 = "0w0sx9ssjks8da973cdv5xi87yjsf038jqxmzj2y26xvpyjsg2v2";
};
checkInputs = [
pytest_3
];
meta = {
description = "Python implementation of Dropbox's realistic password strength estimator, zxcvbn";
homepage = https://github.com/dwolfhub/zxcvbn-python;
license = with lib.licenses; [ mit ];
};
}

View File

@ -0,0 +1,27 @@
{ lib, buildPythonPackage, fetchFromGitHub, pytest }:
buildPythonPackage rec {
pname = "zxcvbn";
version = "4.4.28";
# no tests included in PyPI tarball
src = fetchFromGitHub {
owner = "dwolfhub";
repo = "zxcvbn-python";
rev = "45afdf0d3dd8477bc7e457629bb4bc9680794cd7"; # not tagged in repository
sha256 = "0w0sx9ssjks8da973cdv5xi87yjsf038jqxmzj2y26xvpyjsg2v2";
};
checkInputs = [ pytest ];
checkPhase = ''
pytest
'';
meta = with lib; {
description = "Python implementation of Dropbox's realistic password strength estimator";
homepage = "https://github.com/dwolfhub/zxcvbn-python";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
};
}

View File

@ -5468,7 +5468,7 @@ in {
inherit (pkgs) zstd pkgconfig;
};
zxcvbn-python = callPackage ../development/python-modules/zxcvbn-python { };
zxcvbn = callPackage ../development/python-modules/zxcvbn { };
incremental = callPackage ../development/python-modules/incremental { };