@@ -9,37 +9,21 @@
99
1010python3Packages.buildPythonApplication rec {
1111 pname = "pass-import";
12− version = "3.1";
12+ version = "3.2";
1313
1414 src = fetchFromGitHub {
1515 owner = "roddhjav";
1616 repo = "pass-import";
1717 rev = "v${version}";
18− sha256 = "sha256-nH2xAqWfMT+Brv3z9Aw6nbvYqArEZjpM28rKsRPihqA=";
18+ sha256 = "0hrpg7yiv50xmbajfy0zdilsyhbj5iv0qnlrgkfv99q1dvd5qy56";
1919 };
2020
21− patches = [
22− (fetchpatch {
23− name = "support-for-keepass-4.0.0.patch";
24− url = "https://github.com/roddhjav/pass-import/commit/86cfb1bb13a271fefe1e70f24be18e15a83a04d8.patch";
25− sha256 = "0mrlblqlmwl9gqs2id4rl4sivrcclsv6zyc6vjqi78kkqmnwzhxh";
26− })
27− # by default, tries to install scripts/pimport, which is a bash wrapper around "python -m pass_import ..."
28− # This is a better way to do the same, and takes advantage of the existing Nix python environments
29− # from https://github.com/roddhjav/pass-import/pull/138
30− (fetchpatch {
31− name = "pass-import-pr-138-pimport-entrypoint.patch";
32− url = "https://github.com/roddhjav/pass-import/commit/ccdb6995bee6436992dd80d7b3101f0eb94c59bb.patch";
33− sha256 = "sha256-CO8PyWxa4eLuTQBB+jKTImFPlPn+1yt6NBsIp+SPk94=";
34− })
35− ];
36−
3721 propagatedBuildInputs = with python3Packages; [
3822 cryptography
3923 defusedxml
4024 pyaml
4125 pykeepass
42− python_magic # similar API to "file-magic", but already in nixpkgs.
26+ python_magic # similar API to "file-magic", but already in nixpkgs.
4327 secretstorage
4428 ];
4529
@@ -52,20 +36,21 @@ python3Packages.buildPythonApplication rec {
5236 disabledTests = [
5337 "test_import_gnome_keyring" # requires dbus, which pytest doesn't support
5438 ];
55− postCheck = ''
56− $out/bin/pimport --list-exporters --list-importers
57− '';
5839
5940 postInstall = ''
6041 mkdir -p $out/lib/password-store/extensions
61− cp ${src}/scripts/import.bash $out/lib/password-store/extensions/import.bash
42+ cp ${src}/import.bash $out/lib/password-store/extensions/import.bash
6243 wrapProgram $out/lib/password-store/extensions/import.bash \
63− --prefix PATH : "${python3Packages.python.withPackages(_: propagatedBuildInputs)}/bin" \
44+ --prefix PATH : "${python3Packages.python.withPackages (_: propagatedBuildInputs)}/bin" \
6445 --prefix PYTHONPATH : "$out/${python3Packages.python.sitePackages}" \
6546 --run "export PREFIX"
6647 cp -r ${src}/share $out/
6748 '';
6849
50+ postCheck = ''
51+ $out/bin/pimport --list-exporters --list-importers
52+ '';
53+
6954 meta = with lib; {
7055 description = "Pass extension for importing data from existing password managers";
7156 homepage = "https://github.com/roddhjav/pass-import";