Merge master into staging-next
This commit is contained in:
commit
095591c0d4
10 changed files with 26 additions and 18 deletions
|
@ -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 = [
|
||||
|
|
|
@ -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 = [
|
||||
|
|
|
@ -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 ];
|
||||
|
||||
|
|
|
@ -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 ];
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "papirus-icon-theme";
|
||||
version = "20240201";
|
||||
version = "20240501";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PapirusDevelopmentTeam";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-hAmtvib6wENEAGQdK242wwDqF3Ddu4YR00KPaWR8JMo=";
|
||||
hash = "sha256-ZTijLslItfXRBUVKrz9KcOc78Efr5rRV+HfQckKcZSI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libzim";
|
||||
version = "9.2.0";
|
||||
version = "9.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openzim";
|
||||
repo = "libzim";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-WAbNSrgm/lTARD7Ml4vVLChQLNR23vEZtyE4MXnhnB4=";
|
||||
hash = "sha256-yxEtFsdLTcHFyoIX21nWo6gI7ERDN2/hsUHS/2mTFR4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -10,8 +10,11 @@ stdenv.mkDerivation ({
|
|||
env.NIX_CFLAGS_COMPILE =
|
||||
lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
export MAKEFLAGS+="''${enableParallelBuilding:+-j$NIX_BUILD_CORES}"
|
||||
export R_LIBS_SITE="$R_LIBS_SITE''${R_LIBS_SITE:+:}$out/library"
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2024-04-22";
|
||||
version = "2024-05-02";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = "exploitdb";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-lWWAZwoUFA54uy0qo4H5+MgSv7tYJOerU9X3Or+AhSg=";
|
||||
hash = "sha256-ijfQUvQWEm/657F0GXPBaxEQMkHeU+3N9Lp/om8eB40=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
@ -2786,6 +2786,10 @@ with pkgs;
|
|||
|
||||
ripes = qt6Packages.callPackage ../applications/emulators/ripes { };
|
||||
|
||||
rmg-wayland = callPackage ../by-name/rm/rmg/package.nix {
|
||||
withWayland = true;
|
||||
};
|
||||
|
||||
rpcemu = callPackage ../applications/emulators/rpcemu { };
|
||||
|
||||
ruffle = callPackage ../applications/emulators/ruffle { };
|
||||
|
|
Loading…
Reference in a new issue