Commit 7b5b081d authored by leiserfg's avatar leiserfg Committed by Masum Reza
Browse files

kitty: 0.41.0->0.42.0

parent 5d0f68d3
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ index 1f424146..d3cc191b 100644
                     q = shutil.which(launcher)
-                    if q:
+                    if q and not 'zsh' in q:
                         with self.subTest(sh=sh, launcher=q), tempfile.TemporaryDirectory() as tdir:
                         with tempfile.TemporaryDirectory() as tdir:
                             self.check_bootstrap(sh, tdir, test_script='env; exit 0', SHELL_INTEGRATION_VALUE='', launcher=q)
 
+0 −18
Original line number Diff line number Diff line
--- a/tools/cli/fish.go	2025-04-04 23:43:16
+++ b/tools/cli/fish.go	2025-04-04 23:44:13
@@ -4,6 +4,7 @@
 
 import (
 	"fmt"
+	"sort"
 	"strings"
 
 	"kitty/tools/cli/markup"
@@ -22,6 +23,7 @@
 	}
 	if len(commands) == 0 {
 		commands = append(commands, utils.Keys(all_commands)...)
+		sort.Strings(commands)
 	}
 	script := strings.Builder{}
 	script.WriteString(`function __ksi_completions
+0 −13
Original line number Diff line number Diff line
diff --git a/kitty_tests/ssh.py b/kitty_tests/ssh.py
index 7b3bdbeb..710aeceb 100644
--- a/kitty_tests/ssh.py
+++ b/kitty_tests/ssh.py
@@ -272,8 +272,6 @@ def check_bootstrap(self, sh, home_dir, login_shell='', SHELL_INTEGRATION_VALUE=
 
             def check_untar_or_fail():
                 q = pty.screen_contents()
-                if 'bzip2' in q:
-                    raise ValueError('Untarring failed with screen contents:\n' + q)
                 return 'UNTAR_DONE' in q
             pty.wait_till(check_untar_or_fail)
             self.assertTrue(os.path.exists(os.path.join(home_dir, '.terminfo/kitty.terminfo')))
+0 −35
Original line number Diff line number Diff line
--- a/tools/cli/help.go	2025-04-04 23:55:53
+++ b/tools/cli/help.go	2025-04-04 23:56:59
@@ -9,6 +9,7 @@
 	"os/exec"
 	"slices"
 	"strings"
+	"strconv"
 	"time"
 
 	"golang.org/x/sys/unix"
@@ -133,6 +134,15 @@
 	pager.Stdout = os.Stdout
 	pager.Stderr = os.Stderr
 	_ = pager.Run()
+}
+
+func getDeterministicTimestamp() time.Time {
+	if epochStr, exists := os.LookupEnv("SOURCE_DATE_EPOCH"); exists {
+			if epoch, err := strconv.ParseInt(epochStr, 10, 64); err == nil {
+					return time.Unix(epoch, 0).UTC()
+			}
+	}
+	return time.Now()
 }
 
 func (self *Command) GenerateManPages(level int, recurse bool) (err error) {
@@ -149,7 +159,7 @@
 		return err
 	}
 	defer outf.Close()
-	fmt.Fprintf(outf, `.TH "%s" "1" "%s" "%s" "%s"`, name, time.Now().Format("Jan 02, 2006"), kitty.VersionString, "kitten Manual")
+	fmt.Fprintf(outf, `.TH "%s" "1" "%s" "%s" "%s"`, name, getDeterministicTimestamp().Format("Jan 02, 2006"), kitty.VersionString, "kitten Manual")
 	fmt.Fprintln(outf)
 	fmt.Fprintln(outf, ".SH Name")
 	fmt.Fprintln(outf, name, "\\-", escape_text_for_man(self.ShortDescription))
+3 −11
Original line number Diff line number Diff line
@@ -51,21 +51,21 @@
with python3Packages;
buildPythonApplication rec {
  pname = "kitty";
  version = "0.41.1";
  version = "0.42.0";
  format = "other";

  src = fetchFromGitHub {
    owner = "kovidgoyal";
    repo = "kitty";
    tag = "v${version}";
    hash = "sha256-oTkzFEPgbFa2wPBJxh/9ZbK8liM9isWGEwExJq5/h2o=";
    hash = "sha256-Y9fXSVqkvY4IY5/RYRXXnXWH5kV+9RoHSrp5wSZKZVQ=";
  };

  goModules =
    (buildGo124Module {
      pname = "kitty-go-modules";
      inherit src version;
      vendorHash = "sha256-ld3cGJUjoi3od6gINyGE7fQodl9CSKmakJ1CPLMX+Ss=";
      vendorHash = "sha256-Zp5z5fzCy1q0rXeawWRKBfZkuFbd7N7XkTep94EjnrU=";
    }).goModules;

  buildInputs =
@@ -135,9 +135,6 @@ buildPythonApplication rec {
  ];

  patches = [
    # Gets `test_ssh_env_vars` to pass when `bzip2` is in the output of `env`.
    ./fix-test_ssh_env_vars.patch

    # Needed on darwin

    # Gets `test_ssh_shell_integration` to pass for `zsh` when `compinit` complains about
@@ -148,11 +145,6 @@ buildPythonApplication rec {
    # OSError: master_fd is in error condition
    ./disable-test_ssh_bootstrap_with_different_launchers.patch

    # Makes man page generation respect SOURCE_DATE_EPOCH. Drop on next kitty release https://github.com/kovidgoyal/kitty/pull/8509
    ./fix-timestamp-reproducibility.patch

    # Ensures deterministic ordering of fish shell completions. Drop on next kitty release https://github.com/kovidgoyal/kitty/pull/8509
    ./fix-fish-completion-ordering.patch
  ];

  hardeningDisable = [