From 9ab9515d0a3cc7d9002951fae3c53d3bbf08f32f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 29 Jul 2023 17:05:31 +0000 Subject: [PATCH 1/2] pmenu: 3.1.0 -> 3.1.1 --- pkgs/tools/X11/pmenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/pmenu/default.nix b/pkgs/tools/X11/pmenu/default.nix index cb49de6d4c4b..d6fb5d563aeb 100644 --- a/pkgs/tools/X11/pmenu/default.nix +++ b/pkgs/tools/X11/pmenu/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "pmenu"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "phillbush"; repo = "pmenu"; rev = "v${version}"; - sha256 = "sha256-bX1qiNUTxNFeS0hNc5dUqQLEgv22nHqJ0yW55CQlGw4="; + sha256 = "sha256-7NI5az3LxOYEnsts8Qqi3gvO3dXpNjPDOTW2c5Y25Lc="; }; buildInputs = [ From 50a7139fbd1acd4a3d4cfa695e694c529dd26f3a Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 29 Jul 2023 22:34:04 +0200 Subject: [PATCH 2/2] pmenu: use `finalAttrs` pattern --- pkgs/tools/X11/pmenu/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/X11/pmenu/default.nix b/pkgs/tools/X11/pmenu/default.nix index d6fb5d563aeb..c5f6274d988e 100644 --- a/pkgs/tools/X11/pmenu/default.nix +++ b/pkgs/tools/X11/pmenu/default.nix @@ -12,15 +12,15 @@ , conf ? null }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pmenu"; version = "3.1.1"; src = fetchFromGitHub { owner = "phillbush"; repo = "pmenu"; - rev = "v${version}"; - sha256 = "sha256-7NI5az3LxOYEnsts8Qqi3gvO3dXpNjPDOTW2c5Y25Lc="; + rev = "v${finalAttrs.version}"; + hash = "sha256-7NI5az3LxOYEnsts8Qqi3gvO3dXpNjPDOTW2c5Y25Lc="; }; buildInputs = [ @@ -45,16 +45,16 @@ stdenv.mkDerivation rec { "PREFIX=\${out}" ]; - meta = with lib; { + meta = { description = "A pie-menu tool"; + homepage = "https://github.com/phillbush/pmenu"; + license = lib.licenses.mit; longDescription = '' πmenu is a pie menu utility for X. πmenu receives a menu specification in stdin, shows a menu for the user to select one of the options, and outputs the option selected to stdout. ''; - homepage = "https://github.com/phillbush/pmenu"; - license = licenses.mit; - maintainers = with maintainers; [ azahi ]; - platforms = platforms.unix; + maintainers = [ lib.maintainers.azahi ]; + platforms = lib.platforms.unix; }; -} +})