From b8995ac668ed89b84f73d0be1403fb25fad35045 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone <ricardo.ardissone@gmail.com> Date: Sun, 8 May 2016 16:19:35 -0300 Subject: [PATCH 1/7] dotnetPackages.NUnit3: init at 3.0.1 --- pkgs/top-level/dotnet-packages.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 38dc513ff83c..a354571754ad 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -95,13 +95,22 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/net40/*" ]; }; - NUnit = fetchNuGet { + NUnit3 = fetchNuGet { + baseName = "NUnit"; + version = "3.0.1"; + sha256 = "1g3j3kvg9vrapb1vjgq65nvn1vg7bzm66w7yjnaip1iww1yn1b0p"; + outputFiles = [ "lib/*" ]; + }; + + NUnit2 = fetchNuGet { baseName = "NUnit"; version = "2.6.4"; sha256 = "1acwsm7p93b1hzfb83ia33145x0w6fvdsfjm9xflsisljxpdx35y"; outputFiles = [ "lib/*" ]; }; + NUnit = NUnit2; + MaxMindDb = fetchNuGet { baseName = "MaxMind.Db"; version = "1.1.0.0"; From f0152c64e6b39f7688ba0691b645297105d44864 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone <ricardo.ardissone@gmail.com> Date: Sun, 8 May 2016 17:21:11 -0300 Subject: [PATCH 2/7] dotnetPackages.NUnitConsole: init at 3.0.1 --- pkgs/top-level/dotnet-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index a354571754ad..b448dfb84fa4 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -111,6 +111,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { NUnit = NUnit2; + NUnitConsole = fetchNuGet { + baseName = "NUnit.Console"; + version = "3.0.1"; + sha256 = "154bqwm2n95syv8nwd67qh8qsv0b0h5zap60sk64z3kd3a9ffi5p"; + outputFiles = [ "tools/*" ]; + }; + MaxMindDb = fetchNuGet { baseName = "MaxMind.Db"; version = "1.1.0.0"; From 369515596d0c115952beac121cec614514c3269e Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone <ricardo.ardissone@gmail.com> Date: Sun, 8 May 2016 16:24:14 -0300 Subject: [PATCH 3/7] dotnetPackages.SharpFont: 3.0.1 -> 3.1.0 --- pkgs/top-level/dotnet-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index b448dfb84fa4..c2624db88bc3 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -162,8 +162,8 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { SharpFont = fetchNuGet { baseName = "SharpFont"; - version = "3.0.1"; - sha256 = "1g639i8mbxc6qm0xqsf4mc0shv8nwdaidllka2xxwyksbq54skhs"; + version = "3.1.0"; + sha256 = "137y514i4zi0i0qsx7nv4ibl4kifbr8xr23rqdkwf7yxf88jjmh2"; outputFiles = [ "lib/*" "config/*" ]; }; From 8e85f568493fe09ec1827b6b7e5971e8a1179039 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone <ricardo.ardissone@gmail.com> Date: Sun, 8 May 2016 16:24:48 -0300 Subject: [PATCH 4/7] dotnetPackages.MonoNat: 1.2.21 -> 1.2.24 --- pkgs/top-level/dotnet-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index c2624db88bc3..e8273f35cdee 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -183,8 +183,8 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { MonoNat = fetchNuGet { baseName = "Mono.Nat"; - version = "1.2.21"; - sha256 = "011xhmjrx6w5h110fcp40l95k3qj1gkzz3axgbfy0s8haf5hsf7s"; + version = "1.2.24"; + sha256 = "0vfkach11kkcd9rcqz3s38m70d5spyb21gl99iqnkljxj5555wjs"; outputFiles = [ "lib/*" ]; }; From d88ea67fb7a1fcd25dc6e7b9eb2cbf7ea412084f Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone <ricardo.ardissone@gmail.com> Date: Sun, 8 May 2016 16:25:45 -0300 Subject: [PATCH 5/7] openra: 20151224 -> 20160508 --- pkgs/games/openra/default.nix | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix index de4858e70c70..de29118a68d6 100644 --- a/pkgs/games/openra/default.nix +++ b/pkgs/games/openra/default.nix @@ -4,7 +4,7 @@ }: let - version = "20151224"; + version = "20160508"; in stdenv.mkDerivation rec { name = "openra-${version}"; @@ -19,13 +19,13 @@ in stdenv.mkDerivation rec { src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/OpenRA/OpenRA/archive/release-${version}.tar.gz"; - sha256 = "0dgaxy1my5r3sr3l3gw79v89dsc7179pasj2bibswlv03wsjgqbi"; + sha256 = "1vr5bvdkh0n5569ga2h7ggj43vnzr37hfqkfnsis1sg4vgwrnzr7"; }; dontStrip = true; buildInputs = with dotnetPackages; - [ NUnit NewtonsoftJson MonoNat FuzzyLogicLibrary SmartIrc4net SharpZipLib MaxMindGeoIP2 MaxMindDb SharpFont StyleCopMSBuild StyleCopPlusMSBuild RestSharp ] + [ NUnit3 NewtonsoftJson MonoNat FuzzyLogicLibrary SmartIrc4net SharpZipLib MaxMindGeoIP2 MaxMindDb SharpFont StyleCopMSBuild StyleCopPlusMSBuild RestSharp NUnitConsole ] ++ [ lua gnome3.zenity ]; nativeBuildInputs = [ mono makeWrapper lua pkgconfig ]; @@ -53,28 +53,44 @@ in stdenv.mkDerivation rec { "${StyleCopPlusMSBuild}/lib/dotnet/StyleCopPlus.MSBuild/StyleCopPlus.dll" "${RestSharp}/lib/dotnet/RestSharp/net4-client/RestSharp.dll" "${NUnit}/lib/dotnet/NUnit/nunit.framework.*" + "${NUnitConsole}/lib/dotnet/NUnit.Console/*" "${NewtonsoftJson}/lib/dotnet/Newtonsoft.Json/Newtonsoft.Json.dll" ]; movePackages = [ ( let filename = "Eluant.dll"; in { origin = fetchurl { - url = "https://github.com/OpenRA/Eluant/releases/download/20140425/${filename}"; + url = "https://github.com/OpenRA/Eluant/releases/download/20160124/${filename}"; sha256 = "1c20whz7dzfhg3szd62rvb79745x5iwrd5pp62j3bbj1q9wpddmb"; }; target = filename; }) ( let filename = "SDL2-CS.dll"; in { origin = fetchurl { - url = "https://github.com/OpenRA/SDL2-CS/releases/download/20150709/${filename}"; - sha256 = "0ms75w9w0x3dzpg5g1ym5nb1id7pmagbzqx0am7h8fq4m0cqddmc"; + url = "https://github.com/OpenRA/SDL2-CS/releases/download/20151227/${filename}"; + sha256 = "0gqw2wg37cqhhlc2a9lfc4ndkyfi4m8bkv7ckxbawgydjlknq83n"; + }; target = filename; }) + + ( let filename = "SDL2-CS.dll.config"; in { origin = fetchurl { + url = "https://github.com/OpenRA/SDL2-CS/releases/download/20151227/${filename}"; + sha256 = "15709iscdg44wd33szw5y0fdxwvqfjw8v3xjq6a0mm46gr7mkw7g"; + }; target = filename; }) + + ( let filename = "OpenAL-CS.dll"; in { origin = fetchurl { + url = "https://github.com/OpenRA/OpenAL-CS/releases/download/20151227/${filename}"; + sha256 = "0lvyjkn7fqys97wym8rwlcp6ay2z059iabfvlcxhlrscjpyr2cyk"; + }; target = filename; }) + + ( let filename = "OpenAL-CS.dll.config"; in { origin = fetchurl { + url = "https://github.com/OpenRA/OpenAL-CS/releases/download/20151227/${filename}"; + sha256 = "0wcmk3dw26s93598ck5jism5609v0y233i0f1b76yilyfimg9sjq"; }; target = filename; }) ( let filename = "GeoLite2-Country.mmdb.gz"; in { origin = fetchurl { url = "http://geolite.maxmind.com/download/geoip/database/${filename}"; - sha256 = "0lr978pipk5q2z3x011ps4fx5nfc3hsal7jb77fc60aa6iscr05m"; + sha256 = "0a82v0sj4zf5vigrn1pd6mnbqz6zl3rgk9nidqqzy836as2kxk9v"; }; target = filename; }) ]; in '' mkdir thirdparty/download/ - ${stdenv.lib.concatMapStringsSep "\n" (from: "cp ${from} thirdparty/download") dotnetPackagesDlls} + ${stdenv.lib.concatMapStringsSep "\n" (from: "cp -r ${from} thirdparty/download") dotnetPackagesDlls} ${stdenv.lib.concatMapStringsSep "\n" ({origin, target}: "cp ${origin} thirdparty/download/${target}") movePackages} make dependencies From fab7a4c21f27dba15de7f25fc5d86f632a209104 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone <ricardo.ardissone@gmail.com> Date: Sun, 8 May 2016 18:41:05 -0300 Subject: [PATCH 6/7] openra: add man page --- pkgs/games/openra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix index de29118a68d6..f718babf6b2e 100644 --- a/pkgs/games/openra/default.nix +++ b/pkgs/games/openra/default.nix @@ -30,6 +30,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ mono makeWrapper lua pkgconfig ]; patchPhase = '' + mkdir Support sed -i 's/^VERSION.*/VERSION = release-${version}/g' Makefile substituteInPlace thirdparty/configure-native-deps.sh --replace "locations=\"" "locations=\"${lua}/lib " substituteInPlace Makefile --replace "@./thirdparty/fetch-geoip-db.sh" "" @@ -96,10 +97,9 @@ in stdenv.mkDerivation rec { make dependencies ''; - #todo: man-page - buildFlags = [ "DEBUG=false" "default" ]; + buildFlags = [ "DEBUG=false" "default" "man-page" ]; - installTargets = [ "install" "install-linux-icons" "install-linux-desktop" "install-linux-appdata" "install-linux-mime" ]; + installTargets = [ "install" "install-linux-icons" "install-linux-desktop" "install-linux-appdata" "install-linux-mime" "install-man-page" ]; postInstall = with stdenv.lib; let runtime = makeLibraryPath [ SDL2 freetype openal systemd lua ]; From 20a0e782b595ef64fc6bd5a629beccb97a2e1b74 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone <ricardo.ardissone@gmail.com> Date: Sun, 8 May 2016 18:41:16 -0300 Subject: [PATCH 7/7] openra: add tests --- pkgs/games/openra/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix index f718babf6b2e..f805030aa92b 100644 --- a/pkgs/games/openra/default.nix +++ b/pkgs/games/openra/default.nix @@ -99,6 +99,11 @@ in stdenv.mkDerivation rec { buildFlags = [ "DEBUG=false" "default" "man-page" ]; + doCheck = true; + + #TODO: check + checkTarget = "nunit test"; + installTargets = [ "install" "install-linux-icons" "install-linux-desktop" "install-linux-appdata" "install-linux-mime" "install-man-page" ]; postInstall = with stdenv.lib; let