chore: update llama-swap
This commit is contained in:
@@ -5,6 +5,7 @@
|
|||||||
, versionCheckHook
|
, versionCheckHook
|
||||||
, callPackage
|
, callPackage
|
||||||
, nixosTests
|
, nixosTests
|
||||||
|
, nix-update-script
|
||||||
,
|
,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@@ -13,13 +14,18 @@ let
|
|||||||
in
|
in
|
||||||
buildGoModule (finalAttrs: {
|
buildGoModule (finalAttrs: {
|
||||||
pname = "llama-swap";
|
pname = "llama-swap";
|
||||||
version = "197";
|
version = "199";
|
||||||
|
|
||||||
|
outputs = [
|
||||||
|
"out"
|
||||||
|
"wol" # wake on lan proxy
|
||||||
|
];
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mostlygeek";
|
owner = "mostlygeek";
|
||||||
repo = "llama-swap";
|
repo = "llama-swap";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-EXgyYmpbN/zzr6KeSpvFEB+FS7gDIZFinNMv70v5boY=";
|
hash = "sha256-tAWXhfOWPLBuEgd+32CbuIkn1hN+4VI4xkyx7E2a81I=";
|
||||||
# populate values that require us to use git. By doing this in postFetch we
|
# populate values that require us to use git. By doing this in postFetch we
|
||||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||||
leaveDotGit = true;
|
leaveDotGit = true;
|
||||||
@@ -35,7 +41,6 @@ buildGoModule (finalAttrs: {
|
|||||||
vendorHash = "sha256-XiDYlw/byu8CWvg4KSPC7m8PGCZXtp08Y1velx4BR8U=";
|
vendorHash = "sha256-XiDYlw/byu8CWvg4KSPC7m8PGCZXtp08Y1velx4BR8U=";
|
||||||
|
|
||||||
passthru.ui = callPackage ./ui.nix { llama-swap = finalAttrs.finalPackage; };
|
passthru.ui = callPackage ./ui.nix { llama-swap = finalAttrs.finalPackage; };
|
||||||
passthru.npmDepsHash = "sha256-Fs7+JKE8YBp2Xj8bVBlwmT+UwuD642VeUHiPx+fv94c=";
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
versionCheckHook
|
versionCheckHook
|
||||||
@@ -73,8 +78,8 @@ buildGoModule (finalAttrs: {
|
|||||||
|
|
||||||
checkFlags =
|
checkFlags =
|
||||||
let
|
let
|
||||||
skippedTests = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
|
skippedTests = lib.optionals (stdenv.isDarwin) [
|
||||||
# Fail only on x86_64-darwin intermittently
|
# Fail only on *-darwin intermittently
|
||||||
# https://github.com/mostlygeek/llama-swap/issues/320
|
# https://github.com/mostlygeek/llama-swap/issues/320
|
||||||
"TestProcess_AutomaticallyStartsUpstream"
|
"TestProcess_AutomaticallyStartsUpstream"
|
||||||
"TestProcess_WaitOnMultipleStarts"
|
"TestProcess_WaitOnMultipleStarts"
|
||||||
@@ -90,6 +95,7 @@ buildGoModule (finalAttrs: {
|
|||||||
"TestProcess_ForceStopWithKill"
|
"TestProcess_ForceStopWithKill"
|
||||||
"TestProcess_StopCmd"
|
"TestProcess_StopCmd"
|
||||||
"TestProcess_EnvironmentSetCorrectly"
|
"TestProcess_EnvironmentSetCorrectly"
|
||||||
|
"TestProcess_ReverseProxyPanicIsHandled"
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
|
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
|
||||||
@@ -105,14 +111,22 @@ buildGoModule (finalAttrs: {
|
|||||||
rm "$GOPATH/bin/simple-responder"
|
rm "$GOPATH/bin/simple-responder"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
preInstall = ''
|
postInstall = ''
|
||||||
install -Dm444 -t "$out/share/llama-swap" config.example.yaml
|
install -Dm444 -t "$out/share/llama-swap" config.example.yaml
|
||||||
|
mkdir -p "$wol/bin"
|
||||||
|
mv "$out/bin/wol-proxy" "$wol/bin/"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
doInstallCheck = true;
|
doInstallCheck = true;
|
||||||
versionCheckProgramArg = "-version";
|
versionCheckProgramArg = "-version";
|
||||||
|
|
||||||
passthru.tests.nixos = nixosTests.llama-swap;
|
passthru.tests.nixos = nixosTests.llama-swap;
|
||||||
|
passthru.updateScript = nix-update-script {
|
||||||
|
extraArgs = [
|
||||||
|
"--subpackage"
|
||||||
|
"ui"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "https://github.com/mostlygeek/llama-swap";
|
homepage = "https://github.com/mostlygeek/llama-swap";
|
||||||
|
|||||||
@@ -5,7 +5,8 @@
|
|||||||
|
|
||||||
buildNpmPackage (finalAttrs: {
|
buildNpmPackage (finalAttrs: {
|
||||||
pname = "${llama-swap.pname}-ui";
|
pname = "${llama-swap.pname}-ui";
|
||||||
inherit (llama-swap) version src npmDepsHash;
|
inherit (llama-swap) version src;
|
||||||
|
npmDepsHash = "sha256-gTDsuWPLCWsPltioziygFmSQFdLqjkZpmmVWIWoZwoc=";
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace vite.config.ts \
|
substituteInPlace vite.config.ts \
|
||||||
|
|||||||
Reference in New Issue
Block a user