diff options
author | zimbatm <zimbatm@zimbatm.com> | 2020-06-05 14:56:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-05 14:56:30 +0200 |
commit | 8db1c35e830382c3d3fe1b8b14b4dada41185483 (patch) | |
tree | 328696efe797ca2d113ebb736ebbcae27f2a4b7e | |
parent | dcb64ea42e64aaecd8e6fef65cc86245c9666818 (diff) | |
parent | 7f6442739d105ca927e463b768568650516006cb (diff) | |
download | nixlib-8db1c35e830382c3d3fe1b8b14b4dada41185483.tar nixlib-8db1c35e830382c3d3fe1b8b14b4dada41185483.tar.gz nixlib-8db1c35e830382c3d3fe1b8b14b4dada41185483.tar.bz2 nixlib-8db1c35e830382c3d3fe1b8b14b4dada41185483.tar.lz nixlib-8db1c35e830382c3d3fe1b8b14b4dada41185483.tar.xz nixlib-8db1c35e830382c3d3fe1b8b14b4dada41185483.tar.zst nixlib-8db1c35e830382c3d3fe1b8b14b4dada41185483.zip |
Merge pull request #89393 from wnklmnn/keepass
Keepass
4 files changed, 5 insertions, 23 deletions
diff --git a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix index c3d260774435..85749af0a561 100644 --- a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix @@ -1,14 +1,14 @@ { stdenv, buildEnv, fetchzip, mono }: let - version = "0.10.1"; + version = "0.12.0"; drv = stdenv.mkDerivation { pname = "keeagent"; inherit version; src = fetchzip { - url = "https://lechnology.com/wp-content/uploads/2018/04/KeeAgent_v0.10.1.zip"; - sha256 = "0j7az6l9wcr8z66mfplkxwydd4bgz2p2vd69xncf0nxlfb0lshh7"; + url = "https://lechnology.com/wp-content/uploads/2020/05/KeeAgent_v0.12.0.zip"; + sha256 = "0fcfbj3yikiv3dmp69236h9r3c416amdq849kn131w1129gb68xd"; stripRoot = false; }; diff --git a/pkgs/applications/misc/keepass/fix-paths.patch b/pkgs/applications/misc/keepass/fix-paths.patch index 0a99f506b94b..5ff36a21c002 100644 --- a/pkgs/applications/misc/keepass/fix-paths.patch +++ b/pkgs/applications/misc/keepass/fix-paths.patch @@ -56,24 +56,6 @@ diff --git a/KeePass/Util/ClipboardUtil.Unix.cs b/KeePass/Util/ClipboardUtil.Uni index ab49ee2..7f6c50f 100644 --- a/KeePass/Util/ClipboardUtil.Unix.cs +++ b/KeePass/Util/ClipboardUtil.Unix.cs -@@ -42,7 +42,7 @@ namespace KeePass.Util - // string strGtk = GtkGetString(); - // if(strGtk != null) return strGtk; - -- return (NativeLib.RunConsoleApp("pbpaste", "-pboard general") ?? -+ return (NativeLib.RunConsoleApp("@pbpaste@", "-pboard general") ?? - string.Empty); - } - -@@ -50,7 +50,7 @@ namespace KeePass.Util - { - // if(GtkSetString(str)) return; - -- NativeLib.RunConsoleApp("pbcopy", "-pboard general", str); -+ NativeLib.RunConsoleApp("@pbcopy@", "-pboard general", str); - } - - private static string GetStringU() @@ -62,7 +62,7 @@ namespace KeePass.Util // "-out -selection clipboard"); // if(str != null) return str; diff --git a/pkgs/applications/misc/keepass/keepass-plugins-load.patch b/pkgs/applications/misc/keepass/keepass-plugins-load.patch index ca52e7ef191a..e6a6bff8dad3 100644 --- a/pkgs/applications/misc/keepass/keepass-plugins-load.patch +++ b/pkgs/applications/misc/keepass/keepass-plugins-load.patch @@ -1 +1 @@ -+ m_pluginManager.LoadAllPlugins("$PATH$/lib/dotnet/keepass", SearchOption.TopDirectoryOnly, new string[] {}); ++ m_pluginManager.LoadAllPlugins("$PATH$/lib/dotnet/keepass", System.IO.SearchOption.TopDirectoryOnly, new string[] {}); diff --git a/pkgs/applications/misc/keepass/keepass-plugins.patch b/pkgs/applications/misc/keepass/keepass-plugins.patch index 9a7e3fe99832..891be1ffa314 100644 --- a/pkgs/applications/misc/keepass/keepass-plugins.patch +++ b/pkgs/applications/misc/keepass/keepass-plugins.patch @@ -11,7 +11,7 @@ diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs index 347eaf5..b92e1e2 100644 --- a/KeePass/Forms/MainForm.cs +++ b/KeePass/Forms/MainForm.cs -@@ -440,7 +440,7 @@ namespace KeePass.Forms +@@ -440,7 +440,$OUTPUT_LC$ @@ namespace KeePass.Forms ToolStripItemCollection tsicT = m_ctxTray.Items; ToolStripItem tsiPrevT = m_ctxTrayOptions; |