diff options
author | Adam Stephens <adam@valkor.net> | 2023-07-11 14:10:20 -0400 |
---|---|---|
committer | Adam Stephens <adam@valkor.net> | 2023-07-12 11:19:12 -0400 |
commit | 0fa2ff387127834bb7ccbe484a281712fd76a84e (patch) | |
tree | 3ac403b64bd7f4f1bb3a954229efe5dd2f970e7e | |
parent | 4f05a87f5e83d02e31cfd017a137811dc39e1782 (diff) |
kitty: 0.28.1 -> 0.29.0
-rw-r--r-- | pkgs/applications/terminal-emulators/kitty/default.nix | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index ea7fc0e3e71e4..7ff455286fc4f 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -29,16 +29,21 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.28.1"; + version = "0.29.0"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "refs/tags/v${version}"; - hash = "sha256-pAo+bT10rdQOf9j3imKWCCMFGm8KntUeTQUrEE1wYZc="; + hash = "sha256-FTitj43RFCNvSWInXHALyIljfcBBkaq/XI1ZA1k0glk="; }; - vendorHash = "sha256-vq19exqsEtXhN20mgC5GCpYGm8s9AC6nlfCfG1lUiI8="; + + goModules = (buildGoModule { + pname = "kitty-go-modules"; + inherit src version; + vendorHash = "sha256-jk2EcYVuhV/UQfHAIfpnn8ZIZnwjA/o8YRXmpoC85Vc="; + }).go-modules; buildInputs = [ harfbuzz @@ -100,11 +105,6 @@ buildPythonApplication rec { CGO_ENABLED = 0; GOFLAGS = "-trimpath"; - goModules = (buildGoModule { - pname = "kitty-go-modules"; - inherit src vendorHash version; - }).go-modules; - configurePhase = '' export GOCACHE=$TMPDIR/go-cache export GOPATH="$TMPDIR/go" @@ -156,6 +156,8 @@ buildPythonApplication rec { --replace test_path_mapping_receive dont_test_path_mapping_receive substituteInPlace kitty_tests/shell_integration.py \ --replace test_fish_integration dont_test_fish_integration + substituteInPlace kitty_tests/shell_integration.py \ + --replace test_bash_integration dont_test_bash_integration substituteInPlace kitty_tests/open_actions.py \ --replace test_parsing_of_open_actions dont_test_parsing_of_open_actions substituteInPlace kitty_tests/ssh.py \ @@ -164,6 +166,8 @@ buildPythonApplication rec { --replace 'class Rendering(BaseTest)' 'class Rendering' # theme collection test starts an http server rm tools/themes/collection_test.go + # passwd_test tries to exec /usr/bin/dscl + rm tools/utils/passwd_test.go ''; checkPhase = '' @@ -220,8 +224,9 @@ buildPythonApplication rec { ''; passthru = { - updateScript = nix-update-script {}; + go-modules = goModules; # allow for updateScript to handle vendorHash tests.test = nixosTests.terminal-emulators.kitty; + updateScript = nix-update-script {}; }; meta = with lib; { |