From eacd2bfd357aedb84a7ba91bc6b44856674e3651 Mon Sep 17 00:00:00 2001 From: emaryn Date: Thu, 5 Jun 2025 10:57:28 +0800 Subject: [PATCH 1/2] yuview: 2.13 -> 2.14 Diff: https://github.com/IENT/YUView/compare/v2.13...v2.14 --- pkgs/applications/video/yuview/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/video/yuview/default.nix b/pkgs/applications/video/yuview/default.nix index 3a15d32c4205..1148dfa252d4 100644 --- a/pkgs/applications/video/yuview/default.nix +++ b/pkgs/applications/video/yuview/default.nix @@ -6,15 +6,15 @@ wrapQtAppsHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "yuview"; - version = "2.13"; + version = "2.14"; src = fetchFromGitHub { owner = "IENT"; repo = "YUView"; - rev = "v.${version}"; - sha256 = "sha256-2mNIuyY/ni+zkUc8V/iXUEa7JeBJyOnNod7friMYAm8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-YuKPRYBr1CKrwickk1T89ZCYFt99jP86tdanp+JZMO4="; }; nativeBuildInputs = [ @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { + changelog = "https://github.com/IENT/YUView/releases/tag/${finalAttrs.src.tag}"; homepage = "https://ient.github.io/YUView"; description = "YUV Viewer and Analysis Tool"; longDescription = '' @@ -42,9 +43,9 @@ stdenv.mkDerivation rec { sequences, and many more. Further information can be found in the YUV help in the application itself or in our wiki. ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ leixb ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ leixb ]; + platforms = lib.platforms.unix; mainProgram = "YUView"; }; -} +}) From feda583a343268046e3bb94b407249427f93e0e4 Mon Sep 17 00:00:00 2001 From: emaryn Date: Thu, 5 Jun 2025 11:07:16 +0800 Subject: [PATCH 2/2] yuview: move to by-name --- .../yu}/yuview/disable_version_check.patch | 0 .../yuview/default.nix => by-name/yu/yuview/package.nix} | 7 +++---- pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/qt5-packages.nix | 2 -- 4 files changed, 3 insertions(+), 8 deletions(-) rename pkgs/{applications/video => by-name/yu}/yuview/disable_version_check.patch (100%) rename pkgs/{applications/video/yuview/default.nix => by-name/yu/yuview/package.nix} (96%) diff --git a/pkgs/applications/video/yuview/disable_version_check.patch b/pkgs/by-name/yu/yuview/disable_version_check.patch similarity index 100% rename from pkgs/applications/video/yuview/disable_version_check.patch rename to pkgs/by-name/yu/yuview/disable_version_check.patch diff --git a/pkgs/applications/video/yuview/default.nix b/pkgs/by-name/yu/yuview/package.nix similarity index 96% rename from pkgs/applications/video/yuview/default.nix rename to pkgs/by-name/yu/yuview/package.nix index 1148dfa252d4..6993ec3aa74d 100644 --- a/pkgs/applications/video/yuview/default.nix +++ b/pkgs/by-name/yu/yuview/package.nix @@ -2,8 +2,7 @@ lib, stdenv, fetchFromGitHub, - qmake, - wrapQtAppsHook, + libsForQt5, }: stdenv.mkDerivation (finalAttrs: { @@ -18,8 +17,8 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - qmake - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; patches = [ ./disable_version_check.patch ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91e9769d22e0..144b003a1bff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14640,8 +14640,6 @@ with pkgs; youtube-viewer = perlPackages.WWWYoutubeViewer; - yuview = libsForQt5.yuview; - zathuraPkgs = callPackage ../applications/misc/zathura { }; zathura = zathuraPkgs.zathuraWrapper; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 0ca29f61a4e4..9d67d8024bcc 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -326,8 +326,6 @@ makeScopeWithSplicing' { xp-pen-g430-driver = callPackage ../os-specific/linux/xp-pen-drivers/g430 { }; xwaylandvideobridge = callPackage ../tools/wayland/xwaylandvideobridge { }; - - yuview = callPackage ../applications/video/yuview { }; } )) );