Personal Nix setup
Revert pinentry fork
+9
-11
+2
-3
home/base/gpg.nix
+2
-3
home/base/gpg.nix
···
32
32
enableSshSupport = true;
33
33
enableScDaemon = false;
34
34
verbose = true;
35
-
defaultCacheTtl = 20;
36
-
defaultCacheTtlSsh = 20;
35
+
defaultCacheTtl = 10;
36
+
defaultCacheTtlSsh = 10;
37
37
maxCacheTtl = 60;
38
38
maxCacheTtlSsh = 60;
39
-
noAllowExternalCache = true;
40
39
pinentry = mkMerge [
41
40
(helpers.mkIfDarwin {
42
41
package = pkgs.pinentry-touchid;
+7
-8
lib/pkgs/pinentry-touchid.nix
+7
-8
lib/pkgs/pinentry-touchid.nix
···
8
8
with lib;
9
9
buildGoModule rec {
10
10
pname = "pinentry-touchid";
11
-
version = "v0.0.5";
12
-
vendorHash = "sha256-3NeKIdsZ7uQQmVXDZ6zUQ0QMF4uxFcUDEOHbPSqoqOg=";
11
+
version = "v0.0.4";
12
+
vendorHash = "sha256-v3JtUk94/javwhtUsPUFV9EwFfaixZpb4AqKpCEaZp4=";
13
13
proxyVendor = true;
14
14
15
15
doCheck = false;
16
16
doInstallCheck = true;
17
17
18
18
src = fetchFromGitHub {
19
-
owner = "kitten";
19
+
owner = "lujstn";
20
20
repo = "pinentry-touchid";
21
-
rev = "07322ff7e6509a575ce282aeb3b47db74a142a18";
22
-
sha256 = "sha256-anSdpuUbB1VIIaU28kIqLjsdIEAgHxgzSf0g68MK2as=";
21
+
rev = "v0.0.4";
22
+
sha256 = "sha256-2+AuUbyA1CZQROjX/Wlcx+OVsvOQgli5oPjAEdKB1Gk=";
23
23
};
24
24
25
25
subPackages = [ "." ];
26
26
buildInputs = with pkgs; [ makeBinaryWrapper ];
27
-
nativeBuildInputs = with pkgs; [ pinentry_mac writableTmpDirAsHomeHook ];
27
+
nativeBuildInputs = with pkgs; [ pinentry_mac ];
28
28
ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" ];
29
29
30
30
patchPhase = ''
31
31
substituteInPlace go.mod \
32
-
--replace-fail "=> ./go-assuan" "=> $src/go-assuan" \
33
-
--replace-fail "=> ./go-touchid" "=> $src/go-touchid"
32
+
--replace-fail "=> ./go-assuan" "=> $src/go-assuan"
34
33
'';
35
34
36
35
postInstall = ''