Merge pull request #133251 from mfsch/master

zeroad: 0.0.24b -> 0.0.25

pkgs/games/0ad/data.nix

···
 
   src = fetchurl {
     url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz";
-    sha256 = "0b53jzl64i49rk3n3c3x0hibwbl7vih2xym8jq5s56klg61qdxa1";
+    sha256 = "1d8c58s2fwdmjjpna57gk0d2ar17f2fqcrkgsn45x6s3ickf984p";
   };
 
   installPhase = ''

pkgs/games/0ad/game.nix

···
 in
 stdenv.mkDerivation rec {
   pname = "0ad";
-  version = "0.0.24b";
+  version = "0.0.25";
 
   src = fetchurl {
     url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz";
-    sha256 = "1a1py45hkh2cswi09vbf9chikgxdv9xplsmg6sv6xhdznv4j6p1j";
+    sha256 = "03s38pknggsbzkhgj692yd3vm16ass7k4bgjn63qwn51q4vsnbjr";
   };
 
   nativeBuildInputs = [ python2 perl pkg-config ];

pkgs/top-level/all-packages.nix

···
   keen4 = callPackage ../games/keen4 { };
 
   zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad {
-    wxGTK = wxGTK30;
+    wxGTK = wxGTK31;
   });
 
   zeroad = zeroadPackages.zeroad;