Unverified Commit 75954066 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents ea2bc2c0 db821264

pkgs/applications/audio/csound/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -31,8 +31,7 @@ stdenv.mkDerivation rec { 
  };



  cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp

    ++ lib.optional stdenv.isDarwin "-DCS_FRAMEWORK_DEST=${placeholder "out"}/lib"

    ++ lib.optional (libjack2 != null) "-DJACK_HEADER=${libjack2}/include/jack/jack.h";

    ++ lib.optional stdenv.isDarwin "-DCS_FRAMEWORK_DEST=${placeholder "out"}/lib";



  nativeBuildInputs = [ cmake flex bison gettext ];

  buildInputs = [ libsndfile libsamplerate boost ]

pkgs/applications/editors/texstudio/default.nix

+4 −6
Original line number Diff line number Diff line 
{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qtscript, qtsvg,

{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qtscript, qtsvg,

  wrapQtAppsHook, poppler, zlib, pkg-config }:



mkDerivation rec {

  pname = "texstudio";

  version = "4.5.1";

  version = "4.5.2";



  src = fetchFromGitHub {

    owner = "${pname}-org";

    repo = pname;

    rev = version;

    hash = "sha256-QBPWelCqh8Ggp0IjH37QGYGu5Ya2fpsiSEkKh3Ee7PM=";

    hash = "sha256-L+q4+k4XWywnxIvhfXPCBeCqnGj4E9BhAmgcAZhm7S8=";

  };



  nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ];

  nativeBuildInputs = [ cmake wrapQtAppsHook pkg-config ];

  buildInputs = [ qtbase qtscript qtsvg poppler zlib ];



  qmakeFlags = [ "NO_APPDATA=True" ];



  meta = with lib; {

    description = "TeX and LaTeX editor";

    longDescription=''

pkgs/applications/misc/free42/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,13 +10,13 @@ 


stdenv.mkDerivation rec {

  pname = "free42";

  version = "3.0.17";

  version = "3.0.20";



  src = fetchFromGitHub {

    owner = "thomasokken";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-3G2vRPupZtZKF1VazNQGa1AplqFzhI5M+olyeJ26kXo=";

    hash = "sha256-Dqrys7bAkSnpbOF0D17RDYi7q47ExlM75d5OOAnHCVU=";

  };



  nativeBuildInputs = [

pkgs/applications/networking/davmail/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
}:



let

  rev = 3390;

  rev = 3423;

  jre' = if preferZulu then zulu else jre;

  gtk' = if preferGtk3 then gtk3 else gtk2;
@@ -23,11 +23,11 @@ let 
in

stdenv.mkDerivation rec {

  pname = "davmail";

  version = "6.0.1";

  version = "6.1.0";



  src = fetchurl {

    url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-${toString rev}.zip";

    sha256 = "1i1z1kdglccg7pyidlfbagdhgs0wqvybl8dwxcpglh2hkvi0dba0";

    sha256 = "sha256-/JsJFtGalNuOz21eeCPR/LvLueMtQAR7VSKN8SpnPvA=";

  };



  postPatch = ''

pkgs/applications/networking/seaweedfs/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -7,16 +7,16 @@ 


buildGoModule rec {

  pname = "seaweedfs";

  version = "3.48";

  version = "3.49";



  src = fetchFromGitHub {

    owner = "seaweedfs";

    repo = "seaweedfs";

    rev = version;

    hash = "sha256-yD9GZnx4OvzI4Jo5BJPRsZEDeUg9pUxg1cxfCCiS6AU=";

    hash = "sha256-KmgElp+vnVWLFG+ZuxRmULg2VmbpKbgciCYA2pEQDRE=";

  };



  vendorHash = "sha256-xmo82HgPRnrR53zKfKPadmut/vuNEM9jqbnqj0cTAuM=";

  vendorHash = "sha256-bOBKtsZIVAwTmvjld2SccfqLQaLTW2vV0AXVGYLamFQ=";



  subPackages = [ "weed" ];