Built but needs testing
This commit is contained in:
@@ -29,7 +29,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
ollama = {
|
ollama = {
|
||||||
endpoint = "http://100.109.179.25:11434"; # tailscale IP, no /v1 suffix
|
endpoint = "http://100.86.56.71:11434"; # tailscale IP, no /v1 suffix
|
||||||
model = "qwen2.5:3b"; # swap for "llama3.2:3b" or "deepseek-r1:1.5b"
|
model = "qwen2.5:3b"; # swap for "llama3.2:3b" or "deepseek-r1:1.5b"
|
||||||
timeout = 60000; # local + small model can be slow on first load
|
timeout = 60000; # local + small model can be slow on first load
|
||||||
disable_tools = true; # these small models aren't reliable at tool calling
|
disable_tools = true; # these small models aren't reliable at tool calling
|
||||||
|
|||||||
+1
-1
@@ -12,7 +12,7 @@ _: {
|
|||||||
npm = "@ai-sdk/openai-compatible";
|
npm = "@ai-sdk/openai-compatible";
|
||||||
name = "Ollama (tailscale)";
|
name = "Ollama (tailscale)";
|
||||||
options = {
|
options = {
|
||||||
baseURL = "http://100.109.179.25:11434/v1";
|
baseURL = "http://100.86.56.71:11434/v1";
|
||||||
};
|
};
|
||||||
models = {
|
models = {
|
||||||
"llama3.2:3b" = {
|
"llama3.2:3b" = {
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
_:
|
_:
|
||||||
let
|
let
|
||||||
upstream = "100.109.179.25";
|
|
||||||
|
upstream = "100.86.56.71";
|
||||||
|
|
||||||
mkProxy = port: {
|
mkProxy = port: {
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
|
|||||||
+26
-12
@@ -17,6 +17,8 @@
|
|||||||
libx11,
|
libx11,
|
||||||
SDL2,
|
SDL2,
|
||||||
gmp,
|
gmp,
|
||||||
|
git,
|
||||||
|
gcc,
|
||||||
autoconf,
|
autoconf,
|
||||||
automake,
|
automake,
|
||||||
libtool,
|
libtool,
|
||||||
@@ -33,7 +35,7 @@ let
|
|||||||
owner = "xonotic";
|
owner = "xonotic";
|
||||||
repo = "darkplaces";
|
repo = "darkplaces";
|
||||||
rev = "ddabe55ae766087df0b82d214ca4b6d79a443345";
|
rev = "ddabe55ae766087df0b82d214ca4b6d79a443345";
|
||||||
hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
|
hash = "sha256-S1jWfMx60lTcpMv4DxoDI2BT124bo/jzjtezSsQUL2M=";
|
||||||
};
|
};
|
||||||
|
|
||||||
d0_blind_id-src = fetchFromGitLab {
|
d0_blind_id-src = fetchFromGitLab {
|
||||||
@@ -41,7 +43,7 @@ let
|
|||||||
owner = "xonotic";
|
owner = "xonotic";
|
||||||
repo = "d0_blind_id";
|
repo = "d0_blind_id";
|
||||||
rev = "64983f4156e860a94a6f5e264c67a1c2df69d7e9";
|
rev = "64983f4156e860a94a6f5e264c67a1c2df69d7e9";
|
||||||
hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
|
hash = "sha256-KblIXuzDTcFk7x3YFtJkugrqZ47+aQbDE0fL/sfUxUc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
xonotic-data = fetchFromGitLab {
|
xonotic-data = fetchFromGitLab {
|
||||||
@@ -49,7 +51,7 @@ let
|
|||||||
owner = "xonotic";
|
owner = "xonotic";
|
||||||
repo = "xonotic-data.pk3dir";
|
repo = "xonotic-data.pk3dir";
|
||||||
rev = "bc2ce0925b46ff79d4deb4cf4995f1330f00de43";
|
rev = "bc2ce0925b46ff79d4deb4cf4995f1330f00de43";
|
||||||
hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
|
hash = "sha256-b5QvLdAFxn/7EjF0lufL1DbuXGgC39k6zfVN7G+mD2I=";
|
||||||
};
|
};
|
||||||
|
|
||||||
desktopItem = makeDesktopItem {
|
desktopItem = makeDesktopItem {
|
||||||
@@ -76,9 +78,7 @@ let
|
|||||||
libtool
|
libtool
|
||||||
];
|
];
|
||||||
buildInputs = [ gmp ];
|
buildInputs = [ gmp ];
|
||||||
|
|
||||||
preConfigure = "autoreconf -fi";
|
preConfigure = "autoreconf -fi";
|
||||||
configureFlags = [ "--prefix=$out" ];
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -99,6 +99,7 @@ let
|
|||||||
|
|
||||||
dontStrip = false;
|
dontStrip = false;
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
env.NIX_CFLAGS_COMPILE = "-std=gnu11";
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
mkdir -p ../d0_blind_id/include ../d0_blind_id/lib
|
mkdir -p ../d0_blind_id/include ../d0_blind_id/lib
|
||||||
@@ -154,15 +155,28 @@ let
|
|||||||
inherit version;
|
inherit version;
|
||||||
src = xonotic-data;
|
src = xonotic-data;
|
||||||
|
|
||||||
nativeBuildInputs = [ gmqcc ];
|
nativeBuildInputs = [
|
||||||
|
gmqcc
|
||||||
|
git
|
||||||
|
gcc
|
||||||
|
];
|
||||||
|
|
||||||
|
preBuild = ''
|
||||||
|
chmod +w qcsrc/tools/qcc.sh
|
||||||
|
patchShebangs qcsrc/tools/
|
||||||
|
'';
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
runHook preBuild
|
runHook preBuild
|
||||||
export QCC="${gmqcc}/bin/gmqcc"
|
export QCC="${gmqcc}/bin/gmqcc"
|
||||||
export QCCFLAGS_WATERMARK=nix_build
|
export CPP="cc -xc -E"
|
||||||
export ZIP=/bin/true
|
export WORKDIR="../.tmp"
|
||||||
make -C qcsrc -j $NIX_BUILD_CORES
|
export QCCFLAGS_WATERMARK="nix_build"
|
||||||
runHook postBuild
|
export ZIP=true
|
||||||
|
ls -la qcsrc/tools/qcc.sh || echo "MISSING"
|
||||||
|
ls -la qcsrc/tools/ || echo "DIR MISSING"
|
||||||
|
make -C qcsrc -j1
|
||||||
|
runHook postBuild
|
||||||
'';
|
'';
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
|||||||
Reference in New Issue
Block a user