Merge pull request #72156 from Mic92/pass-import

passExtensions.pass-import: 2.3 -> 2.6
This commit is contained in:
Franz Pletz 2019-10-28 10:55:39 +00:00 committed by GitHub
commit d0d5884ba5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,34 +1,51 @@
{ stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper }: { stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper, fetchpatch }:
let let
pythonEnv = pythonPackages.python.withPackages (p: [ p.defusedxml ]); pythonEnv = pythonPackages.python.withPackages (p: [
p.defusedxml
p.setuptools
p.pyaml
]);
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "pass-import"; pname = "pass-import";
version = "2.3"; version = "2.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "roddhjav"; owner = "roddhjav";
repo = "pass-import"; repo = "pass-import";
rev = "v${version}"; rev = "v${version}";
sha256 = "1209aqkiqqbir5yzwk5jvyk8c1fyrsj9igr3n4banf347rlwmzfv"; sha256 = "1q8rln4djh2z8j2ycm654df5y6anm5iv2r19spgy07c3fnisxlac";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ pythonEnv ]; buildInputs = [ pythonEnv ];
patchPhase = '' patches = [
# https://github.com/roddhjav/pass-import/pull/91
(fetchpatch {
url = "https://github.com/roddhjav/pass-import/commit/6ccaf639e92df45bd400503757ae4aa2c5c030d7.patch";
sha256 = "0lw9vqvbqcy96s7v7nz0i1bdx93x7qr13azymqypcdhjwmq9i63h";
})
];
postPatch = ''
sed -i -e 's|$0|${pass}/bin/pass|' import.bash sed -i -e 's|$0|${pass}/bin/pass|' import.bash
''; '';
dontBuild = true; dontBuild = true;
installFlags = [ "PREFIX=$(out)" ]; installFlags = [
"PREFIX=$(out)"
"BASHCOMPDIR=$(out)/etc/bash_completion.d"
];
postFixup = '' postFixup = ''
install -D pass_import.py $out/${pythonPackages.python.sitePackages}/pass_import.py
wrapProgram $out/lib/password-store/extensions/import.bash \ wrapProgram $out/lib/password-store/extensions/import.bash \
--prefix PATH : "${pythonEnv}/bin" \ --prefix PATH : "${pythonEnv}/bin" \
--prefix PYTHONPATH : "$out/${pythonPackages.python.sitePackages}" \
--run "export PREFIX" --run "export PREFIX"
''; '';