From 8d614300ab97ecdb0deef916ebd26cf1f9b70933 Mon Sep 17 00:00:00 2001 From: Michi Date: Mon, 27 Oct 2025 01:19:46 +0100 Subject: [PATCH 1/5] superTuxKart: update license from gpl2Plus to gpl3Plus The source code is licensed under GPLv3 or later. This was changed upstream at Nov 23, 2018 [here](https://github.com/supertuxkart/stk-code/commit/06952bfd524ce368e12e62aadcc8546b0786051c), but wasn't updated here in nixpkgs, until now. The game assets are released under a mixture of licenses and noted in their respective 'licenses.txt' files. --- pkgs/by-name/su/superTuxKart/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/su/superTuxKart/package.nix b/pkgs/by-name/su/superTuxKart/package.nix index 5b4cf6f8f577..2cb36b616e19 100644 --- a/pkgs/by-name/su/superTuxKart/package.nix +++ b/pkgs/by-name/su/superTuxKart/package.nix @@ -170,7 +170,7 @@ stdenv.mkDerivation rec { Kart. ''; homepage = "https://supertuxkart.net/"; - license = lib.licenses.gpl2Plus; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ peterhoeg ]; From a79325ca71a2b22f4219a3a5e4ad97a4b9bec9d6 Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Sun, 26 Oct 2025 15:07:55 +0100 Subject: [PATCH 2/5] superTuxKart: rename src.rev to src.tag --- pkgs/by-name/su/superTuxKart/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/su/superTuxKart/package.nix b/pkgs/by-name/su/superTuxKart/package.nix index 2cb36b616e19..d684976f3afc 100644 --- a/pkgs/by-name/su/superTuxKart/package.nix +++ b/pkgs/by-name/su/superTuxKart/package.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "supertuxkart"; repo = "stk-code"; - rev = version; + tag = version; hash = "sha256-gqdaVvgNfCN40ZO/9y8+vTeIJPSq6udKxYZ/MAi4ZMM="; }; From 777bba68472d030e134f940667edc64fef66e8b7 Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Sun, 26 Oct 2025 14:25:09 +0100 Subject: [PATCH 3/5] superTuxKart: 1.4 -> 1.5 stk-assets: 18464 -> 18621 --- pkgs/by-name/su/superTuxKart/package.nix | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/su/superTuxKart/package.nix b/pkgs/by-name/su/superTuxKart/package.nix index d684976f3afc..bbeb70dcd8df 100644 --- a/pkgs/by-name/su/superTuxKart/package.nix +++ b/pkgs/by-name/su/superTuxKart/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, fetchsvn, - fetchpatch, cmake, pkg-config, makeWrapper, @@ -29,8 +28,8 @@ let assets = fetchsvn { url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets"; - rev = "18464"; - sha256 = "1a84j3psl4cxzkn5ynakpjill7i2f9ki2p729bpmbrvg8fki95aa"; + rev = "18621"; + sha256 = "sha256-iqQSezGu0tecA53qhrtYA77SLj28WUUCcL4ZCJbK5C8="; name = "stk-assets"; }; @@ -68,29 +67,15 @@ in stdenv.mkDerivation rec { pname = "supertuxkart"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "supertuxkart"; repo = "stk-code"; tag = version; - hash = "sha256-gqdaVvgNfCN40ZO/9y8+vTeIJPSq6udKxYZ/MAi4ZMM="; + hash = "sha256-/fp5iqTHVrVcxRqbTy/3r+dp19oUj9MI2JauvtPWTWA="; }; - patches = [ - # upstreamed patches required to build against cmake 4.0; remove with next release update. - (fetchpatch { - name = "Require-Cmake-3.6-or-higher"; - url = "https://github.com/supertuxkart/stk-code/commit/7d4e8433c124c08c62f5335e2a884aeea71cf184.patch?full_index=1"; - hash = "sha256-5q/Gf1I/maFPQ83NDIa7Sn6gtLfErwxP16fup4SZ+gc="; - }) - (fetchpatch { - name = "Fixed-cmake-4.0-warnings"; - url = "https://github.com/supertuxkart/stk-code/commit/184c80138faf5232c33ff99ffe7706e821be70c2.patch?full_index=1"; - hash = "sha256-5zoDmKBRBC2rAUjgpmyc0ZCObGofjuImqk07Tr5K7Og="; - }) - ]; - postPatch = '' # Deletes all bundled libs in stk-code/lib except those # That couldn't be replaced with system packages From e18f03258aa9754c9bc96665231530c3d5da2d72 Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Sun, 26 Oct 2025 14:50:38 +0100 Subject: [PATCH 4/5] superTuxKart: update descriptions The decription was copied from the official website's discover page ([here](https://supertuxkart.net/Discover)) and got modified. It got added by @Benau [here](https://github.com/supertuxkart/stk-website/commit/2c46fee5aad8412a0187d4e2e0580a5403fbdbf6) --- pkgs/by-name/su/superTuxKart/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/su/superTuxKart/package.nix b/pkgs/by-name/su/superTuxKart/package.nix index bbeb70dcd8df..1c6c0462fe59 100644 --- a/pkgs/by-name/su/superTuxKart/package.nix +++ b/pkgs/by-name/su/superTuxKart/package.nix @@ -147,12 +147,12 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Free 3D kart racing game"; + description = "3D open-source arcade racer"; mainProgram = "supertuxkart"; longDescription = '' - SuperTuxKart is a Free 3D kart racing game, with many tracks, - characters and items for you to try, similar in spirit to Mario - Kart. + Karts. Nitro. Action! SuperTuxKart is a 3D open-source arcade racer + with a variety of characters, tracks, and modes to play. + It aims to be more fun than realistic, and provides an enjoyable experience for all ages. ''; homepage = "https://supertuxkart.net/"; license = lib.licenses.gpl3Plus; From 4a9e4fafab9488da85992200a4d1d82768856871 Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Sun, 26 Oct 2025 14:51:04 +0100 Subject: [PATCH 5/5] superTuxKart: add SchweGELBin to maintainers --- pkgs/by-name/su/superTuxKart/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/su/superTuxKart/package.nix b/pkgs/by-name/su/superTuxKart/package.nix index 1c6c0462fe59..35a74463adff 100644 --- a/pkgs/by-name/su/superTuxKart/package.nix +++ b/pkgs/by-name/su/superTuxKart/package.nix @@ -158,6 +158,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ peterhoeg + SchweGELBin ]; platforms = with lib.platforms; unix; changelog = "https://github.com/supertuxkart/stk-code/blob/${version}/CHANGELOG.md";