From 8ef63df9e88fada173ea90694822e06418a47837 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Fri, 24 Oct 2025 11:44:03 +0200 Subject: [PATCH 1/4] alacritty{-graphics}: make it possible to use different versions when the fork lags behind --- pkgs/by-name/al/alacritty/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix index 7ff0058a9bf3..8e73175d216b 100644 --- a/pkgs/by-name/al/alacritty/package.nix +++ b/pkgs/by-name/al/alacritty/package.nix @@ -42,9 +42,9 @@ let wayland ]; in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "alacritty"; - version = "0.15.1" + lib.optionalString withGraphics "-graphics"; + version = if !withGraphics then "0.15.1" else "0.15.0-graphics"; src = # by default we want the official package @@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec { fetchFromGitHub { owner = "alacritty"; repo = "alacritty"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/yERMNfCFLPb1S17Y9OacVH8UobDIIZDhM2qPzf5Vds="; } # optionally we want to build the sixels feature fork @@ -60,7 +60,7 @@ rustPlatform.buildRustPackage rec { fetchFromGitHub { owner = "ayosec"; repo = "alacritty"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-n8vO6Q4bzWLaOqg8YhZ+aLOtBBTQ9plKIEJHXq+hhnM="; }; @@ -152,6 +152,6 @@ rustPlatform.buildRustPackage rec { rvdp ]; platforms = lib.platforms.unix; - changelog = "https://github.com/alacritty/alacritty/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/alacritty/alacritty/blob/v${finalAttrs.version}/CHANGELOG.md"; }; -} +}) From a7162adedcd584ce78fc386aea0d767edd88565d Mon Sep 17 00:00:00 2001 From: r-vdp Date: Fri, 24 Oct 2025 11:26:11 +0200 Subject: [PATCH 2/4] alacritty: 0.15.1 -> 0.16.1 Diff: https://github.com/alacritty/alacritty/compare/v0.15.1...v0.16.1 Changelog: https://github.com/alacritty/alacritty/blob/v0.16.1/CHANGELOG.md --- pkgs/by-name/al/alacritty/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix index 8e73175d216b..e69ca9e4a765 100644 --- a/pkgs/by-name/al/alacritty/package.nix +++ b/pkgs/by-name/al/alacritty/package.nix @@ -44,7 +44,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "alacritty"; - version = if !withGraphics then "0.15.1" else "0.15.0-graphics"; + version = if !withGraphics then "0.16.1" else "0.15.0-graphics"; src = # by default we want the official package @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "alacritty"; repo = "alacritty"; tag = "v${finalAttrs.version}"; - hash = "sha256-/yERMNfCFLPb1S17Y9OacVH8UobDIIZDhM2qPzf5Vds="; + hash = "sha256-IOPhnJ76kZ2djJjxJEUwWPvHDeeXbJAn1ClipTH7nWs="; } # optionally we want to build the sixels feature fork else @@ -66,7 +66,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = if !withGraphics then - "sha256-uXwefUV1NAKqwwPIWj4Slkx0c5b+RfLR3caTb42fc4M=" + "sha256-OBhrd4q44LCUGnjDEedhrOuoSC2UFR90IKSQfEPY/Q4=" else "sha256-UtxZFqU974N+YcHoEHifBjNSyaVuMvuc1clTDgUPuoQ="; From 70ce85815a0e962ceb7ec2bc92e2d7474a472ab9 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Fri, 24 Oct 2025 11:26:58 +0200 Subject: [PATCH 3/4] alacritty-graphics: 0.15.0-graphics -> 0.16.0-graphics Diff: https://github.com/ayosec/alacritty/compare/v0.15.0-graphics...v0.16.0-graphics Changelog: https://github.com/alacritty/alacritty/blob/v0.16.0-graphics/CHANGELOG.md --- pkgs/by-name/al/alacritty/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix index e69ca9e4a765..f4d900bed9cd 100644 --- a/pkgs/by-name/al/alacritty/package.nix +++ b/pkgs/by-name/al/alacritty/package.nix @@ -44,7 +44,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "alacritty"; - version = if !withGraphics then "0.16.1" else "0.15.0-graphics"; + version = if !withGraphics then "0.16.1" else "0.16.0-graphics"; src = # by default we want the official package @@ -61,14 +61,14 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "ayosec"; repo = "alacritty"; tag = "v${finalAttrs.version}"; - hash = "sha256-n8vO6Q4bzWLaOqg8YhZ+aLOtBBTQ9plKIEJHXq+hhnM="; + hash = "sha256-JbsHozYMh7hFMAsu823IcVZTzvMEGQP+oKpUnlmM7Nk="; }; cargoHash = if !withGraphics then "sha256-OBhrd4q44LCUGnjDEedhrOuoSC2UFR90IKSQfEPY/Q4=" else - "sha256-UtxZFqU974N+YcHoEHifBjNSyaVuMvuc1clTDgUPuoQ="; + "sha256-fsTs37w4CvYvFN8ZgWxMA2hmgW0hJcIvhLiuhYxs4+Y="; nativeBuildInputs = [ cmake From 7a220f81fe72a071d0312d23f14b4a54ef6ffe25 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Fri, 24 Oct 2025 11:32:52 +0200 Subject: [PATCH 4/4] alacritty: make sure to put the right values for the homepage and changelog --- pkgs/by-name/al/alacritty/package.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix index f4d900bed9cd..78fc353cda62 100644 --- a/pkgs/by-name/al/alacritty/package.nix +++ b/pkgs/by-name/al/alacritty/package.nix @@ -144,7 +144,11 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Cross-platform, GPU-accelerated terminal emulator"; - homepage = "https://github.com/alacritty/alacritty"; + homepage = + if !withGraphics then + "https://github.com/alacritty/alacritty" + else + "https://github.com/ayosec/alacritty"; license = lib.licenses.asl20; mainProgram = "alacritty"; maintainers = with lib.maintainers; [ @@ -152,6 +156,10 @@ rustPlatform.buildRustPackage (finalAttrs: { rvdp ]; platforms = lib.platforms.unix; - changelog = "https://github.com/alacritty/alacritty/blob/v${finalAttrs.version}/CHANGELOG.md"; + changelog = + if !withGraphics then + "https://github.com/alacritty/alacritty/blob/v${finalAttrs.version}/CHANGELOG.md" + else + "https://github.com/ayosec/alacritty/blob/v${finalAttrs.version}/CHANGELOG.md"; }; })