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

Merge master into staging-next

parents 69276ad8 579a92ce

pkgs/applications/audio/musescore/default.nix

+5 −15
Original line number Diff line number Diff line
@@ -49,27 +49,15 @@ let 
  } else portaudio;

in stdenv'.mkDerivation (finalAttrs: {

  pname = "musescore";

  version = "4.4.0";

  version = "4.4.1";



  src = fetchFromGitHub {

    owner = "musescore";

    repo = "MuseScore";

    rev = "v${finalAttrs.version}";

    sha256 = "sha256-oDbOaLFmSpZ7D8E7LBxUwFwiaPcucIUj3eEp6sXR5o8=";

    sha256 = "sha256-eLtpLgXSc8L5y1Mg3s1wrxr09+/vBxNqJEtl9IoKYSM=";

  };

  patches = [

    # https://github.com/musescore/MuseScore/pull/24247

    (fetchpatch {

      name = "skip-downloading-harfbuzz.patch";

      url = "https://github.com/musescore/MuseScore/commit/686ea243d58b43eb3dff7ebdabb2e09de4d212e4.patch";

      hash = "sha256-fsb1hKFKXwBdMPh+Ek0UT3XtI8qg3ieWUQW1/XDvhmg=";

    })

    # https://github.com/musescore/MuseScore/pull/24261

    (fetchpatch {

      name = "allow-using-system-harfbuzz.patch";

      url = "https://github.com/musescore/MuseScore/commit/696279e362afe72db5e92f8a47aa64b3a0e86a86.patch";

      hash = "sha256-z1W2SmzUUlVL7mRR2frzUZjMEnwqkVfRVz4TufR1tDU=";

    })

    # https://github.com/musescore/MuseScore/pull/24326

    (fetchpatch {

      name = "fix-menubar-with-qt6.5+.patch";
@@ -132,12 +120,14 @@ in stdenv'.mkDerivation (finalAttrs: { 
    qtbase

    qtdeclarative

    qt5compat

    qtwayland

    qtsvg

    qtscxml

    qtnetworkauth

  ] ++ lib.optionals stdenv.isLinux [

    alsa-lib

    qtwayland

  ] ++ lib.optionals stdenv.isDarwin [

    darwin.apple_sdk_11_0.frameworks.Cocoa

  ];



  postInstall = ''

pkgs/applications/blockchains/clightning/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -20,15 +20,15 @@ 
, jq

}:

let

  py3 = python3.withPackages (p: [ p.mako ]);

  py3 = python3.withPackages (p: [ p.distutils p.mako ]);

in

stdenv.mkDerivation rec {

  pname = "clightning";

  version = "24.05";

  version = "24.08";



  src = fetchurl {

    url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";

    hash = "sha256-FD7JFM80wrruqBWjYnJHZh2f2GZJ6XDQmUQ0XetnWBg=";

    hash = "sha256-u4dkVcdduTBuRE615mPx66U8OFZSeMdL2fNJNoHbVxc=";

  };



  # when building on darwin we need cctools to provide the correct libtool

pkgs/applications/editors/vim/plugins/overrides.nix

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ 
    nvimRequireCheck = "alpha";

  };



  advanced-git-search-nvim = super.autosave-nvim.overrideAttrs {

  advanced-git-search-nvim = super.advanced-git-search-nvim.overrideAttrs {

    dependencies = with super; [ telescope-nvim vim-fugitive vim-rhubarb ];

  };

pkgs/applications/misc/avrdudess/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ 


stdenv.mkDerivation {

  pname = "avrdudess";

  version = "2.17";

  version = "2.18";



  src = fetchurl {

    url = "https://github.com/ZakKemble/AVRDUDESS/releases/download/v2.17/AVRDUDESS-2.17-portable.zip";

    sha256 = "sha256-TcXXGDs75Q2ew+m2B/p00Y24O5aJQlp+3FcAn7GSVyI=";

    url = "https://github.com/ZakKemble/AVRDUDESS/releases/download/v2.18/AVRDUDESS-2.18-portable.zip";

    sha256 = "sha256-N93FLiXp1WwhI5KwH6sho2wyFtkbODwCHOpEVbVnYdc=";

  };



  nativeBuildInputs = [ unzip ];

pkgs/applications/misc/watchmate/Cargo.lock

+1186 −729

File changed.

Preview size limit exceeded, changes collapsed.