diff options
| author | Matthias Beyer <mail@beyermatthias.de> | 2024-05-22 12:49:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-22 12:49:55 +0200 |
| commit | 8a0b2d2f5d2efe629498a1cde3a98372d5e05e8d (patch) | |
| tree | d59746fa10accc46a3eaa6e3a582cdc5abd5ceb6 /pkgs | |
| parent | f10dc46ed4fdc80bc86c1a4bb869b98a223d4614 (diff) | |
| parent | c706ed98fe6d112d09fa34a0ab0bd245f545ed2c (diff) | |
Merge pull request #313590 from dawidd6/pass-import
passExtensions.pass-import: 3.2 -> 3.5
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/security/pass/extensions/import.nix | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix index cbba33c1373a6..0be41525ea289 100644 --- a/pkgs/tools/security/pass/extensions/import.nix +++ b/pkgs/tools/security/pass/extensions/import.nix @@ -1,5 +1,5 @@ { lib -, fetchFromGitHub +, fetchurl , fetchpatch , python3Packages , gnupg @@ -8,30 +8,23 @@ python3Packages.buildPythonApplication rec { pname = "pass-import"; - version = "3.2"; + version = "3.5"; - src = fetchFromGitHub { - owner = "roddhjav"; - repo = "pass-import"; - rev = "v${version}"; - sha256 = "0hrpg7yiv50xmbajfy0zdilsyhbj5iv0qnlrgkfv99q1dvd5qy56"; + src = fetchurl { + url = "https://github.com/roddhjav/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-+wrff3OxPkAGu1Mn4Kl0KN4FmvIAb+MnaERcD5ScDNc="; }; - patches = [ - (fetchpatch { - name = "support-for-pykeepass-4.0.3.patch"; - url = "https://github.com/roddhjav/pass-import/commit/f1b167578916d971ee4f99be99ba0e86ef49015e.patch"; - hash = "sha256-u6bJbV3/QTfRaPauKSyCWNodpy6CKsreMXUZWKRbee0="; - }) - ]; - propagatedBuildInputs = with python3Packages; [ cryptography defusedxml + jsonpath-ng pyaml pykeepass python-magic # similar API to "file-magic", but already in nixpkgs. + requests secretstorage + zxcvbn ]; nativeCheckInputs = [ @@ -46,12 +39,12 @@ python3Packages.buildPythonApplication rec { postInstall = '' mkdir -p $out/lib/password-store/extensions - cp ${src}/import.bash $out/lib/password-store/extensions/import.bash + cp import.bash $out/lib/password-store/extensions/import.bash wrapProgram $out/lib/password-store/extensions/import.bash \ --prefix PATH : "${python3Packages.python.withPackages (_: propagatedBuildInputs)}/bin" \ --prefix PYTHONPATH : "$out/${python3Packages.python.sitePackages}" \ --run "export PREFIX" - cp -r ${src}/share $out/ + cp -r share $out/ ''; postCheck = '' |