From ffb4c8cb1152302ff62fe17ddb554541754ccb3f Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Sat, 31 May 2025 11:46:33 +0200 Subject: [PATCH 1/2] hackneyed: 0.9.1 -> 0.9.3 https://gitlab.com/Enthymeme/hackneyed-x11-cursors/-/blob/master/CHANGELOG\#L1 --- pkgs/by-name/ha/hackneyed/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/hackneyed/package.nix b/pkgs/by-name/ha/hackneyed/package.nix index 6e63869b6077..886f68e6ccf6 100644 --- a/pkgs/by-name/ha/hackneyed/package.nix +++ b/pkgs/by-name/ha/hackneyed/package.nix @@ -4,23 +4,25 @@ fetchFromGitLab, imagemagick, inkscape, + jq, xcursorgen, }: stdenvNoCC.mkDerivation rec { pname = "hackneyed"; - version = "0.9.1"; + version = "0.9.3"; src = fetchFromGitLab { owner = "Enthymeme"; repo = "hackneyed-x11-cursors"; rev = version; - hash = "sha256-+7QtHgBuhJtQejiHeZ+QoedJo24LqSY51XRVLv9Ho2g="; + hash = "sha256-gq+qBYm15satH/XXK1QYDVu2L2DvZ+2aYg/wDqncwmA="; }; nativeBuildInputs = [ imagemagick inkscape + jq xcursorgen ]; @@ -33,6 +35,7 @@ stdenvNoCC.mkDerivation rec { makeFlags = [ "INKSCAPE=inkscape" "INSTALL=install" + "JQ=jq" "PREFIX=$(out)" "VERBOSE=1" "XCURSORGEN=xcursorgen" From e111280e04ed6639dbd712e2da967d4f26280af6 Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Sat, 31 May 2025 11:47:00 +0200 Subject: [PATCH 2/2] hackneyed: remove usages of with lib; --- pkgs/by-name/ha/hackneyed/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ha/hackneyed/package.nix b/pkgs/by-name/ha/hackneyed/package.nix index 886f68e6ccf6..d52b123f6480 100644 --- a/pkgs/by-name/ha/hackneyed/package.nix +++ b/pkgs/by-name/ha/hackneyed/package.nix @@ -53,11 +53,11 @@ stdenvNoCC.mkDerivation rec { --replace 'inkscape-version: $(INKSCAPE)' 'inkscape-version:' ''; - meta = with lib; { + meta = { homepage = "https://gitlab.com/Enthymeme/hackneyed-x11-cursors"; description = "Scalable cursor theme that resembles Windows 3.x/NT 3.x cursors"; - platforms = platforms.all; - license = licenses.mit; - maintainers = with maintainers; [ somasis ]; + platforms = lib.platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ somasis ]; }; }