tangled
alpha
login
or
join now
tjh.dev
/
nixpkgs
0
fork
atom
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
0
fork
atom
overview
issues
pulls
pipelines
passExtensions.pass-import: 2.3 -> 2.6
Jörg Thalheim
6 years ago
22b2ccf8
443f1a43
+23
-6
1 changed file
expand all
collapse all
unified
split
pkgs
tools
security
pass
extensions
import.nix
+23
-6
pkgs/tools/security/pass/extensions/import.nix
···
1
1
-
{ stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper }:
1
1
+
{ stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper, fetchpatch }:
2
2
3
3
let
4
4
-
pythonEnv = pythonPackages.python.withPackages (p: [ p.defusedxml ]);
4
4
+
pythonEnv = pythonPackages.python.withPackages (p: [
5
5
+
p.defusedxml
6
6
+
p.setuptools
7
7
+
p.pyaml
8
8
+
]);
5
9
6
10
in stdenv.mkDerivation rec {
7
11
pname = "pass-import";
8
8
-
version = "2.3";
12
12
+
version = "2.6";
9
13
10
14
src = fetchFromGitHub {
11
15
owner = "roddhjav";
12
16
repo = "pass-import";
13
17
rev = "v${version}";
14
14
-
sha256 = "1209aqkiqqbir5yzwk5jvyk8c1fyrsj9igr3n4banf347rlwmzfv";
18
18
+
sha256 = "1q8rln4djh2z8j2ycm654df5y6anm5iv2r19spgy07c3fnisxlac";
15
19
};
16
20
17
21
nativeBuildInputs = [ makeWrapper ];
18
22
19
23
buildInputs = [ pythonEnv ];
20
24
21
21
-
patchPhase = ''
25
25
+
patches = [
26
26
+
# https://github.com/roddhjav/pass-import/pull/91
27
27
+
(fetchpatch {
28
28
+
url = "https://github.com/roddhjav/pass-import/commit/6ccaf639e92df45bd400503757ae4aa2c5c030d7.patch";
29
29
+
sha256 = "0lw9vqvbqcy96s7v7nz0i1bdx93x7qr13azymqypcdhjwmq9i63h";
30
30
+
})
31
31
+
];
32
32
+
33
33
+
postPatch = ''
22
34
sed -i -e 's|$0|${pass}/bin/pass|' import.bash
23
35
'';
24
36
25
37
dontBuild = true;
26
38
27
27
-
installFlags = [ "PREFIX=$(out)" ];
39
39
+
installFlags = [
40
40
+
"PREFIX=$(out)"
41
41
+
"BASHCOMPDIR=$(out)/etc/bash_completion.d"
42
42
+
];
28
43
29
44
postFixup = ''
45
45
+
install -D pass_import.py $out/${pythonPackages.python.sitePackages}/pass_import.py
30
46
wrapProgram $out/lib/password-store/extensions/import.bash \
31
47
--prefix PATH : "${pythonEnv}/bin" \
48
48
+
--prefix PYTHONPATH : "$out/${pythonPackages.python.sitePackages}" \
32
49
--run "export PREFIX"
33
50
'';
34
51