mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-04-21 14:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into grapheme-width-changes

Browse Source
This commit is contained in:
Jacob Sandlund
2026-02-23 10:57:49 -05:00
parent f53e4b43c4 05b4db574b
commit 327cdbefad
4 changed files with 53 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
flake.nix
View File

@@ -80,6 +80,7 @@
packageOverrides = pyfinal: pyprev: { packageOverrides = pyfinal: pyprev: {
blessed = pyfinal.callPackage ./nix/pkgs/blessed.nix {}; blessed = pyfinal.callPackage ./nix/pkgs/blessed.nix {};
ucs-detect = pyfinal.callPackage ./nix/pkgs/ucs-detect.nix {}; ucs-detect = pyfinal.callPackage ./nix/pkgs/ucs-detect.nix {};
wcwidth = pyfinal.callPackage ./nix/pkgs/wcwidth.nix {};
}; };
}; };
}; };

17
nix/pkgs/blessed.nix
View File

@@ -1,22 +1,24 @@
{ {
lib, lib,
buildPythonPackage, buildPythonPackage,
fetchPypi, fetchFromGitHub,
pythonOlder, pythonOlder,
flit-core, flit-core,
six, six,
wcwidth, wcwidth,
}: }:
buildPythonPackage rec { buildPythonPackage {
pname = "blessed"; pname = "blessed";
version = "1.23.0"; version = "unstable-2026-02-23";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.8";
src = fetchPypi { src = fetchFromGitHub {
inherit pname version; owner = "jquast";
hash = "sha256-VlkaMpZvcE9hMfFACvQVHZ6PX0FEEzpcoDQBl2Pe53s="; repo = "blessed";
rev = "master";
hash = "sha256-ROd/O9pfqnF5DHXqoz+tkl1jQJSZad3Ta1h+oC3+gvY=";
}; };
build-system = [flit-core]; build-system = [flit-core];
@@ -27,6 +29,7 @@ buildPythonPackage rec {
]; ];
doCheck = false; doCheck = false;
dontCheckRuntimeDeps = true;
meta = with lib; { meta = with lib; {
homepage = "https://github.com/jquast/blessed"; homepage = "https://github.com/jquast/blessed";

24
nix/pkgs/ucs-detect.nix
View File

@@ -1,36 +1,42 @@
{ {
lib, lib,
buildPythonPackage, buildPythonPackage,
fetchPypi, fetchFromGitHub,
pythonOlder, pythonOlder,
setuptools, hatchling,
# Dependencies # Dependencies
blessed, blessed,
wcwidth, wcwidth,
pyyaml, pyyaml,
prettytable,
requests,
}: }:
buildPythonPackage rec { buildPythonPackage {
pname = "ucs-detect"; pname = "ucs-detect";
version = "1.0.8"; version = "unstable-2026-02-23";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
src = fetchPypi { src = fetchFromGitHub {
inherit version; owner = "jquast";
pname = "ucs_detect"; repo = "ucs-detect";
hash = "sha256-ihB+tZCd6ykdeXYxc6V1Q6xALQ+xdCW5yqSL7oppqJc="; rev = "master";
hash = "sha256-x7BD14n1/mP9bzjM6DPqc5R1Fk/HLLycl4o41KV+xAE=";
}; };
dependencies = [ dependencies = [
blessed blessed
wcwidth wcwidth
pyyaml pyyaml
prettytable
requests
]; ];
nativeBuildInputs = [setuptools]; nativeBuildInputs = [hatchling];
doCheck = false; doCheck = false;
dontCheckRuntimeDeps = true;
meta = with lib; { meta = with lib; {
description = "Measures number of Terminal column cells of wide-character codes"; description = "Measures number of Terminal column cells of wide-character codes";

27
nix/pkgs/wcwidth.nix Normal file
View File

@@ -0,0 +1,27 @@
{
lib,
buildPythonPackage,
fetchPypi,
hatchling,
}:
buildPythonPackage rec {
pname = "wcwidth";
version = "0.6.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-zcTkJi1u+aGlfgGDhMvrEgjYq7xkF2An4sJFXIExMVk=";
};
build-system = [hatchling];
doCheck = false;
meta = with lib; {
description = "Measures the displayed width of unicode strings in a terminal";
homepage = "https://github.com/jquast/wcwidth";
license = licenses.mit;
maintainers = [];
};
}