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

Merge master into staging-next

parents 3588aea4 79691a01

pkgs/applications/audio/mympd/default.nix

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


stdenv.mkDerivation (finalAttrs: {

  pname = "mympd";

  version = "14.1.2";

  version = "15.0.1";



  src = fetchFromGitHub {

    owner = "jcorporation";

    repo = "myMPD";

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

    sha256 = "sha256-CMqH9iy9U85bKj7YLcYsKFs5CDePGBEfUWL+sb7WzBw=";

    sha256 = "sha256-rZfpGvxDV8KWGfQJ+mXsxLI8DIMSM0D9A3yrEZ+Zc38=";

  };



  nativeBuildInputs = [

pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -63,14 +63,14 @@ let 
in

stdenv.mkDerivation rec {

  pname = "telegram-desktop";

  version = "4.16.8";

  version = "5.0.0";



  src = fetchFromGitHub {

    owner = "telegramdesktop";

    repo = "tdesktop";

    rev = "v${version}";

    fetchSubmodules = true;

    hash = "sha256-M8wFhuTTEJippgvS93LNRqREV2TGF04ccps5oOmSr+0=";

    hash = "sha256-BjXz2LwsvmJIaN+FZ4+mLu01jaajPvwf8YPqCjx7Kw4=";

  };



  patches = [

pkgs/by-name/fz/fzf-make/package.nix

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


rustPlatform.buildRustPackage rec {

  pname = "fzf-make";

  version = "0.28.0";

  version = "0.30.0";



  src = fetchFromGitHub {

    owner = "kyu08";

    repo = "fzf-make";

    rev = "v${version}";

    hash = "sha256-USBK3In/1Uor33wrab1iTt0akQTcjuHd7I86XfERzzg=";

    hash = "sha256-C2CDzcS6iE2ojXtFjQfHDJE2C1b5QNG6rda/MiDW8kk=";

  };



  cargoHash = "sha256-zEcll6X0iclDap40bQ1CXuVBQnVin8VwjpErm+/B0ZY=";

  cargoHash = "sha256-N5hM5xTMNeryFgdICQcKvPt4lHgh02DCaPD3TTGmFBo=";



  nativeBuildInputs = [ makeBinaryWrapper ];

pkgs/by-name/js/jsoncons/package.nix

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


stdenv.mkDerivation (finalAttrs: {

  pname = "jsoncons";

  version = "0.174.0";

  version = "0.175.0";



  src = fetchFromGitHub {

    owner = "danielaparker";

    repo = "jsoncons";

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

    hash = "sha256-VL64oWmaLz4zJm8eCF03tcAkeL+j1BRAQJ5/kUA7L90=";

    hash = "sha256-pLOKgZx3f0Jka0Tm3SBC1JlQ2Rc3ViPgmXRbjgF4UXI=";

  };



  nativeBuildInputs = [ cmake ];

pkgs/by-name/rm/rmg/package.nix

+4 −3
Original line number Diff line number Diff line
@@ -20,12 +20,13 @@ 
, which

, xdg-user-dirs

, zlib

, withWayland ? false

# Affects final license

, withAngrylionRdpPlus ? false

}:



let

  inherit (qt6Packages) qtbase qtsvg wrapQtAppsHook;

  inherit (qt6Packages) qtbase qtsvg qtwayland wrapQtAppsHook;

in

stdenv.mkDerivation rec {

  pname = "rmg";
@@ -72,7 +73,7 @@ stdenv.mkDerivation rec { 
    vulkan-loader

    xdg-user-dirs

    zlib

  ];

  ] ++ lib.optional withWayland qtwayland;



  cmakeFlags = [

    "-DPORTABLE_INSTALL=OFF"
@@ -84,7 +85,7 @@ stdenv.mkDerivation rec { 


  qtWrapperArgs = lib.optionals stdenv.isLinux [

    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}"

  ];

  ] ++ lib.optional withWayland "--set RMG_WAYLAND 1";



  meta = with lib; {

    homepage = "https://github.com/Rosalie241/RMG";