From fcf0878fecf3dec07c267341edde9cf8c6a2c071 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Apr 2025 15:36:09 +0000 Subject: [PATCH 1/3] tageditor: 3.9.4 -> 3.9.5 --- pkgs/applications/audio/tageditor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/tageditor/default.nix b/pkgs/applications/audio/tageditor/default.nix index 4c21e137aed1..a336c2bc4ecd 100644 --- a/pkgs/applications/audio/tageditor/default.nix +++ b/pkgs/applications/audio/tageditor/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "tageditor"; - version = "3.9.4"; + version = "3.9.5"; src = fetchFromGitHub { owner = "martchus"; repo = pname; rev = "v${version}"; - hash = "sha256-VRQV4bTPG4VFhRHFJamUnYd04ZCaNpaxU27Jcl6Chc4="; + hash = "sha256-Sia6Y/V81WQj4oWjZAAR4o3TngfWq7sWxxiKEuFjQ2M="; }; nativeBuildInputs = [ From 19887532afdb8c5dcf8fd066542e9fcc1ecdce89 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 14 Apr 2025 00:42:25 +0400 Subject: [PATCH 2/3] tageditor: enable on darwin --- pkgs/applications/audio/tageditor/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/tageditor/default.nix b/pkgs/applications/audio/tageditor/default.nix index a336c2bc4ecd..7ac0a227d261 100644 --- a/pkgs/applications/audio/tageditor/default.nix +++ b/pkgs/applications/audio/tageditor/default.nix @@ -45,12 +45,18 @@ stdenv.mkDerivation rec { tagparser ]; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications + mv $out/bin/*.app $out/Applications + ln -s $out/Applications/tageditor.app/Contents/MacOS/tageditor $out/bin/tageditor + ''; + meta = with lib; { homepage = "https://github.com/Martchus/tageditor"; description = "Tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska"; license = licenses.gpl2; maintainers = [ maintainers.matthiasbeyer ]; - platforms = platforms.linux; + platforms = platforms.unix; mainProgram = "tageditor"; }; } From 3a524b8e0ecf2d3100f065b9d424998cc8ab4f47 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 14 Apr 2025 00:59:24 +0400 Subject: [PATCH 3/3] tageditor: migrate to by-name --- .../ta/tageditor/package.nix} | 32 ++++++++----------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 14 insertions(+), 20 deletions(-) rename pkgs/{applications/audio/tageditor/default.nix => by-name/ta/tageditor/package.nix} (72%) diff --git a/pkgs/applications/audio/tageditor/default.nix b/pkgs/by-name/ta/tageditor/package.nix similarity index 72% rename from pkgs/applications/audio/tageditor/default.nix rename to pkgs/by-name/ta/tageditor/package.nix index 7ac0a227d261..f0babd818ed2 100644 --- a/pkgs/applications/audio/tageditor/default.nix +++ b/pkgs/by-name/ta/tageditor/package.nix @@ -5,15 +5,11 @@ pkg-config, cmake, cpp-utilities, - qtutilities, mp4v2, libid3tag, - qtbase, - qttools, - qtwebengine, - qtx11extras, + libsForQt5, + qt5, tagparser, - wrapQtAppsHook, }: stdenv.mkDerivation rec { @@ -22,26 +18,26 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "martchus"; - repo = pname; - rev = "v${version}"; + repo = "tageditor"; + tag = "v${version}"; hash = "sha256-Sia6Y/V81WQj4oWjZAAR4o3TngfWq7sWxxiKEuFjQ2M="; }; nativeBuildInputs = [ pkg-config cmake - wrapQtAppsHook + qt5.wrapQtAppsHook ]; buildInputs = [ mp4v2 libid3tag - qtbase - qttools - qtx11extras - qtwebengine + qt5.qtbase + qt5.qttools + qt5.qtx11extras + qt5.qtwebengine cpp-utilities - qtutilities + libsForQt5.qtutilities tagparser ]; @@ -51,12 +47,12 @@ stdenv.mkDerivation rec { ln -s $out/Applications/tageditor.app/Contents/MacOS/tageditor $out/bin/tageditor ''; - meta = with lib; { + meta = { homepage = "https://github.com/Martchus/tageditor"; description = "Tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska"; - license = licenses.gpl2; - maintainers = [ maintainers.matthiasbeyer ]; - platforms = platforms.unix; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.matthiasbeyer ]; + platforms = lib.platforms.unix; mainProgram = "tageditor"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4d7c6373129..f34e4e5937d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11351,8 +11351,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon; }; - tageditor = libsForQt5.callPackage ../applications/audio/tageditor { }; - tclap = tclap_1_2; tclap_1_2 = callPackage ../development/libraries/tclap/1.2.nix { };