Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 510a167a914c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 43311f45c71b
Choose a head ref
  • 5 commits
  • 4 files changed
  • 2 contributors

Commits on Jun 2, 2019

  1. pythonPackages.zxcvbn-python: drop 

    "zxcvbn-python" was deprecated, and renamed to "zxcvbn".
See: dwolfhub/zxcvbn-python#30
    @marsam
    marsam committed Jun 2, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    achang97
    GPG key ID: AD9D4E7B2B89F3D3
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ecfe4b4 View commit details

  2. pythonPackages.zxcvbn: init at 4.4.28

    @marsam
    marsam committed Jun 2, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    achang97
    GPG key ID: AD9D4E7B2B89F3D3
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c86f501 View commit details

  3. flexget: fix build

    @marsam
    marsam committed Jun 2, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    achang97
    GPG key ID: AD9D4E7B2B89F3D3
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cc38877 View commit details

  4. flexget: 2.20.22 -> 2.21.2

    @marsam
    marsam committed Jun 2, 2019
    Copy the full SHA
    c5e7786 View commit details

  5. Merge pull request #62258 from marsam/fix-flexget 

    flexget: fix build
    @worldofpeace
    worldofpeace authored Jun 2, 2019
    Copy the full SHA
    43311f4 View commit details
10 changes: 7 additions & 3 deletions pkgs/applications/networking/flexget/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
24 changes: 0 additions & 24 deletions pkgs/development/python-modules/zxcvbn-python/default.nix
View file

This file was deleted.

27 changes: 27 additions & 0 deletions pkgs/development/python-modules/zxcvbn/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];
};
}
2 changes: 1 addition & 1 deletion pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -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 { };