Merge master into staging-nixos
This commit is contained in:
@@ -73,7 +73,7 @@ mapAliases (
|
||||
easymotion = vim-easymotion;
|
||||
echodoc = echodoc-vim;
|
||||
eighties = vim-eighties;
|
||||
ethersync = teamtype;
|
||||
ethersync = lib.warnOnInstantiate "'ethersync' has been renamed to 'teamtype'" teamtype; # Added 2025-10-31
|
||||
extradite = vim-extradite;
|
||||
feline-nvim = throw "feline.nvim has been removed: upstream deleted repository. Consider using lualine"; # Added 2025-02-09
|
||||
fugitive = vim-fugitive;
|
||||
|
||||
@@ -498,13 +498,13 @@
|
||||
"vendorHash": "sha256-Nxw5C4li2kH6MAlyaqHAUL+XYyuVPZYSkQ6PnmL3sV8="
|
||||
},
|
||||
"hashicorp_awscc": {
|
||||
"hash": "sha256-SrJQG1F9V/HThL6TDduT/qEA2x3tzII56+JMVDFpqEk=",
|
||||
"hash": "sha256-36mL++CVhKitNxzvTyNzvTsmBscZyRlBVOOYZCceqDk=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/awscc",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-awscc",
|
||||
"rev": "v1.61.0",
|
||||
"rev": "v1.62.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-WKshejs/cOtCGpMLxrnzRV+eKDPkPWIjK2nvwDodoDk="
|
||||
"vendorHash": "sha256-AfHyD8OqqBuwkKJOAJmzMxIsIFqnzT+dTFg6jH8qcKk="
|
||||
},
|
||||
"hashicorp_azuread": {
|
||||
"hash": "sha256-9vGXzFLRaQPXECcFtZMnbhHQvEm0FeGwYm4K9utpZf4=",
|
||||
|
||||
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-MoDYjHU6aJY9e5cgjm9InOEDGCs+jvlEurMWg9wo4RY=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
python3.pkgs.cython
|
||||
python3.pkgs.setuptools
|
||||
tcl # One of build scripts require tclsh
|
||||
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
autoreconfHook
|
||||
copyDesktopItems
|
||||
graphicsmagick
|
||||
SDL # for sdl-config during build time
|
||||
SDL
|
||||
];
|
||||
|
||||
depsBuildBuild = [
|
||||
@@ -5,7 +5,7 @@
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
graphviz,
|
||||
igraph,
|
||||
igraph_0, # https://github.com/emsec/hal/issues/623
|
||||
llvmPackages,
|
||||
ninja,
|
||||
nlohmann_json,
|
||||
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||
libsForQt5.qtsvg
|
||||
boost
|
||||
rapidjson
|
||||
igraph
|
||||
igraph_0
|
||||
nlohmann_json
|
||||
spdlog
|
||||
graphviz
|
||||
|
||||
@@ -25,13 +25,13 @@ assert (blas.isILP64 == lapack.isILP64 && blas.isILP64 == arpack.isILP64 && !bla
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "igraph";
|
||||
version = "0.10.17";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "igraph";
|
||||
repo = "igraph";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-NzLn2GXpMgwE8fY1vp5SU0Y7EfyVpQfphGdqU6sQGW4=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-SwcihzISSmeVhpMrysOhWrUzVVuB4ZBVEjC0vHJwrdw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = with lib; {
|
||||
description = "C library for complex network analysis and graph theory";
|
||||
homepage = "https://igraph.org/";
|
||||
changelog = "https://github.com/igraph/igraph/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/igraph/igraph/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [
|
||||
|
||||
@@ -0,0 +1,112 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
arpack,
|
||||
bison,
|
||||
blas,
|
||||
cmake,
|
||||
flex,
|
||||
fop,
|
||||
glpk,
|
||||
gmp,
|
||||
hal-hardware-analyzer,
|
||||
lapack,
|
||||
libxml2,
|
||||
libxslt,
|
||||
llvmPackages,
|
||||
pkg-config,
|
||||
plfit,
|
||||
python3,
|
||||
sourceHighlight,
|
||||
xmlto,
|
||||
}:
|
||||
|
||||
assert (blas.isILP64 == lapack.isILP64 && blas.isILP64 == arpack.isILP64 && !blas.isILP64);
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "igraph";
|
||||
version = "0.10.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "igraph";
|
||||
repo = "igraph";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-NzLn2GXpMgwE8fY1vp5SU0Y7EfyVpQfphGdqU6sQGW4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
echo "${finalAttrs.version}" > IGRAPH_VERSION
|
||||
'';
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"doc"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
cmake
|
||||
flex
|
||||
fop
|
||||
libxml2
|
||||
libxslt
|
||||
pkg-config
|
||||
python3
|
||||
sourceHighlight
|
||||
xmlto
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
arpack
|
||||
blas
|
||||
glpk
|
||||
gmp
|
||||
lapack
|
||||
libxml2
|
||||
plfit
|
||||
]
|
||||
++ lib.optionals stdenv.cc.isClang [
|
||||
llvmPackages.openmp
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DIGRAPH_USE_INTERNAL_BLAS=OFF"
|
||||
"-DIGRAPH_USE_INTERNAL_LAPACK=OFF"
|
||||
"-DIGRAPH_USE_INTERNAL_ARPACK=OFF"
|
||||
"-DIGRAPH_USE_INTERNAL_GLPK=OFF"
|
||||
"-DIGRAPH_USE_INTERNAL_GMP=OFF"
|
||||
"-DIGRAPH_USE_INTERNAL_PLFIT=OFF"
|
||||
"-DIGRAPH_GLPK_SUPPORT=ON"
|
||||
"-DIGRAPH_GRAPHML_SUPPORT=ON"
|
||||
"-DIGRAPH_OPENMP_SUPPORT=ON"
|
||||
"-DIGRAPH_ENABLE_LTO=AUTO"
|
||||
"-DIGRAPH_ENABLE_TLS=ON"
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p "$out/share"
|
||||
cp -r doc "$out/share"
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
substituteInPlace $dev/lib/cmake/igraph/igraph-targets.cmake \
|
||||
--replace-fail "_IMPORT_PREFIX \"$out\"" "_IMPORT_PREFIX \"$dev\""
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
install_name_tool -change libblas.dylib ${blas}/lib/libblas.dylib $out/lib/libigraph.dylib
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "C library for complex network analysis and graph theory";
|
||||
homepage = "https://igraph.org/";
|
||||
changelog = "https://github.com/igraph/igraph/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.all;
|
||||
inherit (hal-hardware-analyzer.meta) maintainers;
|
||||
};
|
||||
})
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdeltachat";
|
||||
version = "2.22.0";
|
||||
version = "2.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chatmail";
|
||||
repo = "core";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-DKqqdcG3C7/RF/wz2SqaiPUjZ/7vMFJTR5DIGTXjoTY=";
|
||||
hash = "sha256-abSLSXD1bZ4Md2cs9pm7wlielLQicyl+/11TeShIsYI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
pname = "chatmail-core";
|
||||
inherit version src;
|
||||
hash = "sha256-x71vytk9ytIhHlRR0lDhDcIaDNJGDdPwb6fkB1SI+NQ=";
|
||||
hash = "sha256-dLcJV2WUwQJ1YdfqrsGp3nkMyilDhmtYA304jeSjxVQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,15 +6,15 @@
|
||||
igraph,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libleidenalg";
|
||||
version = "0.11.1";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vtraag";
|
||||
repo = "libleidenalg";
|
||||
tag = version;
|
||||
hash = "sha256-hEES/OHvgN0yRDp5ZBZTCQfWr1j7s8NqE+Sp9WMHEEY=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ptfX31/1cUHLluc+Y+g28s4BEoGC0LqC9HH0cpkJRJQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -26,11 +26,11 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/vtraag/libleidenalg/blob/${version}/CHANGELOG";
|
||||
changelog = "https://github.com/vtraag/libleidenalg/blob/${finalAttrs.src.tag}/CHANGELOG";
|
||||
description = "C++ library of Leiden algorithm";
|
||||
homepage = "https://github.com/vtraag/libleidenalg";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
howard-hinnant-date,
|
||||
libpng,
|
||||
nlohmann_json,
|
||||
perl,
|
||||
pkg-config,
|
||||
python3Packages,
|
||||
re2,
|
||||
@@ -24,8 +25,10 @@
|
||||
pythonSupport ? true,
|
||||
cudaSupport ? config.cudaSupport,
|
||||
ncclSupport ? cudaSupport && cudaPackages.nccl.meta.available,
|
||||
rocmSupport ? config.rocmSupport,
|
||||
withFullProtobuf ? false,
|
||||
cudaPackages ? { },
|
||||
rocmPackages,
|
||||
}@inputs:
|
||||
|
||||
let
|
||||
@@ -121,6 +124,9 @@ effectiveStdenv.mkDerivation rec {
|
||||
]
|
||||
++ lib.optionals isCudaJetson [
|
||||
cudaPackages.autoAddCudaCompatRunpath
|
||||
]
|
||||
++ lib.optionals rocmSupport [
|
||||
perl # for tools/ci_build/hipify-perl
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -156,6 +162,22 @@ effectiveStdenv.mkDerivation rec {
|
||||
]
|
||||
++ lib.optionals ncclSupport [ nccl ]
|
||||
)
|
||||
++ lib.optionals rocmSupport [
|
||||
rocmPackages.clr
|
||||
rocmPackages.hipblas
|
||||
rocmPackages.hipcub
|
||||
rocmPackages.hipfft
|
||||
rocmPackages.hiprand
|
||||
rocmPackages.hipsparse
|
||||
rocmPackages.rocblas
|
||||
rocmPackages.rocprim
|
||||
rocmPackages.rocrand
|
||||
rocmPackages.rocthrust
|
||||
rocmPackages.miopen
|
||||
rocmPackages.rccl
|
||||
rocmPackages.rocm-smi
|
||||
rocmPackages.roctracer
|
||||
]
|
||||
++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [
|
||||
(darwinMinVersionHook "13.3")
|
||||
];
|
||||
@@ -203,6 +225,7 @@ effectiveStdenv.mkDerivation rec {
|
||||
(lib.cmakeBool "onnxruntime_USE_FULL_PROTOBUF" withFullProtobuf)
|
||||
(lib.cmakeBool "onnxruntime_USE_CUDA" cudaSupport)
|
||||
(lib.cmakeBool "onnxruntime_USE_NCCL" (cudaSupport && ncclSupport))
|
||||
(lib.cmakeBool "onnxruntime_USE_ROCM" rocmSupport)
|
||||
(lib.cmakeBool "onnxruntime_ENABLE_LTO" (!cudaSupport || cudaPackages.cudaOlder "12.8"))
|
||||
]
|
||||
++ lib.optionals pythonSupport [
|
||||
@@ -213,15 +236,43 @@ effectiveStdenv.mkDerivation rec {
|
||||
(lib.cmakeFeature "onnxruntime_CUDNN_HOME" "${cudaPackages.cudnn}")
|
||||
(lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString)
|
||||
(lib.cmakeFeature "onnxruntime_NVCC_THREADS" "1")
|
||||
]
|
||||
++ lib.optionals rocmSupport [
|
||||
# Werror combines with rocprim header issues to cause errors (warp size const deprecation)
|
||||
"--compile-no-warning-as-error"
|
||||
(lib.cmakeFeature "CMAKE_HIP_ARCHITECTURES" (
|
||||
builtins.concatStringsSep ";" rocmPackages.clr.localGpuTargets or rocmPackages.clr.gpuTargets
|
||||
))
|
||||
(lib.cmakeFeature "onnxruntime_ROCM_HOME" "${rocmPackages.clr}")
|
||||
# Incompatible with packaged version, far too slow to build vendored version
|
||||
(lib.cmakeBool "onnxruntime_USE_COMPOSABLE_KERNEL" false)
|
||||
(lib.cmakeBool "onnxruntime_USE_COMPOSABLE_KERNEL_CK_TILE" false)
|
||||
];
|
||||
|
||||
env = lib.optionalAttrs effectiveStdenv.cc.isClang {
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
};
|
||||
env =
|
||||
lib.optionalAttrs effectiveStdenv.cc.isClang {
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
}
|
||||
// lib.optionalAttrs rocmSupport {
|
||||
MIOPEN_PATH = rocmPackages.miopen;
|
||||
# HIP steps fail to find ROCm libs when not in HIPFLAGS, causing
|
||||
# fatal error: 'rocrand/rocrand.h' file not found
|
||||
HIPFLAGS = lib.concatMapStringsSep " " (pkg: "-I${lib.getInclude pkg}/include") [
|
||||
rocmPackages.hipblas
|
||||
rocmPackages.hipcub
|
||||
rocmPackages.hiprand
|
||||
rocmPackages.hipsparse
|
||||
rocmPackages.rocblas
|
||||
rocmPackages.rocprim
|
||||
rocmPackages.rocrand
|
||||
rocmPackages.rocthrust
|
||||
];
|
||||
};
|
||||
|
||||
doCheck =
|
||||
!(
|
||||
cudaSupport
|
||||
|| rocmSupport
|
||||
|| builtins.elem effectiveStdenv.buildPlatform.system [
|
||||
# aarch64-linux fails cpuinfo test, because /sys/devices/system/cpu/ does not exist in the sandbox
|
||||
"aarch64-linux"
|
||||
@@ -231,7 +282,7 @@ effectiveStdenv.mkDerivation rec {
|
||||
]
|
||||
);
|
||||
|
||||
requiredSystemFeatures = lib.optionals cudaSupport [ "big-parallel" ];
|
||||
requiredSystemFeatures = lib.optionals (cudaSupport || rocmSupport) [ "big-parallel" ];
|
||||
|
||||
hardeningEnable = lib.optionals (effectiveStdenv.hostPlatform.system == "loongarch64-linux") [
|
||||
"nostrictaliasing"
|
||||
@@ -247,6 +298,9 @@ effectiveStdenv.mkDerivation rec {
|
||||
"GetRuntimePath() const { return PathString(); }" \
|
||||
"GetRuntimePath() const { return PathString(\"$out/lib/\"); }"
|
||||
''
|
||||
+ lib.optionalString rocmSupport ''
|
||||
patchShebangs tools/ci_build/hipify-perl
|
||||
''
|
||||
+ lib.optionalString (effectiveStdenv.hostPlatform.system == "aarch64-linux") ''
|
||||
# https://github.com/NixOS/nixpkgs/pull/226734#issuecomment-1663028691
|
||||
rm -v onnxruntime/test/optimizer/nhwc_transformer_test.cc
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
diff --git i/packages/opencode/src/provider/models-macro.ts w/packages/opencode/src/provider/models-macro.ts
|
||||
index 91a0348..4f60069 100644
|
||||
--- i/packages/opencode/src/provider/models-macro.ts
|
||||
+++ w/packages/opencode/src/provider/models-macro.ts
|
||||
@@ -1,4 +1,15 @@
|
||||
export async function data() {
|
||||
+ const localApiJsonPath = process.env.MODELS_DEV_API_JSON
|
||||
+
|
||||
+ // Try to read from local file if path is provided
|
||||
+ if (localApiJsonPath) {
|
||||
+ const localFile = Bun.file(localApiJsonPath)
|
||||
+ if (await localFile.exists()) {
|
||||
+ return await localFile.text()
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ // Fallback to fetching from remote URL
|
||||
const json = await fetch("https://models.dev/api.json").then((x) => x.text())
|
||||
return json
|
||||
}
|
||||
@@ -1,200 +1,90 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
stdenvNoCC,
|
||||
buildGoModule,
|
||||
bun,
|
||||
fetchFromGitHub,
|
||||
makeBinaryWrapper,
|
||||
models-dev,
|
||||
nix-update-script,
|
||||
fetchurl,
|
||||
autoPatchelfHook,
|
||||
common-updater-scripts,
|
||||
curl,
|
||||
installShellFiles,
|
||||
jq,
|
||||
unzip,
|
||||
testers,
|
||||
writableTmpDirAsHomeHook,
|
||||
writeShellScript,
|
||||
}:
|
||||
|
||||
let
|
||||
bun-target = {
|
||||
"aarch64-darwin" = "bun-darwin-arm64";
|
||||
"aarch64-linux" = "bun-linux-arm64";
|
||||
"x86_64-darwin" = "bun-darwin-x64";
|
||||
"x86_64-linux" = "bun-linux-x64";
|
||||
};
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "opencode";
|
||||
version = "0.15.29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sst";
|
||||
repo = "opencode";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-L3IcADx0fbtnqlf8Ysc1J5DVJp6ZQtN2faBJqAFMD3g=";
|
||||
};
|
||||
version = "1.0.10";
|
||||
|
||||
tui = buildGoModule {
|
||||
pname = "opencode-tui";
|
||||
inherit (finalAttrs) version src;
|
||||
|
||||
modRoot = "packages/tui";
|
||||
|
||||
vendorHash = "sha256-muwry7B0GlgueV8+9pevAjz3Cg3MX9AMr+rBwUcQ9CM=";
|
||||
|
||||
subPackages = [ "cmd/opencode" ];
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-X=main.Version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 $GOPATH/bin/opencode $out/bin/tui
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
||||
node_modules = stdenvNoCC.mkDerivation {
|
||||
pname = "opencode-node_modules";
|
||||
inherit (finalAttrs) version src;
|
||||
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
|
||||
"GIT_PROXY_COMMAND"
|
||||
"SOCKS_SERVER"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
bun
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
export BUN_INSTALL_CACHE_DIR=$(mktemp -d)
|
||||
|
||||
# NOTE: Disabling post-install scripts with `--ignore-scripts` to avoid
|
||||
# shebang issues
|
||||
# NOTE: `--linker=hoisted` temporarily disables Bun's isolated installs,
|
||||
# which became the default in Bun 1.3.0.
|
||||
# See: https://bun.com/blog/bun-v1.3#isolated-installs-are-now-the-default-for-workspaces
|
||||
# This workaround is required because the 'yargs' dependency is currently
|
||||
# missing when building opencode. Remove this flag once upstream is
|
||||
# compatible with Bun 1.3.0.
|
||||
bun install \
|
||||
--filter=opencode \
|
||||
--force \
|
||||
--frozen-lockfile \
|
||||
--ignore-scripts \
|
||||
--linker=hoisted \
|
||||
--no-progress \
|
||||
--production
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/node_modules
|
||||
cp -R ./node_modules $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# Required else we get errors that our fixed-output derivation references store paths
|
||||
dontFixup = true;
|
||||
|
||||
outputHash =
|
||||
{
|
||||
x86_64-linux = "sha256-QX+6uxG1V4QdecJX5vyFlgy5pBPPv8rne7pklSA2k3c=";
|
||||
aarch64-linux = "sha256-S8nuMMgGeGAuCevuLxMK5j9+VFbqWuqf+ZYZSVzAp/k=";
|
||||
x86_64-darwin = "sha256-qwRMCTSj7+0tygwWO4INYdblpGpUZm2RMhnELdd6sw4=";
|
||||
aarch64-darwin = "sha256-vJ1tSW/ozE1Fz16RFcV46DDyyITGeuBhbqNMegIoGAo=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system};
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
};
|
||||
src =
|
||||
finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}
|
||||
or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
|
||||
sourceRoot = ".";
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [
|
||||
bun
|
||||
makeBinaryWrapper
|
||||
models-dev
|
||||
];
|
||||
unzip
|
||||
installShellFiles
|
||||
]
|
||||
++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ autoPatchelfHook ];
|
||||
|
||||
patches = [
|
||||
# Patch `packages/opencode/src/provider/models-macro.ts` to get contents of
|
||||
# `_api.json` from the file bundled with `bun build`.
|
||||
./local-models-dev.patch
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
cp -R ${finalAttrs.node_modules}/node_modules .
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
env.MODELS_DEV_API_JSON = "${models-dev}/dist/_api.json";
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
bun build \
|
||||
--define OPENCODE_TUI_PATH="'${finalAttrs.tui}/bin/tui'" \
|
||||
--define OPENCODE_VERSION="'${finalAttrs.version}'" \
|
||||
--compile \
|
||||
--target=${bun-target.${stdenvNoCC.hostPlatform.system}} \
|
||||
--outfile=opencode \
|
||||
./packages/opencode/src/index.ts \
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
dontStrip = true;
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 opencode $out/bin/opencode
|
||||
install -Dm 755 ./opencode $out/bin/opencode
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# Execution of commands using bash-tool fail on linux with
|
||||
# Error [ERR_DLOPEN_FAILED]: libstdc++.so.6: cannot open shared object file: No such
|
||||
# file or directory
|
||||
# Thus, we add libstdc++.so.6 manually to LD_LIBRARY_PATH
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/opencode \
|
||||
--set LD_LIBRARY_PATH "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
sources = {
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://github.com/sst/opencode/releases/download/v${finalAttrs.version}/opencode-darwin-arm64.zip";
|
||||
hash = "sha256-D34OcJgIXVkqDOf5Vyce30v5/avDKKYbOAcMWD8HmXM=";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
url = "https://github.com/sst/opencode/releases/download/v${finalAttrs.version}/opencode-linux-arm64.zip";
|
||||
hash = "sha256-v3j0oL2WL4DezOxdEKgOq4f8BkdR01zlYHUzbUUjgtE=";
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://github.com/sst/opencode/releases/download/v${finalAttrs.version}/opencode-darwin-x64.zip";
|
||||
hash = "sha256-+kycX2mbCy7p6VOKO9HequCoJi/5nT8Pf09obZEuj1E=";
|
||||
};
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://github.com/sst/opencode/releases/download/v${finalAttrs.version}/opencode-linux-x64.zip";
|
||||
hash = "sha256-MO8IeCnrTUyNroY7T7XY4WCXP8wgI3r4PxhfGwprh9I=";
|
||||
};
|
||||
};
|
||||
tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
command = "HOME=$(mktemp -d) opencode --version";
|
||||
inherit (finalAttrs) version;
|
||||
};
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--subpackage"
|
||||
"tui"
|
||||
"--subpackage"
|
||||
"node_modules"
|
||||
];
|
||||
};
|
||||
updateScript = writeShellScript "update-opencode" ''
|
||||
set -o errexit
|
||||
export PATH="${
|
||||
lib.makeBinPath [
|
||||
curl
|
||||
jq
|
||||
common-updater-scripts
|
||||
]
|
||||
}"
|
||||
NEW_VERSION=$(curl --silent https://api.github.com/repos/sst/opencode/releases/latest | jq '.tag_name | ltrimstr("v")' --raw-output)
|
||||
if [[ "${finalAttrs.version}" = "$NEW_VERSION" ]]; then
|
||||
echo "No update available."
|
||||
exit 0
|
||||
fi
|
||||
for platform in ${lib.escapeShellArgs finalAttrs.meta.platforms}; do
|
||||
update-source-version "opencode" "$NEW_VERSION" --ignore-same-version --source-key="sources.$platform"
|
||||
done
|
||||
'';
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "AI coding agent built for the terminal";
|
||||
changelog = "https://github.com/sst/opencode/releases/tag/${finalAttrs.src.tag}";
|
||||
changelog = "https://github.com/sst/opencode/releases/tag/v${finalAttrs.version}";
|
||||
longDescription = ''
|
||||
OpenCode is a terminal-based agent that can build anything.
|
||||
It combines a TypeScript/JavaScript core with a Go-based TUI
|
||||
@@ -202,7 +92,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
homepage = "https://github.com/sst/opencode";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
platforms = builtins.attrNames finalAttrs.passthru.sources;
|
||||
maintainers = with lib.maintainers; [
|
||||
zestsystem
|
||||
delafthi
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "stackit-cli";
|
||||
version = "0.45.0";
|
||||
version = "0.46.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stackitcloud";
|
||||
repo = "stackit-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fZ1SlWmPfxhUrLU7mzhM1IP93QgCg2EO3b1JjFDTkcY=";
|
||||
hash = "sha256-f7Af7Zk8rRrYyGChMgAM/a2Cs7fo3ZlN78aq5teZ0oo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pgO+KN6s9MNsOaTiiX4xxsVYPPE5KoTDvG9R8vlRiTw=";
|
||||
vendorHash = "sha256-tMPj4w/9fO9NlmwZoN4F3G4Cc+8wLmAr+fTueHGBn+A=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -16,19 +16,19 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zigbee2mqtt";
|
||||
version = "2.6.2";
|
||||
version = "2.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Koenkk";
|
||||
repo = "zigbee2mqtt";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-tPjIfFAXtezdHDXBSAYLRPYd0G4p1XnU9R36YBRkYTQ=";
|
||||
hash = "sha256-50f5cSwrLiGfMeb3pqOc+599f0y8vG/7emQO1GLrO/4=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-E4FAtOa8FQnPbv0wiMdp1k/L/RYoVOLMPZynag5iGjM=";
|
||||
hash = "sha256-Z8wZX4kGvCG6uAwBxhtY8kFn7WPid8PuxPFjr95nE/I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zizmor";
|
||||
version = "1.15.2";
|
||||
version = "1.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zizmorcore";
|
||||
repo = "zizmor";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-fl3Z4jgeqNxNjcdYQRt02oR7nDrYPN2dhzKeBium7Ug=";
|
||||
hash = "sha256-B1FdgH8IKvcrynFENgpmwAZC/vbKfHVGvyV8bJMFh7k=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4+1EURDrDYG4luaNV9KdRVojXY++H9LNNl2oINfWeLc=";
|
||||
cargoHash = "sha256-1Mf1/ReLrwD/0TE/PhTicMW80oCehAuTy7taztwg6aE=";
|
||||
|
||||
buildInputs = [
|
||||
rust-jemalloc-sys
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "igraph";
|
||||
version = "0.11.9";
|
||||
version = "1.0.0";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
@@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
# export-subst prevents reproducability
|
||||
rm $out/.git_archival.json
|
||||
'';
|
||||
hash = "sha256-rmIICiIyEr5JCmkDAzcdisVaaKDraTQEquPHjK4d7oU=";
|
||||
hash = "sha256-Y7ZQ1yNoD8A5b6c92OGz9Unietdg1uNt/Za6nxdCSP0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -6,26 +6,23 @@
|
||||
igraph,
|
||||
igraph-c,
|
||||
libleidenalg,
|
||||
pythonOlder,
|
||||
setuptools-scm,
|
||||
unittestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "leidenalg";
|
||||
version = "0.10.2";
|
||||
version = "0.11.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vtraag";
|
||||
repo = "leidenalg";
|
||||
tag = version;
|
||||
hash = "sha256-oaTV+BIB/YQBWKrVXuiIEMH/1MxPxeHhjUzbmxt6hlw=";
|
||||
hash = "sha256-u4xW1gsWDpbsFVLlOIiPZtpw9t4iFBC7fzwn04flev8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
buildInputs = [
|
||||
igraph-c
|
||||
@@ -34,18 +31,18 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [ igraph ];
|
||||
|
||||
checkInputs = [
|
||||
nativeCheckInputs = [
|
||||
ddt
|
||||
unittestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "leidenalg" ];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/vtraag/leidenalg/blob/${version}/CHANGELOG";
|
||||
meta = {
|
||||
changelog = "https://github.com/vtraag/leidenalg/blob/${src.tag}/CHANGELOG";
|
||||
description = "Implementation of the Leiden algorithm for various quality functions to be used with igraph in Python";
|
||||
homepage = "https://github.com/vtraag/leidenalg";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ jboy ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ jboy ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -69,6 +69,11 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# https://github.com/jboynyc/textnets/issues/66
|
||||
"test_textnet_save_and_load"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "textnets" ];
|
||||
|
||||
# Enable the package to find the cythonized .so files during testing. See #255262
|
||||
|
||||
@@ -521,6 +521,9 @@ buildPythonPackage.override { inherit stdenv; } rec {
|
||||
}
|
||||
// lib.optionalAttrs rocmSupport {
|
||||
AOTRITON_INSTALLED_PREFIX = "${rocmPackages.aotriton}";
|
||||
# Broken HIP flag setup, fails to compile due to not finding rocthrust
|
||||
# Only supports gfx942 so let's turn it off for now
|
||||
USE_FBGEMM_GENAI = setBool false;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -760,6 +763,7 @@ buildPythonPackage.override { inherit stdenv; } rec {
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [
|
||||
GaetanLepage
|
||||
LunNova # esp. for ROCm
|
||||
teh
|
||||
thoughtpolice
|
||||
tscholak
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "msi-ec-kmods";
|
||||
version = "0-unstable-2025-05-17";
|
||||
version = "0-unstable-2025-09-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BeardOverflow";
|
||||
repo = "msi-ec";
|
||||
rev = "796be9047b13c311ac4cdec33913775f4057f600";
|
||||
hash = "sha256-npJbnWFBVb8TK9ynVD/kXWq2iqO0ACKF4UYsu5mQuok=";
|
||||
rev = "ed92e2eb0005ab815f5492c8cb02495289263738";
|
||||
hash = "sha256-9jynXUvSZT2smyciK8GqojC/4MtxtqfQvJcf5RgPXKY=";
|
||||
};
|
||||
|
||||
dontMakeSourcesWritable = false;
|
||||
@@ -44,6 +44,6 @@ stdenv.mkDerivation {
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.m1dugh ];
|
||||
platforms = lib.platforms.linux;
|
||||
broken = kernel.kernelOlder "5.5";
|
||||
broken = kernel.kernelOlder "6.5";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index bffcbd4..fd1d8a3 100644
|
||||
index 9e598ea..0776132 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,6 +1,7 @@
|
||||
VERSION := 0.08
|
||||
VERSION := 0.12
|
||||
DKMS_ROOT_PATH := /usr/src/msi_ec-$(VERSION)
|
||||
TARGET ?= $(shell uname -r)
|
||||
+KERNELDIR ?= /lib/modules/$(TARGET)/build/
|
||||
KERNELRELEASE ?= $(shell uname -r)
|
||||
+KERNELDIR ?= /lib/modules/$(KERNELRELEASE)/build/
|
||||
|
||||
ccflags-y := -std=gnu11 -Wno-declaration-after-statement
|
||||
|
||||
@@ -14,11 +14,11 @@ index bffcbd4..fd1d8a3 100644
|
||||
all: modules
|
||||
|
||||
modules:
|
||||
- @$(MAKE) -C /lib/modules/$(TARGET)/build M=$(CURDIR) modules
|
||||
- @$(MAKE) -C /lib/modules/$(KERNELRELEASE)/build M=$(CURDIR) modules
|
||||
+ @$(MAKE) -C $(KERNELDIR) M=$(CURDIR) modules
|
||||
|
||||
clean:
|
||||
@$(MAKE) -C /lib/modules/$(TARGET)/build M=$(CURDIR) clean
|
||||
@$(MAKE) -C /lib/modules/$(KERNELRELEASE)/build M=$(CURDIR) clean
|
||||
|
||||
+modules_install:
|
||||
+ @$(MAKE) -C $(KERNELDIR) M=$(CURDIR) modules_install
|
||||
|
||||
@@ -225,7 +225,7 @@ let
|
||||
if lib.isDerivation v then
|
||||
lib.warnOnInstantiate msg v
|
||||
else if lib.isAttrs v then
|
||||
lib.mapAttrs (lib.warn msg) v
|
||||
lib.mapAttrs (_: lib.warn msg) v
|
||||
else if lib.isFunction v then
|
||||
arg: lib.warn msg (v arg)
|
||||
else if lib.isList v then
|
||||
@@ -532,7 +532,7 @@ mapAliases {
|
||||
eris-go = throw "'eris-go' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
|
||||
eriscmd = throw "'eriscmd' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
|
||||
erlang-ls = throw "'erlang-ls' has been removed as it has been archived upstream. Consider using 'erlang-language-platform' instead"; # Added 2025-10-02
|
||||
ethersync = teamtype; # Added 2025-10-31
|
||||
ethersync = warnAlias "'ethersync' has been renamed to 'teamtype'" teamtype; # Added 2025-10-31
|
||||
eww-wayland = throw "'eww-wayland' has been renamed to/replaced by 'eww'"; # Converted to throw 2025-10-27
|
||||
f3d_egl = warnAlias "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # added 2025-07-18
|
||||
fastnlo_toolkit = throw "'fastnlo_toolkit' has been renamed to/replaced by 'fastnlo-toolkit'"; # Converted to throw 2025-10-27
|
||||
|
||||
@@ -1308,10 +1308,6 @@ with pkgs;
|
||||
|
||||
cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { };
|
||||
|
||||
dosbox = callPackage ../applications/emulators/dosbox {
|
||||
SDL = if stdenv.hostPlatform.isDarwin then SDL else SDL_compat;
|
||||
};
|
||||
|
||||
fceux-qt5 = fceux.override { ___qtVersion = "5"; };
|
||||
fceux-qt6 = fceux.override { ___qtVersion = "6"; };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user