pyrox.dev
keepass: 2.30 -> 2.31
Also replaces the keepass.patch with sed,
as the patch was having problems with newlines.
+15
-6
pkgs/applications/misc/keepass/default.nix
+15
-6
pkgs/applications/misc/keepass/default.nix
···
8
8
# plugin derivations in the Nix store and nowhere else.
9
9
with builtins; buildDotnetPackage rec {
10
10
baseName = "keepass";
11
-
version = "2.30";
11
+
version = "2.31";
12
12
13
13
src = fetchurl {
14
14
url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";
15
-
sha256 = "1r792cikgvzj4hrxiv7xd3gx2zmn16dbh4inj2zi6ny0gchkqg2a";
15
+
sha256 = "10bqxpq30gzfq2ip6dkmqlzzsh3bnfdb01jry5xhgxvlycq1lnsm";
16
16
};
17
17
18
18
sourceRoot = ".";
19
19
20
20
buildInputs = [ unzip makeWrapper ];
21
-
22
-
patches = [ ./keepass.patch ];
23
21
24
22
pluginLoadPathsPatch =
25
23
let outputLc = toString (add 8 (length plugins));
···
34
32
35
33
passAsFile = [ "pluginLoadPathsPatch" ];
36
34
postPatch = ''
37
-
patch --binary -p1 <$pluginLoadPathsPatchPath
35
+
sed -i 's/\r*$//' KeePass/Forms/MainForm.cs
36
+
patch -p1 <$pluginLoadPathsPatchPath
38
37
'';
39
38
40
-
preConfigure = "rm -rvf Build/*";
39
+
preConfigure = ''
40
+
rm -rvf Build/*
41
+
find . -name "*.sln" -print -exec sed -i 's/Format Version 10.00/Format Version 11.00/g' {} \;
42
+
find . -name "*.csproj" -print -exec sed -i '
43
+
s#ToolsVersion="3.5"#ToolsVersion="4.0"#g
44
+
s#<TargetFrameworkVersion>.*</TargetFrameworkVersion>##g
45
+
s#<PropertyGroup>#<PropertyGroup><TargetFrameworkVersion>v4.5</TargetFrameworkVersion>#g
46
+
s#<SignAssembly>.*$#<SignAssembly>false</SignAssembly>#g
47
+
s#<PostBuildEvent>.*sgen.exe.*$##
48
+
' {} \;
49
+
'';
41
50
42
51
desktopItem = makeDesktopItem {
43
52
name = "keepass";
-89
pkgs/applications/misc/keepass/keepass.patch
-89
pkgs/applications/misc/keepass/keepass.patch
···
1
-
diff -Naur old/KeePass/KeePass.csproj new/KeePass/KeePass.csproj
2
-
--- old/KeePass/KeePass.csproj 2015-04-10 11:00:46.000000000 +0100
3
-
+++ new/KeePass/KeePass.csproj 2015-05-27 16:35:52.196177593 +0100
4
-
@@ -1,4 +1,4 @@
5
-
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
6
-
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
7
-
<PropertyGroup>
8
-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
9
-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
10
-
@@ -10,7 +10,7 @@
11
-
<RootNamespace>KeePass</RootNamespace>
12
-
<AssemblyName>KeePass</AssemblyName>
13
-
<ApplicationIcon>KeePass.ico</ApplicationIcon>
14
-
- <SignAssembly>true</SignAssembly>
15
-
+ <SignAssembly>false</SignAssembly>
16
-
<AssemblyOriginatorKeyFile>KeePass.pfx</AssemblyOriginatorKeyFile>
17
-
<FileUpgradeFlags>
18
-
</FileUpgradeFlags>
19
-
@@ -1316,6 +1316,5 @@
20
-
</Target>
21
-
-->
22
-
<PropertyGroup>
23
-
- <PostBuildEvent>"$(FrameworkSDKDir)bin\sgen.exe" /assembly:"$(TargetPath)" /force /nologo /compiler:/keycontainer:VS_KEY_33430356D8D7D1B8 /compiler:/delaysign-</PostBuildEvent>
24
-
</PropertyGroup>
25
-
-</Project>
26
-
\ No newline at end of file
27
-
+</Project>
28
-
diff -Naur old/KeePassLib/KeePassLib.csproj new/KeePassLib/KeePassLib.csproj
29
-
--- old/KeePassLib/KeePassLib.csproj 2014-05-08 15:00:24.000000000 +0100
30
-
+++ new/KeePassLib/KeePassLib.csproj 2015-05-27 16:35:52.197177562 +0100
31
-
@@ -1,4 +1,4 @@
32
-
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
33
-
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
34
-
<PropertyGroup>
35
-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
36
-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
37
-
@@ -9,7 +9,7 @@
38
-
<AppDesignerFolder>Properties</AppDesignerFolder>
39
-
<RootNamespace>KeePassLib</RootNamespace>
40
-
<AssemblyName>KeePassLib</AssemblyName>
41
-
- <SignAssembly>true</SignAssembly>
42
-
+ <SignAssembly>false</SignAssembly>
43
-
<AssemblyOriginatorKeyFile>KeePassLib.pfx</AssemblyOriginatorKeyFile>
44
-
<FileUpgradeFlags>
45
-
</FileUpgradeFlags>
46
-
diff -Naur old/KeePass.sln new/KeePass.sln
47
-
--- old/KeePass.sln 2009-08-31 19:47:28.000000000 +0100
48
-
+++ new/KeePass.sln 2015-05-27 16:35:59.568953518 +0100
49
-
@@ -1,11 +1,9 @@
50
-
-Microsoft Visual Studio Solution File, Format Version 10.00
51
-
+Microsoft Visual Studio Solution File, Format Version 12.00
52
-
# Visual Studio 2008
53
-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassLib", "KeePassLib\KeePassLib.csproj", "{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}"
54
-
EndProject
55
-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePass", "KeePass\KeePass.csproj", "{10938016-DEE2-4A25-9A5A-8FD3444379CA}"
56
-
EndProject
57
-
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassLibSD", "KeePassLibSD\KeePassLibSD.csproj", "{DC15F71A-2117-4DEF-8C10-AA355B5E5979}"
58
-
-EndProject
59
-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrlUtil", "Translation\TrlUtil\TrlUtil.csproj", "{B7E890E7-BF50-4450-9A52-C105BD98651C}"
60
-
EndProject
61
-
Global
62
-
@@ -44,18 +42,6 @@
63
-
{10938016-DEE2-4A25-9A5A-8FD3444379CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
64
-
{10938016-DEE2-4A25-9A5A-8FD3444379CA}.Release|Win32.ActiveCfg = Release|Any CPU
65
-
{10938016-DEE2-4A25-9A5A-8FD3444379CA}.Release|x64.ActiveCfg = Release|Any CPU
66
-
- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
67
-
- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Any CPU.Build.0 = Debug|Any CPU
68
-
- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
69
-
- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
70
-
- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Win32.ActiveCfg = Debug|Any CPU
71
-
- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|x64.ActiveCfg = Debug|Any CPU
72
-
- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Any CPU.ActiveCfg = Release|Any CPU
73
-
- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Any CPU.Build.0 = Release|Any CPU
74
-
- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
75
-
- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Mixed Platforms.Build.0 = Release|Any CPU
76
-
- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Win32.ActiveCfg = Release|Any CPU
77
-
- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|x64.ActiveCfg = Release|Any CPU
78
-
{B7E890E7-BF50-4450-9A52-C105BD98651C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
79
-
{B7E890E7-BF50-4450-9A52-C105BD98651C}.Debug|Any CPU.Build.0 = Debug|Any CPU
80
-
{B7E890E7-BF50-4450-9A52-C105BD98651C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
81
-
diff -Naur old/Translation/TrlUtil/TrlUtil.csproj new/Translation/TrlUtil/TrlUtil.csproj
82
-
--- old/Translation/TrlUtil/TrlUtil.csproj 2013-07-21 10:06:38.000000000 +0100
83
-
+++ new/Translation/TrlUtil/TrlUtil.csproj 2015-05-27 16:35:52.197177562 +0100
84
-
@@ -1,4 +1,4 @@
85
-
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
86
-
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
87
-
<PropertyGroup>
88
-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
89
-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>