public/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] 2021-01-08 06:28:59 +00:00 committed by GitHub
commit 67bbf2c845
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/emacs/wrapper.nix
View File

@ -203,10 +203,6 @@ runCommand
--subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \ --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \
--subst-var-by prog "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs" --subst-var-by prog "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs"
chmod +x $out/Applications/Emacs.app/Contents/MacOS/Emacs chmod +x $out/Applications/Emacs.app/Contents/MacOS/Emacs
makeWrapper $emacs/Applications/Emacs.app/Contents/MacOS/Emacs $out/Applications/Emacs.app/Contents/MacOS/Emacs \
--suffix EMACSLOADPATH ":" "$deps/share/emacs/site-lisp:" \
--suffix EMACSNATIVELOADPATH ":" "$deps/share/emacs/native-lisp:"
fi fi
mkdir -p $out/share mkdir -p $out/share

2
pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
View File

@ -44,7 +44,6 @@
, libsecret , libsecret
, libcap_ng , libcap_ng
, numactl , numactl
, xen
, libapparmor , libapparmor
, json-glib , json-glib
, webkitgtk , webkitgtk
@ -117,7 +116,6 @@ stdenv.mkDerivation rec {
tracker-miners tracker-miners
vte vte
webkitgtk webkitgtk
xen
yajl yajl
]; ];

3
pkgs/tools/misc/coreutils/default.nix
View File

@ -76,8 +76,7 @@ stdenv.mkDerivation (rec {
outputs = [ "out" "info" ]; outputs = [ "out" "info" ];
nativeBuildInputs = [ perl xz.bin ] nativeBuildInputs = [ perl xz.bin ]
++ optionals stdenv.hostPlatform.isCygwin [ autoreconfHook texinfo ] # due to patch ++ optionals stdenv.hostPlatform.isCygwin [ autoreconfHook texinfo ]; # due to patch
++ optionals stdenv.hostPlatform.isMusl [ autoreconfHook bison ]; # due to patch
configureFlags = [ "--with-packager=https://NixOS.org" ] configureFlags = [ "--with-packager=https://NixOS.org" ]
++ optional (singleBinary != false) ++ optional (singleBinary != false)
("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}") ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}")

8
pkgs/tools/misc/hdf4/default.nix
View File

@ -8,7 +8,8 @@
, zlib , zlib
, szip ? null , szip ? null
}: }:
let uselibtirpc = stdenv.isLinux;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "hdf"; pname = "hdf";
version = "4.2.15"; version = "4.2.15";
@ -49,12 +50,13 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libjpeg libjpeg
libtirpc
szip szip
zlib zlib
] ++ stdenv.lib.optionals uselibtirpc [
libtirpc
]; ];
preConfigure = '' preConfigure = stdenv.lib.optionalString uselibtirpc ''
# Make tirpc discovery work with CMAKE_PREFIX_PATH # Make tirpc discovery work with CMAKE_PREFIX_PATH
substituteInPlace config/cmake/FindXDR.cmake \ substituteInPlace config/cmake/FindXDR.cmake \
--replace 'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATHS "/usr/include" "/usr/include/tirpc")' \ --replace 'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATHS "/usr/include" "/usr/include/tirpc")' \

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

@ -4967,7 +4967,9 @@ in
ipfs = callPackage ../applications/networking/ipfs { }; ipfs = callPackage ../applications/networking/ipfs { };
ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { };
ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; ipfs-cluster = callPackage ../applications/networking/ipfs-cluster {
buildGoModule = buildGo114Module;
};
ipget = callPackage ../applications/networking/ipget { }; ipget = callPackage ../applications/networking/ipget { };