philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Merge pull request #121287 from dotlambda/pass-import-fix

Browse source 
passExtensions.pass-import: fix tests
This commit is contained in:
Maximilian Bosch 2021-04-30 22:18:06 +02:00 committed by GitHub
parent b6b5fe550d 93507828b2
commit f476258fdf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkgs/development/python-modules/pykeepass/default.nix
View file

@ -1,15 +1,18 @@
{ lib, fetchPypi, buildPythonPackage { lib, fetchFromGitHub, buildPythonPackage
, lxml, pycryptodomex, construct , lxml, pycryptodomex, construct
, argon2_cffi, dateutil, future , argon2_cffi, dateutil, future
, python
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pykeepass"; pname = "pykeepass";
version = "4.0.0"; version = "4.0.0";
src = fetchPypi { src = fetchFromGitHub {
inherit pname version; owner = "libkeepass";
sha256 = "1b41b3277ea4e044556e1c5a21866ea4dfd36e69a4c0f14272488f098063178f"; repo = "pykeepass";
rev = version;
sha256 = "1zw5hjk90zfxpgq2fz4h5qzw3kmvdnlfbd32gw57l034hmz2i08v";
}; };
postPatch = '' postPatch = ''
@ -21,13 +24,15 @@ buildPythonPackage rec {
argon2_cffi dateutil future argon2_cffi dateutil future
]; ];
# no tests in PyPI tarball checkPhase = ''
doCheck = false; ${python.interpreter} -m unittest tests.tests
'';
meta = { meta = with lib; {
homepage = "https://github.com/pschmitt/pykeepass"; homepage = "https://github.com/libkeepass/pykeepass";
changelog = "https://github.com/libkeepass/pykeepass/blob/${version}/CHANGELOG.rst";
description = "Python library to interact with keepass databases (supports KDBX3 and KDBX4)"; description = "Python library to interact with keepass databases (supports KDBX3 and KDBX4)";
license = lib.licenses.gpl3; license = licenses.gpl3Only;
maintainers = with maintainers; [ dotlambda ];
}; };
} }

7
pkgs/tools/security/pass/extensions/import.nix
View file

@ -17,9 +17,14 @@ python3Packages.buildPythonApplication rec {
sha256 = "sha256-nH2xAqWfMT+Brv3z9Aw6nbvYqArEZjpM28rKsRPihqA="; sha256 = "sha256-nH2xAqWfMT+Brv3z9Aw6nbvYqArEZjpM28rKsRPihqA=";
}; };
patches = [
(fetchpatch {
name = "support-for-keepass-4.0.0.patch";
url = "https://github.com/roddhjav/pass-import/commit/86cfb1bb13a271fefe1e70f24be18e15a83a04d8.patch";
sha256 = "0mrlblqlmwl9gqs2id4rl4sivrcclsv6zyc6vjqi78kkqmnwzhxh";
})
# by default, tries to install scripts/pimport, which is a bash wrapper around "python -m pass_import ..." # by default, tries to install scripts/pimport, which is a bash wrapper around "python -m pass_import ..."
# This is a better way to do the same, and takes advantage of the existing Nix python environments # This is a better way to do the same, and takes advantage of the existing Nix python environments
patches = [
# from https://github.com/roddhjav/pass-import/pull/138 # from https://github.com/roddhjav/pass-import/pull/138
(fetchpatch { (fetchpatch {
name = "pass-import-pr-138-pimport-entrypoint.patch"; name = "pass-import-pr-138-pimport-entrypoint.patch";