cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-11-13 12:01:13 +00:00 committed by GitHub
commit 631c3d7cb2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/graphics/monado/default.nix
View file

@ -19,6 +19,7 @@
, libXau , libXau
, libXdmcp , libXdmcp
, libXrandr , libXrandr
, libbsd
, libffi , libffi
, libjpeg , libjpeg
# , librealsense # , librealsense
@ -88,6 +89,7 @@ stdenv.mkDerivation rec {
libXau libXau
libXdmcp libXdmcp
libXrandr libXrandr
libbsd
libjpeg libjpeg
libffi libffi
# librealsense.dev - see below # librealsense.dev - see below

4
pkgs/servers/nextcloud/default.nix
View file

@ -51,8 +51,8 @@ in {
}; };
nextcloud22 = generic { nextcloud22 = generic {
version = "22.2.1"; version = "22.2.2";
sha256 = "sha256-0BtQt7siUYGiEVGkUYmd0gjfccq4kIhCVaOTR9frvys="; sha256 = "sha256-lDvn29N19Lhm3P2YIVM/85vr/U07qR+M8TkF/D/GTfA=";
}; };
# tip: get she sha with: # tip: get she sha with:
# curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256'

2
pkgs/tools/system/tree/default.nix
View file

@ -30,12 +30,12 @@ stdenv.mkDerivation rec {
preConfigure = '' preConfigure = ''
sed -i Makefile -e 's|^OBJS=|OBJS=$(EXTRA_OBJS) |' sed -i Makefile -e 's|^OBJS=|OBJS=$(EXTRA_OBJS) |'
makeFlags+=("CC=$CC")
''; '';
makeFlags = [ makeFlags = [
"prefix=${placeholder "out"}" "prefix=${placeholder "out"}"
"MANDIR=${placeholder "out"}/share/man/man1" "MANDIR=${placeholder "out"}/share/man/man1"
"CC=$CC"
systemFlags systemFlags
]; ];