From 641a59ab6d3b9d1b479d068aaccbcf314f90f8ff Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 5 Jun 2019 22:52:04 -0400 Subject: [PATCH 01/15] mysql55: broken on darwin https://hydra.nixos.org/build/94204716 --- pkgs/servers/sql/mysql/5.5.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index a24dee07de47..d5fbe0bf2494 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -78,6 +78,6 @@ self = stdenv.mkDerivation rec { artistic1 bsd0 bsd2 bsd3 bsdOriginal gpl2 lgpl2 lgpl21 mit publicDomain licenses.zlib ]; - broken = stdenv.isAarch64; + broken = stdenv.isAarch64 && stdenv.isDarwin; }; }; in self From 8633a122247cf2675df8c589a8c22602cf11b5af Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 5 Jun 2019 22:52:58 -0400 Subject: [PATCH 02/15] =?UTF-8?q?kconfig-frontends:=20don=E2=80=99t=20erro?= =?UTF-8?q?r=20on=20security=20warning?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit needed for clang 7 --- pkgs/development/tools/misc/kconfig-frontends/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/misc/kconfig-frontends/default.nix b/pkgs/development/tools/misc/kconfig-frontends/default.nix index bceb15f11659..e33259b416fa 100644 --- a/pkgs/development/tools/misc/kconfig-frontends/default.nix +++ b/pkgs/development/tools/misc/kconfig-frontends/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=format-security"; + meta = with stdenv.lib; { description = "Out of Linux tree packaging of the kconfig infrastructure"; longDescription = '' From 9edd19631234bfdcc2ff1a267a7edc1d11f306f4 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 5 Jun 2019 22:54:08 -0400 Subject: [PATCH 03/15] fsv: only works on linux https://hydra.nixos.org/build/94218493 --- pkgs/applications/misc/fsv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/fsv/default.nix b/pkgs/applications/misc/fsv/default.nix index 152078065395..00e11858fb41 100644 --- a/pkgs/applications/misc/fsv/default.nix +++ b/pkgs/applications/misc/fsv/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { ''; homepage = https://github.com/mcuelenaere/fsv; license = licenses.lgpl2; - platforms = platforms.mesaPlatforms; + platforms = platforms.linux; maintainers = with maintainers; [ rnhmjoj ]; }; } From a430a5c96377ea356f24dd75754a1c9a3cd513fc Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 5 Jun 2019 22:54:38 -0400 Subject: [PATCH 04/15] libtommatch: fix substituteInPlace var name was changed --- pkgs/development/libraries/libtommath/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libtommath/default.nix b/pkgs/development/libraries/libtommath/default.nix index 15c392fa7923..a90377dad34a 100644 --- a/pkgs/development/libraries/libtommath/default.nix +++ b/pkgs/development/libraries/libtommath/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libtool ]; postPatch = '' - substituteInPlace makefile.shared --replace "LT:=glibtool" "LT:=libtool" + substituteInPlace makefile.shared --replace glibtool libtool substituteInPlace makefile_include.mk --replace "shell arch" "shell uname -m" ''; From f2a33b8709a0d8cefb0acf299c4ca9ee94a70106 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 5 Jun 2019 22:55:15 -0400 Subject: [PATCH 05/15] libdc1394: remove patch applied in newer version --- .../libraries/libdc1394/darwin-fixes.patch | 24 ------------------- .../libraries/libdc1394/default.nix | 6 ++--- 2 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 pkgs/development/libraries/libdc1394/darwin-fixes.patch diff --git a/pkgs/development/libraries/libdc1394/darwin-fixes.patch b/pkgs/development/libraries/libdc1394/darwin-fixes.patch deleted file mode 100644 index 5356a1111129..000000000000 --- a/pkgs/development/libraries/libdc1394/darwin-fixes.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur libdc1394-2.2.5-old/dc1394/bayer.c libdc1394-2.2.5-new/dc1394/bayer.c ---- libdc1394-2.2.5-old/dc1394/bayer.c 2016-10-11 02:19:10.000000000 -0400 -+++ libdc1394-2.2.5-new/dc1394/bayer.c 2017-03-28 17:59:02.000000000 -0400 -@@ -775,7 +775,7 @@ - { - uint8_t *outR, *outG, *outB; - register int i, j; -- uint tmp; -+ uint32_t tmp; - int st=sx*sy; - int p; - int sx2=sx<<1; -diff -Naur libdc1394-2.2.5-old/dc1394/macosx/capture.c libdc1394-2.2.5-new/dc1394/macosx/capture.c ---- libdc1394-2.2.5-old/dc1394/macosx/capture.c 2016-12-20 08:10:34.000000000 -0500 -+++ libdc1394-2.2.5-new/dc1394/macosx/capture.c 2017-03-28 17:58:38.000000000 -0400 -@@ -614,7 +614,7 @@ - dc1394video_frame_t * frame_tmp = capture->frames + next; - char ch; - -- if(craw->frames==NULL || craw->capture_is_set==0) { -+ if(craw->capture.frames==NULL || craw->capture_is_set==0) { - *frame=NULL; - return DC1394_CAPTURE_IS_NOT_SET; - } diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index ea4a50275a3f..86b9fcd0bef3 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, libraw1394, -libusb1, CoreServices }: +{ stdenv, fetchurl, libraw1394 +, libusb1, CoreServices }: stdenv.mkDerivation rec { name = "libdc1394-${version}"; @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isLinux libraw1394 ++ stdenv.lib.optional stdenv.isDarwin CoreServices; - patches = stdenv.lib.optional stdenv.isDarwin ./darwin-fixes.patch; - meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/libdc1394/; description = "Capture and control API for IIDC compliant cameras"; From a74150e66e93243c4adaf486730d0806d7ab9144 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 5 Jun 2019 22:57:51 -0400 Subject: [PATCH 06/15] libgssglue: mark linux only https://hydra.nixos.org/build/94203083 --- pkgs/development/libraries/libgssglue/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libgssglue/default.nix b/pkgs/development/libraries/libgssglue/default.nix index 612946f73ed5..0177869d3e39 100644 --- a/pkgs/development/libraries/libgssglue/default.nix +++ b/pkgs/development/libraries/libgssglue/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = http://www.citi.umich.edu/projects/nfsv4/linux/; description = "Exports a gssapi interface which calls other random gssapi libraries"; license = licenses.bsd3; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ corngood ]; }; } From a04bbae81cdd6f058b88eea9325c1e36ee6e901c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 5 Jun 2019 23:03:40 -0400 Subject: [PATCH 07/15] l-smash: use gccStdenv --- 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 a714e34371b4..b2f8363257ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11034,7 +11034,9 @@ in libkrb5 = krb5.override { type = "lib"; }; kerberos = libkrb5; # TODO: move to aliases.nix - l-smash = callPackage ../development/libraries/l-smash { }; + l-smash = callPackage ../development/libraries/l-smash { + stdenv = gccStdenv; + }; languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix { inherit callPackage; }); From e0a33f36fda201cf7814011c3e74a436033250b8 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 5 Jun 2019 23:04:19 -0400 Subject: [PATCH 08/15] slop: mark linux only https://hydra.nixos.org/build/94247171 --- pkgs/tools/misc/slop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index f411bbd2c300..6f7c9d3506b2 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Queries a selection from the user and prints to stdout"; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl3Plus; maintainers = with maintainers; [ primeos mbakke ]; }; From 441485af6684a18c6e3bcba355e8a21024f1b621 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 5 Jun 2019 23:42:58 -0400 Subject: [PATCH 09/15] iv: only use patchelf on linux --- pkgs/applications/science/biology/iv/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/biology/iv/default.nix b/pkgs/applications/science/biology/iv/default.nix index f204d9bbca96..37abcf396211 100644 --- a/pkgs/applications/science/biology/iv/default.nix +++ b/pkgs/applications/science/biology/iv/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec break fi done + '' + stdenv.lib.optionalString stdenv.isLinux '' patchelf --add-needed ${libX11}/lib/libX11.so $out/lib/libIVhines.so ''; meta = with stdenv.lib; From 1f22e7143975ab0914859a9819887909cf8a4b91 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 5 Jun 2019 23:43:37 -0400 Subject: [PATCH 10/15] ksh: add libiconv dependency --- pkgs/shells/ksh/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/ksh/default.nix b/pkgs/shells/ksh/default.nix index 05335a1eb68c..d16704b71d5e 100644 --- a/pkgs/shells/ksh/default.nix +++ b/pkgs/shells/ksh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, meson, ninja, fetchFromGitHub, which, python }: +{ stdenv, meson, ninja, fetchFromGitHub, which, python, libiconv }: stdenv.mkDerivation rec { name = "ksh-${version}"; @@ -13,13 +13,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja which python ]; + buildInputs = [ libiconv ]; + meta = with stdenv.lib; { description = "KornShell Command And Programming Language"; longDescription = '' The KornShell language was designed and developed by David G. Korn at AT&T Bell Laboratories. It is an interactive command language that provides access to the UNIX system and to many other systems, on the - many different computers and workstations on which it is implemented. + many different computers and workstations on which it is implemented. ''; homepage = https://github.com/att/ast; license = licenses.cpl10; @@ -31,4 +33,3 @@ stdenv.mkDerivation rec { shellPath = "/bin/ksh"; }; } - From 50998c84750973bc7a98dffdf2df268f21a429cf Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 5 Jun 2019 23:45:27 -0400 Subject: [PATCH 11/15] opencv2: only works on linux https://hydra.nixos.org/build/94234038 --- pkgs/development/libraries/opencv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 4532285e53dc..123b8807a74f 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -89,6 +89,6 @@ stdenv.mkDerivation rec { homepage = https://opencv.org/; license = licenses.bsd3; maintainers = with maintainers; [ ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.linux; }; } From 402b717de71a305ca74a9af6270d7f7d3c84e53c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 5 Jun 2019 23:48:09 -0400 Subject: [PATCH 12/15] openimageio1: mark broken on x86_64-darwin https://hydra.nixos.org/build/93723034 --- pkgs/applications/graphics/openimageio/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index a3fc0ea46f43..00b33b652164 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.unix; + badPlatforms = [ "x86_64-darwin" ]; }; } From 0c3b7ea547d534f26140e42526475fbc4a514f59 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 6 Jun 2019 00:18:38 -0400 Subject: [PATCH 13/15] postgresql: disable tests on darwin reported in https://www.postgresql.org/message-id/4D8E1BC5-BBCF-4B19-8226-359201EA8305%40gmail.com --- pkgs/servers/sql/postgresql/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 5e5f9fc07d49..d46f0cc6317a 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -101,7 +101,7 @@ let wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin ''; - doCheck = true; + doCheck = !stdenv.isDarwin; # autodetection doesn't seem to able to find this, but it's there. checkTarget = "check"; From eb189808c49e651ab3c1988c666d898e2b925077 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 6 Jun 2019 00:33:23 -0400 Subject: [PATCH 14/15] =?UTF-8?q?python-cld2-cffi:=20don=E2=80=99t=20error?= =?UTF-8?q?=20on=20c++11-narrowing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/cld2-cffi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cld2-cffi/default.nix b/pkgs/development/python-modules/cld2-cffi/default.nix index c54b962a8f6c..a38d4c0866e0 100644 --- a/pkgs/development/python-modules/cld2-cffi/default.nix +++ b/pkgs/development/python-modules/cld2-cffi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; # gcc doesn't approve of this code, so disable -Werror - NIX_CFLAGS_COMPILE = "-w"; + NIX_CFLAGS_COMPILE = [ "-w" ] ++ stdenv.lib.optional stdenv.cc.isClang "-Wno-error=c++11-narrowing"; checkPhase = "nosetests -v"; From 9a0ced7e4502bfd5f835f3a18770fe72efd28e76 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 6 Jun 2019 00:59:44 -0400 Subject: [PATCH 15/15] opencv: disable QTKit backend QTKit was removed in macOS 10.12 --- pkgs/development/libraries/opencv/3.x.nix | 5 +++-- pkgs/development/libraries/opencv/4.x.nix | 5 +++-- pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index f1e82c166a12..676666d7f472 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -31,7 +31,7 @@ , enableDC1394 ? false, libdc1394 , enableDocs ? false, doxygen, graphviz-nox -, cf-private, AVFoundation, Cocoa, QTKit, VideoDecodeAcceleration, bzip2 +, cf-private, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2 }: let @@ -200,7 +200,7 @@ stdenv.mkDerivation rec { ++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optional enableTbb tbb ++ lib.optional enableCuda cudatoolkit - ++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa QTKit VideoDecodeAcceleration bzip2 ] + ++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa VideoDecodeAcceleration bzip2 ] ++ lib.optionals enableDocs [ doxygen graphviz-nox ]; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; @@ -237,6 +237,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" + "-DBUILD_opencv_videoio=OFF" ] ++ lib.optionals enablePython [ "-DOPENCV_SKIP_PYTHON_LOADER=ON" ]; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 8addc150555d..a21cd6d079bf 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -31,7 +31,7 @@ , enableDC1394 ? false, libdc1394 , enableDocs ? false, doxygen, graphviz-nox -, cf-private, AVFoundation, Cocoa, QTKit, VideoDecodeAcceleration, bzip2 +, cf-private, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2 }: let @@ -213,7 +213,7 @@ stdenv.mkDerivation rec { ++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optional enableTbb tbb ++ lib.optional enableCuda cudatoolkit - ++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa QTKit VideoDecodeAcceleration bzip2 ] + ++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa VideoDecodeAcceleration bzip2 ] ++ lib.optionals enableDocs [ doxygen graphviz-nox ]; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; @@ -251,6 +251,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" + "-DBUILD_opencv_videoio=OFF" ] ++ lib.optionals enablePython [ "-DOPENCV_SKIP_PYTHON_LOADER=ON" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2f8363257ff..01a4eb632577 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12427,7 +12427,7 @@ in opencv3 = callPackage ../development/libraries/opencv/3.x.nix { inherit (darwin) cf-private; - inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration; + inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration; }; opencv3WithoutCuda = opencv3.override { @@ -12436,7 +12436,7 @@ in opencv4 = callPackage ../development/libraries/opencv/4.x.nix { inherit (darwin) cf-private; - inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration; + inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration; }; openexr = callPackage ../development/libraries/openexr { };