From d92f62ac06b7562afd198491991da269e64a9e1b Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 28 Dec 2024 04:11:09 +0200 Subject: [PATCH 1/2] koboldcpp: revert e62a47c0 `add (darwinMinVersionHook "10.15")` This reverts commit e62a47c0c8c1f340066165e1d35dab63f519ce6a. Refs: https://github.com/NixOS/nixpkgs/pull/366837#discussion_r1897446732 --- pkgs/by-name/ko/koboldcpp/package.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index 1c5b60219bde..c51e2f010408 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -8,7 +8,6 @@ addDriverRunpath, apple-sdk_12, - darwinMinVersionHook, koboldLiteSupport ? true, @@ -62,10 +61,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { buildInputs = [ tk ] ++ finalAttrs.pythonInputs - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_12 - (darwinMinVersionHook "10.15") - ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_12 ] ++ lib.optionals cublasSupport [ cudaPackages.libcublas cudaPackages.cuda_nvcc From b814f3f6c3d558a647c12248d88f55951e882cab Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 28 Dec 2024 02:29:57 +0000 Subject: [PATCH 2/2] koboldcpp: 1.80.1 -> 1.80.3 Changelog: https://github.com/LostRuins/koboldcpp/releases/tag/v1.80.3 Diff: https://github.com/LostRuins/koboldcpp/compare/v1.80.1...v1.80.3 --- pkgs/by-name/ko/koboldcpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index c51e2f010408..9175c4aadb78 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -40,13 +40,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "koboldcpp"; - version = "1.80.1"; + version = "1.80.3"; src = fetchFromGitHub { owner = "LostRuins"; repo = "koboldcpp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-CgJzYF8FnHk0zKdysGJWLnNo/MND24AbQdjRbDtv0II="; + hash = "sha256-uxqn4t2dDaVSkVilJOflNbG2Q3fH3Yid8qdEaDGfIcw="; }; enableParallelBuilding = true;