colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2024-05-03 06:01:07 +00:00 committed by GitHub
commit 095591c0d4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/mympd/default.nix
View File

@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "mympd"; pname = "mympd";
version = "14.1.2"; version = "15.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jcorporation"; owner = "jcorporation";
repo = "myMPD"; repo = "myMPD";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
sha256 = "sha256-CMqH9iy9U85bKj7YLcYsKFs5CDePGBEfUWL+sb7WzBw="; sha256 = "sha256-rZfpGvxDV8KWGfQJ+mXsxLI8DIMSM0D9A3yrEZ+Zc38=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

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

@ -63,14 +63,14 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "telegram-desktop"; pname = "telegram-desktop";
version = "4.16.8"; version = "5.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "telegramdesktop"; owner = "telegramdesktop";
repo = "tdesktop"; repo = "tdesktop";
rev = "v${version}"; rev = "v${version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-M8wFhuTTEJippgvS93LNRqREV2TGF04ccps5oOmSr+0="; hash = "sha256-BjXz2LwsvmJIaN+FZ4+mLu01jaajPvwf8YPqCjx7Kw4=";
}; };
patches = [ patches = [

6
pkgs/by-name/fz/fzf-make/package.nix
View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "fzf-make"; pname = "fzf-make";
version = "0.28.0"; version = "0.30.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kyu08"; owner = "kyu08";
repo = "fzf-make"; repo = "fzf-make";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-USBK3In/1Uor33wrab1iTt0akQTcjuHd7I86XfERzzg="; hash = "sha256-C2CDzcS6iE2ojXtFjQfHDJE2C1b5QNG6rda/MiDW8kk=";
}; };
cargoHash = "sha256-zEcll6X0iclDap40bQ1CXuVBQnVin8VwjpErm+/B0ZY="; cargoHash = "sha256-N5hM5xTMNeryFgdICQcKvPt4lHgh02DCaPD3TTGmFBo=";
nativeBuildInputs = [ makeBinaryWrapper ]; nativeBuildInputs = [ makeBinaryWrapper ];

4
pkgs/by-name/js/jsoncons/package.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "jsoncons"; pname = "jsoncons";
version = "0.174.0"; version = "0.175.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "danielaparker"; owner = "danielaparker";
repo = "jsoncons"; repo = "jsoncons";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-VL64oWmaLz4zJm8eCF03tcAkeL+j1BRAQJ5/kUA7L90="; hash = "sha256-pLOKgZx3f0Jka0Tm3SBC1JlQ2Rc3ViPgmXRbjgF4UXI=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

7
pkgs/by-name/rm/rmg/package.nix
View File

@ -20,12 +20,13 @@
, which , which
, xdg-user-dirs , xdg-user-dirs
, zlib , zlib
, withWayland ? false
# Affects final license # Affects final license
, withAngrylionRdpPlus ? false , withAngrylionRdpPlus ? false
}: }:
let let
inherit (qt6Packages) qtbase qtsvg wrapQtAppsHook; inherit (qt6Packages) qtbase qtsvg qtwayland wrapQtAppsHook;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rmg"; pname = "rmg";
@ -72,7 +73,7 @@ stdenv.mkDerivation rec {
vulkan-loader vulkan-loader
xdg-user-dirs xdg-user-dirs
zlib zlib
]; ] ++ lib.optional withWayland qtwayland;
cmakeFlags = [ cmakeFlags = [
"-DPORTABLE_INSTALL=OFF" "-DPORTABLE_INSTALL=OFF"
@ -84,7 +85,7 @@ stdenv.mkDerivation rec {
qtWrapperArgs = lib.optionals stdenv.isLinux [ qtWrapperArgs = lib.optionals stdenv.isLinux [
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}" "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}"
]; ] ++ lib.optional withWayland "--set RMG_WAYLAND 1";
meta = with lib; { meta = with lib; {
homepage = "https://github.com/Rosalie241/RMG"; homepage = "https://github.com/Rosalie241/RMG";

4
pkgs/data/icons/papirus-icon-theme/default.nix
View File

@ -13,13 +13,13 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "papirus-icon-theme"; pname = "papirus-icon-theme";
version = "20240201"; version = "20240501";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PapirusDevelopmentTeam"; owner = "PapirusDevelopmentTeam";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-hAmtvib6wENEAGQdK242wwDqF3Ddu4YR00KPaWR8JMo="; hash = "sha256-ZTijLslItfXRBUVKrz9KcOc78Efr5rRV+HfQckKcZSI=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/libraries/libzim/default.nix
View File

@ -14,13 +14,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libzim"; pname = "libzim";
version = "9.2.0"; version = "9.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "openzim"; owner = "openzim";
repo = "libzim"; repo = "libzim";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-WAbNSrgm/lTARD7Ml4vVLChQLNR23vEZtyE4MXnhnB4="; hash = "sha256-yxEtFsdLTcHFyoIX21nWo6gI7ERDN2/hsUHS/2mTFR4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

3
pkgs/development/r-modules/generic-builder.nix
View File

@ -10,8 +10,11 @@ stdenv.mkDerivation ({
env.NIX_CFLAGS_COMPILE = env.NIX_CFLAGS_COMPILE =
lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
enableParallelBuilding = true;
configurePhase = '' configurePhase = ''
runHook preConfigure runHook preConfigure
export MAKEFLAGS+="''${enableParallelBuilding:+-j$NIX_BUILD_CORES}"
export R_LIBS_SITE="$R_LIBS_SITE''${R_LIBS_SITE:+:}$out/library" export R_LIBS_SITE="$R_LIBS_SITE''${R_LIBS_SITE:+:}$out/library"
runHook postConfigure runHook postConfigure
''; '';

4
pkgs/tools/security/exploitdb/default.nix
View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "exploitdb"; pname = "exploitdb";
version = "2024-04-22"; version = "2024-05-02";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "exploit-database"; owner = "exploit-database";
repo = "exploitdb"; repo = "exploitdb";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-lWWAZwoUFA54uy0qo4H5+MgSv7tYJOerU9X3Or+AhSg="; hash = "sha256-ijfQUvQWEm/657F0GXPBaxEQMkHeU+3N9Lp/om8eB40=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

4
pkgs/top-level/all-packages.nix
View File

@ -2786,6 +2786,10 @@ with pkgs;
ripes = qt6Packages.callPackage ../applications/emulators/ripes { }; ripes = qt6Packages.callPackage ../applications/emulators/ripes { };
rmg-wayland = callPackage ../by-name/rm/rmg/package.nix {
withWayland = true;
};
rpcemu = callPackage ../applications/emulators/rpcemu { }; rpcemu = callPackage ../applications/emulators/rpcemu { };
ruffle = callPackage ../applications/emulators/ruffle { }; ruffle = callPackage ../applications/emulators/ruffle { };