From 2bbaf390ffd24c277a68d6c86b33a400a7ac5d2a Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sun, 2 Jun 2024 01:29:08 +0300 Subject: [PATCH 1/7] iina: 1.3.4 -> 1.3.5 Diff: https://github.com/iina/iina/compare/v1.3.4...v1.3.5 Changelog: https://github.com/iina/iina/releases/tag/v1.3.5 --- pkgs/by-name/ii/iina/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ii/iina/package.nix b/pkgs/by-name/ii/iina/package.nix index 2288a688cf0d..f53f869e933d 100644 --- a/pkgs/by-name/ii/iina/package.nix +++ b/pkgs/by-name/ii/iina/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "iina"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { url = "https://github.com/iina/iina/releases/download/v${version}/IINA.v${version}.dmg"; - hash = "sha256-feUPWtSi/Vsnv1mjGyBgB0wFMxx6r6UzrUratlAo14w="; + hash = "sha256-O4uRmfQaGMKqizDlgk0MnazMHVkXaDLqZQ9TP8vcajg="; }; nativeBuildInputs = [ undmg ]; From 7173015b46aa27a081a58d4f83f9540e4d9a2849 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sun, 2 Jun 2024 01:29:18 +0300 Subject: [PATCH 2/7] iina: add maintainer donteatoreo --- pkgs/by-name/ii/iina/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ii/iina/package.nix b/pkgs/by-name/ii/iina/package.nix index f53f869e933d..8210f3b72c26 100644 --- a/pkgs/by-name/ii/iina/package.nix +++ b/pkgs/by-name/ii/iina/package.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; mainProgram = "iina"; - maintainers = with maintainers; [ arkivm stepbrobd ]; + maintainers = with maintainers; [ arkivm donteatoreo stepbrobd ]; }; } From 0cac0b7e95d585ef093366d5cde3610fa3265dcb Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sun, 2 Jun 2024 01:31:41 +0300 Subject: [PATCH 3/7] iina: use finalAttrs pattern --- pkgs/by-name/ii/iina/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ii/iina/package.nix b/pkgs/by-name/ii/iina/package.nix index 8210f3b72c26..2f6aaefd36dc 100644 --- a/pkgs/by-name/ii/iina/package.nix +++ b/pkgs/by-name/ii/iina/package.nix @@ -5,12 +5,12 @@ , nix-update-script }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "iina"; version = "1.3.5"; src = fetchurl { - url = "https://github.com/iina/iina/releases/download/v${version}/IINA.v${version}.dmg"; + url = "https://github.com/iina/iina/releases/download/v${finalAttrs.version}/IINA.v${finalAttrs.version}.dmg"; hash = "sha256-O4uRmfQaGMKqizDlgk0MnazMHVkXaDLqZQ9TP8vcajg="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { mainProgram = "iina"; maintainers = with maintainers; [ arkivm donteatoreo stepbrobd ]; }; -} +}) From 5b281e4f3008329550b6b50fe77191c1a8f7cf40 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sun, 2 Jun 2024 01:33:48 +0300 Subject: [PATCH 4/7] iina: sort meta alphabetically --- pkgs/by-name/ii/iina/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ii/iina/package.nix b/pkgs/by-name/ii/iina/package.nix index 2f6aaefd36dc..d1ca49d94ed6 100644 --- a/pkgs/by-name/ii/iina/package.nix +++ b/pkgs/by-name/ii/iina/package.nix @@ -27,12 +27,12 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = with lib; { - homepage = "https://iina.io/"; description = "The modern media player for macOS"; - platforms = platforms.darwin; + homepage = "https://iina.io/"; license = licenses.gpl3; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - mainProgram = "iina"; maintainers = with maintainers; [ arkivm donteatoreo stepbrobd ]; + mainProgram = "iina"; + platforms = platforms.darwin; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; }) From ff3bced431be3fddbe3514320430de0e0df68a85 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sun, 2 Jun 2024 01:34:40 +0300 Subject: [PATCH 5/7] iina: remove `with lib;` from meta --- pkgs/by-name/ii/iina/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ii/iina/package.nix b/pkgs/by-name/ii/iina/package.nix index d1ca49d94ed6..726c28f7d892 100644 --- a/pkgs/by-name/ii/iina/package.nix +++ b/pkgs/by-name/ii/iina/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "The modern media player for macOS"; homepage = "https://iina.io/"; - license = licenses.gpl3; - maintainers = with maintainers; [ arkivm donteatoreo stepbrobd ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ arkivm donteatoreo stepbrobd ]; mainProgram = "iina"; - platforms = platforms.darwin; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + platforms = lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; }) From f19a7101dec159bc0efa5fb875fc354272af0338 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sun, 2 Jun 2024 01:35:45 +0300 Subject: [PATCH 6/7] iina: refactor stdenv -> stdenvNoCC - Since no C compiler is needed, we should prefer stdenvNoCC --- pkgs/by-name/ii/iina/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ii/iina/package.nix b/pkgs/by-name/ii/iina/package.nix index 726c28f7d892..bb91238521ff 100644 --- a/pkgs/by-name/ii/iina/package.nix +++ b/pkgs/by-name/ii/iina/package.nix @@ -1,11 +1,11 @@ { lib , fetchurl -, stdenv +, stdenvNoCC , undmg , nix-update-script }: -stdenv.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "iina"; version = "1.3.5"; From 8ea8729f12371422e602730c726360c43179f692 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sun, 2 Jun 2024 01:37:09 +0300 Subject: [PATCH 7/7] iina: format with nixfmt-rfc-style --- pkgs/by-name/ii/iina/package.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ii/iina/package.nix b/pkgs/by-name/ii/iina/package.nix index bb91238521ff..d2c19a077ff9 100644 --- a/pkgs/by-name/ii/iina/package.nix +++ b/pkgs/by-name/ii/iina/package.nix @@ -1,8 +1,9 @@ -{ lib -, fetchurl -, stdenvNoCC -, undmg -, nix-update-script +{ + lib, + fetchurl, + stdenvNoCC, + undmg, + nix-update-script, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -30,7 +31,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "The modern media player for macOS"; homepage = "https://iina.io/"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ arkivm donteatoreo stepbrobd ]; + maintainers = with lib.maintainers; [ + arkivm + donteatoreo + stepbrobd + ]; mainProgram = "iina"; platforms = lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];