From 758c4dbcbd50c91c151fb68ac22725d1ca86816c Mon Sep 17 00:00:00 2001 From: deftdawg Date: Sun, 27 Apr 2025 02:47:34 -0400 Subject: [PATCH] lmstudio: 0.3.14-5 -> 0.3.15-11 (#401615) - lmstudio: 0.3.14-5 -> 0.3.15-11 - Fixes to update.sh - Fixes to derivation updateScript handling (thanks @numinit) --- pkgs/by-name/lm/lmstudio/darwin.nix | 3 +++ pkgs/by-name/lm/lmstudio/linux.nix | 3 ++- pkgs/by-name/lm/lmstudio/package.nix | 12 ++++++------ pkgs/by-name/lm/lmstudio/update.sh | 6 ++++-- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/lm/lmstudio/darwin.nix b/pkgs/by-name/lm/lmstudio/darwin.nix index 9b2acdf5929a..f18a880feabe 100644 --- a/pkgs/by-name/lm/lmstudio/darwin.nix +++ b/pkgs/by-name/lm/lmstudio/darwin.nix @@ -7,6 +7,7 @@ version, url, hash, + passthru, }: stdenv.mkDerivation { inherit meta pname version; @@ -47,4 +48,6 @@ stdenv.mkDerivation { echo 'Copying extracted content into "sourceRoot"' cp -a $mnt/LM\ Studio.app $PWD/ ''; + + inherit passthru; } diff --git a/pkgs/by-name/lm/lmstudio/linux.nix b/pkgs/by-name/lm/lmstudio/linux.nix index df9421c581c4..5b6e09171819 100644 --- a/pkgs/by-name/lm/lmstudio/linux.nix +++ b/pkgs/by-name/lm/lmstudio/linux.nix @@ -8,7 +8,7 @@ meta, stdenv, lib, - patchelf, + passthru, }: let src = fetchurl { inherit url hash; }; @@ -21,6 +21,7 @@ appimageTools.wrapType2 { pname version src + passthru ; extraPkgs = pkgs: [ pkgs.ocl-icd ]; diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index ba5eb9c4d2b0..5da2f785865f 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -7,12 +7,10 @@ let pname = "lmstudio"; - version_aarch64-darwin = "0.3.14-5"; - hash_aarch64-darwin = "sha256-8OTfjEZ27ubRFvRQ84em2Gz3mS9w3oev41Qg6MMNjNU="; - version_x86_64-linux = "0.3.14-5"; - hash_x86_64-linux = "sha256-WrO95ez81/A0U1Tt1Oi2PyUp6nvsmQMzK0VUVH1TYbg="; - - passthru.updateScript = ./update.sh; + version_aarch64-darwin = "0.3.15-11"; + hash_aarch64-darwin = "sha256-Bi5UbZR0fDYF+x9mtFaqZsOZZ1gMQAJN+IS/ST/5Wkc="; + version_x86_64-linux = "0.3.15-11"; + hash_x86_64-linux = "sha256-EfynIN6DGSvzOgI+E7CxycJ2KUlFZx2YRwRihjhE3SM="; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; @@ -31,6 +29,7 @@ in if stdenv.hostPlatform.isDarwin then callPackage ./darwin.nix { inherit pname meta; + passthru.updateScript = ./update.sh; version = version_aarch64-darwin; url = args.url @@ -40,6 +39,7 @@ if stdenv.hostPlatform.isDarwin then else callPackage ./linux.nix { inherit pname meta; + passthru.updateScript = ./update.sh; version = version_x86_64-linux; url = args.url diff --git a/pkgs/by-name/lm/lmstudio/update.sh b/pkgs/by-name/lm/lmstudio/update.sh index efbaf5a7d8d2..4b9f5ef47560 100755 --- a/pkgs/by-name/lm/lmstudio/update.sh +++ b/pkgs/by-name/lm/lmstudio/update.sh @@ -5,12 +5,14 @@ set -euo pipefail packages="$(curl -s -L "https://lmstudio.ai/" | grep -oE 'https://installers.lmstudio.ai[^"\]*' | sort -u | grep -v \\.exe)" for system in "aarch64-darwin darwin/arm64" "x86_64-linux linux/x64"; do - set -- ${system} + # shellcheck disable=SC2086 + set -- ${system} # split string into variables $1 and $2 arch="${1}" url=$(echo "${packages}" | grep "${2}") version="$(echo "${url}" | cut -d/ -f6)" hash=$(nix hash convert --hash-algo sha256 "$(nix-prefetch-url "${url}")") - update-source-version lmstudio "${version}" "${hash}" --system="${arch}" --version-key="version_${arch}" + update-source-version lmstudio "${version}" "${hash}" --system="${arch}" --version-key="version_${arch}" \ + 2> >(tee /dev/stderr) | grep -q "nothing to do" && exit done