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: f70f3b30056c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e43f2369ae89
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Mar 2, 2019

  1. pythonPackages.pykeepass: fix build 

    Add missing dependency future
    @terlar
    terlar authored and Robert Schütz committed Mar 2, 2019
    Copy the full SHA
    80b6892 View commit details

  2. python.pkgs.argon2_cffi: add enum34 dependency

    Robert Schütz committed Mar 2, 2019
    Copy the full SHA
    d9b1bfa View commit details

  3. Merge pull request #56675 from terlar/pykeepass-fix-build 

    pythonPackages.pykeepass: fix build
    @dotlambda
    dotlambda authored Mar 2, 2019
    Copy the full SHA
    e43f236 View commit details
Showing with 11 additions and 5 deletions.
  1. +6 −3 pkgs/development/python-modules/argon2_cffi/default.nix
  2. +5 −2 pkgs/development/python-modules/pykeepass/default.nix
9 changes: 6 additions & 3 deletions pkgs/development/python-modules/argon2_cffi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,33 @@
{ cffi
, six
, enum34
, hypothesis
, pytest
, wheel
, buildPythonPackage
, fetchPypi
, isPy3k
, lib
}:

buildPythonPackage rec {
pname = "argon2_cffi";
version = "19.1.0";
name = "${pname}-${version}";

src = fetchPypi {
inherit pname version;
sha256 = "81548a27b919861040cb928a350733f4f9455dd67c7d1ba92eb5960a1d7f8b26";
};

propagatedBuildInputs = [ cffi six ];
propagatedBuildInputs = [ cffi six ] ++ lib.optional (!isPy3k) enum34;
checkInputs = [ hypothesis pytest wheel ];
checkPhase = ''
pytest tests
'';

meta = {
meta = with lib; {
description = "Secure Password Hashes for Python";
homepage = https://argon2-cffi.readthedocs.io/;
license = licenses.mit;
};
}
7 changes: 5 additions & 2 deletions pkgs/development/python-modules/pykeepass/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib, fetchPypi, buildPythonPackage
, lxml, pycryptodome, construct
, argon2_cffi, dateutil, enum34
, argon2_cffi, dateutil, future
}:

buildPythonPackage rec {
@@ -14,9 +14,12 @@ buildPythonPackage rec {

propagatedBuildInputs = [
lxml pycryptodome construct
argon2_cffi dateutil enum34
argon2_cffi dateutil future
];

# no tests in PyPI tarball
doCheck = false;

meta = {
homepage = https://github.com/pschmitt/pykeepass;
description = "Python library to interact with keepass databases (supports KDBX3 and KDBX4)";