From 7fad8c800363dda8e0814f83ea90822b5dd2f23b Mon Sep 17 00:00:00 2001 From: Atin Bainada Date: Fri, 20 Dec 2024 23:02:16 +0530 Subject: [PATCH 1/2] openboard: 1.7.1 -> 1.7.3 (cherry picked from commit d02e0f5e4b8cb30302126171d529430abaa3a6d9) --- .../graphics/openboard/default.nix | 27 +++++-------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index f8ffdc12ec671..b07a13beb2b4a 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch2, copyDesktopItems, makeDesktopItem, qmake, @@ -56,31 +55,15 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "openboard"; - version = "1.7.1"; + version = "1.7.3"; src = fetchFromGitHub { owner = "OpenBoard-org"; repo = "OpenBoard"; rev = "v${finalAttrs.version}"; - hash = "sha256-gXxxlAEuzMCvFu5oSQayNW191XAC/YKvldItYEFxvNM="; + hash = "sha256-Igp5WSVQ9FrzS2AhDDPwVBo76SaFw9xP6lqgW7S/KIE="; }; - patches = [ - # fix: Support FFmpeg 7.0 - # https://github.com/OpenBoard-org/OpenBoard/pull/1017 - (fetchpatch2 { - url = "https://github.com/OpenBoard-org/OpenBoard/commit/4f45b6c4016972cf5835f9188bda6197b1b4ed2f.patch?full_index=1"; - hash = "sha256-MUJbHfOCMlRO4pg5scm+DrBsngZwB7UPuDJZss5x9Zs="; - }) - - # fix: Resolve FFmpeg 7.0 warnings - # https://github.com/OpenBoard-org/OpenBoard/pull/1017 - (fetchpatch2 { - url = "https://github.com/OpenBoard-org/OpenBoard/commit/315bcac782e10cc6ceef1fc8b78fff40541ea38f.patch?full_index=1"; - hash = "sha256-736eX+uXuZwHJxOXAgxs2/vjjD1JY9mMyj3rR45/7xk="; - }) - ]; - postPatch = '' substituteInPlace OpenBoard.pro \ --replace-fail '/usr/include/quazip5' '${lib.getDev quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \ @@ -167,8 +150,12 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Interactive whiteboard application"; + homepage = "https://openboard.ch/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ fufexan ]; + maintainers = with maintainers; [ + atinba + fufexan + ]; platforms = platforms.linux; mainProgram = "OpenBoard"; }; From 14686e08a472be9784b50a2ca62dd5cf03384d6e Mon Sep 17 00:00:00 2001 From: Atin Bainada Date: Fri, 20 Dec 2024 23:32:55 +0530 Subject: [PATCH 2/2] maintainers: add atinba (cherry picked from commit b1660ddf91c2220ff1f25da19d698eba3054d486) --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4c3999ce44dce..fd18697076eb7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2106,6 +2106,11 @@ github = "AtilaSaraiva"; githubId = 29521461; }; + atinba = { + name = "Atin Bainada"; + github = "atinba"; + githubId = 61903527; + }; atkinschang = { email = "atkinschang+nixpkgs@gmail.com"; github = "AtkinsChang";