From 41844750e55f17b1385d5b09ca7ade5f11f49506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 31 Aug 2026 17:06:21 +0200 Subject: [PATCH] treewide: convert stdenv.{isLinux,isDarwin} alias to stdenv.hostPlatform.{isLinux,isDarwin} --- flake/dev/fmt.nix | 2 +- plugins/by-name/vimtex/default.nix | 2 +- tests/test-sources/plugins/by-name/magma-nvim/default.nix | 4 ++-- tests/test-sources/plugins/by-name/netman/default.nix | 2 +- tests/test-sources/plugins/by-name/perfanno/default.nix | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake/dev/fmt.nix b/flake/dev/fmt.nix index 2f507342..12c9e302 100644 --- a/flake/dev/fmt.nix +++ b/flake/dev/fmt.nix @@ -53,7 +53,7 @@ }; stylua.enable = true; # FIXME: re-enable on darwin, currently broken: taplo with options '[format]' failed to apply: exit status 101 - taplo.enable = pkgs.stdenv.isLinux; + taplo.enable = pkgs.stdenv.hostPlatform.isLinux; # keep-sorted end }; diff --git a/plugins/by-name/vimtex/default.nix b/plugins/by-name/vimtex/default.nix index 9c668fc9..1674f682 100644 --- a/plugins/by-name/vimtex/default.nix +++ b/plugins/by-name/vimtex/default.nix @@ -59,7 +59,7 @@ lib.nixvim.plugins.mkVimPlugin { extraPackages = let # xdotool does not exist on darwin - xdotool = lib.optional pkgs.stdenv.isLinux cfg.xdotoolPackage; + xdotool = lib.optional pkgs.stdenv.hostPlatform.isLinux cfg.xdotoolPackage; viewerPackages = { general = xdotool; diff --git a/tests/test-sources/plugins/by-name/magma-nvim/default.nix b/tests/test-sources/plugins/by-name/magma-nvim/default.nix index 105f76f0..bc7adae1 100644 --- a/tests/test-sources/plugins/by-name/magma-nvim/default.nix +++ b/tests/test-sources/plugins/by-name/magma-nvim/default.nix @@ -2,13 +2,13 @@ { empty = { # NOTE: 2024-10-10 when marked as linux specific platform - plugins.magma-nvim.enable = pkgs.stdenv.isLinux; + plugins.magma-nvim.enable = pkgs.stdenv.hostPlatform.isLinux; }; defaults = { plugins.magma-nvim = { # NOTE: 2024-10-10 when marked as linux specific platform - enable = pkgs.stdenv.isLinux; + enable = pkgs.stdenv.hostPlatform.isLinux; settings = { image_provider = "none"; diff --git a/tests/test-sources/plugins/by-name/netman/default.nix b/tests/test-sources/plugins/by-name/netman/default.nix index f823f55e..5abf0fd5 100644 --- a/tests/test-sources/plugins/by-name/netman/default.nix +++ b/tests/test-sources/plugins/by-name/netman/default.nix @@ -1,7 +1,7 @@ { pkgs }: # Fails on darwin with: # E5113: Error while calling lua chunk: ...ckages/start/netman.nvim/lua/netman/tools/utils/init.lua:52: Unable to open netman utils cache -pkgs.lib.optionalAttrs (!pkgs.stdenv.isDarwin) { +pkgs.lib.optionalAttrs (!pkgs.stdenv.hostPlatform.isDarwin) { empty = { plugins.netman.enable = true; }; diff --git a/tests/test-sources/plugins/by-name/perfanno/default.nix b/tests/test-sources/plugins/by-name/perfanno/default.nix index d4dba35b..6192c5b0 100644 --- a/tests/test-sources/plugins/by-name/perfanno/default.nix +++ b/tests/test-sources/plugins/by-name/perfanno/default.nix @@ -2,14 +2,14 @@ empty = { pkgs, ... }: { - plugins.perfanno.enable = !pkgs.stdenv.isDarwin; + plugins.perfanno.enable = !pkgs.stdenv.hostPlatform.isDarwin; }; example = { pkgs, ... }: { plugins.perfanno = { - enable = !pkgs.stdenv.isDarwin; + enable = !pkgs.stdenv.hostPlatform.isDarwin; settings = { line_highlights.__raw = ''require("perfanno.util").make_bg_highlights(nil, "#CC3300", 10)'';