diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix
index 6914120f2967..8f16283d3911 100644
--- a/pkgs/applications/misc/keepass/default.nix
+++ b/pkgs/applications/misc/keepass/default.nix
@@ -8,19 +8,17 @@
# plugin derivations in the Nix store and nowhere else.
with builtins; buildDotnetPackage rec {
baseName = "keepass";
- version = "2.30";
+ version = "2.31";
src = fetchurl {
url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";
- sha256 = "1r792cikgvzj4hrxiv7xd3gx2zmn16dbh4inj2zi6ny0gchkqg2a";
+ sha256 = "10bqxpq30gzfq2ip6dkmqlzzsh3bnfdb01jry5xhgxvlycq1lnsm";
};
sourceRoot = ".";
buildInputs = [ unzip makeWrapper ];
- patches = [ ./keepass.patch ];
-
pluginLoadPathsPatch =
let outputLc = toString (add 8 (length plugins));
patchTemplate = readFile ./keepass-plugins.patch;
@@ -34,10 +32,21 @@ with builtins; buildDotnetPackage rec {
passAsFile = [ "pluginLoadPathsPatch" ];
postPatch = ''
- patch --binary -p1 <$pluginLoadPathsPatchPath
+ sed -i 's/\r*$//' KeePass/Forms/MainForm.cs
+ patch -p1 <$pluginLoadPathsPatchPath
'';
- preConfigure = "rm -rvf Build/*";
+ preConfigure = ''
+ rm -rvf Build/*
+ find . -name "*.sln" -print -exec sed -i 's/Format Version 10.00/Format Version 11.00/g' {} \;
+ find . -name "*.csproj" -print -exec sed -i '
+ s#ToolsVersion="3.5"#ToolsVersion="4.0"#g
+ s#.*##g
+ s##v4.5#g
+ s#.*$#false#g
+ s#.*sgen.exe.*$##
+ ' {} \;
+ '';
desktopItem = makeDesktopItem {
name = "keepass";
diff --git a/pkgs/applications/misc/keepass/keepass.patch b/pkgs/applications/misc/keepass/keepass.patch
deleted file mode 100644
index 6ecf0bb074de..000000000000
--- a/pkgs/applications/misc/keepass/keepass.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -Naur old/KeePass/KeePass.csproj new/KeePass/KeePass.csproj
---- old/KeePass/KeePass.csproj 2015-04-10 11:00:46.000000000 +0100
-+++ new/KeePass/KeePass.csproj 2015-05-27 16:35:52.196177593 +0100
-@@ -1,4 +1,4 @@
--
-+
-
- Debug
- AnyCPU
-@@ -10,7 +10,7 @@
- KeePass
- KeePass
- KeePass.ico
-- true
-+ false
- KeePass.pfx
-
-
-@@ -1316,6 +1316,5 @@
-
- -->
-
-- "$(FrameworkSDKDir)bin\sgen.exe" /assembly:"$(TargetPath)" /force /nologo /compiler:/keycontainer:VS_KEY_33430356D8D7D1B8 /compiler:/delaysign-
-
--
-\ No newline at end of file
-+
-diff -Naur old/KeePassLib/KeePassLib.csproj new/KeePassLib/KeePassLib.csproj
---- old/KeePassLib/KeePassLib.csproj 2014-05-08 15:00:24.000000000 +0100
-+++ new/KeePassLib/KeePassLib.csproj 2015-05-27 16:35:52.197177562 +0100
-@@ -1,4 +1,4 @@
--
-+
-
- Debug
- AnyCPU
-@@ -9,7 +9,7 @@
- Properties
- KeePassLib
- KeePassLib
-- true
-+ false
- KeePassLib.pfx
-
-
-diff -Naur old/KeePass.sln new/KeePass.sln
---- old/KeePass.sln 2009-08-31 19:47:28.000000000 +0100
-+++ new/KeePass.sln 2015-05-27 16:35:59.568953518 +0100
-@@ -1,11 +1,9 @@
--Microsoft Visual Studio Solution File, Format Version 10.00
-+Microsoft Visual Studio Solution File, Format Version 12.00
- # Visual Studio 2008
- Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassLib", "KeePassLib\KeePassLib.csproj", "{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}"
- EndProject
- Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePass", "KeePass\KeePass.csproj", "{10938016-DEE2-4A25-9A5A-8FD3444379CA}"
- EndProject
--Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassLibSD", "KeePassLibSD\KeePassLibSD.csproj", "{DC15F71A-2117-4DEF-8C10-AA355B5E5979}"
--EndProject
- Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrlUtil", "Translation\TrlUtil\TrlUtil.csproj", "{B7E890E7-BF50-4450-9A52-C105BD98651C}"
- EndProject
- Global
-@@ -44,18 +42,6 @@
- {10938016-DEE2-4A25-9A5A-8FD3444379CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {10938016-DEE2-4A25-9A5A-8FD3444379CA}.Release|Win32.ActiveCfg = Release|Any CPU
- {10938016-DEE2-4A25-9A5A-8FD3444379CA}.Release|x64.ActiveCfg = Release|Any CPU
-- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Any CPU.Build.0 = Debug|Any CPU
-- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Win32.ActiveCfg = Debug|Any CPU
-- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|x64.ActiveCfg = Debug|Any CPU
-- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Any CPU.ActiveCfg = Release|Any CPU
-- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Any CPU.Build.0 = Release|Any CPU
-- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Win32.ActiveCfg = Release|Any CPU
-- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|x64.ActiveCfg = Release|Any CPU
- {B7E890E7-BF50-4450-9A52-C105BD98651C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B7E890E7-BF50-4450-9A52-C105BD98651C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B7E890E7-BF50-4450-9A52-C105BD98651C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-diff -Naur old/Translation/TrlUtil/TrlUtil.csproj new/Translation/TrlUtil/TrlUtil.csproj
---- old/Translation/TrlUtil/TrlUtil.csproj 2013-07-21 10:06:38.000000000 +0100
-+++ new/Translation/TrlUtil/TrlUtil.csproj 2015-05-27 16:35:52.197177562 +0100
-@@ -1,4 +1,4 @@
--
-+
-
- Debug
- AnyCPU