From c82e39f05dee5038274dddfa6ab0df3226e8b0e5 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Thu, 2 May 2024 07:35:58 +0530 Subject: [PATCH 1/3] wofi-emoji: unstable-2023-12-22 -> 1.0.0 --- pkgs/applications/misc/wofi-emoji/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/wofi-emoji/default.nix b/pkgs/applications/misc/wofi-emoji/default.nix index 38f0f8318134..5584ae7ac3b4 100644 --- a/pkgs/applications/misc/wofi-emoji/default.nix +++ b/pkgs/applications/misc/wofi-emoji/default.nix @@ -1,18 +1,18 @@ { stdenv, lib, fetchurl, fetchFromGitHub, jq, wofi, wtype, wl-clipboard }: let emojiJSON = fetchurl { - url = "https://raw.githubusercontent.com/muan/emojilib/v3.0.10/dist/emoji-en-US.json"; - hash = "sha256-UhAB5hVp5vV2d1FjIb2TBd2FJ6OPBbiP31HGAEDQFnA=";}; + url = "https://raw.githubusercontent.com/muan/emojilib/v3.0.12/dist/emoji-en-US.json"; + hash = "sha256-q6YcO8Fd1RuQe9rgY25Ga+cD7OULdDRC8Ck4or9h9oQ="; }; in stdenv.mkDerivation rec { pname = "wofi-emoji"; - version = "unstable-2023-12-22"; + version = "1.0.0"; src = fetchFromGitHub { owner = "Zeioth"; - repo = pname; - rev = "2cc95880848134a3bbe0675bcb62a0dae1d0f572"; - hash = "sha256-t9M8z8JxuvBDzNs98L7YTNUfTK23W1DYGdHDiXNQOgk="; + repo = "wofi-emoji"; + rev = "v${version}"; + hash = "sha256-wLZK7RcDxxlYuu27WNj+SoRoBiCqk9whp4Fyg0SOoPA="; }; nativeBuildInputs = [ jq ]; @@ -44,12 +44,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Simple emoji selector for Wayland using wofi and wl-clipboard"; homepage = "https://github.com/Zeioth/wofi-emoji"; - license = licenses.mit; - maintainers = [ maintainers.ymarkus ]; - platforms = platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ymarkus ]; + platforms = lib.platforms.all; mainProgram = "wofi-emoji"; }; } From e9a121de7b75ceca64e9f0fc485daaa686b8768c Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Thu, 2 May 2024 07:36:57 +0530 Subject: [PATCH 2/3] wofi-emoji: format with nixfmt-rfc-style --- pkgs/applications/misc/wofi-emoji/default.nix | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/wofi-emoji/default.nix b/pkgs/applications/misc/wofi-emoji/default.nix index 5584ae7ac3b4..1c39bbe18348 100644 --- a/pkgs/applications/misc/wofi-emoji/default.nix +++ b/pkgs/applications/misc/wofi-emoji/default.nix @@ -1,8 +1,19 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, jq, wofi, wtype, wl-clipboard }: +{ + stdenv, + lib, + fetchurl, + fetchFromGitHub, + jq, + wofi, + wtype, + wl-clipboard, +}: -let emojiJSON = fetchurl { - url = "https://raw.githubusercontent.com/muan/emojilib/v3.0.12/dist/emoji-en-US.json"; - hash = "sha256-q6YcO8Fd1RuQe9rgY25Ga+cD7OULdDRC8Ck4or9h9oQ="; }; +let + emojiJSON = fetchurl { + url = "https://raw.githubusercontent.com/muan/emojilib/v3.0.11/dist/emoji-en-US.json"; + hash = "sha256-WHqCSNgDzc6ZASdVrwPvsU4MtBcYLKDp2D2Hykrq1sI="; + }; in stdenv.mkDerivation rec { pname = "wofi-emoji"; @@ -16,7 +27,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ jq ]; - buildInputs = [ wofi wtype wl-clipboard ]; + buildInputs = [ + wofi + wtype + wl-clipboard + ]; postPatch = '' substituteInPlace build.sh \ From 9adf11dea9b9da2fd1b6323d7c4444d83ae2093d Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Thu, 2 May 2024 07:37:38 +0530 Subject: [PATCH 3/3] wofi-emoji: add johnrtitor as maintainer --- pkgs/applications/misc/wofi-emoji/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/wofi-emoji/default.nix b/pkgs/applications/misc/wofi-emoji/default.nix index 1c39bbe18348..81ba584cc246 100644 --- a/pkgs/applications/misc/wofi-emoji/default.nix +++ b/pkgs/applications/misc/wofi-emoji/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { description = "Simple emoji selector for Wayland using wofi and wl-clipboard"; homepage = "https://github.com/Zeioth/wofi-emoji"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ymarkus ]; + maintainers = with lib.maintainers; [ johnrtitor ymarkus ]; platforms = lib.platforms.all; mainProgram = "wofi-emoji"; };