diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-08 20:44:26 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-08 20:44:26 +0200 |
commit | 5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3 (patch) | |
tree | c999ad66361e4c4c5d3ad5443bf575422c41150d /pkgs | |
parent | ccc8c73ea00321318e9ac2cb75879f57bef328a7 (diff) | |
parent | e7297363c95415aa2376130583d6c74a85714ab5 (diff) |
Merge remote-tracking branch 'upstream/gcc-8' into staging-next
Earlier the gcc8 branch was merged instead of the gcc-8 branch (note the dash)...
Diffstat (limited to 'pkgs')
70 files changed, 275 insertions, 659 deletions
diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index ff3c456c3644..c72815d5ca25 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -6,18 +6,18 @@ , curl, ffmpeg, gdk-pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras }: -mkDerivation { +mkDerivation rec { pname = "amarok"; - version = "2.9.0-20190731"; + version = "2.9.0-20190824"; src = fetchgit { # master has the Qt5 version as of April 2018 but a formal release has not # yet been made so change this back to the proper upstream when such a # release is out url = git://anongit.kde.org/amarok.git; - # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.CZ"; - rev = "783da6d8e93737f5e41a3bc017906dc1f94bb94f"; - sha256 = "08bypxk5kaay98hbwz9pj3hwgiyk3qmn9qw99bnjkkkw9wzsxiy6"; + # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + rev = "457fbda25a85a102bfda92aa7137e7ef5e4c8b00"; + sha256 = "1ig2mg8pqany6m2zplkrvldcv4ibxwsypnyv5igm7nz7ax82cd5j"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix index eb48333997ca..2535f7514f1d 100644 --- a/pkgs/applications/graphics/gnuclad/default.nix +++ b/pkgs/applications/graphics/gnuclad/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0ka2kscpjff7gflsargv3r9fdaxhkf3nym9mfaln3pnq6q7fwdki"; }; + NIX_CFLAGS_COMPILE = [ "-Wno-error=catch-value" ]; + nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/getxbook/default.nix b/pkgs/applications/misc/getxbook/default.nix index 265181d7db3a..b2a992b850e1 100644 --- a/pkgs/applications/misc/getxbook/default.nix +++ b/pkgs/applications/misc/getxbook/default.nix @@ -9,12 +9,12 @@ stdenv.mkDerivation rec { sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs"; }; + NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" "-Wno-error=deprecated-declarations" ]; + buildInputs = [ openssl ]; makeFlags = [ "PREFIX=$(out)" ]; - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - meta = with stdenv.lib; { description = "A collection of tools to download books from Google Books"; homepage = https://njw.me.uk/getxbook/; diff --git a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix b/pkgs/applications/misc/netsurf/libwapcaplet/default.nix index a234af740f3c..ad59b1be10e0 100644 --- a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix +++ b/pkgs/applications/misc/netsurf/libwapcaplet/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; + meta = with stdenv.lib; { homepage = http://www.netsurf-browser.org/; description = "String internment library for netsurf browser"; diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 0ffc7a1fb6f0..1ad30335b94d 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -61,6 +61,9 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ pythonProtobuf ]; + + NIX_CFLAGS_COMPILE = "-Wno-error=format-overflow -Wno-error=class-memaccess"; + preConfigure = '' # https://issues.apache.org/jira/browse/MESOS-6616 configureFlagsArray+=( diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix index df2665d8ce8f..ef298883b1b4 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, pkgconfig, pidgin, libwebp, libgcrypt, gettext } : let - version = "1.3.0"; + version = "1.3.1"; in stdenv.mkDerivation rec { pname = "telegram-purple"; @@ -9,10 +9,12 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://github.com/majn/telegram-purple"; - rev = "0340e4f14b2480782db4e5b9242103810227c522"; - sha256 = "1xb7hrgisbpx00dsrm5yz934bdd7nfzicd7k855iynk3hjzqj7k5"; + rev = "v${version}"; + sha256 = "0p93jpjpx7hszwffzgixw04zkrpsiyzz4za3gfr4j07krc4771fp"; }; + NIX_CFLAGS_COMPILE = [ "-Wno-error=cast-function-type" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pidgin libwebp libgcrypt gettext ]; diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix index 0792aefe25f5..249fdc958c80 100644 --- a/pkgs/applications/networking/irc/bip/default.nix +++ b/pkgs/applications/networking/irc/bip/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }) ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" "-Wno-error=duplicate-decl-specifier" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" "-Wno-error=duplicate-decl-specifier" "-Wno-error=format-truncation" ]; meta = { description = "An IRC proxy (bouncer)"; diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index d1a990a5eb28..834d2497e8df 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, itk, vtk }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, itk, vtk }: stdenv.mkDerivation rec { _name = "ANTs"; @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1hrdwv3m9xh3yf7l0rm2ggxc2xzckfb8srs88g485ibfszx7i03q"; }; + patches = [ + # Fix build with gcc8 + (fetchpatch { + url = "https://github.com/ANTsX/ANTs/commit/89af9b2694715bf8204993e032fa132f80cf37bd.patch"; + sha256 = "1glkrwa1jmxxbmzihycxr576azjqby31jwpj165qc54c91pn0ams"; + }) + ]; + nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ itk vtk ]; diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index 1bac7eb9b95e..12d68f0265c4 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; + /* ** We patch out a very annoying 'feature' in ./configure, which ** tries to use 'git' to update submodules. diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 2a90902df1e7..97af433d6067 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -26,6 +26,7 @@ edk2 = stdenv.mkDerivation { buildInputs = [ libuuid pythonEnv ]; makeFlags = [ "-C BaseTools" ]; + NIX_CFLAGS_COMPILE = "-Wno-return-type -Wno-error=stringop-truncation"; hardeningDisable = [ "format" "fortify" ]; diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix index ab9fd23f5088..1bcf4106a34d 100644 --- a/pkgs/development/compilers/iasl/default.nix +++ b/pkgs/development/compilers/iasl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iasl"; - version = "20181213"; + version = "20190108"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "1vgqlv9pvxc52faxixpgz7hi1awqmj88bw5vqn3bldf6fmkh147w"; + sha256 = "0bqhr3ndchvfhxb31147z8gd81dysyz5dwkvmp56832d0js2564q"; }; NIX_CFLAGS_COMPILE = [ diff --git a/pkgs/development/compilers/llvm/3.8/D17533-1.patch b/pkgs/development/compilers/llvm/3.8/D17533-1.patch deleted file mode 100644 index 79ca953d6e5b..000000000000 --- a/pkgs/development/compilers/llvm/3.8/D17533-1.patch +++ /dev/null @@ -1,60 +0,0 @@ -commit eb92f5a745014532b83abfba04602fce87ca8393 -Author: Chuang-Yu Cheng <cycheng@multicorewareinc.com> -Date: Fri Apr 8 12:04:32 2016 +0000 - - CXX_FAST_TLS calling convention: performance improvement for PPC64 - - This is the same change on PPC64 as r255821 on AArch64. I have even borrowed - his commit message. - - The access function has a short entry and a short exit, the initialization - block is only run the first time. To improve the performance, we want to - have a short frame at the entry and exit. - - We explicitly handle most of the CSRs via copies. Only the CSRs that are not - handled via copies will be in CSR_SaveList. - - Frame lowering and prologue/epilogue insertion will generate a short frame - in the entry and exit according to CSR_SaveList. The majority of the CSRs will - be handled by register allcoator. Register allocator will try to spill and - reload them in the initialization block. - - We add CSRsViaCopy, it will be explicitly handled during lowering. - - 1> we first set FunctionLoweringInfo->SplitCSR if conditions are met (the target - supports it for the given machine function and the function has only return - exits). We also call TLI->initializeSplitCSR to perform initialization. - 2> we call TLI->insertCopiesSplitCSR to insert copies from CSRsViaCopy to - virtual registers at beginning of the entry block and copies from virtual - registers to CSRsViaCopy at beginning of the exit blocks. - 3> we also need to make sure the explicit copies will not be eliminated. - - Author: Tom Jablin (tjablin) - Reviewers: hfinkel kbarton cycheng - - http://reviews.llvm.org/D17533 - - git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@265781 91177308-0d34-0410-b5e6-96231b3b80d8 - -diff --git a/lib/CodeGen/TargetFrameLoweringImpl.cpp b/lib/CodeGen/TargetFrameLoweringImpl.cpp -index 679ade1..0a0e079 100644 ---- a/lib/CodeGen/TargetFrameLoweringImpl.cpp -+++ b/lib/CodeGen/TargetFrameLoweringImpl.cpp -@@ -63,12 +63,15 @@ void TargetFrameLowering::determineCalleeSaves(MachineFunction &MF, - const TargetRegisterInfo &TRI = *MF.getSubtarget().getRegisterInfo(); - const MCPhysReg *CSRegs = TRI.getCalleeSavedRegs(&MF); - -+ // Resize before the early returns. Some backends expect that -+ // SavedRegs.size() == TRI.getNumRegs() after this call even if there are no -+ // saved registers. -+ SavedRegs.resize(TRI.getNumRegs()); -+ - // Early exit if there are no callee saved registers. - if (!CSRegs || CSRegs[0] == 0) - return; - -- SavedRegs.resize(TRI.getNumRegs()); -- - // In Naked functions we aren't going to save any registers. - if (MF.getFunction()->hasFnAttribute(Attribute::Naked)) - return; diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix deleted file mode 100644 index 0276393d840c..000000000000 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python }: - -let - gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; - self = stdenv.mkDerivation { - pname = "clang"; - inherit version; - - src = fetch "cfe" "1prc72xmkgx8wrzmrr337776676nhsp1qd3mw2bvb22bzdnq7lsc"; - - unpackPhase = '' - unpackFile $src - mv cfe-${version}.src clang - sourceRoot=$PWD/clang - unpackFile ${clang-tools-extra_src} - mv clang-tools-extra-* $sourceRoot/tools/extra - ''; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libxml2 llvm python ]; - - cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-std=c++11" - ] ++ - # Maybe with compiler-rt this won't be needed? - (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++ - (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"); - - patches = [ ./purity.patch ]; - - postPatch = '' - sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp - sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' - sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/Tools.cpp - ''; - - outputs = [ "out" "lib" "python" ]; - - # Clang expects to find LLVMgold in its own prefix - # Clang expects to find sanitizer libraries in its own prefix - postInstall = '' - if [ -e ${llvm}/lib/LLVMgold.so ]; then - ln -sv ${llvm}/lib/LLVMgold.so $out/lib - fi - - ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ - ln -sv $out/bin/clang $out/bin/cpp - - # Move libclang to 'lib' output - moveToOutput "lib/libclang.*" "$lib" - substituteInPlace $out/share/clang/cmake/ClangTargets-release.cmake \ - --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." - - mkdir -p $python/bin $python/share/clang/ - mv $out/bin/{git-clang-format,scan-view} $python/bin - if [ -e $out/bin/set-xcode-analyzer ]; then - mv $out/bin/set-xcode-analyzer $python/bin - fi - mv $out/share/clang/*.py $python/share/clang - - rm $out/bin/c-index-test - ''; - - enableParallelBuilding = true; - - passthru = { - isClang = true; - inherit llvm; - } // stdenv.lib.optionalAttrs stdenv.isLinux { - inherit gcc; - }; - - meta = { - description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; - }; - }; -in self diff --git a/pkgs/development/compilers/llvm/3.8/clang/purity.patch b/pkgs/development/compilers/llvm/3.8/clang/purity.patch deleted file mode 100644 index 2d1c68d865e6..000000000000 --- a/pkgs/development/compilers/llvm/3.8/clang/purity.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/lib/Driver/Tools.cpp 2016-02-12 15:51:41.000000000 -0700 -+++ b/lib/Driver/Tools.cpp 2016-03-08 15:39:06.790111122 -0700 -@@ -8833,15 +8833,6 @@ - CmdArgs.push_back("-shared"); - } - -- if (Arch == llvm::Triple::arm || Arch == llvm::Triple::armeb || -- Arch == llvm::Triple::thumb || Arch == llvm::Triple::thumbeb || -- (!Args.hasArg(options::OPT_static) && -- !Args.hasArg(options::OPT_s |