From 0f4be28af526a8421efeb820e529f66d083cb0a2 Mon Sep 17 00:00:00 2001 From: Steve Purcell Date: Wed, 6 Jan 2021 13:03:51 +1300 Subject: [PATCH 1/5] hdf4: fix build on darwin The fix here is to not include libtirc on Darwin, on which platform the library is unavailable. --- pkgs/tools/misc/hdf4/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index a1aff8575279..b5269a15867a 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -8,7 +8,8 @@ , zlib , szip ? null }: - +let uselibtirpc = stdenv.isLinux; +in stdenv.mkDerivation rec { pname = "hdf"; version = "4.2.15"; @@ -49,12 +50,13 @@ stdenv.mkDerivation rec { buildInputs = [ libjpeg - libtirpc szip zlib + ] ++ stdenv.lib.optionals uselibtirpc [ + libtirpc ]; - preConfigure = '' + preConfigure = stdenv.lib.optionalString uselibtirpc '' # Make tirpc discovery work with CMAKE_PREFIX_PATH substituteInPlace config/cmake/FindXDR.cmake \ --replace 'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATHS "/usr/include" "/usr/include/tirpc")' \ From 4cd39c9c149fafb392ea923449226473c054128b Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Thu, 7 Jan 2021 17:31:18 -0300 Subject: [PATCH 2/5] gnome3.gnome-boxes: remove xen as dependency --- pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 7f0c7c4f621d..bf19768ad22a 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -44,7 +44,6 @@ , libsecret , libcap_ng , numactl -, xen , libapparmor , json-glib , webkitgtk @@ -117,7 +116,6 @@ stdenv.mkDerivation rec { tracker-miners vte webkitgtk - xen yajl ]; From a00f391174f1f4572b6b11cb25e071af30223c7b Mon Sep 17 00:00:00 2001 From: Joachim Breitner Date: Thu, 7 Jan 2021 17:12:21 +0100 Subject: [PATCH 3/5] coreutils: Do not autoreconfHook on Musl as suggested by @tobim, fixes #108661 --- pkgs/tools/misc/coreutils/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index d0e032b7c10e..1a0c9b2e10c8 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -76,8 +76,7 @@ stdenv.mkDerivation (rec { outputs = [ "out" "info" ]; nativeBuildInputs = [ perl xz.bin ] - ++ optionals stdenv.hostPlatform.isCygwin [ autoreconfHook texinfo ] # due to patch - ++ optionals stdenv.hostPlatform.isMusl [ autoreconfHook bison ]; # due to patch + ++ optionals stdenv.hostPlatform.isCygwin [ autoreconfHook texinfo ]; # due to patch configureFlags = [ "--with-packager=https://NixOS.org" ] ++ optional (singleBinary != false) ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}") From 0f06d94a206d9697bc6c4a6e5b592a9921deef2b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 7 Jan 2021 10:05:51 +0000 Subject: [PATCH 4/5] emacs: fix accidental double wrapper (Darwin) This was already fixed on non-Darwin, but the fix missed that it was also reintroduced for the Darwin code path at the same time. Fixes: dd5d2482c9d ("emacs: Fix accidental double wrapping") --- pkgs/build-support/emacs/wrapper.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index a3136839122d..ddd150656632 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -203,10 +203,6 @@ runCommand --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \ --subst-var-by prog "$emacs/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 mkdir -p $out/share From ca908523246ffa9064d14ab8daaacf032798453d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 8 Jan 2021 05:57:17 +0000 Subject: [PATCH 5/5] Revert "ipfs-cluster: Remove go1.14 pinning." Quoting : > If you're going to remove the 1.14 pin, you'll need to bump the > version by a few commits, or it builds but doesn't actually work. This reverts commit f7fc3bfd559190866d1adb32ed32b7836c2282d2. --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 606b2d5cd664..d5d879add671 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4967,7 +4967,9 @@ in ipfs = callPackage ../applications/networking/ipfs { }; 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 { };