wezterm: 20240203-110809-5046fc22 -> 0-unstable-2025-01-03 (#370838)

pkgs/applications/terminal-emulators/wezterm/zlib-fdopen.patch

@@ -1,24 +0,0 @@
-Submodule deps/freetype/zlib contains modified content
-diff --git a/deps/freetype/zlib/zutil.h b/deps/freetype/zlib/zutil.h
-index b079ea6..4e94f2f 100644
---- a/deps/freetype/zlib/zutil.h
-+++ b/deps/freetype/zlib/zutil.h
-@@ -130,17 +130,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
- #  endif
- #endif
- 
--#if defined(MACOS) || defined(TARGET_OS_MAC)
-+#if defined(MACOS)
- #  define OS_CODE  7
--#  ifndef Z_SOLO
--#    if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
--#      include <unix.h> /* for fdopen */
--#    else
--#      ifndef fdopen
--#        define fdopen(fd,mode) NULL /* No fdopen() */
--#      endif
--#    endif
--#  endif
- #endif
- 
- #ifdef __acorn

pkgs/by-name/we/wezterm/headless.nix

@@ -0,0 +1,36 @@
+{
+  openssl,
+  pkg-config,
+  rustPlatform,
+  wezterm,
+}:
+
+rustPlatform.buildRustPackage {
+  pname = "wezterm-headless";
+  inherit (wezterm)
+    version
+    src
+    postPatch
+    cargoHash
+    useFetchCargoVendor
+    meta
+    ;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ openssl ];
+
+  cargoBuildFlags = [
+    "--package"
+    "wezterm"
+    "--package"
+    "wezterm-mux-server"
+  ];
+
+  doCheck = false;
+
+  postInstall = ''
+    install -Dm644 assets/shell-integration/wezterm.sh -t $out/etc/profile.d
+    install -Dm644 ${wezterm.passthru.terminfo}/share/terminfo/w/wezterm -t $out/share/terminfo/w
+  '';
+}

pkgs/by-name/we/wezterm/package.nix

@@ -1,61 +1,45 @@
 {
-  stdenv,
-  rustPlatform,
   lib,
+  stdenv,
   fetchFromGitHub,
-  ncurses,
-  perl,
-  pkg-config,
-  python3,
   fontconfig,
   installShellFiles,
-  openssl,
   libGL,
   libX11,
   libxcb,
   libxkbcommon,
+  ncurses,
+  nixosTests,
+  openssl,
+  perl,
+  pkg-config,
+  python3,
+  runCommand,
+  rustPlatform,
+  unstableGitUpdater,
+  vulkan-loader,
+  wayland,
+  wezterm,
   xcbutil,
   xcbutilimage,
   xcbutilkeysyms,
   xcbutilwm,
-  wayland,
   zlib,
-  nixosTests,
-  runCommand,
-  vulkan-loader,
-  fetchpatch2,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "wezterm";
-  version = "20240203-110809-5046fc22";
+  version = "0-unstable-2025-01-03";
 
   src = fetchFromGitHub {
     owner = "wez";
     repo = "wezterm";
-    rev = version;
+    rev = "8e9cf912e66f704f300fac6107206a75036de1e7";
     fetchSubmodules = true;
-    hash = "sha256-Az+HlnK/lRJpUSGm5UKyma1l2PaBKNCGFiaYnLECMX8=";
+    hash = "sha256-JkAovAeoVrH2QlHzzcciraebfsSQPBQPsA3fUKEjRm8=";
   };
 
-  patches = [
-    # Remove unused `fdopen` in vendored zlib, which causes compilation failures with clang 19 on Darwin.
-    # Ref: https://github.com/madler/zlib/commit/4bd9a71f3539b5ce47f0c67ab5e01f3196dc8ef9
-    ./zlib-fdopen.patch
-
-    # Fix platform check in vendored libpng with clang 19 on Darwin.
-    (fetchpatch2 {
-      url = "https://github.com/pnggroup/libpng/commit/893b8113f04d408cc6177c6de19c9889a48faa24.patch?full_index=1";
-      extraPrefix = "deps/freetype/libpng/";
-      stripLen = 1;
-      excludes = [ "deps/freetype/libpng/AUTHORS" ];
-      hash = "sha256-zW/oUo2EGcnsxAfbbbhTKGui/lwCqovyrvUnylfRQzc=";
-    })
-  ];
-
   postPatch = ''
-    cp ${./Cargo.lock} Cargo.lock
-
     echo ${version} > .tag
 
     # tests are failing with: Unable to exchange encryption keys
@@ -69,12 +53,8 @@ rustPlatform.buildRustPackage rec {
       --replace-fail 'hash hostnamectl 2>/dev/null' 'command type -P hostnamectl &>/dev/null'
   '';
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "xcb-imdkit-0.3.0" = "sha256-fTpJ6uNhjmCWv7dZqVgYuS2Uic36XNYTbqlaly5QBjI=";
-    };
-  };
+  cargoHash = "sha256-UagPKPH/PRXk3EFe+rDbkSTSnHdi/Apz0Qek8YlNMxo=";
+  useFetchCargoVendor = true;
 
   nativeBuildInputs = [
     installShellFiles
@@ -137,33 +117,13 @@ rustPlatform.buildRustPackage rec {
 
   passthru = {
     # the headless variant is useful when deploying wezterm's mux server on remote severs
-    headless = rustPlatform.buildRustPackage {
-      pname = "${pname}-headless";
+    headless = import ./headless.nix {
       inherit
-        version
-        src
-        postPatch
-        cargoLock
-        meta
+        openssl
+        pkg-config
+        rustPlatform
+        wezterm
         ;
-
-      nativeBuildInputs = [ pkg-config ];
-
-      buildInputs = [ openssl ];
-
-      cargoBuildFlags = [
-        "--package"
-        "wezterm"
-        "--package"
-        "wezterm-mux-server"
-      ];
-
-      doCheck = false;
-
-      postInstall = ''
-        install -Dm644 assets/shell-integration/wezterm.sh -t $out/etc/profile.d
-        install -Dm644 ${passthru.terminfo}/share/terminfo/w/wezterm -t $out/share/terminfo/w
-      '';
     };
 
     terminfo =
@@ -181,6 +141,11 @@ rustPlatform.buildRustPackage rec {
       # the test is commented out in nixos/tests/terminal-emulators.nix
       #terminal-emulators = nixosTests.terminal-emulators.wezterm;
     };
+
+    # upstream tags are composed with timestamp+commit, e.g.:
+    # 20240203-110809-5046fc22
+    # doesn't make much sense if we are following unstable
+    updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
   };
 
   meta = with lib; {
@@ -189,8 +154,9 @@ rustPlatform.buildRustPackage rec {
     license = licenses.mit;
     mainProgram = "wezterm";
     maintainers = with maintainers; [
-      SuperSandro2000
       mimame
+      SuperSandro2000
+      thiagokokada
     ];
   };
 }

pkgs/top-level/all-packages.nix

@@ -1572,8 +1572,6 @@ with pkgs;
   };
   termite-unwrapped = callPackage ../applications/terminal-emulators/termite { };
 
-  wezterm = callPackage ../applications/terminal-emulators/wezterm { };
-
   twine = with python3Packages; toPythonApplication twine;
 
   amazon-qldb-shell = callPackage ../development/tools/amazon-qldb-shell {