Merge commit '373488e6f4c3dc3bb51cabcb959e4a70eb5d7b2c'

4 files changed, 15 insertions, 13 deletions

diff --git a/nixpkgs/pkgs/games/anki/default.nix b/nixpkgs/pkgs/games/anki/default.nix
index c9a227b98db1..250a4598b972 100644
--- a/nixpkgs/pkgs/games/anki/default.nix
+++ b/nixpkgs/pkgs/games/anki/default.nix
@@ -33,10 +33,10 @@ let
     # when updating, also update rev-manual to a recent version of
     # https://github.com/dae/ankidocs
     # The manual is distributed independently of the software.
-    version = "2.1.9";
-    sha256-pkg = "0p4admjxs0gwc54hby9kc1isg99ghxd5kpy08w9hrk3mcyq74z3i";
-    rev-manual = "c2c443bf991089534b0193029f6ee34908124e80";
-    sha256-manual = "1jwm5zrydc6qis7zslfqj56d083kpbzbl51n0x4czhskm9pjh7qd";
+    version = "2.1.11";
+    sha256-pkg = "0rcjam7f017yg0fx5apdc309lsx59lfw33nikczz7hrw6gby6z3q";
+    rev-manual = "f933104fecd8a83c33494bdb2b59817a3318202f";
+    sha256-manual = "12j4x1bh8x6yinym4d1ard32vfl22iq2wz1lfwz6s3ljhggkc52h";
 
     manual = stdenv.mkDerivation {
       name = "anki-manual-${version}";
@@ -187,6 +187,6 @@ buildPythonApplication rec {
       license = licenses.agpl3Plus;
       broken = stdenv.hostPlatform.isAarch64;
       platforms = platforms.mesaPlatforms;
-      maintainers = with maintainers; [ the-kenny Profpatsch ];
+      maintainers = with maintainers; [ the-kenny Profpatsch enzime ];
     };
 }
diff --git a/nixpkgs/pkgs/games/commandergenius/default.nix b/nixpkgs/pkgs/games/commandergenius/default.nix
index 45be0a3085e4..4509f8140ce4 100644
--- a/nixpkgs/pkgs/games/commandergenius/default.nix
+++ b/nixpkgs/pkgs/games/commandergenius/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchFromGitHub, SDL2, SDL2_image, pkgconfig
+{ stdenv, fetchFromGitLab, SDL2, SDL2_image, pkgconfig
 , libvorbis, libGL, boost, cmake, zlib, curl, SDL2_mixer, python3
 }:
 
 stdenv.mkDerivation rec {
   name = "commandergenius-${version}";
-  version = "2.2.2";
+  version = "2.3.2";
 
-  src = fetchFromGitHub {
-    owner = "gerstrong";
+  src = fetchFromGitLab {
+    owner = "Dringgstein";
     repo = "Commander-Genius";
     rev = "v${version}";
-    sha256 = "1mfw25pgr492ayqw3b85mwp20wh6anrr90gdy605nv1yjma62pmj";
+    sha256 = "1a8as56ycbq8csnssd5wqv2jand5c9yskld6prh3dn9gy96jbvgj";
   };
 
   buildInputs = [ SDL2 SDL2_image SDL2_mixer libGL boost libvorbis zlib curl python3 ];
diff --git a/nixpkgs/pkgs/games/factorio/default.nix b/nixpkgs/pkgs/games/factorio/default.nix
index f0fa09b167a8..7ec27d29fc6f 100644
--- a/nixpkgs/pkgs/games/factorio/default.nix
+++ b/nixpkgs/pkgs/games/factorio/default.nix
@@ -53,11 +53,11 @@ let
     x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in {
       alpha = {
         stable        = bdist { sha256 = "0b4hbpdcrh5hgip9q5dkmw22p66lcdhnr0kmb0w5dw6yi7fnxxh0"; version = "0.16.51"; withAuth = true; };
-        experimental  = bdist { sha256 = "0f8scld3447jwcn98zks634bv594zz24fy1xr41nf1k1llmgnmnc"; version = "0.17.12"; withAuth = true; };
+        experimental  = bdist { sha256 = "0piprfkywja35m5x4wv9xdykp6ywfs5f2z1y6fmszfv26jz234sg"; version = "0.17.14"; withAuth = true; };
       };
       headless = {
         stable        = bdist { sha256 = "0zrnpg2js0ysvx9y50h3gajldk16mv02dvrwnkazh5kzr1d9zc3c"; version = "0.16.51"; };
-        experimental  = bdist { sha256 = "1hfi8pngml3phdr3h30fym5qmi575fx0cv4zxn6prh2prz7h1z7d"; version = "0.17.12"; };
+        experimental  = bdist { sha256 = "1h8psnrwdd2h3myndw35723qsgbn3xpmrz94r7mdyirfabi870a9"; version = "0.17.14"; };
       };
       demo = {
         stable        = bdist { sha256 = "0zf61z8937yd8pyrjrqdjgd0rjl7snwrm3xw86vv7s7p835san6a"; version = "0.16.51"; };
diff --git a/nixpkgs/pkgs/games/hedgewars/default.nix b/nixpkgs/pkgs/games/hedgewars/default.nix
index 745b430a95e3..6953ac2f57a5 100644
--- a/nixpkgs/pkgs/games/hedgewars/default.nix
+++ b/nixpkgs/pkgs/games/hedgewars/default.nix
@@ -5,7 +5,7 @@
 
 let
   ghc = ghcWithPackages (pkgs: with pkgs; [
-          network vector utf8-string bytestring-show random hslogger
+          network vector utf8-string /* broken: bytestring-show */ random hslogger
           SHA entropy pkgs.zlib sandi regex-tdfa
         ]);
 in
@@ -74,5 +74,7 @@ stdenv.mkDerivation rec {
        all movement on the battlefield has ceased).'';
     maintainers = with maintainers; [ kragniz fpletz ];
     platforms = ghc.meta.platforms;
+    hydraPlatforms = [];
+    broken = true;  # depends on broken Haskell package bytestring-show
   };
 }