From fcc5dc94c3214d489e7910efdc509567d1e3ab9f Mon Sep 17 00:00:00 2001 From: kyehn Date: Mon, 1 Sep 2025 15:46:22 +0800 Subject: [PATCH] tuxpaint: 0.9.32 -> 0.9.35 --- pkgs/by-name/tu/tuxpaint/package.nix | 14 ++++++-------- .../by-name/tu/tuxpaint/tuxpaint-completion.diff | 16 ---------------- 2 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 pkgs/by-name/tu/tuxpaint/tuxpaint-completion.diff diff --git a/pkgs/by-name/tu/tuxpaint/package.nix b/pkgs/by-name/tu/tuxpaint/package.nix index 3063332535c7..27146a18264b 100644 --- a/pkgs/by-name/tu/tuxpaint/package.nix +++ b/pkgs/by-name/tu/tuxpaint/package.nix @@ -15,6 +15,7 @@ libpaper, libpng, librsvg, + libxml2, pango, SDL2_gfx, SDL2_image, @@ -26,24 +27,20 @@ let stamps = fetchurl { - url = "mirror://sourceforge/project/tuxpaint/tuxpaint-stamps/2024-01-29/tuxpaint-stamps-2024.01.29.tar.gz"; - hash = "sha256-GwJx9tqaX7I623tJQYO53iiaApZtYsTLQw2ptBIFlKk="; + url = "mirror://sourceforge/project/tuxpaint/tuxpaint-stamps/2025-05-26/tuxpaint-stamps-2025.05.26.tar.gz"; + hash = "sha256-CfSin4A2yTpkwoE046+u+0udlaCaceaPt1N/PF+ClJ8="; }; in stdenv.mkDerivation (finalAttrs: { - version = "0.9.32"; + version = "0.9.35"; pname = "tuxpaint"; src = fetchurl { url = "mirror://sourceforge/tuxpaint/${finalAttrs.version}/tuxpaint-${finalAttrs.version}.tar.gz"; - hash = "sha256-CcziIkFIHcE2D8S8XU2h0xgV16JWO56fohemcrqXS/I="; + hash = "sha256-wcGK+RvnfpT9qrLJKCBMTDm6OaxdovRBqvLsq22L0K0="; }; - patches = [ - ./tuxpaint-completion.diff - ]; - postPatch = '' grep -Zlr include.*SDL . | xargs -0 \ sed -i -E \ @@ -70,6 +67,7 @@ stdenv.mkDerivation (finalAttrs: { libpaper libpng librsvg + libxml2 pango SDL2 SDL2_gfx diff --git a/pkgs/by-name/tu/tuxpaint/tuxpaint-completion.diff b/pkgs/by-name/tu/tuxpaint/tuxpaint-completion.diff deleted file mode 100644 index 0824b2becf49..000000000000 --- a/pkgs/by-name/tu/tuxpaint/tuxpaint-completion.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- tuxpaint-0.9.22/src/tuxpaint-completion.bash~ 1970-01-01 01:00:01.000000000 +0100 -+++ tuxpaint-0.9.22/src/tuxpaint-completion.bash 2018-03-06 10:54:03.437560921 +0100 -@@ -8,7 +8,6 @@ - # FIXME: See http://www.debian-administration.org/articles/316 for an intro - # to how we should be doing this... -bjk 2009.09.09 - --have tuxpaint && - _tuxpaint() - { - local cur -@@ -96,4 +95,4 @@ - fi - - } --[ "${have:-}" ] && complete -F _tuxpaint $filenames tuxpaint -+complete -F _tuxpaint $filenames tuxpaint