Unverified Commit 2ba160ab authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

ghostty{,-bin}: 1.2.3 -> 1.3.0 (#498283)

parents f31bde08 85c85d3c

pkgs/by-name/gh/ghostty-bin/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -8,11 +8,11 @@ 


stdenvNoCC.mkDerivation (finalAttrs: {

  pname = "ghostty-bin";

  version = "1.2.3";

  version = "1.3.0";



  src = fetchurl {

    url = "https://release.files.ghostty.org/${finalAttrs.version}/Ghostty.dmg";

    hash = "sha256-817pHxFuKAJ6ufje9FCYx1dbRLQH/4g6Lc0phcSDIGs=";

    hash = "sha256-U/6Y5wmCEYAIwDuf2/XfJlUip/22vfoY630NTNMdDMU=";

  };



  sourceRoot = ".";

pkgs/by-name/gh/ghostty/deps.nix

+59 −51
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
  fetchurl,

  fetchgit,

  runCommandLocal,

  zig_0_14,

  zig_0_15,

  name ? "zig-packages",

}:

let
@@ -16,7 +16,7 @@ let 
    }:

    runCommandLocal name

      {

        nativeBuildInputs = [ zig_0_14 ];

        nativeBuildInputs = [ zig_0_15 ];

      }

      ''

        hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
@@ -88,6 +88,14 @@ let 
    fetcher.${proto};

in

linkFarm name [

  {

    name = "N-V-__8AANT61wB--nJ95Gj_ctmzAtcjloZ__hRqNw5lC1Kr";

    path = fetchZigArtifact {

      name = "bindings";

      url = "https://deps.files.ghostty.org/DearBindings_v0.17_ImGui_v1.92.5-docking.tar.gz";

      hash = "sha256-i/7FAOAJJvZ5hT7iPWfMOS08MYFzPKRwRzhlHT9wuqM=";

    };

  }

  {

    name = "N-V-__8AALw2uwF_03u4JRkZwRLc3Y9hakkYV7NKRR9-RIZJ";

    path = fetchZigArtifact {
@@ -129,11 +137,11 @@ linkFarm name [ 
    };

  }

  {

    name = "gobject-0.3.0-Skun7ET3nQAc0LzvO0NAvTiGGnmkF36cnmbeCAF6MB7Z";

    name = "gobject-0.3.0-Skun7ANLnwDvEfIpVmohcppXgOvg_I6YOJFmPIsKfXk-";

    path = fetchZigArtifact {

      name = "gobject";

      url = "https://github.com/jcollie/ghostty-gobject/releases/download/0.15.1-2025-09-04-48-1/ghostty-gobject-0.15.1-2025-09-04-48-1.tar.zst";

      hash = "sha256-h6aKUerGlX2ATVEeoN03eWaqDqvUmKdedgpxrSoHvrY=";

      url = "https://deps.files.ghostty.org/gobject-2025-11-08-23-1.tar.zst";

      hash = "sha256-2b1DBvAIHY5LhItq3+q9L6tJgi7itnnrSAHc7fXWDEg=";

    };

  }

  {
@@ -161,19 +169,19 @@ linkFarm name [ 
    };

  }

  {

    name = "N-V-__8AAH0GaQC8a52s6vfIxg88OZgFgEW6DFxfSK4lX_l3";

    name = "N-V-__8AAEbOfQBnvcFcCX2W5z7tDaN8vaNZGamEQtNOe0UI";

    path = fetchZigArtifact {

      name = "imgui";

      url = "https://deps.files.ghostty.org/imgui-1220bc6b9daceaf7c8c60f3c3998058045ba0c5c5f48ae255ff97776d9cd8bfc6402.tar.gz";

      hash = "sha256-oF/QHgTPEat4Hig4fGIdLkIPHmBEyOJ6JeYD6pnveGA=";

      url = "https://github.com/ocornut/imgui/archive/refs/tags/v1.92.5-docking.tar.gz";

      hash = "sha256-yBbCDox18+Fa6Gc1DnmSVQLRpqhZOLsac7iSfl8x+cs=";

    };

  }

  {

    name = "N-V-__8AAIdIAwDt5PxH-cwCxEcTfw4jBV8sR6fZ_XLh-cR7";

    name = "N-V-__8AABVbAwBwDRyZONfx553tvMW8_A2OKUoLzPUSRiLF";

    path = fetchZigArtifact {

      name = "iterm2_themes";

      url = "https://github.com/mbadolato/iTerm2-Color-Schemes/releases/download/release-20260112-150707-28c8f5b/ghostty-themes.tgz";

      hash = "sha256-NIqF12KqXhIrP+LyBtg6WtkHxNUdWOyziAdq8S45RrU=";

      url = "https://deps.files.ghostty.org/ghostty-themes-release-20260216-151611-fc73ce3.tgz";

      hash = "sha256-FCALuGoMgUq2lgnVALKAs5a20uuDXt8Gdt5KeJwKqP0=";

    };

  }

  {
@@ -193,11 +201,11 @@ linkFarm name [ 
    };

  }

  {

    name = "libxev-0.0.0-86vtc2UaEwDfiTKX3iBI-s_hdzfzWQUarT3MUrmUQl-Q";

    name = "libxev-0.0.0-86vtc4IcEwCqEYxEYoN_3KXmc6A9VLcm22aVImfvecYs";

    path = fetchZigArtifact {

      name = "libxev";

      url = "https://github.com/mitchellh/libxev/archive/7f803181b158a10fec8619f793e3b4df515566cb.tar.gz";

      hash = "sha256-KaozYKEhhT/6sInef7/8O/60LDBJN+8QmdLuNY1Gkmc=";

      url = "https://deps.files.ghostty.org/libxev-34fa50878aec6e5fa8f532867001ab3c36fae23e.tar.gz";

      hash = "sha256-YAPqa5bkpRihKPkyMn15oRvTCZaxO3O66ymRY3lIfdc=";

    };

  }

  {
@@ -265,11 +273,27 @@ linkFarm name [ 
    };

  }

  {

    name = "vaxis-0.1.0-BWNV_FUICQAFZnTCL11TUvnUr1Y0_ZdqtXHhd51d76Rn";

    name = "uucode-0.1.0-ZZjBPj96QADXyt5sqwBJUnhaDYs_qBeeKijZvlRa0eqM";

    path = fetchZigArtifact {

      name = "uucode";

      url = "git+https://github.com/jacobsandlund/uucode#5f05f8f83a75caea201f12cc8ea32a2d82ea9732";

      hash = "sha256-sHPh+TQSdUGus/QTbj7KSJJkTuNTrK4VNmQDjS30Lf8=";

    };

  }

  {

    name = "uucode-0.2.0-ZZjBPqZVVABQepOqZHR7vV_NcaN-wats0IB6o-Exj6m9";

    path = fetchZigArtifact {

      name = "uucode";

      url = "https://deps.files.ghostty.org/uucode-0.2.0-ZZjBPqZVVABQepOqZHR7vV_NcaN-wats0IB6o-Exj6m9.tar.gz";

      hash = "sha256-0KvuD0+L1urjwFF3fhbnxC2JZKqqAVWRxOVlcD9GX5U=";

    };

  }

  {

    name = "vaxis-0.5.1-BWNV_LosCQAGmCCNOLljCIw6j6-yt53tji6n6rwJ2BhS";

    path = fetchZigArtifact {

      name = "vaxis";

      url = "git+https://github.com/rockorager/libvaxis#1f41c121e8fc153d9ce8c6eb64b2bbab68ad7d23";

      hash = "sha256-bNZ3oveT6vPChjimPJ/GGfcdivlAeJdl/xfWM+S/MHY=";

      url = "https://deps.files.ghostty.org/vaxis-7dbb9fd3122e4ffad262dd7c151d80d863b68558.tar.gz";

      hash = "sha256-LnIzK8icW1Qexua9SHaeHz+3V8QAbz0a+UC1T5sIjvY=";

    };

  }

  {
@@ -297,67 +321,51 @@ linkFarm name [ 
    };

  }

  {

    name = "z2d-0.8.1-j5P_Hq8vDwB8ZaDA54-SzESDLF2zznG_zvTHiQNJImZP";

    name = "z2d-0.10.0-j5P_Hu-6FgBsZNgwphIqh17jDnj8_yPtD8yzjO6PpHRQ";

    path = fetchZigArtifact {

      name = "z2d";

      url = "https://github.com/vancluever/z2d/archive/refs/tags/v0.8.1.tar.gz";

      hash = "sha256-0DbDKSYA1ejhVx/WbOkwTgD57PNRFcnRviqBh8xpPZ0=";

      url = "https://deps.files.ghostty.org/z2d-0.10.0-j5P_Hu-6FgBsZNgwphIqh17jDnj8_yPtD8yzjO6PpHRQ.tar.gz";

      hash = "sha256-afIdou/V7gk3/lXE0J5Ir8T7L5GgHvFnyMJ1rgRnl/c=";

    };

  }

  {

    name = "zf-0.10.3-OIRy8aiIAACLrBllz0zjxaH0aOe5oNm3KtEMyCntST-9";

    name = "zf-0.10.3-OIRy8RuJAACKA3Lohoumrt85nRbHwbpMcUaLES8vxDnh";

    path = fetchZigArtifact {

      name = "zf";

      url = "https://github.com/natecraddock/zf/archive/7aacbe6d155d64d15937ca95ca6c014905eb531f.tar.gz";

      hash = "sha256-3nulNQd/4rZ4paeXJYXwAliNNyRNsIOX/q3z1JB8C7I=";

    };

  }

  {

    name = "zg-0.13.4-AAAAAGiZ7QLz4pvECFa_wG4O4TP4FLABHHbemH2KakWM";

    path = fetchZigArtifact {

      name = "zg";

      url = "git+https://codeberg.org/atman/zg#4a002763419a34d61dcbb1f415821b83b9bf8ddc";

      hash = "sha256-fo3l6cjkrr/godElTGnQzalBsasN7J73IDIRmw7v1gA=";

      url = "https://deps.files.ghostty.org/zf-3c52637b7e937c5ae61fd679717da3e276765b23.tar.gz";

      hash = "sha256-OwFdkorwTp4mJyvBXrTbtNmp1GnrbSkKDdrmc7d8RWg=";

    };

  }

  {

    name = "N-V-__8AAB9YCQBaZtQjJZVndk-g_GDIK-NTZcIa63bFp9yZ";

    name = "zig_js-0.0.0-rjCAV-6GAADxFug7rDmPH-uM_XcnJ5NmuAMJCAscMjhi";

    path = fetchZigArtifact {

      name = "zig_js";

      url = "https://deps.files.ghostty.org/zig_js-12205a66d423259567764fa0fc60c82be35365c21aeb76c5a7dc99698401f4f6fefc.tar.gz";

      hash = "sha256-fyNeCVbC9UAaKJY6JhAZlT0A479M/AKYMPIWEZbDWD0=";

      url = "https://deps.files.ghostty.org/zig_js-04db83c617da1956ac5adc1cb9ba1e434c1cb6fd.tar.gz";

      hash = "sha256-TCAY5WAV05UEuAkDhq2c6Tk/ODgAhdnDI3O/flb8c6M=";

    };

  }

  {

    name = "zig_objc-0.0.0-Ir_SpwsPAQBJgi9YRm2ubJMfdoysSq5gKpsIj3izQ8Zk";

    name = "zig_objc-0.0.0-Ir_Sp5gTAQCvxxR7oVIrPXxXwsfKgVP7_wqoOQrZjFeK";

    path = fetchZigArtifact {

      name = "zig_objc";

      url = "https://github.com/mitchellh/zig-objc/archive/c9e917a4e15a983b672ca779c7985d738a2d517c.tar.gz";

      hash = "sha256-o3vl7qfkSi0bKXa6JWuF92qMEGP8Af/shcip5nRo5Nw=";

      url = "https://deps.files.ghostty.org/zig_objc-f356ed02833f0f1b8e84d50bed9e807bf7cdc0ae.tar.gz";

      hash = "sha256-3YSvc3YlNW/NciyzCQnzsujXAmZ89XlxSqfqvArAjsw=";

    };

  }

  {

    name = "wayland-0.4.0-dev-lQa1kjfIAQCmhhQu3xF0KH-94-TzeMXOqfnP0-Dg6Wyy";

    name = "wayland-0.5.0-dev-lQa1khrMAQDJDwYFKpdH3HizherB7sHo5dKMECfvxQHe";

    path = fetchZigArtifact {

      name = "zig_wayland";

      url = "https://codeberg.org/ifreund/zig-wayland/archive/f3c5d503e540ada8cbcb056420de240af0c094f7.tar.gz";

      hash = "sha256-E77GZ15APYbbO1WzmuJi8eG9/iQFbc2CgkNBxjCLUhk=";

      url = "https://deps.files.ghostty.org/zig_wayland-1b5c038ec10da20ed3a15b0b2a6db1c21383e8ea.tar.gz";

      hash = "sha256-TxRrc17Q1Sf1IOO/cdPpP3LD0PpYOujt06SFH3B5Ek4=";

    };

  }

  {

    name = "zigimg-0.1.0-lly-O6N2EABOxke8dqyzCwhtUCAafqP35zC7wsZ4Ddxj";

    name = "zigimg-0.1.0-8_eo2vHnEwCIVW34Q14Ec-xUlzIoVg86-7FU2ypPtxms";

    path = fetchZigArtifact {

      name = "zigimg";

      url = "git+https://github.com/TUSF/zigimg#31268548fe3276c0e95f318a6c0d2ab10565b58d";

      hash = "sha256-oblfr2FIzuqq0FLo/RrzCwUX1NJJuT53EwD3nP3KwN0=";

    };

  }

  {

    name = "ziglyph-0.11.2-AAAAAHPtHwB4Mbzn1KvOV7Wpjo82NYEc_v0WC8oCLrkf";

    path = fetchZigArtifact {

      name = "ziglyph";

      url = "https://deps.files.ghostty.org/ziglyph-b89d43d1e3fb01b6074bc1f7fc980324b04d26a5.tar.gz";

      hash = "sha256-cse98+Ft8QUjX+P88yyYfaxJOJGQ9M7Ymw7jFxDz89k=";

      url = "https://github.com/ivanstepanovftw/zigimg/archive/d7b7ab0ba0899643831ef042bd73289510b39906.tar.gz";

      hash = "sha256-LB7Xa6KzVRRUSwwnyWM+y6fDG+kIDjfnoBDJO1obxVM=";

    };

  }

  {

pkgs/by-name/gh/ghostty/package.nix

+11 −19
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
  bzip2,

  callPackage,

  fetchFromGitHub,

  fetchpatch2,

  fontconfig,

  freetype,

  glib,
@@ -23,16 +22,15 @@ 
  removeReferencesTo,

  versionCheckHook,

  wrapGAppsHook4,

  zig_0_14,

  zig_0_15,



  # Upstream recommends a non-default level

  # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/PACKAGING.md#build-options

  optimizeLevel ? "ReleaseFast",

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "ghostty";

  version = "1.2.3";

  version = "1.3.0";



  outputs = [

    "out"
@@ -46,19 +44,9 @@ stdenv.mkDerivation (finalAttrs: { 
    owner = "ghostty-org";

    repo = "ghostty";

    tag = "v${finalAttrs.version}";

    hash = "sha256-0tmLOJCrrEnVc/ZCp/e646DTddXjv249QcSwkaukL30=";

    hash = "sha256-44bF0MtsaoF0EgUI1TbGUz4NUH6psIRMCZgZJ0GtSaU=";

  };



  # Replace the defunct iTerm2 themes dependency with a newer version

  # Remove when 1.2.4 or 1.3.0 is released

  patches = [

    (fetchpatch2 {

      name = "fix-iterm2-themes-ref.patch";

      url = "https://github.com/pluiedev/ghostty/commit/dc51adc52661bbcacebe5e70b62b5041e3ee56a5.patch";

      hash = "sha256-0DrP4zN26pjeBawoi9U8y6VM/NlfhPmo27Iy5OsMj0s=";

    })

  ];



  deps = callPackage ./deps.nix {

    name = "${finalAttrs.pname}-cache-${finalAttrs.version}";

  };
@@ -70,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { 
    pandoc

    pkg-config

    removeReferencesTo

    zig_0_14

    zig_0_15



    # GTK frontend

    glib # Required for `glib-compile-schemas`
@@ -99,18 +87,22 @@ stdenv.mkDerivation (finalAttrs: { 


  dontSetZigDefaultFlags = true;



  zigBuildFlags = [

  zigCheckFlags = [

    "--system"

    "${finalAttrs.deps}"

    "-Dversion-string=${finalAttrs.version}"

    "-Dcpu=baseline"

    "-Doptimize=${optimizeLevel}"

  ]

  ++ lib.mapAttrsToList (name: package: "-fsys=${name} --search-prefix ${lib.getLib package}") {

    inherit glslang;

  };



  zigCheckFlags = finalAttrs.zigBuildFlags;

  # Only specify the optimization level for the actual build.

  # Tests do not work on ReleaseFast as they rely on triggering

  # specific integrity violations within the internal data structures.

  zigBuildFlags = finalAttrs.zigCheckFlags ++ [

    "-Doptimize=${optimizeLevel}"

  ];



  doCheck = true;