From c7e14db3ba71deb86b9eece97a717db0f8d837a4 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sun, 16 Feb 2025 17:34:07 -0800 Subject: [PATCH 1/3] mattermost: disable Darwin support https://mattermost.com/download/ does not list macOS support. While it compiles, it's not worth supporting. --- pkgs/by-name/ma/mattermost/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix index 03763b6f3f16..eec0732b6f73 100644 --- a/pkgs/by-name/ma/mattermost/package.nix +++ b/pkgs/by-name/ma/mattermost/package.nix @@ -246,20 +246,21 @@ buildMattermost rec { }; }; - meta = with lib; { + meta = { description = "Mattermost is an open source platform for secure collaboration across the entire software development lifecycle"; homepage = "https://www.mattermost.org"; - license = with licenses; [ + license = with lib.licenses; [ agpl3Only asl20 ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ ryantm numinit kranzes mgdelacroix fsagbuya ]; + platforms = lib.platforms.linux; mainProgram = "mattermost"; }; } From 91aaedde77b7a470cafcfb63229d4c91011915a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 05:03:34 +0000 Subject: [PATCH 2/3] llama-cpp: 4621 -> 4731 --- pkgs/by-name/ll/llama-cpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 172d0f30c6ab..3330e6a1733b 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -82,13 +82,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "4621"; + version = "4731"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; tag = "b${finalAttrs.version}"; - hash = "sha256-6/M1KbGEXYwalHP9PyW7kIJKdEBDViVIO3s6VHp4PbM="; + hash = "sha256-XB7TI1/Ui9BGdsD5TVH5MMZalgEGquW9wYcAhxgAcP0="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT From a0d8769244ab912cafdee16399b93bbb325ec8a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Kucharczyk?= Date: Mon, 17 Feb 2025 17:23:38 +0100 Subject: [PATCH 3/3] syncthingtray: set mainProgram --- pkgs/applications/misc/syncthingtray/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 6cded45faf1c..9acd79fbf379 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -120,5 +120,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Plus; maintainers = with maintainers; [ doronbehar ]; platforms = platforms.linux ++ platforms.darwin; + mainProgram = "syncthingtray"; }; })