10 Commits

Author SHA1 Message Date
doloro 0188aff399 fix: it builds now
check / build (push) Failing after 15s
check / build (pull_request) Failing after 14s
2026-04-21 23:10:14 +01:00
doloro 34974204db wip: llama-cpp with hexagon 2026-04-21 17:38:09 +01:00
doloro 1228969d80 renamed: llama-cpp-hexagon -> llama-cpp
check / build (push) Failing after 15s
2026-04-20 20:37:53 +01:00
doloro d462837a55 added: llama-cpp 2026-04-20 20:37:29 +01:00
nikkuss a93e936203 Merge pull request 'chore: update neovide hash' (#6) from h4rl/fix-neovide-hash:fix-meow into main
cache / build (push) Failing after 4m27s
Reviewed-on: #6
2026-04-12 22:24:04 +04:00
h4rl 80330456f3 chore: update neovide hash
check / build (pull_request) Failing after 1h32m39s
2026-04-12 20:08:23 +02:00
nikkuss 6e29baf596 fix hash
cache / build (push) Failing after 4m47s
2026-04-10 00:35:41 +04:00
nikkuss 65e6519672 bump firwmware
cache / build (push) Has been cancelled
2026-04-10 00:32:16 +04:00
nikkuss 6948d2a668 Merge pull request 'added: neovide-nightly' (#5) from h4rl/add-neovide:main into main
cache / build (push) Failing after 1h31m28s
Reviewed-on: #5
2026-04-03 01:11:34 +04:00
h4rl 7190efff26 feat: add neovide-nightly
check / build (pull_request) Has been cancelled
2026-04-02 21:41:26 +02:00
10 changed files with 4862 additions and 53 deletions
+42 -17
View File
@@ -1,7 +1,7 @@
{ {
"ath-tools": { "ath-tools": {
"cargoLock": null, "cargoLock": null,
"date": "2026-01-09", "date": "2026-03-03",
"extract": null, "extract": null,
"name": "ath-tools", "name": "ath-tools",
"passthru": null, "passthru": null,
@@ -11,17 +11,17 @@
"fetchSubmodules": false, "fetchSubmodules": false,
"leaveDotGit": false, "leaveDotGit": false,
"name": null, "name": null,
"rev": "f4901c23602cb5b5d86202f3f7f4a62323fdbc82", "rev": "c8182015b0ec81da1d4c39841aca190deae77c2c",
"sha256": "sha256-8kRhGM0Q/0GLMNGztiUVnyRYLAFMx/w6prgWJ3EIU1c=", "sha256": "sha256-Va845WLEyB+l7cpLIvYpvwOyMZuLKcb3Afqqs/cUSmI=",
"sparseCheckout": [], "sparseCheckout": [],
"type": "git", "type": "git",
"url": "https://github.com/qca/qca-swiss-army-knife.git" "url": "https://github.com/qca/qca-swiss-army-knife.git"
}, },
"version": "f4901c23602cb5b5d86202f3f7f4a62323fdbc82" "version": "c8182015b0ec81da1d4c39841aca190deae77c2c"
}, },
"base24-schemes": { "base24-schemes": {
"cargoLock": null, "cargoLock": null,
"date": "2026-02-17", "date": "2026-04-12",
"extract": null, "extract": null,
"name": "base24-schemes", "name": "base24-schemes",
"passthru": null, "passthru": null,
@@ -31,13 +31,13 @@
"fetchSubmodules": false, "fetchSubmodules": false,
"leaveDotGit": false, "leaveDotGit": false,
"name": null, "name": null,
"rev": "7725e097895102ca2949c7a553b54dca0b2e2667", "rev": "3e228732e93c107e8b65b8be30c36e5b3c507d95",
"sha256": "sha256-lOw77YOBM6HNuWcLL4Qugn+vr4RxMKV8FgXqFlnyLIo=", "sha256": "sha256-G34G4hri8H2XNwF0e15MFj3sjO8fTOphNk0WjBwnVew=",
"sparseCheckout": [], "sparseCheckout": [],
"type": "git", "type": "git",
"url": "https://github.com/tinted-theming/schemes.git" "url": "https://github.com/tinted-theming/schemes.git"
}, },
"version": "7725e097895102ca2949c7a553b54dca0b2e2667" "version": "3e228732e93c107e8b65b8be30c36e5b3c507d95"
}, },
"claude-code-acp": { "claude-code-acp": {
"cargoLock": null, "cargoLock": null,
@@ -53,12 +53,12 @@
"name": null, "name": null,
"owner": "zed-industries", "owner": "zed-industries",
"repo": "claude-code-acp", "repo": "claude-code-acp",
"rev": "v0.18.0", "rev": "v0.26.0",
"sha256": "sha256-KZg9z8cyMqMHOfATaT2gcbp0+HkqzecQvAVeHN+bCYg=", "sha256": "sha256-2G8gjMCnk3W1I2+4sNsumL15ts9bLXAOMguCmwnzWSA=",
"sparseCheckout": [], "sparseCheckout": [],
"type": "github" "type": "github"
}, },
"version": "v0.18.0" "version": "v0.26.0"
}, },
"flightcore": { "flightcore": {
"cargoLock": null, "cargoLock": null,
@@ -81,6 +81,31 @@
}, },
"version": "v3.2.0" "version": "v3.2.0"
}, },
"neovide": {
"cargoLock": {
"Cargo.lock": [
"sha256-JBV939TEfG44w59iUJ3KgiCrQ9aCcjmPxu2uoBD_Ank=/Cargo.lock",
{}
]
},
"date": null,
"extract": null,
"name": "neovide",
"passthru": null,
"pinned": false,
"src": {
"deepClone": true,
"fetchSubmodules": true,
"leaveDotGit": false,
"name": null,
"rev": "nightly",
"sha256": "sha256-JBV939TEfG44w59iUJ3KgiCrQ9aCcjmPxu2uoBD/Ank=",
"sparseCheckout": [],
"type": "git",
"url": "https://github.com/neovide/neovide.git"
},
"version": "nightly"
},
"qebspil": { "qebspil": {
"cargoLock": null, "cargoLock": null,
"date": "2025-10-25", "date": "2025-10-25",
@@ -115,12 +140,12 @@
"name": null, "name": null,
"owner": "radareorg", "owner": "radareorg",
"repo": "r2ghidra", "repo": "r2ghidra",
"rev": "6.1.0", "rev": "6.1.2",
"sha256": "sha256-KmzS4Q39ztiGc8rnUqcx5tUXuTCK8WcQrFelKzvaOEw=", "sha256": "sha256-bGA7izBSvlwnD4BZXNucYS39BDdmo+49cY3o4LjIpYM=",
"sparseCheckout": [], "sparseCheckout": [],
"type": "github" "type": "github"
}, },
"version": "6.1.0" "version": "6.1.2"
}, },
"radare2-mcp": { "radare2-mcp": {
"cargoLock": null, "cargoLock": null,
@@ -136,12 +161,12 @@
"name": null, "name": null,
"owner": "radareorg", "owner": "radareorg",
"repo": "radare2-mcp", "repo": "radare2-mcp",
"rev": "1.5.6", "rev": "1.7.2",
"sha256": "sha256-oR7+6djPmrEWpomqNPnw+ciEgXWsB/pmJPvpt37z21w=", "sha256": "sha256-ToSvRmgOyrmsFWjfwuDit5hLXYJQD7YKGoy2utkqUe0=",
"sparseCheckout": [], "sparseCheckout": [],
"type": "github" "type": "github"
}, },
"version": "1.5.6" "version": "1.7.2"
}, },
"slbounce": { "slbounce": {
"cargoLock": null, "cargoLock": null,
+39 -22
View File
@@ -4,45 +4,44 @@
fetchurl, fetchurl,
fetchFromGitHub, fetchFromGitHub,
dockerTools, dockerTools,
}: }: {
{
ath-tools = { ath-tools = {
pname = "ath-tools"; pname = "ath-tools";
version = "f4901c23602cb5b5d86202f3f7f4a62323fdbc82"; version = "c8182015b0ec81da1d4c39841aca190deae77c2c";
src = fetchgit { src = fetchgit {
url = "https://github.com/qca/qca-swiss-army-knife.git"; url = "https://github.com/qca/qca-swiss-army-knife.git";
rev = "f4901c23602cb5b5d86202f3f7f4a62323fdbc82"; rev = "c8182015b0ec81da1d4c39841aca190deae77c2c";
fetchSubmodules = false; fetchSubmodules = false;
deepClone = false; deepClone = false;
leaveDotGit = false; leaveDotGit = false;
sparseCheckout = [ ]; sparseCheckout = [];
sha256 = "sha256-8kRhGM0Q/0GLMNGztiUVnyRYLAFMx/w6prgWJ3EIU1c="; sha256 = "sha256-Va845WLEyB+l7cpLIvYpvwOyMZuLKcb3Afqqs/cUSmI=";
}; };
date = "2026-01-09"; date = "2026-03-03";
}; };
base24-schemes = { base24-schemes = {
pname = "base24-schemes"; pname = "base24-schemes";
version = "7725e097895102ca2949c7a553b54dca0b2e2667"; version = "3e228732e93c107e8b65b8be30c36e5b3c507d95";
src = fetchgit { src = fetchgit {
url = "https://github.com/tinted-theming/schemes.git"; url = "https://github.com/tinted-theming/schemes.git";
rev = "7725e097895102ca2949c7a553b54dca0b2e2667"; rev = "3e228732e93c107e8b65b8be30c36e5b3c507d95";
fetchSubmodules = false; fetchSubmodules = false;
deepClone = false; deepClone = false;
leaveDotGit = false; leaveDotGit = false;
sparseCheckout = [ ]; sparseCheckout = [];
sha256 = "sha256-lOw77YOBM6HNuWcLL4Qugn+vr4RxMKV8FgXqFlnyLIo="; sha256 = "sha256-G34G4hri8H2XNwF0e15MFj3sjO8fTOphNk0WjBwnVew=";
}; };
date = "2026-02-17"; date = "2026-04-12";
}; };
claude-code-acp = { claude-code-acp = {
pname = "claude-code-acp"; pname = "claude-code-acp";
version = "v0.18.0"; version = "v0.26.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zed-industries"; owner = "zed-industries";
repo = "claude-code-acp"; repo = "claude-code-acp";
rev = "v0.18.0"; rev = "v0.26.0";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-KZg9z8cyMqMHOfATaT2gcbp0+HkqzecQvAVeHN+bCYg="; sha256 = "sha256-2G8gjMCnk3W1I2+4sNsumL15ts9bLXAOMguCmwnzWSA=";
}; };
}; };
flightcore = { flightcore = {
@@ -56,6 +55,24 @@
sha256 = "sha256-MFnW9cXFzqmdtC31r8cRcihV3NjGAC6+2/DnNVMheCI="; sha256 = "sha256-MFnW9cXFzqmdtC31r8cRcihV3NjGAC6+2/DnNVMheCI=";
}; };
}; };
neovide = {
pname = "neovide";
version = "nightly";
src = fetchgit {
url = "https://github.com/neovide/neovide.git";
rev = "nightly";
fetchSubmodules = true;
deepClone = true;
leaveDotGit = false;
sparseCheckout = [];
sha256 = "sha256-JBV939TEfG44w59iUJ3KgiCrQ9aCcjmPxu2uoBD/Ank=";
};
cargoLock."Cargo.lock" = {
lockFile = ./. + "/sha256-JBV939TEfG44w59iUJ3KgiCrQ9aCcjmPxu2uoBD_Ank=/Cargo.lock";
outputHashes = {
};
};
};
qebspil = { qebspil = {
pname = "qebspil"; pname = "qebspil";
version = "8e4d9e676a3b3afe136cda9b953a2139ff1a32d0"; version = "8e4d9e676a3b3afe136cda9b953a2139ff1a32d0";
@@ -65,31 +82,31 @@
fetchSubmodules = true; fetchSubmodules = true;
deepClone = false; deepClone = false;
leaveDotGit = false; leaveDotGit = false;
sparseCheckout = [ ]; sparseCheckout = [];
sha256 = "sha256-kWUXzeYWNxGgmjt/p9yozrWc5ouUs0XXBRfiFMlu+QQ="; sha256 = "sha256-kWUXzeYWNxGgmjt/p9yozrWc5ouUs0XXBRfiFMlu+QQ=";
}; };
date = "2025-10-25"; date = "2025-10-25";
}; };
radare2-ghidra = { radare2-ghidra = {
pname = "radare2-ghidra"; pname = "radare2-ghidra";
version = "6.1.0"; version = "6.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "radareorg"; owner = "radareorg";
repo = "r2ghidra"; repo = "r2ghidra";
rev = "6.1.0"; rev = "6.1.2";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-KmzS4Q39ztiGc8rnUqcx5tUXuTCK8WcQrFelKzvaOEw="; sha256 = "sha256-bGA7izBSvlwnD4BZXNucYS39BDdmo+49cY3o4LjIpYM=";
}; };
}; };
radare2-mcp = { radare2-mcp = {
pname = "radare2-mcp"; pname = "radare2-mcp";
version = "1.5.6"; version = "1.7.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "radareorg"; owner = "radareorg";
repo = "radare2-mcp"; repo = "radare2-mcp";
rev = "1.5.6"; rev = "1.7.2";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-oR7+6djPmrEWpomqNPnw+ciEgXWsB/pmJPvpt37z21w="; sha256 = "sha256-ToSvRmgOyrmsFWjfwuDit5hLXYJQD7YKGoy2utkqUe0=";
}; };
}; };
slbounce = { slbounce = {
File diff suppressed because it is too large Load Diff
+7
View File
@@ -30,3 +30,10 @@ git.fetchSubmodules = true
[ath-tools] [ath-tools]
src.git = "https://github.com/qca/qca-swiss-army-knife.git" src.git = "https://github.com/qca/qca-swiss-army-knife.git"
fetch.git = "https://github.com/qca/qca-swiss-army-knife.git" fetch.git = "https://github.com/qca/qca-swiss-army-knife.git"
[neovide]
src.manual = "nightly"
fetch.git = "https://github.com/neovide/neovide.git"
git.fetchSubmodules = true
git.deepClone = true
cargo_lock = ["Cargo.lock"]
+5 -5
View File
@@ -15,7 +15,6 @@
wrapGAppsHook4, wrapGAppsHook4,
fetchFromGitHub, fetchFromGitHub,
}: }:
rustPlatform.buildRustPackage (finalAttrs: { rustPlatform.buildRustPackage (finalAttrs: {
pname = "flightcore"; pname = "flightcore";
version = "3.2.0"; version = "3.2.0";
@@ -25,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
sha256 = "sha256-MFnW9cXFzqmdtC31r8cRcihV3NjGAC6+2/DnNVMheCI="; sha256 = "sha256-MFnW9cXFzqmdtC31r8cRcihV3NjGAC6+2/DnNVMheCI=";
}; };
patches = [ ./cargo-lock.patch ]; patches = [./cargo-lock.patch];
cargoDeps = rustPlatform.fetchCargoVendor { cargoDeps = rustPlatform.fetchCargoVendor {
src = finalAttrs.src; src = finalAttrs.src;
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}";
@@ -42,7 +41,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
hash = "sha256-QhUPkCBK1kcAF7gByFxlg8Ca9PLF3evCl0QYEPP/Q2c="; hash = "sha256-QhUPkCBK1kcAF7gByFxlg8Ca9PLF3evCl0QYEPP/Q2c=";
}; };
nativeBuildInputs = [ nativeBuildInputs =
[
cargo-tauri.hook cargo-tauri.hook
nodejs nodejs
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
jq jq
moreutils moreutils
] ]
++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook4 ]; ++ lib.optionals stdenv.hostPlatform.isLinux [wrapGAppsHook4];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
glib-networking glib-networking
@@ -67,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
buildAndTestSubdir = finalAttrs.cargoRoot; buildAndTestSubdir = finalAttrs.cargoRoot;
meta = { meta = {
platforms = [ "x86_64-linux" ]; platforms = ["x86_64-linux"];
description = "FlightCore A Northstar installer, updater, and mod-manager"; description = "FlightCore A Northstar installer, updater, and mod-manager";
}; };
}) })
@@ -0,0 +1,6 @@
{ llama-cpp }:
llama-cpp.override {
hexagonSupport = true;
blasSupport = false;
}
+223
View File
@@ -0,0 +1,223 @@
{
lib,
pkgs,
autoAddDriverRunpath,
cmake,
fetchFromGitHub,
nix-update-script,
stdenv,
config,
cudaSupport ? config.cudaSupport,
cudaPackages ? { },
rocmSupport ? config.rocmSupport,
rocmPackages ? { },
rocmGpuTargets ? rocmPackages.clr.localGpuTargets or rocmPackages.clr.gpuTargets,
openclSupport ? false,
clblast,
blasSupport ? builtins.all (x: !x) [
cudaSupport
metalSupport
openclSupport
rocmSupport
vulkanSupport
],
blas,
pkg-config,
metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && !openclSupport,
vulkanSupport ? false,
rpcSupport ? false,
hexagonSupport ? false,
curl,
llama-cpp,
shaderc,
vulkan-headers,
hexagon-sdk,
vulkan-loader,
ninja,
}:
let
# It's necessary to consistently use backendStdenv when building with CUDA support,
# otherwise we get libstdc++ errors downstream.
# cuda imposes an upper bound on the gcc version
buildPkgs = import pkgs.path {
system = "x86_64-linux"; # builder uses x86_64
};
# hexagon needs a x86 build env
crossPkgs = buildPkgs.pkgsCross.aarch64-multiplatform;
effectiveStdenv = if hexagonSupport then crossPkgs.stdenv else stdenv;
inherit (lib)
cmakeBool
cmakeFeature
optionals
optionalString
;
cudaBuildInputs = with cudaPackages; [
cuda_cccl # <nv/target>
# A temporary hack for reducing the closure size, remove once cudaPackages
# have stopped using lndir: https://github.com/NixOS/nixpkgs/issues/271792
cuda_cudart
libcublas
];
rocmBuildInputs = with rocmPackages; [
clr
hipblas
rocblas
];
vulkanBuildInputs = [
shaderc
vulkan-headers
vulkan-loader
];
hexagonBuildInputs = [
hexagon-sdk
];
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "llama-cpp";
version = "8871";
src = fetchFromGitHub {
owner = "ggml-org";
repo = "llama.cpp";
tag = "b${finalAttrs.version}";
hash = "sha256-dSMomkkG3YFwXAcYTym6Z03u8ZAWFFio8jdQJPMJ/yg=";
leaveDotGit = true;
postFetch = ''
git -C "$out" rev-parse --short HEAD > $out/COMMIT
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
nativeBuildInputs = [
cmake
pkgs.clang
ninja
pkg-config
blas
]
++ optionals cudaSupport [
cudaPackages.cuda_nvcc
autoAddDriverRunpath
];
buildInputs =
optionals cudaSupport cudaBuildInputs
++ optionals openclSupport [ clblast ]
++ optionals rocmSupport rocmBuildInputs
++ optionals blasSupport [ blas ]
++ optionals vulkanSupport vulkanBuildInputs
++ optionals hexagonSupport hexagonBuildInputs
++ [
curl
];
preConfigure = ''
prependToVar cmakeFlags "-DLLAMA_BUILD_COMMIT:STRING=$(cat COMMIT)"
'';
cmakeFlags = [
# -march=native is non-deterministic; override with platform-specific flags if needed
(cmakeBool "GGML_NATIVE" false)
(cmakeBool "LLAMA_BUILD_EXAMPLES" false)
(cmakeBool "LLAMA_BUILD_SERVER" true)
(cmakeBool "LLAMA_BUILD_TESTS" (finalAttrs.finalPackage.doCheck or false))
(cmakeBool "LLAMA_CURL" true)
(cmakeBool "BUILD_SHARED_LIBS" true)
(cmakeBool "GGML_BLAS" blasSupport)
(cmakeBool "GGML_CLBLAST" openclSupport)
(cmakeBool "GGML_CUDA" cudaSupport)
(cmakeBool "GGML_HIP" rocmSupport)
(cmakeBool "GGML_METAL" metalSupport)
(cmakeBool "GGML_RPC" rpcSupport)
(cmakeBool "GGML_VULKAN" vulkanSupport)
(cmakeBool "GGML_HEXAGON" hexagonSupport)
(cmakeFeature "LLAMA_BUILD_NUMBER" finalAttrs.version)
]
++ optionals cudaSupport [
(cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString)
]
++ optionals rocmSupport [
(cmakeFeature "CMAKE_HIP_COMPILER" "${rocmPackages.clr.hipClangPath}/clang++")
(cmakeFeature "CMAKE_HIP_ARCHITECTURES" (builtins.concatStringsSep ";" rocmGpuTargets))
]
++ optionals metalSupport [
(cmakeFeature "CMAKE_C_FLAGS" "-D__ARM_FEATURE_DOTPROD=1")
(cmakeBool "LLAMA_METAL_EMBED_LIBRARY" true)
]
++ optionals rpcSupport [
# This is done so we can move rpc-server out of bin because llama.cpp doesn't
# install rpc-server in their install target.
(cmakeBool "CMAKE_SKIP_BUILD_RPATH" true)
]
++ optionals hexagonSupport [
# (cmakeFeature "CMAKE_TOOLCHAIN_FILE" "${finalAttrs.src}/cmake/arm64-linux-clang.cmake")
(cmakeFeature "CMAKE_C_FLAGS" "-D__ARM_FEATURE_DOTPROD=1")
(cmakeFeature "CMAKE_CXX_FLAGS" "")
(cmakeBool "GGML_OPENMP" false)
(cmakeBool "GGML_LLAMAFILE" false)
(cmakeFeature "GGML_OPENCL" "OFF")
(cmakeFeature "PREBUILT_LIB_DIR" "linux_aarch64")
(cmakeFeature "GGML_HEXAGON_FP32_QUANTIZE_GROUP_SIZE" "128")
(cmakeFeature "HEXAGON_SDK_ROOT" "${hexagon-sdk}/opt")
(cmakeFeature "HEXAGON_TOOLS_ROOT" "${hexagon-sdk}/opt/tools/HEXAGON_Tools/19.0.04")
(cmakeFeature "LLAMA_OPENSSL" "OFF")
];
# upstream plans on adding targets at the cmakelevel, remove those
# additional steps after that
postInstall = ''
# Match previous binary name for this package
ln -sf $out/bin/llama-cli $out/bin/llama
mkdir -p $out/include
cp $src/include/llama.h $out/include/
''
+ optionalString rpcSupport "cp bin/rpc-server $out/bin/llama-rpc-server";
# the tests are failing as of 2025-08
doCheck = false;
passthru = {
tests = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
metal = llama-cpp.override { metalSupport = true; };
};
updateScript = nix-update-script {
attrPath = "llama-cpp";
extraArgs = [
"--version-regex"
"b(.*)"
];
};
};
meta = {
description = "Inference of Meta's LLaMA model (and others) in pure C/C++";
homepage = "https://github.com/ggml-org/llama.cpp";
license = lib.licenses.mit;
mainProgram = "llama";
maintainers = with lib.maintainers; [
booxter
dit7ya
philiptaron
xddxdd
];
platforms = lib.platforms.unix;
badPlatforms = optionals (cudaSupport || openclSupport) lib.platforms.darwin;
broken =
(metalSupport && !effectiveStdenv.hostPlatform.isDarwin)
|| (hexagonSupport && !effectiveStdenv.hostPlatform.isAarch64);
};
})
+134
View File
@@ -0,0 +1,134 @@
{
lib,
rustPlatform,
clangStdenv,
fetchFromGitHub,
linkFarm,
fetchgit,
runCommand,
gn,
neovim,
ninja,
makeWrapper,
pkg-config,
python3,
removeReferencesTo,
cctools,
SDL2,
fontconfig,
libxrandr,
libxi,
libxext,
libxcursor,
libx11,
stdenv,
libglvnd,
libxkbcommon,
enableWayland ? stdenv.hostPlatform.isLinux,
wayland,
callPackage,
}: let
sources = callPackage ../../../../_sources/generated.nix {};
inherit (sources.neovide) src;
in
rustPlatform.buildRustPackage.override {stdenv = clangStdenv;} (finalAttrs: {
pname = "neovide";
version = src.rev;
src = src;
cargoLock = sources.neovide.cargoLock."Cargo.lock";
env = {
SKIA_SOURCE_DIR = let
repo = fetchFromGitHub {
owner = "rust-skia";
repo = "skia";
# see rust-skia:skia-bindings/Cargo.toml#package.metadata skia
tag = "m145-0.92.0";
hash = "sha256-9N780AwheKBJRcZC4l/uWFNq+oOyoNp4M6dJAVVAFeo=";
};
# The externals for skia are taken from skia/DEPS
externals = linkFarm "skia-externals" (
lib.mapAttrsToList (name: value: {
inherit name;
path = fetchgit value;
}) (lib.importJSON ./skia-externals.json)
);
in
runCommand "source" {} ''
cp -R ${repo} $out
chmod -R +w $out
ln -s ${externals} $out/third_party/externals
'';
SKIA_GN_COMMAND = "${gn}/bin/gn";
SKIA_NINJA_COMMAND = "${ninja}/bin/ninja";
};
nativeBuildInputs =
[
makeWrapper
pkg-config
python3 # skia
removeReferencesTo
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
cctools.libtool
];
nativeCheckInputs = [neovim];
buildInputs = [
SDL2
fontconfig
rustPlatform.bindgenHook
];
postFixup = let
libPath = lib.makeLibraryPath (
[
libglvnd
libxkbcommon
libx11
libxcursor
libxext
libxrandr
libxi
]
++ lib.optionals enableWayland [wayland]
);
in ''
# library skia embeds the path to its sources
remove-references-to -t "$SKIA_SOURCE_DIR" \
$out/bin/neovide
wrapProgram $out/bin/neovide \
--prefix LD_LIBRARY_PATH : ${libPath}
'';
postInstall =
lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/Applications
cp -r extra/osx/Neovide.app $out/Applications
ln -s $out/bin $out/Applications/Neovide.app/Contents/MacOS
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
for n in 16x16 32x32 48x48 256x256; do
install -m444 -D "assets/neovide-$n.png" \
"$out/share/icons/hicolor/$n/apps/neovide.png"
done
install -m444 -Dt $out/share/icons/hicolor/scalable/apps assets/neovide.svg
install -m444 -Dt $out/share/applications assets/neovide.desktop
'';
disallowedReferences = [finalAttrs.env.SKIA_SOURCE_DIR];
meta = {
description = "Simple, no-nonsense, cross-platform graphical user interface for Neovim";
mainProgram = "neovide";
homepage = "https://neovide.dev/";
changelog = "https://github.com/neovide/neovide/releases/tag/${finalAttrs.version}";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
};
})
@@ -0,0 +1,37 @@
{
"expat": {
"url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git",
"rev": "8e49998f003d693213b538ef765814c7d21abada",
"sha256": "sha256-zP2kiB4nyLi0/I8OsRhxKG0qRGPe2ALLQ+HHfqlBJ6Y="
},
"libjpeg-turbo": {
"url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git",
"rev": "e14cbfaa85529d47f9f55b0f104a579c1061f9ad",
"sha256": "sha256-Ig+tmprZDvlf/M72/DTar2pbxat9ZElgSqdXdoM0lPs="
},
"icu": {
"url": "https://chromium.googlesource.com/chromium/deps/icu.git",
"rev": "364118a1d9da24bb5b770ac3d762ac144d6da5a4",
"sha256": "sha256-frsmwYMiFixEULsE91x5+p98DvkyC0s0fNupqjoRnvg="
},
"zlib": {
"url": "https://chromium.googlesource.com/chromium/src/third_party/zlib",
"rev": "646b7f569718921d7d4b5b8e22572ff6c76f2596",
"sha256": "sha256-jNj6SuTZ5/a7crtYhxW3Q/TlfRMNMfYIVxDlr7bYdzQ="
},
"harfbuzz": {
"url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
"rev": "31695252eb6ed25096893aec7f848889dad874bc",
"sha256": "sha256-Csyz08JTNXfY2fo27x1Eg1CqO/tt8Rt9udr3KflojSg="
},
"wuffs": {
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
"rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8",
"sha256": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw="
},
"libpng": {
"url": "https://skia.googlesource.com/third_party/libpng.git",
"rev": "4e3f57d50f552841550a36eabbb3fbcecacb7750",
"sha256": "sha256-tNRrA9RUp6Mi7dbIB/70a/4tn/JxAsTUb9EI9nlXLjM="
}
}
@@ -27,11 +27,11 @@ stdenv.mkDerivation (
rec { rec {
name = "x1e80100-firmware"; name = "x1e80100-firmware";
version = "26100_25.101.12926.0"; version = "26100_26.011.9344.0";
src = fetchurl { src = fetchurl {
# https://www.microsoft.com/en-us/download/details.aspx?id=106120 # https://www.microsoft.com/en-us/download/details.aspx?id=106120
url = "https://download.microsoft.com/download/b7ca2c3f-d320-4795-be0f-529a0117abb4/SurfaceLaptop7_ARM_Win11_${version}.msi"; url = "https://download.microsoft.com/download/b7ca2c3f-d320-4795-be0f-529a0117abb4/SurfaceLaptop7_ARM_Win11_${version}.msi";
hash = "sha256-4LVqkA4YwGrAh3gNSUQ5G2ahwBoj/5QvyFqvNgznvX4="; hash = "sha256-ZkZgmKz5ihrRaarAioWoc0dx9XbmobGwTTyY/VLzahk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
msitools msitools