diff --git a/hosts/modules/hal/aarch64.nix b/hosts/modules/hal/aarch64.nix index 6a0504ecc..ceea6b202 100644 --- a/hosts/modules/hal/aarch64.nix +++ b/hosts/modules/hal/aarch64.nix @@ -19,6 +19,7 @@ in sane.programs.blueberry.enableFor.user.colin = false; # bluetooth manager: doesn't cross compile (2025-01-05; blocked by marco) sane.programs.fcitx5.enableFor.user.colin = false; #< does not cross compile (2025-01-05; blocked by qtsvg) sane.programs.firefox.config.addons.browserpass-extension.enable = false; #< does not cross compile + sane.programs.lua-language-server.enableFor = { system = false; user.colin = false; }; # lua neovim LSP: doesn't cross compile (2025-01-06) # sane.programs.marksman.enableFor = { system = false; user.colin = false; }; # markdown neovim LSP: cross compiles, but the result is a x86 .NET exe (2025-01-05) sane.programs.mercurial.enableFor.user.colin = false; #< does not cross compile (2025-01-05; unblocked) sane.programs.nix-tree.enableFor = { system = false; user.colin = false; }; #< does not cross compile (2025-01-05; blocked by vty) diff --git a/hosts/modules/hal/samsung/cross.nix b/hosts/modules/hal/samsung/cross.nix index 41a18f81f..b8a40c917 100644 --- a/hosts/modules/hal/samsung/cross.nix +++ b/hosts/modules/hal/samsung/cross.nix @@ -11,6 +11,7 @@ in sane.programs.blueberry.enableFor.user.colin = false; # bluetooth manager: doesn't cross compile sane.programs.efibootmgr.enableFor = { system = false; user.colin = false; }; # efivar doesn't cross compile (2024-09-14) sane.programs.fcitx5.enableFor.user.colin = false; + sane.programs.lua-language-server.enableFor = { system = false; user.colin = false; }; # lua neovim LSP: doesn't cross compile (2025-01-06) sane.programs.ltex-ls.enableFor = { system = false; user.colin = false; }; # LaTeX/html/markdown neovim LSP: doesn't cross compile (2024-08-26) sane.programs.marksman.enableFor = { system = false; user.colin = false; }; # markdown neovim LSP: doesn't cross compile (2024-08-26) sane.programs.mepo.enableFor.user.colin = false; # 2024/06/04: doesn't cross compile (nodejs) diff --git a/pkgs/by-name/nixpkgs-bootstrap/patches.nix b/pkgs/by-name/nixpkgs-bootstrap/patches.nix index ee9b79ad8..82901d10b 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/patches.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/patches.nix @@ -54,24 +54,25 @@ in # hash = "sha256-Hzz+aAzdgdnTu4jvLqpHzdIE3xYMP02/EuA+KvFbUeI="; # }) - (fetchpatch' { - name = "lua-language-server: fix cross compiling"; - prUrl = "https://github.com/NixOS/nixpkgs/pull/370992"; - hash = "sha256-0TG7u+Gcp5y3OKCEG2eDE9D9t+F1zv/I1W6CXlbCOYA="; - }) + # (fetchpatch' { + # # XXX(2025-01-06): patch does not produce valid binaries for cross + # name = "lua-language-server: fix cross compiling"; + # prUrl = "https://github.com/NixOS/nixpkgs/pull/370992"; + # hash = "sha256-jW66W1V3upZMfbjuoruY3OGNJfEewx7DW/Z4vAhMEXw="; + # }) (fetchpatch' { # patch should be safe to remove; keeping it here to track the upstreaming status name = "nixos/gitea: don't configure the database if `createDatabase == false`"; prUrl = "https://github.com/NixOS/nixpkgs/pull/268849"; # saneCommit = "92662a9920cf8b70ad8a061591dc37146123bde3"; - hash = "sha256-3mvNFvOgUtzWwPEHGBSv9UEANxVfD1/fXbiV/mlq0l8="; + hash = "sha256-Bmy1xqqmHqJVpleKWOssF+6SUpKOIm6hIGQsW6+hUTg="; }) (fetchpatch' { name = "itgmania: init at 0.9.0"; prUrl = "https://github.com/NixOS/nixpkgs/pull/355725"; - hash = "sha256-pN14eynQizhGPPiF4bj9e/HdNEmW/gJHvK59ihwM/vA="; + hash = "sha256-PWY7mDoUNrUJMvMJ0fAF8cmvA34YrizG2MvuNIjofvU="; }) # (fetchpatch' {