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

Merge pull request #18641 from mjanczyk/update/keepass 

keepass: 2.33 -> 2.34
This commit is contained in:
Joachim F 2016-09-22 14:12:13 +02:00 committed by GitHub
parent b9df84cd4f 5cbda61791
commit 775bb8791e
3 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/keepass/default.nix
View File

@ -8,11 +8,11 @@
# plugin derivations in the Nix store and nowhere else. # plugin derivations in the Nix store and nowhere else.
with builtins; buildDotnetPackage rec { with builtins; buildDotnetPackage rec {
baseName = "keepass"; baseName = "keepass";
version = "2.33"; version = "2.34";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";
sha256 = "0n4rkx2awyq1gbqiby1lkf2zw82brji96s4fkjsahmci528a882i"; sha256 = "e3f184e4deddd1aa5ee2b52e2373c772d3f3975e5eddb2fd729eb27b437011aa";
}; };
sourceRoot = "."; sourceRoot = ".";
@ -20,7 +20,7 @@ with builtins; buildDotnetPackage rec {
buildInputs = [ unzip makeWrapper icoutils ]; buildInputs = [ unzip makeWrapper icoutils ];
pluginLoadPathsPatch = pluginLoadPathsPatch =
let outputLc = toString (add 8 (length plugins)); let outputLc = toString (add 7 (length plugins));
patchTemplate = readFile ./keepass-plugins.patch; patchTemplate = readFile ./keepass-plugins.patch;
loadTemplate = readFile ./keepass-plugins-load.patch; loadTemplate = readFile ./keepass-plugins-load.patch;
loads = loads =

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

@ -1 +1 @@
+ m_pluginManager.LoadAllPlugins("$PATH$/lib/dotnet/keepass"); + m_pluginManager.LoadAllPlugins("$PATH$/lib/dotnet/keepass", SearchOption.TopDirectoryOnly, new string[] {});

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

@ -1,13 +1,45 @@
--- old/KeePass/Forms/MainForm.cs --- old/KeePass/Forms/MainForm.cs
+++ new/KeePass/Forms/MainForm.cs +++ new/KeePass/Forms/MainForm.cs
@@ -384,9 +384,$OUTPUT_LC$ @@ namespace KeePass.Forms @@ -386,42 +386,$OUTPUT_LC$ @@ namespace KeePass.Forms
m_pluginManager.Initialize(m_pluginDefaultHost);
m_pluginManager.UnloadAllPlugins(); m_pluginManager.UnloadAllPlugins();
- if(AppPolicy.Current.Plugins) if(AppPolicy.Current.Plugins)
- m_pluginManager.LoadAllPlugins(UrlUtil.GetFileDirectory( {
- WinUtil.GetExecutable(), false, true)); - string[] vExclNames = new string[] {
+ if(AppPolicy.Current.Plugins) { - AppDefs.FileNames.Program, AppDefs.FileNames.XmlSerializers,
- AppDefs.FileNames.NativeLib32, AppDefs.FileNames.NativeLib64,
- AppDefs.FileNames.ShInstUtil
- };
-
- string strPlgRoot = UrlUtil.GetFileDirectory(
- WinUtil.GetExecutable(), false, true);
- m_pluginManager.LoadAllPlugins(strPlgRoot, SearchOption.TopDirectoryOnly,
- vExclNames);
-
- if(!NativeLib.IsUnix())
- {
- string strPlgSub = UrlUtil.EnsureTerminatingSeparator(strPlgRoot,
- false) + AppDefs.PluginsDir;
- m_pluginManager.LoadAllPlugins(strPlgSub, SearchOption.AllDirectories,
- vExclNames);
- }
- else // Unix
- {
- try
- {
- DirectoryInfo diPlgRoot = new DirectoryInfo(strPlgRoot);
- foreach(DirectoryInfo diSub in diPlgRoot.GetDirectories())
- {
- if(diSub == null) { Debug.Assert(false); continue; }
-
- if(string.Equals(diSub.Name, AppDefs.PluginsDir,
- StrUtil.CaseIgnoreCmp))
- m_pluginManager.LoadAllPlugins(diSub.FullName,
- SearchOption.AllDirectories, vExclNames);
- }
- }
- catch(Exception) { Debug.Assert(false); }
- }
- }
$DO_LOADS$+ } $DO_LOADS$+ }
// Delete old files *after* loading plugins (when timestamps // Delete old files *after* loading plugins (when timestamps