Merge pull request #56744 from matthewbauer/macos-10-12

Update macOS to 10.12

pkgs/tools/archivers/gnutar/default.nix

@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
   configureFlags = stdenv.lib.optionals stdenv.isDarwin [
     "gt_cv_func_CFPreferencesCopyAppValue=no"
     "gt_cv_func_CFLocaleCopyCurrent=no"
+    "gt_cv_func_CFLocaleCopyPreferredLanguages=no"
   ];
 
   # gnutar tries to call into gettext between `fork` and `exec`,

pkgs/tools/archivers/p7zip/default.nix

@@ -37,6 +37,8 @@ stdenv.mkDerivation rec {
 
   setupHook = ./setup-hook.sh;
 
+  NIX_CFLAGS_COMPILE = "-Wno-error=c++11-narrowing";
+
   meta = {
     homepage = http://p7zip.sourceforge.net/;
     description = "A port of the 7-zip archiver";

pkgs/tools/compression/pbzip2/default.nix

@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
 
   installFlags = "PREFIX=$(out)";
 
+  NIX_CFLAGS_COMPILE = "-Wno-error=reserved-user-defined-literal";
+
   meta = with stdenv.lib; {
     homepage = http://compression.ca/pbzip2/;
     description = "A parallel implementation of bzip2 for multi-core machines";

pkgs/tools/filesystems/e2fsprogs/default.nix

@@ -39,7 +39,9 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     # avoid cycle between outputs
-    mv $out/lib/${pname}/e2scrub_all_cron $bin/bin/
+    if [ -f $out/lib/${pname}/e2scrub_all_cron ]; then
+      mv $out/lib/${pname}/e2scrub_all_cron $bin/bin/
+    fi
   '';
 
   enableParallelBuilding = true;

pkgs/tools/filesystems/file-rename/default.nix

@@ -15,6 +15,8 @@ perlPackages.buildPerlPackage rec {
       --prefix PERL5LIB : $out/${perlPackages.perl.libPrefix}
   '';
 
+  doCheck = !stdenv.isDarwin;
+
   meta = with stdenv.lib; {
     description = "Perl extension for renaming multiple files";
     license = licenses.artistic1;

pkgs/tools/misc/toybox/default.nix

@@ -54,6 +54,8 @@ stdenv.mkDerivation rec {
   checkInputs = [ which ]; # used for tests with checkFlags = [ "DEBUG=true" ];
   checkTarget = "tests";
 
+  NIX_CFLAGS_COMPILE = "-Wno-error";
+
   meta = with stdenv.lib; {
     description = "Lightweight implementation of some Unix command line utilities";
     homepage = https://landley.net/toybox/;

pkgs/tools/networking/ntopng/default.nix

@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     sed 's|LIBS += -lstdc++.6||' -i Makefile
   '';
 
-  NIX_CFLAGS_COMPILE = [ "-fpermissive" ];
+  NIX_CFLAGS_COMPILE = [ "-fpermissive" "-Wno-error=reserved-user-defined-literal" ];
 
   meta = with stdenv.lib; {
     description = "High-speed web-based traffic analysis and flow collection tool";

pkgs/tools/package-management/nix/default.nix

@@ -3,6 +3,7 @@
 , stateDir ? "/nix/var"
 , confDir ? "/etc"
 , boehmgc
+, llvmPackages_6
 }:
 
 let
@@ -174,6 +175,8 @@ in rec {
     };
 
     inherit storeDir stateDir confDir boehmgc;
+
+    stdenv = llvmPackages_6.stdenv;
   };
 
   nixUnstable = lib.lowPrio (callPackage common rec {
@@ -188,6 +191,8 @@ in rec {
     fromGit = true;
 
     inherit storeDir stateDir confDir boehmgc;
+
+    stdenv = llvmPackages_6.stdenv;
   });
 
 }

pkgs/tools/security/opensc/default.nix

@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
     libXt libxslt libiconv docbook_xml_dtd_412
   ] ++ stdenv.lib.optional stdenv.isDarwin Carbon;
 
+  NIX_CFLAGS_COMPILE = "-Wno-error";
+
   configureFlags = [
     "--enable-zlib"
     "--enable-readline"

pkgs/tools/security/tcpcrypt/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, autoreconfHook
-, openssl
+, openssl, lib
 , libcap, libpcap, libnfnetlink, libnetfilter_conntrack, libnetfilter_queue
 }:
 
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
 
   outputs = [ "bin" "dev" "out" ];
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ openssl ]
-    ++ optionals stdenv.isLinux [ libcap libpcap libnfnetlink libnetfilter_conntrack libnetfilter_queue ];
+  buildInputs = [ openssl libpcap ]
+    ++ optionals stdenv.isLinux [ libcap libnfnetlink libnetfilter_conntrack libnetfilter_queue ];
 
   enableParallelBuilding = true;
 

pkgs/tools/text/platinum-searcher/default.nix

@@ -16,11 +16,6 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
-  preFixup = stdenv.lib.optionalString stdenv.isDarwin ''
-    # fixes cycle between $out and $bin
-    install_name_tool -delete_rpath $out/lib $bin/bin/pt
-  '';
-
   meta = with stdenv.lib; {
     homepage = https://github.com/monochromegane/the_platinum_searcher;
     description = "A code search tool similar to ack and the_silver_searcher(ag).";

pkgs/tools/text/sgml/opensp/default.nix

@@ -1,4 +1,5 @@
-{ lib, stdenv, fetchurl, xmlto, docbook_xml_dtd_412, libxslt, docbook_xsl, autoconf, automake, gettext, libiconv, libtool}:
+{ lib, stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412
+, libxslt, docbook_xsl, autoconf, automake, gettext, libiconv, libtool}:
 
 stdenv.mkDerivation {
   name = "opensp-1.5.2";
@@ -8,16 +9,18 @@ stdenv.mkDerivation {
     sha256 = "1khpasr6l0a8nfz6kcf3s81vgdab8fm2dj291n5r2s53k228kx2p";
   };
 
-  patchPhase = ''
+  postPatch = ''
     sed -i s,/usr/share/sgml/docbook/xml-dtd-4.1.2/,${docbook_xml_dtd_412}/xml/dtd/docbook/, \
       docsrc/*.xml
   '';
 
-  configureFlags = lib.optional stdenv.isDarwin [
-    "--with-libintl-prefix=/usr"
-    "--with-libiconv-prefix=/usr"
+  patches = [
+    (fetchpatch {
+      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-text/opensp/files/opensp-1.5.2-c11-using.patch?id=688d9675782dfc162d4e6cff04c668f7516118d0";
+      sha256 = "04q14s8qsad0bkjmj067dn831i0r6v7742rafdlnbfm5y249m2q6";
+    })
   ];
-
+  
   setupHook = ./setup-hook.sh;
 
   postFixup = ''
@@ -29,8 +32,9 @@ stdenv.mkDerivation {
   preConfigure = if stdenv.isCygwin then "autoreconf -fi" else null;
 
   # need autoconf, automake, gettext, and libtool for reconfigure
-  buildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake gettext libiconv libtool ]
-    ++ [ xmlto docbook_xml_dtd_412 libxslt docbook_xsl ];
+  nativeBuildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ];
+
+  buildInputs = [ xmlto docbook_xml_dtd_412 libxslt docbook_xsl gettext libiconv ];
 
   doCheck = false; # fails