public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #89393 from wnklmnn/keepass

Browse Source 
Keepass
This commit is contained in:
zimbatm 2020-06-05 14:56:30 +02:00 committed by GitHub
commit 8db1c35e83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/keepass-plugins/keeagent/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, buildEnv, fetchzip, mono }: { stdenv, buildEnv, fetchzip, mono }:
let let
version = "0.10.1"; version = "0.12.0";
drv = stdenv.mkDerivation { drv = stdenv.mkDerivation {
pname = "keeagent"; pname = "keeagent";
inherit version; inherit version;
src = fetchzip { src = fetchzip {
url = "https://lechnology.com/wp-content/uploads/2018/04/KeeAgent_v0.10.1.zip"; url = "https://lechnology.com/wp-content/uploads/2020/05/KeeAgent_v0.12.0.zip";
sha256 = "0j7az6l9wcr8z66mfplkxwydd4bgz2p2vd69xncf0nxlfb0lshh7"; sha256 = "0fcfbj3yikiv3dmp69236h9r3c416amdq849kn131w1129gb68xd";
stripRoot = false; stripRoot = false;
}; };

18
pkgs/applications/misc/keepass/fix-paths.patch
View File

@ -56,24 +56,6 @@ diff --git a/KeePass/Util/ClipboardUtil.Unix.cs b/KeePass/Util/ClipboardUtil.Uni
index ab49ee2..7f6c50f 100644 index ab49ee2..7f6c50f 100644
--- a/KeePass/Util/ClipboardUtil.Unix.cs --- a/KeePass/Util/ClipboardUtil.Unix.cs
+++ b/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 @@ -62,7 +62,7 @@ namespace KeePass.Util
// "-out -selection clipboard"); // "-out -selection clipboard");
// if(str != null) return str; // if(str != null) return str;

2
pkgs/applications/misc/keepass/keepass-plugins-load.patch
View File

@ -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[] {});

2
pkgs/applications/misc/keepass/keepass-plugins.patch
View File

@ -11,7 +11,7 @@ diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs
index 347eaf5..b92e1e2 100644 index 347eaf5..b92e1e2 100644
--- a/KeePass/Forms/MainForm.cs --- a/KeePass/Forms/MainForm.cs
+++ b/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; ToolStripItemCollection tsicT = m_ctxTray.Items;
ToolStripItem tsiPrevT = m_ctxTrayOptions; ToolStripItem tsiPrevT = m_ctxTrayOptions;