git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #89393 from wnklmnn/keepass

Keepass

commit8db1c35e830382c3d3fe1b8b14b4dada41185483 authorzimbatm <zimbatm@zimbatm.com> dateFri 5 Jun 2020, 14:56 (6 years ago) parentdcb64ea7f64427
4 files changed+5−23
pkgs/applications/misc/keepass-plugins/keeagent/default.nix+3−3 pkgs/applications/misc/keepass/fix-paths.patch−18 pkgs/applications/misc/keepass/keepass-plugins-load.patch+1−1 pkgs/applications/misc/keepass/keepass-plugins.patch+1−1
pkgs/applications/misc/keepass-plugins/keeagent/default.nix+3−3
@@ -1,14 +1,14 @@
11{ stdenv, buildEnv, fetchzip, mono }:
22
33let
4− version = "0.10.1";
4+ version = "0.12.0";
55 drv = stdenv.mkDerivation {
66 pname = "keeagent";
77 inherit version;
88
99 src = fetchzip {
10− url = "https://lechnology.com/wp-content/uploads/2018/04/KeeAgent_v0.10.1.zip";
11− sha256 = "0j7az6l9wcr8z66mfplkxwydd4bgz2p2vd69xncf0nxlfb0lshh7";
10+ url = "https://lechnology.com/wp-content/uploads/2020/05/KeeAgent_v0.12.0.zip";
11+ sha256 = "0fcfbj3yikiv3dmp69236h9r3c416amdq849kn131w1129gb68xd";
1212 stripRoot = false;
1313 };
1414
pkgs/applications/misc/keepass/fix-paths.patch−18
@@ -56,24 +56,6 @@ diff --git a/KeePass/Util/ClipboardUtil.Unix.cs b/KeePass/Util/ClipboardUtil.Uni
5656index ab49ee2..7f6c50f 100644
5757--- a/KeePass/Util/ClipboardUtil.Unix.cs
5858+++ b/KeePass/Util/ClipboardUtil.Unix.cs
59−@@ -42,7 +42,7 @@ namespace KeePass.Util
60− // string strGtk = GtkGetString();
61− // if(strGtk != null) return strGtk;
62−
63−- return (NativeLib.RunConsoleApp("pbpaste", "-pboard general") ??
64−+ return (NativeLib.RunConsoleApp("@pbpaste@", "-pboard general") ??
65− string.Empty);
66− }
67−
68−@@ -50,7 +50,7 @@ namespace KeePass.Util
69− {
70− // if(GtkSetString(str)) return;
71−
72−- NativeLib.RunConsoleApp("pbcopy", "-pboard general", str);
73−+ NativeLib.RunConsoleApp("@pbcopy@", "-pboard general", str);
74− }
75−
76− private static string GetStringU()
7759@@ -62,7 +62,7 @@ namespace KeePass.Util
7860 // "-out -selection clipboard");
7961 // if(str != null) return str;
pkgs/applications/misc/keepass/keepass-plugins-load.patch+1−1
@@ -1 +1 @@
1−+ m_pluginManager.LoadAllPlugins("$PATH$/lib/dotnet/keepass", SearchOption.TopDirectoryOnly, new string[] {});
1++ m_pluginManager.LoadAllPlugins("$PATH$/lib/dotnet/keepass", System.IO.SearchOption.TopDirectoryOnly, new string[] {});
pkgs/applications/misc/keepass/keepass-plugins.patch+1−1
@@ -11,7 +11,7 @@ diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs
1111index 347eaf5..b92e1e2 100644
1212--- a/KeePass/Forms/MainForm.cs
1313+++ b/KeePass/Forms/MainForm.cs
14−@@ -440,7 +440,7 @@ namespace KeePass.Forms
14+@@ -440,7 +440,$OUTPUT_LC$ @@ namespace KeePass.Forms
1515 ToolStripItemCollection tsicT = m_ctxTray.Items;
1616 ToolStripItem tsiPrevT = m_ctxTrayOptions;
1717