nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-21 16:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-22.05 into staging-next-22.05

Browse Source
This commit is contained in:
github-actions[bot]
2022-12-07 00:15:20 +00:00
committed by GitHub
parent 539eb36607 d881cf9fd6
commit 57fecb2425
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/graphics/ImageMagick/default.nix
View File

@@ -45,13 +45,13 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
version = "7.1.0-52";
version = "7.1.0-53";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = version;
hash = "sha256-GV71O4cHUKJ7+6u4T+vdaFz5q2SpZVDCfEAbfz0s6f4=";
hash = "sha256-U111mor498zAyoYKqCerb9cnxUUOlXKYPfaIzKxZiUM=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

6
pkgs/development/mobile/androidenv/compose-android-packages.nix
View File

@@ -305,6 +305,12 @@ rec {
ln -s $i $out/bin
done
# the emulator auto-linked from platform-tools does not find its local qemu, while this one does
${lib.optionalString includeEmulator ''
rm $out/bin/emulator
ln -s $out/libexec/android-sdk/emulator/emulator $out/bin
''}
# Write licenses
mkdir -p licenses
${lib.concatMapStrings (licenseName:

6
pkgs/servers/matrix-synapse/default.nix
View File

@@ -11,20 +11,20 @@ in
with python3.pkgs;
buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.72.0";
version = "1.73.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "synapse";
rev = "v${version}";
hash = "sha256-LkzUrEXC+jonkEpAGIEDQhAKisrKNQB8/elchN/4YMU=";
hash = "sha256-Er5a+0Qyvm5V1ObWjDQ8fs+r/XB+4aRItJMqaz1VSqk=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-AuQURcVaIoOYG9jh6QhPpXB0akASVWMYe4fA/376cwo=";
hash = "sha256-yU72e8OBnUtNdUI/crX7v2KRYHHHOY4Ga9CI3PJwais=";
};
postPatch = ''