tjh.dev
Merge pull request #53849 from guillaumekoenig/master
enpass: 5.6.5 -> 6.0.1
authored by
Ryan Mulligan
and committed by
GitHub
d97724e9
f3e16883
+6
-6
pkgs/tools/security/enpass/data.json
+6
-6
pkgs/tools/security/enpass/data.json
···
1
1
{
2
2
"amd64": {
3
-
"path": "pool/main/e/enpass/enpass_5.6.5_amd64.deb",
4
-
"sha256": "c7529b745aa462b56eac17af6fe88d4c1610fd2f446d222aaad9510f19212a7d",
5
-
"version": "5.6.5"
3
+
"path": "pool/main/e/enpass/enpass_6.0.1.239_amd64.deb",
4
+
"sha256": "408a2bb318564307607f13b52fec7667f425c01ac40cbe345ebfa191ab1479ba",
5
+
"version": "6.0.1.239"
6
6
},
7
7
"i386": {
8
-
"path": "pool/main/e/enpass/enpass_5.6.5_i386.deb",
9
-
"sha256": "de46e27d5552dcd9d72abac8e5c3b6161ad551ce191a2ee689c67367b63ff8f9",
10
-
"version": "5.6.5"
8
+
"path": "pool/main/e/enpass/enpass_5.6.9_i386.deb",
9
+
"sha256": "3f699ac3e2ecfd4afee1505d8d364d4f6b6b94c55ba989d0a80bd678ff66cb2c",
10
+
"version": "5.6.9"
11
11
}
12
12
}
+16
-35
pkgs/tools/security/enpass/default.nix
+16
-35
pkgs/tools/security/enpass/default.nix
···
1
-
{ stdenv, fetchurl, dpkg, openssl, xorg
1
+
{ stdenv, fetchurl, dpkg, xorg
2
2
, glib, libGLU_combined, libpulseaudio, zlib, dbus, fontconfig, freetype
3
-
, gtk2, pango, atk, cairo, gdk_pixbuf, jasper, xkeyboardconfig
3
+
, gtk3, pango
4
4
, makeWrapper , python, pythonPackages, lib
5
-
, libredirect, lsof
5
+
, lsof, curl, libuuid, cups, mesa_drivers
6
6
}:
7
7
8
8
let
9
9
all_data = builtins.fromJSON (builtins.readFile ./data.json);
10
10
system_map = {
11
-
i686-linux = "i386";
11
+
# i686-linux = "i386"; Uncomment if enpass 6 becomes available on i386
12
12
x86_64-linux = "amd64";
13
13
};
14
14
···
18
18
19
19
# used of both wrappers and libpath
20
20
libPath = lib.makeLibraryPath (with xorg; [
21
-
openssl
21
+
mesa_drivers
22
22
libGLU_combined
23
23
fontconfig
24
24
freetype
···
29
29
libXi
30
30
libSM
31
31
libICE
32
-
libXext
33
32
libXrender
34
33
libXScrnSaver
34
+
libxcb
35
35
glib
36
-
gtk2
36
+
gtk3
37
37
pango
38
-
cairo
39
-
atk
40
-
gdk_pixbuf
41
-
jasper
42
-
stdenv.cc.cc
38
+
curl
39
+
libuuid
40
+
cups
43
41
]);
44
42
package = stdenv.mkDerivation rec {
45
43
···
63
61
64
62
unpackPhase = "dpkg -X $src .";
65
63
installPhase=''
66
-
mkdir $out
67
-
cp -r opt/Enpass/* $out
64
+
mkdir -p $out/bin
65
+
cp -r opt/enpass/* $out/bin
68
66
cp -r usr/* $out
69
-
rm $out/bin/runenpass.sh
70
-
cp $out/bin/EnpassHelper/EnpassHelper{,.untampered}
71
-
cp $out/bin/EnpassHelper/EnpassNMHost{,.untampered}
72
67
73
68
sed \
74
-
-i s@/opt/Enpass/bin/runenpass.sh@$out/bin/Enpass@ \
69
+
-i s@/opt/enpass/Enpass@$out/bin/Enpass@ \
75
70
$out/share/applications/enpass.desktop
76
71
77
-
for i in $out/bin/{Enpass,EnpassHelper/{EnpassHelper,EnpassNMHost}}; do
72
+
for i in $out/bin/{Enpass,importer_enpass}; do
78
73
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $i
79
74
done
80
75
81
-
# The helper's sha256 sum must match, hence the use of libredirect.
82
-
# Also, lsof must be in the path for proper operation.
76
+
# lsof must be in PATH for proper operation
83
77
wrapProgram $out/bin/Enpass \
84
-
--set LD_LIBRARY_PATH "${libPath}:$out/lib:$out/plugins/sqldrivers" \
85
-
--set QT_PLUGIN_PATH "$out/plugins" \
86
-
--set QT_QPA_PLATFORM_PLUGIN_PATH "$out/plugins/platforms" \
87
-
--set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" \
88
-
--set HIDE_TOOLBAR_LINE 0 \
89
-
--set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
90
-
--set NIX_REDIRECTS "$out/bin/EnpassHelper/EnpassHelper=$out/bin/EnpassHelper/EnpassHelper.untampered:$out/bin/EnpassHelper/EnpassNMHost=$out/bin/EnpassHelper/EnpassNMHost.untampered" \
78
+
--set LD_LIBRARY_PATH "${libPath}" \
91
79
--prefix PATH : ${lsof}/bin
92
-
93
-
makeWrapper $out/bin/EnpassHelper/{EnpassNMHost,runNativeMessaging.sh} \
94
-
--set LD_LIBRARY_PATH "${libPath}:$out/lib:$out/plugins/sqldrivers" \
95
-
--set QT_PLUGIN_PATH "$out/plugins" \
96
-
--set QT_QPA_PLATFORM_PLUGIN_PATH "$out/plugins/platforms" \
97
-
--set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" \
98
-
--set HIDE_TOOLBAR_LINE 0
99
80
'';
100
81
};
101
82
updater = {