From cb7760c205ee701eb8e8a0e5d6dcd01c9a50cea0 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 13 May 2024 17:33:06 -0300 Subject: [PATCH 1/3] smplayer: migrate to by-name --- .../default.nix => by-name/sm/smplayer/package.nix} | 12 ++++++++---- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 8 insertions(+), 6 deletions(-) rename pkgs/{applications/video/smplayer/default.nix => by-name/sm/smplayer/package.nix} (94%) diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/by-name/sm/smplayer/package.nix similarity index 94% rename from pkgs/applications/video/smplayer/default.nix rename to pkgs/by-name/sm/smplayer/package.nix index 513468cb16cf..67ec92ddaef5 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/by-name/sm/smplayer/package.nix @@ -1,11 +1,15 @@ { lib , stdenv , fetchFromGitHub -, qmake -, qtscript -, wrapQtAppsHook +, qt5 }: +let + inherit (qt5) + qmake + qtscript + wrapQtAppsHook; +in stdenv.mkDerivation (finalAttrs: { pname = "smplayer"; version = "23.12.0"; @@ -53,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { options of MPlayer, SMPlayer adds other interesting features like the possibility to play Youtube videos or download subtitles. ''; - changelog = "https://github.com/smplayer-dev/smplayer/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/smplayer-dev/smplayer/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee2907d324cc..75d4e2a0e7d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33280,8 +33280,6 @@ with pkgs; protobuf = protobuf_21; }; - smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; - smtube = libsForQt5.callPackage ../applications/video/smtube { }; softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix { }; From 16fc9a5a6532063a05ea13e8e687c8b5f21c7196 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 13 May 2024 17:35:56 -0300 Subject: [PATCH 2/3] smplayer: nixfmt --- pkgs/by-name/sm/smplayer/package.nix | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/sm/smplayer/package.nix b/pkgs/by-name/sm/smplayer/package.nix index 67ec92ddaef5..83287e6b6e59 100644 --- a/pkgs/by-name/sm/smplayer/package.nix +++ b/pkgs/by-name/sm/smplayer/package.nix @@ -1,14 +1,12 @@ -{ lib -, stdenv -, fetchFromGitHub -, qt5 +{ + lib, + stdenv, + fetchFromGitHub, + qt5, }: let - inherit (qt5) - qmake - qtscript - wrapQtAppsHook; + inherit (qt5) qmake qtscript wrapQtAppsHook; in stdenv.mkDerivation (finalAttrs: { pname = "smplayer"; @@ -26,15 +24,11 @@ stdenv.mkDerivation (finalAttrs: { wrapQtAppsHook ]; - buildInputs = [ - qtscript - ]; + buildInputs = [ qtscript ]; dontUseQmakeConfigure = true; - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = { homepage = "https://www.smplayer.info"; From 93b021a440bd392660d990740ce91e157aee71ef Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 13 May 2024 17:51:25 -0300 Subject: [PATCH 3/3] smplayer: 23.12.0 -> 24.5.0 --- pkgs/by-name/sm/smplayer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sm/smplayer/package.nix b/pkgs/by-name/sm/smplayer/package.nix index 83287e6b6e59..f835c1808bc3 100644 --- a/pkgs/by-name/sm/smplayer/package.nix +++ b/pkgs/by-name/sm/smplayer/package.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "smplayer"; - version = "23.12.0"; + version = "24.5.0"; src = fetchFromGitHub { owner = "smplayer-dev"; repo = "smplayer"; rev = "v${finalAttrs.version}"; - hash = "sha256-ip4y9GF2u1yl1Ts8T9XcFg9wdXVTYXfDrrPuHLz6oSs="; + hash = "sha256-KblVDlE8EglMMAclGFZm81obipm6/JLUvsn5sLrpKqc="; }; nativeBuildInputs = [