clean up of ds4 (using my fork of it instead) + update scripts!!!

This commit is contained in:
ari committed 2026-09-25 10:25:13 -04:00
1 parent fd5bb0af6e
commit 507d603ef0
20 files changed
+209 -837

No files matched your search

+4 -4
View File
@@ -42,7 +42,7 @@ let
# nix cc-wrapper, so it needs explicit -I include paths to find the HIP
# runtime + rocWMMA headers. rocWMMA defines COLI_GPU_HAS_WMMA in
# backend_gpu_compat.h; without its include dir that macro is undeclared and
# backend_cuda.cu fails to compile (mirrors the ds4 rocm build inputs).
# backend_cuda.cu fails to compile.
rocmInputs = lib.optionals (backend == "rocm") [
rocmPackages.clr # provides hipcc + HIP runtime
rocmPackages.rocm-runtime
@@ -77,13 +77,13 @@ let
in
stdenv.mkDerivation {
pname = "colibri" + lib.optionalString (backend == "rocm") "-rocm";
version = "1.5.0";
version = "1.12.1";
src = fetchFromGitHub {
owner = "JustVugg";
repo = "colibri";
rev = "8f512fc8c2f48ffa18cd624cd4a5bcaae4a4abfc"; # tag v1.5.0
hash = "sha256-SW5RDghfITxblAI+nZGVCHULrTQxskzdNHguJkSMfN4=";
rev = "1c59bff28738f808b130d14758d5a76fc7047e0d"; # tag v1.5.0
hash = "sha256-A2+k57KNvTBKWe8Ts1XrQaJn5X7C5G5TLFo+5Uu5Mkk=";
};
nativeBuildInputs = [ makeWrapper ];
+38
View File
@@ -0,0 +1,38 @@
#!/usr/bin/env bash
# Bump colibri to a new version.
# Usage: ./update.sh [<version>]
# With version: bump to that version (e.g. "1.6.0").
# Without args: auto-detect latest tag from GitHub.
set -euo pipefail
PKG="colibri"
REPO="JustVugg/colibri"
if [ $# -ge 1 ]; then
VERSION="$1"
else
echo "Auto-detecting latest colibri version..."
VERSION=$(curl -fsSL "https://api.github.com/repos/${REPO}/releases" \
| jq -r '[.[] | select(.tag_name | startswith("v")) | .tag_name | sub("^v"; "")] | .[0]')
if [ -z "$VERSION" ]; then
echo "Could not auto-detect latest version from GitHub."
echo "Usage: $0 [<version>]"
exit 1
fi
echo "Latest: $VERSION"
fi
# Resolve tag to commit hash
REV=$(git ls-remote "https://github.com/${REPO}" "v${VERSION}" | awk '{print $1}')
if [ -z "$REV" ]; then
echo "Could not find tag v${VERSION} in upstream repo"
exit 1
fi
sed -i "s/version = \".*\";/version = \"${VERSION}\";/" default.nix
sed -i "s|rev = \".*\";|rev = \"${REV}\";|" default.nix
HASH=$(nix hash file --type sha256 --sri <(curl -fsSL "https://github.com/${REPO}/archive/${REV}.tar.gz"))
sed -i "s|hash = \".*\";|hash = \"${HASH}\";|" default.nix
echo "✅ ${PKG} bumped to ${VERSION} (rev ${REV})"