glaxnimate: 0.5.4 -> 0.5.80 (#443852)

pkgs/applications/video/glaxnimate/default.nix

@@ -1,103 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitLab,
-  fetchpatch,
-  cmake,
-  zlib,
-  potrace,
-  ffmpeg,
-  libarchive,
-  python3,
-  qtbase,
-  qttools,
-  wrapQtAppsHook,
-  testers,
-  qtsvg,
-  qtimageformats,
-  # For the tests
-  glaxnimate, # Call itself, for the tests
-  xvfb-run,
-}:
-let
-  # TODO: try to add a python library, see toPythonModule in doc/languages-frameworks/python.section.md
-  python3WithLibs = python3.withPackages (
-    ps: with ps; [
-      # In data/lib/python-lottie/requirements.txt
-      numpy
-      pillow
-      cairosvg
-      fonttools
-      grapheme
-      opencv4
-      pyqt5
-      qscintilla
-      # Not sure if needed, but appears in some files
-      pyyaml
-      requests
-      pybind11
-    ]
-  );
-in
-stdenv.mkDerivation (finalAttrs: {
-  pname = "glaxnimate";
-  version = "0.5.4";
-
-  src = fetchFromGitLab {
-    domain = "invent.kde.org";
-    owner = "graphics";
-    repo = "glaxnimate";
-    tag = finalAttrs.version;
-    hash = "sha256-8oHJCQdP2xxSSDM0MDkSrG89WgCtMKm1AKlddnq3gig=";
-    fetchSubmodules = true;
-  };
-
-  patches = [
-    # Backport fix for newer ffmpeg
-    # FIXME: remove in next update
-    (fetchpatch {
-      url = "https://invent.kde.org/graphics/glaxnimate/-/commit/4fb2b67a0f0ce2fbffb6fe9f87c3bf7914c8a602.patch";
-      hash = "sha256-QjCnscGa7n+zwrImA4mbQiTQb9jmDGm8Y/7TK8jZXvM=";
-    })
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    wrapQtAppsHook
-    qttools
-  ];
-
-  buildInputs = [
-    zlib
-    potrace
-    # Upstream asks for libav dependency, which is fulfilled by ffmpeg
-    ffmpeg
-    libarchive
-    qtbase
-    qttools
-    qtsvg
-    qtimageformats
-    python3WithLibs
-  ];
-
-  # Translation needs to be separately compiled
-  # https://gitlab.com/mattbas/glaxnimate/-/issues/648
-  buildFlags = [ "translations" ];
-
-  qtWrapperArgs = [ ''--prefix PATH : ${python3WithLibs}/bin'' ];
-
-  passthru.tests.version = lib.optionalAttrs stdenv.hostPlatform.isLinux (
-    testers.testVersion {
-      package = glaxnimate;
-      command = "${xvfb-run}/bin/xvfb-run glaxnimate --version";
-    }
-  );
-
-  meta = {
-    homepage = "https://gitlab.com/mattbas/glaxnimate";
-    description = "Simple vector animation program";
-    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ tobiasBora ];
-    mainProgram = "glaxnimate";
-  };
-})

pkgs/kde/default.nix

@@ -71,6 +71,7 @@ let
         selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub
 
         alpaka = self.callPackage ./misc/alpaka { };
+        glaxnimate = self.callPackage ./misc/glaxnimate { };
         kdiagram = self.callPackage ./misc/kdiagram { };
         kdevelop-pg-qt = self.callPackage ./misc/kdevelop-pg-qt { };
         kdsoap-ws-discovery-client = self.callPackage ./misc/kdsoap-ws-discovery-client { };

pkgs/kde/misc/glaxnimate/default.nix

@@ -0,0 +1,63 @@
+{
+  lib,
+  mkKdeDerivation,
+  fetchFromGitLab,
+  qttools,
+  potrace,
+  ffmpeg,
+  libarchive,
+  python3Packages,
+  testers,
+  glaxnimate,
+  xvfb-run,
+}:
+
+mkKdeDerivation rec {
+  pname = "glaxnimate";
+  version = "0.5.80";
+
+  src = fetchFromGitLab {
+    domain = "invent.kde.org";
+    owner = "graphics";
+    repo = "glaxnimate";
+    tag = "v${version}";
+    fetchSubmodules = true;
+    hash = "sha256-+4vvp9nxtpKUOojgQL9T5Eyv9eMCGGwmDAex91XPwyA=";
+  };
+
+  extraBuildInputs = [
+    qttools
+    potrace
+    ffmpeg
+    libarchive
+    # Has vendored `qt-color-widgets` and `pybind11`.
+  ];
+
+  qtWrapperArgs = [
+    "--prefix PYTHONPATH : ${
+      python3Packages.makePythonPath [
+        python3Packages.pillow
+        python3Packages.lottie
+      ]
+    }"
+  ];
+
+  passthru.tests.version = testers.testVersion {
+    package = glaxnimate;
+    command = "${lib.getExe xvfb-run} glaxnimate --version";
+  };
+
+  meta = {
+    homepage = "https://glaxnimate.org/";
+    license = with lib.licenses; [
+      bsd2
+      cc-by-sa-40
+      cc0
+      gpl2Plus
+      gpl3Plus
+      unicodeTOU
+    ];
+    maintainers = [ lib.maintainers.tobiasBora ];
+    mainProgram = "glaxnimate";
+  };
+}

pkgs/top-level/aliases.nix

@@ -1039,6 +1039,7 @@ mapAliases {
   givaro_3 = throw "'givaro_3' has been removed as it is end-of-life. Consider using the up-to-date 'givaro' instead"; # Added 2025-05-07
   givaro_3_7 = throw "'givaro_3_7' has been removed as it is end-of-life. Consider using the up-to-date 'givaro' instead"; # Added 2025-05-07
   gkraken = throw "'gkraken' has been deprecated by upstream. Consider using the replacement 'coolercontrol' instead."; # Added 2024-11-22
+  glaxnimate = kdePackages.glaxnimate; # Added 2025-09-17
   glew-egl = lib.warnOnInstantiate "'glew-egl' is now provided by 'glew' directly" glew; # Added 2024-08-11
   glfw-wayland = glfw; # Added 2024-04-19
   glfw-wayland-minecraft = glfw3-minecraft; # Added 2024-05-08

pkgs/top-level/all-packages.nix

@@ -1695,8 +1695,6 @@ with pkgs;
 
   glances = python3Packages.callPackage ../applications/system/glances { };
 
-  glaxnimate = libsForQt5.callPackage ../applications/video/glaxnimate { };
-
   go2tv-lite = go2tv.override { withGui = false; };
 
   guglielmo = libsForQt5.callPackage ../applications/radio/guglielmo { };