diff --git a/flake.lock b/flake.lock index 26823995c..cb80371e2 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770537093, - "narHash": "sha256-XV30uo8tXuxdzuV8l3sojmlPRLd/8tpMsOp4lNzLGUo=", - "rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51", + "lastModified": 1776949667, + "narHash": "sha256-Kq5uL1t/WUp+Z3CjXDpoE9seUiUNLqHN3FkiIjneWeA=", + "rev": "01fbdeef22b76df85ea168fbfe1bfd9e63681b30", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre942631.fef9403a3e4d/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre985930.01fbdeef22b7/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -101,40 +101,18 @@ "type": "github" } }, - "zig_2": { - "inputs": { - "nixpkgs": [ - "zon2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1776888758, - "narHash": "sha256-OlQexlc8pMXAPhGrT89MtDcPCJv8MsFJcxFPMibRBho=", - "ref": "refs/heads/main", - "rev": "a380ec6969faf5fae32f08b96f8529a3bca55d42", - "revCount": 1672, - "type": "git", - "url": "https://codeberg.org/jcollie/zig-overlay.git" - }, - "original": { - "type": "git", - "url": "https://codeberg.org/jcollie/zig-overlay.git" - } - }, "zon2nix": { "inputs": { "nixpkgs": [ "nixpkgs" - ], - "zig": "zig_2" + ] }, "locked": { - "lastModified": 1776999674, - "narHash": "sha256-dEuWd2li80+H7f0k7RA25/Od49G91Pn3El3TcbEpONw=", + "lastModified": 1777261004, + "narHash": "sha256-0djKIL0E8Y1W495bzIkmbCub571ubghZx3Fg7xQPNrk=", "owner": "jcollie", "repo": "zon2nix", - "rev": "fe860f11b076bba30708d1efb4830459ecf85f0d", + "rev": "0251ad79a7c95ba05687a7b0499b90e78699531d", "type": "github" }, "original": { diff --git a/flatpak/zig-packages.json b/flatpak/zig-packages.json index fb895b016..23411e695 100644 --- a/flatpak/zig-packages.json +++ b/flatpak/zig-packages.json @@ -39,7 +39,7 @@ "type": "archive", "url": "https://deps.files.ghostty.org/gobject-2025-11-08-23-1.tar.zst", "dest": "vendor/p/gobject-0.3.0-Skun7ANLnwDvEfIpVmohcppXgOvg_I6YOJFmPIsKfXk-", - "sha256": "3b14bdfd70b968c263d4a84e7053f565937b3c8e000f0e1fee8731e95eb898e7" + "sha256": "d9bd4306f0081d8e4b848b6adfeabd2fab49822ee2b679eb4801dcedf5d60c48" }, { "type": "archive", @@ -87,7 +87,7 @@ "type": "archive", "url": "https://deps.files.ghostty.org/libxev-34fa50878aec6e5fa8f532867001ab3c36fae23e.tar.gz", "dest": "vendor/p/libxev-0.0.0-86vtc4IcEwCqEYxEYoN_3KXmc6A9VLcm22aVImfvecYs", - "sha256": "d41f68244c55c8e5918fe63d77d78790e05394e62e12473018150a7658118648" + "sha256": "6003ea6b96e4a518a128f932327d79a11bd30996b13b73baeb29916379487dd7" }, { "type": "archive", @@ -141,13 +141,13 @@ "type": "archive", "url": "https://deps.files.ghostty.org/uucode-0.2.0-ZZjBPqZVVABQepOqZHR7vV_NcaN-wats0IB6o-Exj6m9.tar.gz", "dest": "vendor/p/uucode-0.2.0-ZZjBPqZVVABQepOqZHR7vV_NcaN-wats0IB6o-Exj6m9", - "sha256": "8cbae1ae60974354fe2d03f5253041077267fb584265f3836c2e127657cd74a8" + "sha256": "d0abee0f4f8bd6eae3c051777e16e7c42d8964aaaa015591c4e565703f465f95" }, { "type": "archive", "url": "https://deps.files.ghostty.org/vaxis-7dbb9fd3122e4ffad262dd7c151d80d863b68558.tar.gz", "dest": "vendor/p/vaxis-0.5.1-BWNV_LosCQAGmCCNOLljCIw6j6-yt53tji6n6rwJ2BhS", - "sha256": "cd3cab66b21f7ccf86248b7def7b4a0de58798e0b06e7eca2c3750c5288ad346" + "sha256": "2e72332bc89c5b541ec6e6bd48769e1f3fb757c4006f3d1af940b54f9b088ef6" }, { "type": "archive", @@ -177,37 +177,37 @@ "type": "archive", "url": "https://deps.files.ghostty.org/z2d-0.10.0-j5P_Hu-6FgBsZNgwphIqh17jDnj8_yPtD8yzjO6PpHRQ.tar.gz", "dest": "vendor/p/z2d-0.10.0-j5P_Hu-6FgBsZNgwphIqh17jDnj8_yPtD8yzjO6PpHRQ", - "sha256": "a83f977b19c08d26a7440c2be5921a3d8d5a421356e431552783d82f0848af61" + "sha256": "69f21da2efd5ee0937fe55c4d09e48afc4fb2f91a01ef167c8c275ae046797f7" }, { "type": "archive", "url": "https://deps.files.ghostty.org/zf-3c52637b7e937c5ae61fd679717da3e276765b23.tar.gz", "dest": "vendor/p/zf-0.10.3-OIRy8RuJAACKA3Lohoumrt85nRbHwbpMcUaLES8vxDnh", - "sha256": "05f01920b8a597723f9c17f5a16c2897becddf825ca66e21b9d0be5d278c8196" + "sha256": "3b015d928af04e9e26272bc15eb4dbb4d9a9d469eb6d290a0ddae673b77c4568" }, { "type": "archive", "url": "https://deps.files.ghostty.org/zig_js-04db83c617da1956ac5adc1cb9ba1e434c1cb6fd.tar.gz", "dest": "vendor/p/zig_js-0.0.0-rjCAV-6GAADxFug7rDmPH-uM_XcnJ5NmuAMJCAscMjhi", - "sha256": "afa19d5f0aeffa34eed0091397237f16e3be3785fe976d20b1b4b9f70ac4ed5e" + "sha256": "4c2018e56015d39504b8090386ad9ce9393f38380085d9c32373bf7e56fc73a3" }, { "type": "archive", "url": "https://deps.files.ghostty.org/zig_objc-f356ed02833f0f1b8e84d50bed9e807bf7cdc0ae.tar.gz", "dest": "vendor/p/zig_objc-0.0.0-Ir_Sp5gTAQCvxxR7oVIrPXxXwsfKgVP7_wqoOQrZjFeK", - "sha256": "8d6150e41ad5f3cd2aa9af4aca996d5ae44ba8d4a1db5ac3c6de89c69d04a0c3" + "sha256": "dd84af737625356fcd722cb30909f3b2e8d702667cf579714aa7eabc0ac08ecc" }, { "type": "archive", "url": "https://deps.files.ghostty.org/zig_wayland-1b5c038ec10da20ed3a15b0b2a6db1c21383e8ea.tar.gz", "dest": "vendor/p/wayland-0.5.0-dev-lQa1khrMAQDJDwYFKpdH3HizherB7sHo5dKMECfvxQHe", - "sha256": "d704648b1cac8dd14ccab013c655ddba401cdf83307cd8f407ac9d6159fe50ac" + "sha256": "4f146b735ed0d527f520e3bf71d3e93f72c3d0fa583ae8edd3a4851f7079124e" }, { "type": "archive", "url": "https://github.com/ivanstepanovftw/zigimg/archive/d7b7ab0ba0899643831ef042bd73289510b39906.tar.gz", "dest": "vendor/p/zigimg-0.1.0-8_eo2vHnEwCIVW34Q14Ec-xUlzIoVg86-7FU2ypPtxms", - "sha256": "be4713968197faf470edee866092cef5ea1c61a10e6235d8134753ee3b1c6780" + "sha256": "2c1ed76ba2b35514544b0c27c9633ecba7c31be9080e37e7a010c93b5a1bc553" }, { "type": "archive", diff --git a/nix/build-support/check-zig-cache.sh b/nix/build-support/check-zig-cache.sh index 934a3c096..9a3927846 100755 --- a/nix/build-support/check-zig-cache.sh +++ b/nix/build-support/check-zig-cache.sh @@ -79,11 +79,6 @@ elif [ "$1" != "--update" ]; then exit 1 fi -# Fetch all dependencies (including lazy ones) into the global cache -# so that zon2nix can find them when resolving transitive dependencies. -# Otherwise, lazy dependencies that aren't unpacked will fail below. -zig build --fetch=all - zon2nix "$BUILD_ZIG_ZON" --15 --nix "$WORK_DIR/build.zig.zon.nix" --txt "$WORK_DIR/build.zig.zon.txt" --json "$WORK_DIR/build.zig.zon.json" --flatpak "$WORK_DIR/zig-packages.json" alejandra --quiet "$WORK_DIR/build.zig.zon.nix" prettier --log-level warn --write "$WORK_DIR/build.zig.zon.json" diff --git a/nix/devShell.nix b/nix/devShell.nix index d1df9fefa..b530c56cd 100644 --- a/nix/devShell.nix +++ b/nix/devShell.nix @@ -12,7 +12,7 @@ #, glxinfo # unused ncurses, nodejs, - nodePackages, + prettier, oniguruma, parallel, pkg-config, @@ -109,7 +109,7 @@ in nodejs # Linting - nodePackages.prettier + prettier alejandra pinact typos