about summary refs log tree commit diff
path: root/pkgs/games
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2024-03-07 00:02:06 +0000
committerGitHub <noreply@github.com>2024-03-07 00:02:06 +0000
commite0fd83a6589ece4aba5d7be946606c1b8bec30e7 (patch)
treeb99618d70573838bec6875819ca1465eb826f453 /pkgs/games
parent8a8a630460413b06ebb48a4ff69d649071c4a245 (diff)
parentf32e786e98f0dc9cbf46a47f8cf79a9c57f6b777 (diff)
downloadnixlib-e0fd83a6589ece4aba5d7be946606c1b8bec30e7.tar
nixlib-e0fd83a6589ece4aba5d7be946606c1b8bec30e7.tar.gz
nixlib-e0fd83a6589ece4aba5d7be946606c1b8bec30e7.tar.bz2
nixlib-e0fd83a6589ece4aba5d7be946606c1b8bec30e7.tar.lz
nixlib-e0fd83a6589ece4aba5d7be946606c1b8bec30e7.tar.xz
nixlib-e0fd83a6589ece4aba5d7be946606c1b8bec30e7.tar.zst
nixlib-e0fd83a6589ece4aba5d7be946606c1b8bec30e7.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/games')
-rw-r--r--pkgs/games/cdogs-sdl/default.nix4
-rw-r--r--pkgs/games/gcompris/default.nix4
-rw-r--r--pkgs/games/xskat/default.nix2
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/games/cdogs-sdl/default.nix b/pkgs/games/cdogs-sdl/default.nix
index 5c74b10ef32a..e6ea213b6220 100644
--- a/pkgs/games/cdogs-sdl/default.nix
+++ b/pkgs/games/cdogs-sdl/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cdogs-sdl";
-  version = "1.5.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     repo = pname;
     owner = "cxong";
     rev = version;
-    sha256 = "sha256-XSq0TK3ZuLOa8JJnp/Qxt16Ru3p35tq5FOo4+tv+c60=";
+    sha256 = "sha256-es04sCqthjf9unK2mbsBVHlxOeTpimQ+ViabhC/WD0I=";
   };
 
   postPatch = ''
diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix
index a9e9f860d852..c6e16da0280c 100644
--- a/pkgs/games/gcompris/default.nix
+++ b/pkgs/games/gcompris/default.nix
@@ -20,11 +20,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gcompris";
-  version = "3.3";
+  version = "4.0";
 
   src = fetchurl {
     url = "mirror://kde/stable/gcompris/qt/src/gcompris-qt-${version}.tar.xz";
-    hash = "sha256-8hqiq1wYw4irbOXCrwcJqTMuLISzSmSqPuw2Rn8XzQA=";
+    hash = "sha256-wcTqnK7ESv+jWHr5asedlkQ5rZV9iV4PLS8yQkvuDrY=";
   };
 
   cmakeFlags = [
diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix
index 6baf397ad678..0d9fc5fe312f 100644
--- a/pkgs/games/xskat/default.nix
+++ b/pkgs/games/xskat/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Famous german card game";
     platforms = platforms.unix;
-    license = licenses.free;
+    license = licenses.xskat;
     longDescription = "Play the german card game Skat against the AI or over IRC.";
     homepage = "https://web.archive.org/web/20221003060115/https://www.xskat.de/xskat.html";
   };