Merge pull request #242896 from adamcstephens/kitty/0.29.0

kitty: 0.28.1 -> 0.29.0

authored by Sandro and committed by GitHub f278beca 447d867e

+14 -9
+14 -9
pkgs/applications/terminal-emulators/kitty/default.nix
··· 29 29 with python3Packages; 30 30 buildPythonApplication rec { 31 31 pname = "kitty"; 32 - version = "0.28.1"; 32 + version = "0.29.0"; 33 33 format = "other"; 34 34 35 35 src = fetchFromGitHub { 36 36 owner = "kovidgoyal"; 37 37 repo = "kitty"; 38 38 rev = "refs/tags/v${version}"; 39 - hash = "sha256-pAo+bT10rdQOf9j3imKWCCMFGm8KntUeTQUrEE1wYZc="; 39 + hash = "sha256-FTitj43RFCNvSWInXHALyIljfcBBkaq/XI1ZA1k0glk="; 40 40 }; 41 - vendorHash = "sha256-vq19exqsEtXhN20mgC5GCpYGm8s9AC6nlfCfG1lUiI8="; 41 + 42 + goModules = (buildGoModule { 43 + pname = "kitty-go-modules"; 44 + inherit src version; 45 + vendorHash = "sha256-jk2EcYVuhV/UQfHAIfpnn8ZIZnwjA/o8YRXmpoC85Vc="; 46 + }).go-modules; 42 47 43 48 buildInputs = [ 44 49 harfbuzz ··· 100 105 CGO_ENABLED = 0; 101 106 GOFLAGS = "-trimpath"; 102 107 103 - goModules = (buildGoModule { 104 - pname = "kitty-go-modules"; 105 - inherit src vendorHash version; 106 - }).go-modules; 107 - 108 108 configurePhase = '' 109 109 export GOCACHE=$TMPDIR/go-cache 110 110 export GOPATH="$TMPDIR/go" ··· 156 156 --replace test_path_mapping_receive dont_test_path_mapping_receive 157 157 substituteInPlace kitty_tests/shell_integration.py \ 158 158 --replace test_fish_integration dont_test_fish_integration 159 + substituteInPlace kitty_tests/shell_integration.py \ 160 + --replace test_bash_integration dont_test_bash_integration 159 161 substituteInPlace kitty_tests/open_actions.py \ 160 162 --replace test_parsing_of_open_actions dont_test_parsing_of_open_actions 161 163 substituteInPlace kitty_tests/ssh.py \ ··· 164 166 --replace 'class Rendering(BaseTest)' 'class Rendering' 165 167 # theme collection test starts an http server 166 168 rm tools/themes/collection_test.go 169 + # passwd_test tries to exec /usr/bin/dscl 170 + rm tools/utils/passwd_test.go 167 171 ''; 168 172 169 173 checkPhase = '' ··· 220 224 ''; 221 225 222 226 passthru = { 227 + go-modules = goModules; # allow for updateScript to handle vendorHash 228 + tests.test = nixosTests.terminal-emulators.kitty; 223 229 updateScript = nix-update-script {}; 224 - tests.test = nixosTests.terminal-emulators.kitty; 225 230 }; 226 231 227 232 meta = with lib; {