From 1c023c6519dabf7b80aa0555640632663e2f184f Mon Sep 17 00:00:00 2001 From: Caleb Norton Date: Sun, 8 Feb 2026 15:51:46 -0600 Subject: [PATCH] chore: nix typos and deprecations --- CONTRIBUTING.md | 2 +- flake.nix | 7 ++++--- nix/tests.nix | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 41376765b..693768b56 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -370,7 +370,7 @@ requirements for macOS are detailed below. ### Linux 1. Check out the Ghostty source and change to the directory. -2. Run `nix run .#check...driver`. `` should be +2. Run `nix run .#checks...driver`. `` should be `x86_64-linux` or `aarch64-linux` (even on macOS, this launches a Linux VM, not a macOS one). `` should be one of the tests defined in `nix/tests.nix`. The test will build and then launch. Depending on the speed diff --git a/flake.nix b/flake.nix index 945dcd946..0aaeed310 100644 --- a/flake.nix +++ b/flake.nix @@ -64,8 +64,8 @@ forAllPlatforms = f: lib.genAttrs platforms (s: f legacyPackages.${s}); forBuildablePlatforms = f: lib.genAttrs buildablePlatforms (s: f legacyPackages.${s}); in { - devShell = forAllPlatforms (pkgs: - pkgs.callPackage ./nix/devShell.nix { + devShells = forAllPlatforms (pkgs: { + default = pkgs.callPackage ./nix/devShell.nix { zig = zig.packages.${pkgs.stdenv.hostPlatform.system}."0.15.2"; wraptest = pkgs.callPackage ./nix/pkgs/wraptest.nix {}; zon2nix = zon2nix; @@ -77,7 +77,8 @@ ucs-detect = pyfinal.callPackage ./nix/pkgs/ucs-detect.nix {}; }; }; - }); + }; + }); packages = forAllPlatforms (pkgs: { diff --git a/nix/tests.nix b/nix/tests.nix index 3949877cf..28fefbf25 100644 --- a/nix/tests.nix +++ b/nix/tests.nix @@ -91,6 +91,7 @@ }; programs.ssh = { enable = true; + enableDefaultConfig = false; extraOptionOverrides = { StrictHostKeyChecking = "accept-new"; UserKnownHostsFile = "/dev/null";