Unverified Commit ec38df95 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 1d16f334 5f30488d

pkgs/applications/misc/syncthingtray/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -120,5 +120,6 @@ stdenv.mkDerivation (finalAttrs: { 
    license = licenses.gpl2Plus;

    maintainers = with maintainers; [ doronbehar ];

    platforms = platforms.linux ++ platforms.darwin;

    mainProgram = "syncthingtray";

  };

})

pkgs/by-name/ll/llama-cpp/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -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

pkgs/by-name/ma/mattermost/package.nix

+4 −3
Original line number Diff line number Diff line
@@ -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";

  };

}