tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
ripasso-cursive: 0.4.0 -> 0.5.1
Stig Palmquist
4 years ago
89f642c0
ee25ce04
+74
-25
2 changed files
expand all
collapse all
unified
split
pkgs
tools
security
ripasso
cursive.nix
fix-tests.patch
+12
-10
pkgs/tools/security/ripasso/cursive.nix
···
1
1
-
{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, ncurses, python3, openssl, libgpgerror, gpgme, xorg, AppKit, Security }:
1
1
+
{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, ncurses, python3, openssl, libgpgerror, gpgme, xorg, AppKit, Security, installShellFiles }:
2
2
3
3
with rustPlatform;
4
4
buildRustPackage rec {
5
5
-
version = "0.4.0";
5
5
+
version = "0.5.1";
6
6
pname = "ripasso-cursive";
7
7
8
8
src = fetchFromGitHub {
9
9
owner = "cortex";
10
10
repo = "ripasso";
11
11
rev = "release-${version}";
12
12
-
sha256 = "164da20j727p8l7hh37j2r8pai9sj402nhswvg0nrlgj53nr6083";
12
12
+
sha256 = "1jx6qv7skikl1ap3g1r34rkz4ab756kra7dgwwv45vl2fb6x74k4";
13
13
};
14
14
15
15
patches = [ ./fix-tests.patch ];
16
16
17
17
-
cargoSha256 = "1sv5czhrafk15yj5xyd1x9jdqn1dz6aqpxxnyz49icx53qlg9f8g";
17
17
+
cargoSha256 = "1li1gmcs7lnjr4qhzs0rrgngdcxy1paiibjwk9zx2rrs71021cgk";
18
18
19
19
-
cargoBuildFlags = [ "-p ripasso-cursive -p ripasso-man" ];
19
19
+
cargoBuildFlags = [ "-p ripasso-cursive" ];
20
20
21
21
-
nativeBuildInputs = [ pkg-config gpgme python3 ];
21
21
+
nativeBuildInputs = [ pkg-config gpgme python3 installShellFiles ];
22
22
buildInputs = [
23
23
ncurses openssl libgpgerror gpgme xorg.libxcb
24
24
] ++ lib.optionals stdenv.isDarwin [ AppKit Security ];
25
25
26
26
-
preFixup = ''
27
27
-
mkdir -p "$out/man/man1"
28
28
-
$out/bin/ripasso-man > $out/man/man1/ripasso-cursive.1
29
29
-
rm $out/bin/ripasso-man
26
26
+
preCheck = ''
27
27
+
export HOME=$TMPDIR
28
28
+
'';
29
29
+
30
30
+
postInstall = ''
31
31
+
installManPage target/man-page/cursive/ripasso-cursive.1
30
32
'';
31
33
32
34
meta = with lib; {
+62
-15
pkgs/tools/security/ripasso/fix-tests.patch
···
1
1
-
diff --git a/src/pass/test.rs b/src/pass/test.rs
2
2
-
index c980a2f..2e6c8cc 100644
3
1
--- a/src/pass/test.rs
4
4
-
+++ b/src/pass/test.rs
5
5
-
@@ -56,6 +56,7 @@ fn populate_password_list_small_repo() {
2
2
+
+++ a/src/pass/test.rs
3
3
+
@@ -83,6 +83,7 @@
4
4
+
base_path.pop();
5
5
+
base_path.pop();
6
6
+
base_path.pop();
7
7
+
+ base_path.pop();
8
8
+
base_path.push("testres");
9
9
+
10
10
+
let home: PathBuf = base_path.clone();
11
11
+
@@ -114,6 +115,7 @@
12
12
+
base_path.pop();
13
13
+
base_path.pop();
14
14
+
base_path.pop();
15
15
+
+ base_path.pop();
16
16
+
base_path.push("testres");
17
17
+
18
18
+
let home: PathBuf = base_path.clone();
19
19
+
@@ -144,6 +146,7 @@
20
20
+
base_path.pop();
21
21
+
base_path.pop();
22
22
+
base_path.pop();
23
23
+
+ base_path.pop();
24
24
+
base_path.push("testres");
25
25
+
26
26
+
let home: PathBuf = base_path.clone();
27
27
+
@@ -185,6 +188,7 @@
28
28
+
base_path.pop();
29
29
+
base_path.pop();
30
30
+
base_path.pop();
31
31
+
+ base_path.pop();
32
32
+
base_path.push("testres");
33
33
+
34
34
+
let home: PathBuf = base_path.clone();
35
35
+
@@ -220,6 +224,7 @@
36
36
+
base_path.pop();
37
37
+
base_path.pop();
38
38
+
base_path.pop();
39
39
+
+ base_path.pop();
40
40
+
base_path.push("testres");
41
41
+
42
42
+
let home: PathBuf = base_path.clone();
43
43
+
@@ -267,6 +272,7 @@
6
44
base_path.pop();
7
45
base_path.pop();
8
46
base_path.pop();
9
47
+ base_path.pop();
10
48
base_path.push("testres");
11
49
12
12
-
let mut password_dir: PathBuf = base_path.clone();
13
13
-
@@ -84,6 +85,7 @@ fn populate_password_list_repo_with_deleted_files() {
50
50
+
let home: PathBuf = base_path.clone();
51
51
+
@@ -298,6 +304,7 @@
14
52
base_path.pop();
15
53
base_path.pop();
16
54
base_path.pop();
17
55
+ base_path.pop();
18
56
base_path.push("testres");
19
57
20
20
-
let mut password_dir: PathBuf = base_path.clone();
21
21
-
@@ -112,6 +114,7 @@ fn populate_password_list_directory_without_git() {
58
58
+
let home: PathBuf = base_path.clone();
59
59
+
@@ -337,6 +344,7 @@
22
60
base_path.pop();
23
61
base_path.pop();
24
62
base_path.pop();
25
63
+ base_path.pop();
26
64
base_path.push("testres");
27
65
28
28
-
let mut password_dir: PathBuf = base_path.clone();
29
29
-
@@ -149,4 +152,4 @@ fn parse_signing_keys_empty() {
30
30
-
let result = PasswordStore::parse_signing_keys(&None).unwrap();
66
66
+
let home: PathBuf = base_path.clone();
67
67
+
@@ -828,6 +836,7 @@
68
68
+
base_path.pop();
69
69
+
base_path.pop();
70
70
+
base_path.pop();
71
71
+
+ base_path.pop();
72
72
+
base_path.push("testres");
31
73
32
32
-
assert_eq!(result.len(), 0);
33
33
-
-}
34
34
-
\ No newline at end of file
35
35
-
+}
74
74
+
let home: PathBuf = base_path.clone();
75
75
+
@@ -860,6 +869,7 @@
76
76
+
base_path.pop();
77
77
+
base_path.pop();
78
78
+
base_path.pop();
79
79
+
+ base_path.pop();
80
80
+
base_path.pop();
81
81
+
base_path.push("testres");
82
82
+