Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk 2019-09-08 22:33:17 +02:00
commit 4b929acf67
88 changed files with 1327 additions and 1696 deletions

View file

@ -4782,6 +4782,12 @@
githubId = 11016164;
name = "Fedor Pakhomov";
};
pamplemousse = {
email = "xav.maso@gmail.com";
github = "Pamplemousse";
githubId = 2647236;
name = "Xavier Maso";
};
panaeon = {
email = "vitalii.voloshyn@gmail.com";
github = "panaeon";

View file

@ -1,6 +1,6 @@
pkgs: with pkgs.lib;
{
rec {
# Check whenever fileSystem is needed for boot
fsNeededForBoot = fs: fs.neededForBoot

View file

@ -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 ];

View file

@ -2,37 +2,37 @@
stdenv.mkDerivation rec {
pname = "wasabiwallet";
version = "1.1.5";
version = "1.1.6";
src = fetchurl {
url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/WasabiLinux-${version}.tar.gz";
sha256 = "1iq7qkpq073yq1bz8pam4cbm2myznhpjr3g9afblvmxwgbdjxak0";
};
src = fetchurl {
url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/WasabiLinux-${version}.tar.gz";
sha256 = "1i7fhaj9chjlm7qg0h3azy4djnm9rxskbr3dzjj0n9rw8cjdqyq6";
};
dontBuild = true;
dontPatchELF = true;
dontBuild = true;
dontPatchELF = true;
desktopItem = makeDesktopItem {
name = "wasabi";
exec = "wasabiwallet";
desktopName = "Wasabi";
genericName = "Bitcoin wallet";
comment = meta.description;
categories = "Application;Network;Utility;";
};
desktopItem = makeDesktopItem {
name = "wasabi";
exec = "wasabiwallet";
desktopName = "Wasabi";
genericName = "Bitcoin wallet";
comment = meta.description;
categories = "Application;Network;Utility;";
};
installPhase = ''
mkdir -p $out/opt/${pname} $out/bin $out/share/applications
cp -Rv . $out/opt/${pname}
cd $out/opt/${pname}
for i in $(find . -type f -name '*.so') wassabee
do
patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc.lib xorg.libX11 curl fontconfig.lib krb5 zlib dotnet-sdk ]} $i
done
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" wassabee
ln -s $out/opt/${pname}/wassabee $out/bin/${pname}
cp -v $desktopItem/share/applications/* $out/share/applications
'';
mkdir -p $out/opt/${pname} $out/bin $out/share/applications
cp -Rv . $out/opt/${pname}
cd $out/opt/${pname}
for i in $(find . -type f -name '*.so') wassabee
do
patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc.lib xorg.libX11 curl fontconfig.lib krb5 zlib dotnet-sdk ]} $i
done
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" wassabee
ln -s $out/opt/${pname}/wassabee $out/bin/${pname}
cp -v $desktopItem/share/applications/* $out/share/applications
'';
meta = with stdenv.lib; {
description = "Privacy focused Bitcoin wallet";

View file

@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "0ka2kscpjff7gflsargv3r9fdaxhkf3nym9mfaln3pnq6q7fwdki";
};
NIX_CFLAGS_COMPILE = [ "-Wno-error=catch-value" ];
nativeBuildInputs = [ pkgconfig ];
meta = with stdenv.lib; {

View file

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/applications/19.08.0/ )
WGET_ARGS=( https://download.kde.org/stable/applications/19.08.1/ )

File diff suppressed because it is too large Load diff

View file

@ -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/;

View file

@ -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";

View file

@ -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+=(

View file

@ -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 ];

View file

@ -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)";

View file

@ -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 ];

View file

@ -1,20 +1,20 @@
{ lib, fetchzip }:
let
version = "2.010";
version = "3.000";
in fetchzip {
name = "source-serif-pro-${version}";
url = "https://github.com/adobe-fonts/source-serif-pro/releases/download/${version}R-ro%2F1.010R-it/source-serif-pro-${version}R-ro-1.010R-it.zip";
url = "https://github.com/adobe-fonts/source-serif-pro/releases/download/${version}R/source-serif-pro-${version}R.zip";
postFetch = ''
mkdir -p $out/share/fonts/{opentype,truetype,variable}
unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype
unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype
unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable
unzip -j $downloadedFile "OTF/*.otf" -d $out/share/fonts/opentype
unzip -j $downloadedFile "TTF/*.ttf" -d $out/share/fonts/truetype
unzip -j $downloadedFile "VAR/*.otf" -d $out/share/fonts/variable
'';
sha256 = "1a3lmqk7hyxpfkb30s9z73lhs823dmq6xr5llp9w23g6bh332x2h";
sha256 = "06yp8y79mqk02qzp81h8zkmzqqlhicgrkwmzkd0bm338xh8grsiz";
meta = with lib; {
homepage = https://adobe-fonts.github.io/source-serif-pro/;

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-system-monitor";
version = "36";
version = "38";
src = fetchFromGitHub {
owner = "paradoxxxzero";
repo = "gnome-shell-system-monitor-applet";
rev = "v${version}";
sha256 = "0x3r189h5264kjxsm18d34gzb5ih8l4pz7i9qks9slcnzaiw4y0z";
sha256 = "1sdj2kxb418mgq44a6lf6jic33wlfbnn3ja61igmx0jj1530iknv";
};
buildInputs = [
@ -39,7 +39,6 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Display system informations in gnome shell status bar";
license = licenses.gpl3Plus;
broken = true; # GNOME 3.32 support WIP: https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/510
maintainers = with maintainers; [ aneeshusa tiramiseb ];
homepage = https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet;
};

View file

@ -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.

View file

@ -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" ];

View file

@ -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 = [

View file

@ -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;

View file

@ -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

View file

@ -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_shared))) {
- CmdArgs.push_back("-dynamic-linker");
- CmdArgs.push_back(Args.MakeArgString(
- D.DyldPrefix + getLinuxDynamicLinker(Args, ToolChain)));
- }
-
CmdArgs.push_back("-o");
CmdArgs.push_back(Output.getFilename());

View file

@ -1,59 +0,0 @@
{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith
, buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross
}:
let
version = "3.8.1";
fetch = fetch_v version;
fetch_v = ver: name: sha256: fetchurl {
url = "https://releases.llvm.org/${ver}/${name}-${ver}.src.tar.xz";
inherit sha256;
};
compiler-rt_src = fetch "compiler-rt" "0p0y85c7izndbpg2l816z7z7558axq11d5pwkm4h11sdw7d13w0d";
clang-tools-extra_src = fetch "clang-tools-extra" "15n39r4ssphpaq4a0wzyjm7ilwxb0bch6nrapy8c5s8d49h5qjk6";
tools = stdenv.lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv isl version fetch; });
in {
llvm = callPackage ./llvm.nix {
inherit compiler-rt_src;
};
clang-unwrapped = callPackage ./clang {
inherit clang-tools-extra_src;
};
libclang = tools.clang-unwrapped.lib;
clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
libstdcxxClang = wrapCCWith {
cc = tools.clang-unwrapped;
extraPackages = [ libstdcxxHook ];
};
libcxxClang = wrapCCWith {
cc = tools.clang-unwrapped;
extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ];
};
lldb = callPackage ./lldb.nix {};
});
libraries = stdenv.lib.makeExtensible (libraries: let
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; });
in {
stdenv = overrideCC stdenv buildLlvmTools.clang;
libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
libcxx = callPackage ./libc++ {};
libcxxabi = callPackage ./libc++abi.nix {};
});
in { inherit tools libraries; } // libraries // tools

View file

@ -1,11 +0,0 @@
--- llvm.org/utils/llvm-build/llvmbuild/main.py 2015-10-07 00:24:35.000000000 +0100
+++ llvm/utils/llvm-build/llvmbuild/main.py 2017-06-16 17:08:39.866586578 +0100
@@ -413,7 +413,7 @@
if library_name is None:
library_name_as_cstr = 'nullptr'
else:
- library_name_as_cstr = '"lib%s.a"' % library_name
+ library_name_as_cstr = '"lib%s.so"' % library_name
if is_installed:
is_installed_as_cstr = 'true'
else:

View file

@ -1,39 +0,0 @@
--- libcxx-3.8.0.src.org/lib/CMakeLists.txt 2015-12-16 15:41:05.000000000 -0800
+++ libcxx-3.8.0.src/lib/CMakeLists.txt 2016-06-17 19:40:00.293394500 -0700
@@ -94,30 +94,30 @@
add_definitions(-D__STRICT_ANSI__)
add_link_flags(
"-compatibility_version 1"
"-current_version 1"
- "-install_name /usr/lib/libc++.1.dylib"
- "-Wl,-reexport_library,/usr/lib/libc++abi.dylib"
+ "-install_name ${LIBCXX_LIBCXXABI_LIB_PATH}/libc++.1.dylib"
+ "-Wl,-reexport_library,${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib"
"-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp"
"/usr/lib/libSystem.B.dylib")
else()
if ( ${CMAKE_OSX_SYSROOT} )
list(FIND ${CMAKE_OSX_ARCHITECTURES} "armv7" OSX_HAS_ARMV7)
if (OSX_HAS_ARMV7)
set(OSX_RE_EXPORT_LINE
- "${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib"
+ "${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib"
"-Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++sjlj-abi.exp")
else()
set(OSX_RE_EXPORT_LINE
- "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib")
+ "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib")
endif()
else()
- set(OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp")
+ set(OSX_RE_EXPORT_LINE "${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp")
endif()
add_link_flags(
"-compatibility_version 1"
- "-install_name /usr/lib/libc++.1.dylib"
+ "-install_name ${LIBCXX_LIBCXXABI_LIB_PATH}/libc++.1.dylib"
"-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp"
"${OSX_RE_EXPORT_LINE}"
"-Wl,-force_symbols_not_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/notweak.exp"
"-Wl,-force_symbols_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/weak.exp")

View file

@ -1,53 +0,0 @@
{ lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }:
stdenv.mkDerivation {
pname = "libc++";
inherit version;
src = fetch "libcxx" "1k7f9qk5bgwa02ksh6yr9hccwcbhmcdzl1fpbdw6s2c89iwg7mvp";
postUnpack = ''
unpackFile ${libcxxabi.src}
'';
preConfigure = ''
# Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package
cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$NIX_BUILD_TOP/libcxxabi-${version}.src/include")
'';
patches = [
# glibc 2.26 fix
../../3.9/libc++/xlocale-glibc-2.26.patch
]
++ lib.optional stdenv.isDarwin ./darwin.patch
++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
../../libcxx-0001-musl-hacks.patch
../../libcxx-max_align_t.patch
];
nativeBuildInputs = [ cmake ];
buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
cmakeFlags = [
"-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
"-DLIBCXX_LIBCPPABI_VERSION=2"
"-DLIBCXX_CXX_ABI=libcxxabi"
] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1";
enableParallelBuilding = true;
linkCxxAbi = stdenv.isLinux;
setupHooks = [
../../../../../build-support/setup-hooks/role.bash
./setup-hook.sh
];
meta = {
homepage = http://libcxx.llvm.org/;
description = "A new implementation of the C++ standard library, targeting C++11";
license = with stdenv.lib.licenses; [ ncsa mit ];
platforms = stdenv.lib.platforms.unix;
};
}

View file

@ -1,6 +0,0 @@
# See pkgs/build-support/setup-hooks/role.bash
getHostRole
linkCxxAbi="@linkCxxAbi@"
export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"

View file

@ -1,52 +0,0 @@
{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
stdenv.mkDerivation {
pname = "libc++abi";
inherit version;
src = fetch "libcxxabi" "1qfs2iis1i0ppv11jndc98cvd7s25pj46pq2sfyldmzswdxmzdg1";
nativeBuildInputs = [ cmake ];
buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
postUnpack = ''
unpackFile ${libcxx.src}
unpackFile ${llvm.src}
export NIX_CFLAGS_COMPILE+=" -I$PWD/include"
export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_INCLUDES=$PWD/$(ls -d libcxx-*)/include"
'' + stdenv.lib.optionalString stdenv.isDarwin ''
export TRIPLE=x86_64-apple-darwin
'' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-max_align_t.patch}
'';
installPhase = if stdenv.isDarwin
then ''
for file in lib/*.dylib; do
# this should be done in CMake, but having trouble figuring out
# the magic combination of necessary CMake variables
# if you fancy a try, take a look at
# http://www.cmake.org/Wiki/CMake_RPATH_handling
install_name_tool -id $out/$file $file
done
make install
install -d 755 $out/include
install -m 644 ../include/*.h $out/include
''
else ''
install -d -m 755 $out/include $out/lib
install -m 644 lib/libc++abi.so.1.0 $out/lib
install -m 644 ../include/cxxabi.h $out/include
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
'';
meta = {
homepage = http://libcxxabi.llvm.org/;
description = "A new implementation of low level support for a standard C++ library";
license = with stdenv.lib.licenses; [ ncsa mit ];
maintainers = with stdenv.lib.maintainers; [ vlstill ];
platforms = stdenv.lib.platforms.unix;
};
}

View file

@ -1,51 +0,0 @@
{ stdenv
, fetch
, cmake
, zlib
, ncurses
, swig
, which
, libedit
, llvm
, clang-unwrapped
, python
, version
}:
stdenv.mkDerivation {
pname = "lldb";
inherit version;
src = fetch "lldb" "18z8vhfgh4m57hl66i83cp4d4mv3i86z2hjhbp5rvqs7d88li49l";
postUnpack = ''
# Hack around broken standalone builf as of 3.8
unpackFile ${llvm.src}
srcDir="$(ls -d lldb-*.src)"
mkdir -p "$srcDir/tools/lib/Support"
cp "$(ls -d llvm-*.src)/lib/Support/regex_impl.h" "$srcDir/tools/lib/Support/"
'';
buildInputs = [ cmake python which swig ncurses zlib libedit llvm ];
hardeningDisable = [ "format" ];
cmakeFlags = [
"-DLLDB_PATH_TO_LLVM_BUILD=${llvm}"
"-DLLVM_MAIN_INCLUDE_DIR=${llvm}/include"
"-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}"
"-DCLANG_MAIN_INCLUDE_DIR=${clang-unwrapped}/include"
"-DPYTHON_VERSION_MAJOR=2"
"-DPYTHON_VERSION_MINOR=7"
"-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898
];
enableParallelBuilding = true;
meta = {
description = "A next-generation high-performance debugger";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.ncsa;
platforms = stdenv.lib.platforms.all;
};
}

View file

@ -1,116 +0,0 @@
{ stdenv
, fetch
, fetchpatch
, perl
, groff
, cmake
, python
, libffi
, libbfd
, libxml2
, ncurses
, version
, zlib
, compiler-rt_src
, debugVersion ? false
, enableSharedLibraries ? true
}:
stdenv.mkDerivation {
pname = "llvm";
inherit version;
src = fetch "llvm" "1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf";
unpackPhase = ''
unpackFile $src
mv llvm-${version}.src llvm
sourceRoot=$PWD/llvm
unpackFile ${compiler-rt_src}
mv compiler-rt-* $sourceRoot/projects/compiler-rt
'';
buildInputs = [ perl groff cmake libxml2 python libffi ];
propagatedBuildInputs = [ ncurses zlib ];
# Fix a segfault in llc
# See http://lists.llvm.org/pipermail/llvm-dev/2016-October/106500.html
patches = [ ./D17533-1.patch ]
++ stdenv.lib.optional (!stdenv.isDarwin) ./fix-llvm-config.patch
++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
../TLI-musl.patch
../dynamiclibrary-musl.patch
];
# hacky fix: New LLVM releases require a newer macOS SDK than
# 10.9. This is a temporary measure until nixpkgs darwin support is
# updated.
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i 's/os_trace(\(.*\)");$/printf(\1\\n");/g' ./projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc
substituteInPlace CMakeLists.txt \
--replace 'set(CMAKE_INSTALL_NAME_DIR "@rpath")' "set(CMAKE_INSTALL_NAME_DIR "$out/lib")" \
--replace 'set(CMAKE_INSTALL_RPATH "@executable_path/../lib")' ""
''
+ ''
(
cd projects/compiler-rt
patch -p1 < ${
fetchpatch {
name = "sigaltstack.patch"; # for glibc-2.26
url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff;
sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi";
}
}
)
'';
# hacky fix: created binaries need to be run before installation
preBuild = ''
mkdir -p $out/
ln -sv $PWD/lib $out
'';
cmakeFlags = with stdenv; [
"-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}"
"-DLLVM_INSTALL_UTILS=ON" # Needed by rustc
"-DLLVM_BUILD_TESTS=ON"
"-DLLVM_ENABLE_FFI=ON"
"-DLLVM_ENABLE_RTTI=ON"
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
"-DTARGET_TRIPLE=${stdenv.hostPlatform.config}"
] ++ stdenv.lib.optional enableSharedLibraries [
"-DLLVM_LINK_LLVM_DYLIB=ON"
] ++ stdenv.lib.optional (!isDarwin)
"-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
++ stdenv.lib.optionals ( isDarwin) [
"-DLLVM_ENABLE_LIBCXX=ON"
"-DCAN_TARGET_i386=false"
] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
# Not yet supported
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
"-DCOMPILER_RT_BUILD_XRAY=OFF"
];
postBuild = ''
rm -fR $out
'';
postInstall = stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) ''
ln -s $out/lib/libLLVM.dylib $out/lib/libLLVM-${version}.dylib
'';
enableParallelBuilding = true;
meta = {
description = "Collection of modular and reusable compiler and toolchain technologies";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.ncsa;
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ];
platforms = stdenv.lib.platforms.all;
};
}

View file

@ -46,6 +46,14 @@ stdenv.mkDerivation ({
propagatedBuildInputs = [ ncurses zlib ];
patches = [
(fetchpatch {
name = "0001-Fix-return-type-in-ORC-readMem-client-interface.patch";
url = "https://bugzilla.redhat.com/attachment.cgi?id=1389687";
sha256 = "0ga2123aclq3x9w72d0rm0az12m8c1i4r1106vh701hf4cghgbch";
})
];
# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
# to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
# can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd

View file

@ -1,5 +1,6 @@
{ stdenv
, fetch
, fetchpatch
, cmake
, python
, libffi
@ -42,6 +43,13 @@ stdenv.mkDerivation ({
propagatedBuildInputs = [ ncurses zlib ];
patches = [
(fetchpatch {
url = "https://bugzilla.redhat.com/attachment.cgi?id=1389687";
name = "llvm-gcc8-type-mismatch.patch";
sha256 = "0ga2123aclq3x9w72d0rm0az12m8c1i4r1106vh701hf4cghgbch";
})
];
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace cmake/modules/AddLLVM.cmake \
--replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \

View file

@ -11,9 +11,13 @@ stdenv.mkDerivation rec {
buildInputs = [ readline gettext ncurses ];
# Needed with GCC 7
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=int-in-bool-context"
+ stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=null-dereference";
# Needed with GCC 8
NIX_CFLAGS_COMPILE = with stdenv.lib; (optionals stdenv.cc.isGNU [
"-Wno-error=int-in-bool-context"
"-Wno-error=class-memaccess"
"-Wno-error=restrict"
"-Wno-error=format-truncation"
]) ++ optional stdenv.cc.isClang "-Wno-error=null-dereference";
patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h"

View file

@ -10,6 +10,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ autoconf automake libtool freetype SDL libX11 ];
postPatch = ''
substituteInPlace include/agg_renderer_outline_aa.h \
--replace 'line_profile_aa& profile() {' 'const line_profile_aa& profile() {'
'';
# fix build with new automake, from Gentoo ebuild
preConfigure = ''
sed -i '/^AM_C_PROTOTYPES/d' configure.in

View file

@ -18,7 +18,11 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib ];
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
NIX_CFLAGS_COMPILE = [
"-Wno-error=deprecated-declarations"
"-Wno-error=format-truncation"
"-Wno-error=cast-function-type"
];
propagatedBuildInputs = [ antlr3_4 libantlr3c polarssl bctoolbox ];
@ -26,7 +30,8 @@ stdenv.mkDerivation rec {
"--with-polarssl=${polarssl}"
];
enableParallelBuilding = true;
# Fails to build with lots of parallel jobs
enableParallelBuilding = false;
meta = with stdenv.lib; {
homepage = http://www.linphone.org/index.php/eng;

View file

@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
buildInputs = [ bctoolbox sqlite ];
nativeBuildInputs = [ cmake ];
NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type";
meta = with stdenv.lib; {
description = "BZRTP is an opensource implementation of ZRTP keys exchange protocol";
homepage = https://github.com/BelledonneCommunications/bzrtp;

View file

@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
owner = "puppetlabs";
};
NIX_CFLAGS_COMPILE = [ "-Wno-error=catch-value" ];
nativeBuildInputs = [ cmake ];
buildInputs = [ boost curl leatherman ];

View file

@ -1,65 +1,46 @@
{ stdenv, fetchurl, unzip, darwin }:
{ lib, stdenv, fetchurl, unzip, darwin }:
stdenv.mkDerivation {
name = "freeimage-3.17.0";
name = "freeimage-3.18.0";
src = fetchurl {
url = mirror://sourceforge/freeimage/FreeImage3170.zip;
sha256 = "12bz57asdcfsz3zr9i9nska0fb6h3z2aizy412qjqkixkginbz7v";
url = mirror://sourceforge/freeimage/FreeImage3180.zip;
sha256 = "1z9qwi9mlq69d5jipr3v2jika2g0kszqdzilggm99nls5xl7j4zl";
};
patches = let
patchURL = https://anonscm.debian.org/cgit/debian-science/packages/freeimage.git/plain/debian/patches;
in [
(fetchurl {
url = patchURL + "/Fix-CVE-2015-0852.patch";
sha256 = "1vxdck4i5qi5j6i3cjja0gfy79mmbf0lq2qdrnqdsl4kclbvw2c8";
})
(fetchurl {
url = patchURL + "/Fix-CVE-2016-5684.patch";
sha256 = "14ffgqbnwg28r6sjvm3z89zbnnm9ghbc81hdhrzxlyk3vwvd6cw3";
})
(fetchurl {
url = https://raw.githubusercontent.com/buildroot/buildroot/2018.05/package/libfreeimage/0005-Manage-powf64-with-glibc.patch;
sha256 = "1lis479ad5cfkhqm044nk4x97wfwm3hry3bvij1w5xkndnlfppc2";
})
];
patches = lib.optional stdenv.isDarwin ./dylib.patch;
buildInputs = [ unzip ] ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools;
buildInputs = [ unzip ] ++ lib.optional stdenv.isDarwin darwin.cctools;
prePatch = if stdenv.isDarwin
then ''
sed -e 's/gcc-4.0/clang/g' \
-e 's/g++-4.0/clang++/g' \
-e 's/COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS/COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS -D__ANSI__/' \
prePatch = if stdenv.isDarwin then ''
sed -e 's/$(shell xcrun -find clang)/clang/g' \
-e 's/$(shell xcrun -find clang++)/clang++/g' \
-e "s|PREFIX = /usr/local|PREFIX = $out|" \
-e 's|-Wl,-syslibroot /Developer/SDKs/MacOSX10.5.sdk||g' \
-e 's|-Wl,-syslibroot /Developer/SDKs/MacOSX10.6.sdk||g' \
-e 's|-isysroot /Developer/SDKs/MacOSX10.6.sdk||g' \
-e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||g' \
-e 's| $(STATICLIB)-ppc $(STATICLIB)-i386||g' \
-e 's| $(SHAREDLIB)-ppc $(SHAREDLIB)-i386||g' \
-e 's|-Wl,-syslibroot $(MACOSX_SYSROOT)||g' \
-e 's|-isysroot $(MACOSX_SYSROOT)||g' \
-e 's| install -d -m 755 -o root -g wheel $(INCDIR) $(INSTALLDIR)||' \
-e 's| -m 644 -o root -g wheel||g' \
-i ./Makefile.osx
# Fix LibJXR performance timers
sed 's|^SRCS = \(.*\)$|SRCS = \1 Source/LibJXR/image/sys/perfTimerANSI.c|' -i ./Makefile.srcs
''
else ''
'' else ''
sed -e s@/usr/@$out/@ \
-e 's@-o root -g root@@' \
-e 's@ldconfig@echo not running ldconfig@' \
-i Makefile.gnu Makefile.fip
# Fix gcc 5.1 macro problems
# https://chromium.googlesource.com/webm/libwebp/+/eebaf97f5a1cb713d81d311308d8a48c124e5aef%5E!/
sed -i -e 's/"\(#[^"]*\)"/" \1 "/g' Source/LibWebP/src/dsp/*
'';
postBuild = stdenv.lib.optionalString (!stdenv.isDarwin) "make -f Makefile.fip";
preInstall = "mkdir -p $out/include $out/lib";
postInstall = stdenv.lib.optionalString (!stdenv.isDarwin) "make -f Makefile.fip install";
postBuild = lib.optionalString (!stdenv.isDarwin) ''
make -f Makefile.fip
'';
NIX_CFLAGS_COMPILE = "-Wno-narrowing";
preInstall = ''
mkdir -p $out/include $out/lib
'';
postInstall = lib.optionalString (!stdenv.isDarwin) ''
make -f Makefile.fip install
'';
enableParallelBuilding = true;
@ -67,7 +48,7 @@ stdenv.mkDerivation {
description = "Open Source library for accessing popular graphics image file formats";
homepage = http://freeimage.sourceforge.net/;
license = "GPL";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; unix;
maintainers = with lib.maintainers; [viric];
platforms = with lib.platforms; unix;
};
}

View file

@ -0,0 +1,16 @@
--- a/Makefile.osx
+++ b/Makefile.osx
@@ -60,1 +60,1 @@
-FreeImage: $(STATICLIB)
+FreeImage: $(STATICLIB) $(SHAREDLIB)
@@ -87,7 +87,7 @@
-$(SHAREDLIB): $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64
- $(LIPO) -create $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 -output $(SHAREDLIB)
+#$(SHAREDLIB): $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64
+# $(LIPO) -create $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 -output $(SHAREDLIB)
$(SHAREDLIB)-i386: $(MODULES_I386)
$(CPP_I386) -arch i386 -dynamiclib $(LIBRARIES_I386) -o $@ $(MODULES_I386)
-$(SHAREDLIB)-x86_64: $(MODULES_X86_64)
+$(SHAREDLIB): $(MODULES_X86_64)

View file

@ -40,6 +40,8 @@ callPackage ./common.nix { inherit stdenv; } {
# limit rebuilds by only disabling pie w/musl
++ stdenv.lib.optional stdenv.hostPlatform.isMusl "pie";
NIX_CFLAGS_COMPILE = if withGd then "-Wno-error=stringop-truncation" else null;
# When building glibc from bootstrap-tools, we need libgcc_s at RPATH for
# any program we run, because the gcc will have been placed at a new
# store path than that determined when built (as a source for the

View file

@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
owner = "puppetlabs";
};
buildInputs = [ boost cmake curl ruby ];
NIX_CFLAGS_COMPILE = [ "-Wno-error=ignored-qualifiers" "-Wno-error=class-memaccess" "-Wno-error=catch-value" ];
nativeBuildInputs = [ cmake ];
buildInputs = [ boost curl ruby ];
enableParallelBuilding = true;

View file

@ -20,6 +20,9 @@ stdenv.mkDerivation {
NIX_CFLAGS_COMPILE = [
"-Wno-error=implicit-fallthrough"
"-Wno-error=nonnull"
"-Wno-error=tautological-compare"
"-Wno-error=class-memaccess"
"-Wno-error=parentheses"
];
buildInputs = [ cmake ];

View file

@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
};
patches = [
./fix-gcc8-build.patch
# Fixes build with exiv2 0.27
(fetchpatch {
name = "libextractor-exiv2-0.27.patch";

View file

@ -0,0 +1,16 @@
diff --git a/src/plugins/ole2_extractor.c b/src/plugins/ole2_extractor.c
index 072ffc5..a105840 100644
--- a/src/plugins/ole2_extractor.c
+++ b/src/plugins/ole2_extractor.c
@@ -345,9 +345,8 @@ process_star_office (GsfInput *src,
gsf_input_read (src, size, (unsigned char*) buf);
if ( (buf[0] != 0x0F) ||
(buf[1] != 0x0) ||
- (0 != strncmp (&buf[2],
- "SfxDocumentInfo",
- strlen ("SfxDocumentInfo"))) ||
+ (0 != strcmp (&buf[2],
+ "SfxDocumentInfo")) ||
(buf[0x11] != 0x0B) ||
(buf[0x13] != 0x00) || /* pw protected! */
(buf[0x12] != 0x00) )

View file

@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
PREFIX = placeholder "out";
LIBDIRNAME = "/lib";
NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type -Wno-error=format-truncation";
checkInputs = [ perl ];
meta = with stdenv.lib; {

View file

@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1n2wkmvw6n80ybdwkjq8ka43z2x8mvxq49byv61b52iyz69slf7b";
};
NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" ];
buildInputs = [ ncurses perl ];
configureFlags = stdenv.lib.optional (perl == null) "--with-perl-bindings=no";

View file

@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
owner = "puppetlabs";
};
# post gcc7, upstream bug: https://tickets.puppetlabs.com/browse/FACT-1828
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated";
NIX_CFLAGS_COMPILE = [ "-Wno-error=catch-value" ];
nativeBuildInputs = [ cmake ];

View file

@ -34,8 +34,12 @@ stdenv.mkDerivation rec {
openssl
];
NIX_CFLAGS_COMPILE = " -DGIT_VERSION=\"v2.14.0\" -Wno-error=deprecated-declarations ";
NIX_LDFLAGS = " -lXext -lssl ";
NIX_CFLAGS_COMPILE = [
"-DGIT_VERSION=\"v2.14.0\""
"-Wno-error=deprecated-declarations"
"-Wno-error=cast-function-type"
];
NIX_LDFLAGS = "-lXext -lssl";
meta = with stdenv.lib; {
description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications";

View file

@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = [
"-Wno-implicit-fallthrough"
"-Wno-error=clobbered"
"-Wno-error=cast-function-type"
];

View file

@ -48,6 +48,8 @@ stdenv.mkDerivation rec {
prePatch = ''
substituteInPlace configure --replace /bin/pwd pwd
substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
substituteInPlace src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp \
--replace 'asm volatile' 'asm'
sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf
'' + lib.optionalString stdenv.isDarwin ''
# remove impure reference to /usr/lib/libstdc++.6.dylib
@ -91,12 +93,6 @@ stdenv.mkDerivation rec {
#})
./qt4-gcc6.patch
./qt4-openssl-1.1.patch
(fetchpatch {
name = "qt4-gcc8.diff";
url = "https://aur.archlinux.org/cgit/aur.git/plain/qt4-gcc8.patch?h=qt4&id=3ac369b8";
sha256 = "0zcdrlmanczr9cbrnc6f3nz6ldmj7rw5irlvndk89fl6fvj8zkwy";
extraPrefix = "./";
})
]
++ lib.optional gtkStyle (substituteAll ({
src = ./dlopen-gtkstyle.diff;

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "13mngf9kl0y2wfxqvkad0smdaag7k8fvw82b4312gx62nwhc1i6r";
};
buildInputs = [ stdenv ];
NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" ];
preConfigure = ''
cd src

View file

@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
patches = [
./format.patch
./gcc6.patch
./libx11.patch
];
enableParallelBuilding = true;

View file

@ -0,0 +1,25 @@
Index: smpeg-0.4.5+cvs20030824/Makefile.am
===================================================================
--- smpeg-0.4.5+cvs20030824.orig/Makefile.am
+++ smpeg-0.4.5+cvs20030824/Makefile.am
@@ -74,7 +74,7 @@
# Sources for gtv
gtv_SOURCES = gtv.c gtv.h
-gtv_LDADD = @GTK_LIBS@ libsmpeg.la
+gtv_LDADD = @GTK_LIBS@ @X11_LIBS@ libsmpeg.la
# Sources for glmovie
glmovie_SOURCES = glmovie-tile.c glmovie.c glmovie.h
Index: smpeg-0.4.5+cvs20030824/configure.in
===================================================================
--- smpeg-0.4.5+cvs20030824.orig/configure.in
+++ smpeg-0.4.5+cvs20030824/configure.in
@@ -215,6 +215,7 @@
CFLAGS="$CFLAGS $GTK_CFLAGS"
fi
AC_SUBST(GTK_LIBS)
+ PKG_CHECK_MODULES([X11], [x11])
fi
AM_CONDITIONAL(HAVE_GTK, test x$have_gtk = xyes)

View file

@ -1,15 +1,18 @@
{ stdenv, fetchFromGitHub, cmake, doxygen }:
stdenv.mkDerivation {
name = "uri-2017-07-16";
stdenv.mkDerivation rec {
name = "uri-${version}";
version = "1.1.0";
src = fetchFromGitHub {
owner = "cpp-netlib";
repo = "uri";
rev = "ac30f19cc7a4745667a8ebd3eac68d5e70b9a4a6";
sha256 = "0ys295ij071rilwkk3xq1p3sdzgb0gyybvd3f0cahh67kh8hyk6n";
rev = "v${version}";
sha256 = "148361pixrm94q6v04k13s1msa04bx9yc3djb0lxpa7dlw19vhcd";
};
NIX_CFLAGS_COMPILE = [ "-Wno-error=parentheses" ];
nativeBuildInputs = [ cmake doxygen ];
cmakeFlags = [

View file

@ -8,8 +8,8 @@ with stdenv.lib;
let
os = stdenv.lib.optionalString;
majorVersion = "7.0";
minorVersion = "0";
majorVersion = "7.1";
minorVersion = "1";
version = "${majorVersion}.${minorVersion}";
in
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
name = "vtk-${os (qtLib != null) "qvtk-"}${version}";
src = fetchurl {
url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz";
sha256 = "1hrjxkcvs3ap0bdhk90vymz5pgvxmg7q6sz8ab3wsyddbshr1abq";
sha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d";
};
buildInputs = [ cmake ]

View file

@ -32,6 +32,8 @@ in stdenv.mkDerivation rec {
buildInputs = [ zeroc_mcpp bzip2 expat openssl lmdb ]
++ lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ];
NIX_CFLAGS_COMPILE = [ "-Wno-error=class-memaccess" ];
prePatch = lib.optional stdenv.isDarwin ''
substituteInPlace Make.rules.Darwin \
--replace xcrun ""

View file

@ -1,9 +0,0 @@
--- a/src/Makefile
+++ b/src/Makefile
@@ -77,4 +77,6 @@ FreezeScript: Freeze
Glacier2 IceGridLib Glacier2CryptPermissionsVerifier: Glacier2Lib
+Glacier2: IceSSL
+
IcePatch2: IcePatch2Lib

View file

@ -1,20 +1,21 @@
{ stdenv, zookeeper, bash }:
stdenv.mkDerivation {
name = "zookeeper_mt-${stdenv.lib.getVersion zookeeper}";
src = zookeeper.src;
setSourceRoot = "export sourceRoot=${zookeeper.name}/src/c";
stdenv.mkDerivation rec {
name = "zookeeper_mt-${stdenv.lib.getVersion zookeeper}";
buildInputs = [ zookeeper bash ];
src = zookeeper.src;
meta = with stdenv.lib; {
homepage = http://zookeeper.apache.org;
description = "Apache Zookeeper";
license = licenses.asl20;
maintainers = [ maintainers.boothead ];
platforms = platforms.unix;
};
setSourceRoot = "export sourceRoot=${zookeeper.name}/src/c";
NIX_CFLAGS_COMPILE = [ "-Wno-error=format-overflow" ];
buildInputs = [ zookeeper bash ];
meta = with stdenv.lib; {
homepage = http://zookeeper.apache.org;
description = "Apache Zookeeper";
license = licenses.asl20;
maintainers = [ maintainers.boothead ];
platforms = platforms.unix;
};
}

View file

@ -0,0 +1,38 @@
{ fetchFromGitHub
, libedit
, makeWrapper
, nasm
, stdenv
}:
stdenv.mkDerivation rec {
pname = "rappel";
version = "unstable-2019-07-08";
src = fetchFromGitHub {
owner = "yrp604";
repo = "rappel";
rev = "95a776f850cf6a7c21923a2100b605408ef038de";
sha256 = "0fmd15xa6hswh3x48av4g1sf6rncbiinbj7gbw1ffvqsbcfnsgcr";
};
buildInputs = [ libedit ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
runHook preInstall
install -Dm755 -t $out/bin bin/rappel
wrapProgram $out/bin/rappel --prefix PATH : "${nasm}/bin"
runHook postInstall
'';
meta = with stdenv.lib; {
homepage = "https://github.com/yrp604/rappel";
description = "A pretty janky assembly REPL";
license = licenses.bsdOriginal;
maintainers = [ maintainers.pamplemousse ];
platforms = platforms.linux;
};
}

View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchurl
, ocaml, findlib, ocamlbuild, ocaml_oasis,
bitstring, camlzip, cmdliner, core_kernel, ezjsonm, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, frontc, ounit, ppx_jane, parsexp,
utop,
bitstring, camlzip, cmdliner, core_kernel, ezjsonm, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm, frontc, ounit, ppx_jane, parsexp,
utop, libxml2,
ppx_tools_versioned,
which, makeWrapper, writeText
}:
@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ which makeWrapper ];
buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis
llvm_38 ppx_tools_versioned
utop ];
llvm ppx_tools_versioned
utop libxml2 ];
propagatedBuildInputs = [ bitstring camlzip cmdliner ppx_jane core_kernel ezjsonm fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi parsexp
piqi-ocaml uuidm frontc ounit ];
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
disableIda = "--disable-ida --disable-fsi-benchmark";
configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm_38}/bin/llvm-config" ];
configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm}/bin/llvm-config" ];
BAPBUILDFLAGS = "-j $(NIX_BUILD_CORES)";

View file

@ -11,18 +11,20 @@ stdenv.mkDerivation {
buildInputs = [ python cmake llvm ocaml findlib ctypes ];
patches = [ (fetchpatch {
url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/llvm/llvm.3.9/files/cmake.patch;
sha256 = "1fcc6ylfiw1npdhx7mrsj7h0dx7cym7i9664kpr76zqazb52ikm9";
url = https://raw.githubusercontent.com/ocaml/opam-repository/2bdc193f5a9305ea93bf0f0dfc1fbc327c8b9306/packages/llvm/llvm.7.0.0/files/fix-shared.patch;
sha256 = "1p98j3b1vrryfn1xa7i50m6mmm4dyw5ldafq6kyh9sfmdihz4zsx";
})];
cmakeFlags = [ "-DLLVM_OCAML_OUT_OF_TREE=TRUE" ];
cmakeFlags = [
"-DLLVM_OCAML_OUT_OF_TREE=TRUE"
"-DLLVM_OCAML_INSTALL_PATH=${placeholder "out"}/ocaml"
];
buildFlags = "ocaml_all";
installFlags = "-C bindings/ocaml";
postInstall = ''
mv $out/lib/ocaml $out/ocaml
mkdir -p $OCAMLFIND_DESTDIR/
mv $out/ocaml $OCAMLFIND_DESTDIR/llvm
mv $OCAMLFIND_DESTDIR/llvm/META{.llvm,}

View file

@ -3,7 +3,7 @@
buildPythonPackage rec {
pname = "XlsxWriter";
version = "1.1.8";
version = "1.2.0";
# PyPI release tarball doesn't contain tests so let's use GitHub. See:
# https://github.com/jmcnamara/XlsxWriter/issues/327
@ -11,7 +11,7 @@ buildPythonPackage rec {
owner = "jmcnamara";
repo = pname;
rev = "RELEASE_${version}";
sha256 = "19qhdcycaiamd3bp8v2z9rpirxsr4c29fgs219k2766fpmfrgx40";
sha256 = "0w9ggzi887w4z6i5mz24kcy7qbkd4d7gycqi0dhqgaj9lzxh7jjh";
};
meta = {

View file

@ -1,7 +1,9 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchPypi
, pythonOlder
, isPy27
, aenum
, wrapt
, typing
, pyserial
@ -14,21 +16,21 @@
buildPythonPackage rec {
pname = "python-can";
version = "3.1.0";
version = "3.3.1";
# PyPI tarball is missing some tests and is missing __init__.py in test
# directory causing the tests to fail. See:
# https://github.com/hardbyte/python-can/issues/518
src = fetchFromGitHub {
repo = pname;
owner = "hardbyte";
rev = "v${version}";
sha256 = "01lfsh7drm4qvv909x9i0vnhskdh27mcb5xa86sv9m3zfpq8cjis";
src = fetchPypi {
inherit pname version;
sha256 = "1giv9s6w90lalxsijgnxzynygkckcfyaxnxsldbwv0784vwy1jcd";
};
propagatedBuildInputs = [ wrapt pyserial ] ++ lib.optional (pythonOlder "3.5") typing;
propagatedBuildInputs = [ wrapt pyserial aenum ] ++ lib.optional (pythonOlder "3.5") typing;
checkInputs = [ nose mock pytest pytest-timeout hypothesis future ];
# Tests won't work with hypothesis 4.7.3 under Python 2. So skip the tests in
# that case. This clause can be removed once hypothesis has been upgraded in
# nixpkgs.
doCheck = !(isPy27 && (hypothesis.version == "4.7.3"));
# Add the scripts to PATH
checkPhase = ''
PATH=$out/bin:$PATH pytest -c /dev/null

View file

@ -1,27 +1,26 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, pandas, pytz, six
, pytest, mock, pytest-mock }:
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, numpy, pandas, pytz, six
, pytest, mock, pytest-mock, requests }:
buildPythonPackage rec {
pname = "pvlib";
version = "0.6.1";
version = "0.6.3";
# Use GitHub because PyPI release tarball doesn't contain the tests. See:
# https://github.com/pvlib/pvlib-python/issues/473
src = fetchFromGitHub{
owner = "pvlib";
repo = "pvlib-python";
rev = "v${version}";
sha256 = "17h7vz9s829qxnl4byr8458gzgiismrbrn5gl0klhfhwvc5kkdfh";
# Support for Python <3.5 dropped in 0.6.3 on June 1, 2019.
disabled = pythonOlder "3.5";
src = fetchPypi{
inherit pname version;
sha256 = "03nvgpmnscd7rh9jwm2h579zvriq5lva6rsdhb6jckpra5wjkn69";
};
checkInputs = [ pytest mock pytest-mock ];
propagatedBuildInputs = [ numpy pandas pytz six ];
propagatedBuildInputs = [ numpy pandas pytz six requests ];
# Skip a few tests that try to access some URLs
checkPhase = ''
runHook preCheck
pushd pvlib/test
pytest . -k "not test_read_srml_dt_index and not test_read_srml_month_from_solardata"
pytest . -k "not test_read_srml_dt_index and not test_read_srml_month_from_solardata and not test_get_psm3"
popd
runHook postCheck
'';

View file

@ -20,10 +20,7 @@ buildPythonPackage {
# no test data
doCheck = false;
preConfigure = ''
mkdir build
cd build
cmake ..
postConfigure = ''
cd ../py_ext
'';

View file

@ -30,6 +30,9 @@ buildPythonPackage rec {
sha256 = "0qfzx3sqx4mwxv99sfybhsij4b5pc03ricl73h4vhkzazgjjjhfm";
};
dontUseSetuptoolsBuild = true;
dontUsePipInstall = true;
hardeningDisable = [ "format" ];
nativeBuildInputs = [ pkgconfig ]

View file

@ -242,7 +242,20 @@ in
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl ];
hardeningDisable = [ "format" ];
NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-overflow" "-Wno-error=implicit-fallthrough" ];
NIX_CFLAGS_COMPILE = [
"-Wno-error=stringop-overflow"
"-Wno-error=implicit-fallthrough"
"-Wno-error=sizeof-pointer-memaccess"
"-Wno-error=cast-function-type"
"-Wno-error=class-memaccess"
"-Wno-error=ignored-qualifiers"
"-Wno-error=tautological-compare"
];
dontBuild = false;
postPatch = ''
substituteInPlace Makefile \
--replace '-Wno-invalid-source-encoding' ""
'';
};
hitimes = attrs: {

View file

@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
"-Wno-implicit-fallthrough"
"-Wno-format-truncation"
"-Wno-format-overflow"
"-Wno-error=tautological-compare"
];
postInstall = lib.optionalString stdenv.isLinux ''

View file

@ -27,29 +27,22 @@ in
let plugins = {
v330 = stdenv.mkDerivation rec {
name = "iscan-v330-bundle";
version = "1.0.1";
pluginVersion = "0.2.0";
version = "2.30.4";
src = fetchurl {
url = "https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-${version}.x64.rpm.tar.gz";
sha256 = "f6fa455f04cdfbc3d38526573260746e9546830de93ba182d0365f557d2f7df9";
sha256 = "16iq5gmfcgkvcx5hixggxgb8lwin5gjdhnq0zabgpfqg11n2w21q";
};
buildInputs = [ patchelf rpm ];
nativeBuildInputs = [ autoPatchelfHook rpm ];
installPhase = ''
${rpm}/bin/rpm2cpio "plugins/esci-interpreter-perfection-v330-${pluginVersion}-1.x86_64.rpm" | ${cpio}/bin/cpio -idmv
${rpm}/bin/rpm2cpio plugins/esci-interpreter-perfection-v330-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
mkdir $out{,/share,/lib}
cp -r ./usr/share/{iscan-data,esci}/ $out/share/
cp -r ./usr/lib64/esci $out/lib
'';
preFixup = ''
lib=$out/lib/esci/libesci-interpreter-perfection-v330.so
rpath=${gcc.cc.lib}/lib/
patchelf --set-rpath $rpath $lib
'';
passthru = {
registrationCommand = ''
$registry --add interpreter usb 0x04b8 0x0142 "$plugin/lib/esci/libesci-interpreter-perfection-v330 $plugin/share/esci/esfwad.bin"
@ -60,28 +53,22 @@ let plugins = {
};
x770 = stdenv.mkDerivation rec {
pname = "iscan-gt-x770-bundle";
version = "1.0.1";
pluginVersion = "2.1.2-1";
version = "2.30.4";
nativeBuildInputs = [ patchelf rpm ];
nativeBuildInputs = [ autoPatchelfHook rpm ];
src = fetchurl {
url = "https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz";
sha256 = "0m9c60rszzdvq1pqfzygzzrjycm1giy465lj29108j7hsnfcv56r";
sha256 = "1cz4z3wz216s77z185m665jcgdslil5gn4dsi118nv1fm17z3jik";
};
installPhase = ''
cd plugins
${rpm}/bin/rpm2cpio iscan-plugin-gt-x770-${pluginVersion}.x86_64.rpm | ${cpio}/bin/cpio -idmv
${rpm}/bin/rpm2cpio iscan-plugin-gt-x770-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
mkdir $out
cp -r usr/share $out
cp -r usr/lib64 $out/lib
mv $out/share/iscan $out/share/esci
mv $out/lib/iscan $out/lib/esci
'';
preFixup = ''
lib=$out/lib/esci/libesint7C.so
rpath=${gcc.cc.lib}/lib/
patchelf --set-rpath $rpath $lib
'';
passthru = {
registrationCommand = ''
$registry --add interpreter usb 0x04b8 0x0130 "$plugin/lib/esci/libesint7C $plugin/share/esci/esfw7C.bin"
@ -92,26 +79,22 @@ let plugins = {
};
f720 = stdenv.mkDerivation rec {
pname = "iscan-gt-f720-bundle";
version = "1.0.1";
pluginVersion = "0.1.1-2";
version = "2.30.4";
buildInputs = [ patchelf ];
nativeBuildInputs= [ autoPatchelfHook ];
buildInputs = [ gcc.cc.lib ];
src = fetchurl {
url = "https://download2.ebz.epson.net/iscan/plugin/gt-f720/rpm/x64/iscan-gt-f720-bundle-${version}.x64.rpm.tar.gz";
sha256 = "0dvikq5ad6wid3lxw1amar8lsbr50g39g6zlmcjxdcsg0wb1qspp";
sha256 = "12rivh00n9mhagy5yjl1m0bv7ypbig6brqkxm0a12xy0mjq7yv8y";
};
installPhase = ''
cd plugins
${rpm}/bin/rpm2cpio esci-interpreter-gt-f720-${pluginVersion}.x86_64.rpm | ${cpio}/bin/cpio -idmv
${rpm}/bin/rpm2cpio esci-interpreter-gt-f720-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
mkdir $out
cp -r usr/share $out
cp -r usr/lib64 $out/lib
'';
preFixup = ''
lib=$out/lib/esci/libesci-interpreter-gt-f720.so
rpath=${gcc.cc.lib}/lib/
patchelf --set-rpath $rpath $lib
'';
passthru = {
registrationCommand = ''
$registry --add interpreter usb 0x04b8 0x0131 "$plugin/lib/esci/libesci-interpreter-gt-f720 $plugin/share/esci/esfw8b.bin"
@ -123,32 +106,24 @@ let plugins = {
};
s80 = stdenv.mkDerivation rec {
pname = "iscan-gt-s80-bundle";
version = "1.0.1";
esciPluginVersion = "0.2.1-1";
esdipPluginVersion = "1.0.0-5";
version = "2.30.4";
buildInputs = [ patchelf ];
nativeBuildInputs = [ autoPatchelfHook ];
buildInputs = [ gcc.cc.lib libtool ];
src = fetchurl {
url = "https://download2.ebz.epson.net/iscan/plugin/gt-s80/rpm/x64/iscan-gt-s80-bundle-${version}.x64.rpm.tar.gz";
sha256 = "14j11znx5ga2ykpyg6kjg7lbrddyr9pwxrsa82dmdishd1j7zji9";
sha256 = "1ran75zsxcdci00jakngkz6p9lj4q483hjapmf80p68rzhpmdr5y";
};
installPhase = ''
cd plugins
${rpm}/bin/rpm2cpio esci-interpreter-gt-s80-${esciPluginVersion}.x86_64.rpm | ${cpio}/bin/cpio -idmv
${rpm}/bin/rpm2cpio iscan-plugin-esdip-${esdipPluginVersion}.ltdl7.x86_64.rpm | ${cpio}/bin/cpio -idmv
${rpm}/bin/rpm2cpio esci-interpreter-gt-s80-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
${rpm}/bin/rpm2cpio iscan-plugin-esdip-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
mkdir $out
cp -r usr/share $out
cp -r usr/lib64 $out/lib
mkdir $out/share/esci
'';
preFixup = ''
rpath=${gcc.cc.lib}/lib/
patchelf --set-rpath $rpath $out/lib/esci/libesci-interpreter-gt-s80.so
patchelf --set-rpath $rpath $out/lib/esci/libesci-interpreter-gt-s50.so
patchelf --set-rpath $rpath $out/lib/iscan/esdip
patchelf --set-rpath $rpath $out/lib/iscan/libesdtr.so.0
patchelf --set-rpath $rpath $out/lib/iscan/libesdtr2.so.0
'';
passthru = {
registrationCommand = ''
$registry --add interpreter usb 0x04b8 0x0136 "$plugin/lib/esci/libesci-interpreter-gt-s80.so"
@ -163,19 +138,19 @@ let plugins = {
};
network = stdenv.mkDerivation rec {
pname = "iscan-nt-bundle";
version = "1.0.0";
ntPluginVersion = "1.1.1-1";
# for the version, look for the driver of XP-750 in the search page
version = "2.30.4";
buildInputs = [ stdenv.cc.cc.lib ];
nativeBuildInputs = [ autoPatchelfHook ];
src = fetchurl {
url = "https://download2.ebz.epson.net/iscan/general/rpm/x64/iscan-bundle-${version}.x64.rpm.tar.gz";
sha256 = "1k3dmv4ml21k6mafvcvgfymb1acpcdxpvyrbfh2yf07jzmn5if4f";
sha256 = "1l0y4dy88y91jdq66pxrxqmiwsxwy0rd7x4bh0cw08r4iyhjqprz";
};
installPhase = ''
cd plugins
${rpm}/bin/rpm2cpio iscan-network-nt-${ntPluginVersion}.x86_64.rpm | ${cpio}/bin/cpio -idmv
${rpm}/bin/rpm2cpio iscan-network-nt-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
mkdir $out
cp -r usr/share $out
@ -201,11 +176,11 @@ let fwdir = symlinkJoin {
in
let iscan-data = stdenv.mkDerivation rec {
pname = "iscan-data";
version = "1.39.0-1";
version = "1.39.1-2";
src = fetchurl {
url = "http://support.epson.net/linux/src/scanner/iscan/iscan-data_${version}.tar.gz";
sha256 = "0pvm67gqyvzhnv5qyfbaz802l4sbgvaf0zb8wz60k1wcasb99vv1";
sha256 = "04zrvbnxf1k6zinrd13hwnbzscc3qhmwlvx3k2jhjys2lginw7w4";
};
buildInputs = [
@ -217,11 +192,11 @@ let iscan-data = stdenv.mkDerivation rec {
in
stdenv.mkDerivation rec {
pname = "iscan";
version = "2.30.3-1";
version = "2.30.4-2";
src = fetchurl {
url = "http://support.epson.net/linux/src/scanner/iscan/iscan_${version}.tar.gz";
sha256 = "0ryy946h7ddmxh866hfszqfyff1qy4svpsk7w3739v75f4awr9li";
sha256 = "1ma76jj0k3bz0fy06fiyl4di4y77rcryb0mwjmzs5ms2vq9rjysr";
};
nativeBuildInputs = [ pkgconfig ];

View file

@ -2,12 +2,12 @@
stdenv.mkDerivation {
pname = "mmc-utils";
version = "2018-03-27";
version = "2018-12-14";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git";
rev = "b4fe0c8c0e57a74c01755fa9362703b60d7ee49d";
sha256 = "01llwan5j40mv5p867f31lm87qh0hcyhy892say60y5pxc0mzpyn";
rev = "aef913e31b659462fe6b9320d241676cba97f67b";
sha256 = "1mak9rqjp6yvqk2h5hfil5a9gfx138h62n3cryckfbhr6fmaylm7";
};
makeFlags = "CC=${stdenv.cc.targetPrefix}cc";

View file

@ -8,13 +8,13 @@ with python3.pkgs;
buildPythonApplication rec {
pname = "setools";
version = "2017-11-10";
version = "4.2.0";
src = fetchFromGitHub {
owner = "TresysTechnology";
owner = "SELinuxProject";
repo = pname;
rev = "a1aa0f33f5c428d3f9fe82960ed5de36f38047f7";
sha256 = "0iyj35fff93cprjkzbkg9dn5xz8dg5h2kjx3476fl625nxxskndn";
rev = version;
sha256 = "1bjwcvr6rjx79cdcvaxn68bdrnl4f2a8gnnqsngdxhkhwpddksjy";
};
nativeBuildInputs = [ bison flex swig ];
@ -34,8 +34,8 @@ buildPythonApplication rec {
'';
meta = {
description = "SELinux Tools";
homepage = https://github.com/TresysTechnology/setools/wiki;
description = "SELinux Policy Analysis Tools";
homepage = https://github.com/SELinuxProject/setools;
license = licenses.gpl2;
platforms = platforms.linux;
};

View file

@ -5,6 +5,11 @@ stdenv.mkDerivation {
src = kernel.src;
patches = [
# fixes build with gcc8
./fix-snprintf-truncation.patch
];
nativeBuildInputs = [ autoconf automake libtool ];
buildInputs = [ udev ];

View file

@ -0,0 +1,13 @@
diff --git a/tools/usb/usbip/libsrc/vhci_driver.c b/tools/usb/usbip/libsrc/vhci_driver.c
index 8159fd98680b..7d6eb3e3fe1e 100644
--- a/tools/usb/usbip/libsrc/vhci_driver.c
+++ b/tools/usb/usbip/libsrc/vhci_driver.c
@@ -111,7 +111,7 @@ static int parse_status(const char *value)
static int refresh_imported_device_list(void)
{
const char *attr_status;
- char status[MAX_STATUS_NAME+1] = "status";
+ char status[MAX_STATUS_NAME+2] = "status";
int i, ret;
for (i = 0; i < vhci_driver->ncontrollers; i++) {

View file

@ -38,6 +38,8 @@ let
"-Wno-error=int-in-bool-context"
"-Wno-error=maybe-uninitialized"
"-Wno-error=unused-function"
"-Wno-error=ignored-qualifiers"
"-Wno-error=catch-value"
];
};

View file

@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
buildInputs = [ libtool ];
# configureFlags = [ "--datadir=/run/current-system/share/dictd" ];
NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation";
meta = with stdenv.lib; {
description = "Dict protocol server and client";
maintainers = [ ];

View file

@ -70,7 +70,10 @@ stdenv.mkDerivation {
++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio"
++ map (mod: "--add-module=${mod.src}") modules;
NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations";
NIX_CFLAGS_COMPILE = [
"-I${libxml2.dev}/include/libxml2"
"-Wno-error=implicit-fallthrough"
] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations";
configurePlatforms = [];

View file

@ -42,7 +42,10 @@ stdenv.mkDerivation {
--replace /bin/bash ${bash}/bin/bash;
'';
NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=nonnull-compare";
NIX_CFLAGS_COMPILE = [
"-Wno-error=unused-result" "-Wno-error=nonnull-compare"
"-Wno-error=format-truncation"
];
makeFlags = "DESTDIR=$(out) prefix=";

View file

@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoconf automake libtool ];
buildInputs = [ openssl zlib ];
NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation";
preBuild = ''
patchShebangs build/gen_version
substituteInPlace build/gen_version --replace 'git describe' 'echo ${version}'

View file

@ -53,7 +53,6 @@ let
};
};
in {
arangodb_3_2 = common { version = "3.2.18"; sha256 = "05mfrx1g6dh1bzzqs23nvk0rg3v8y2dhdam4lym55pzlhqa7lf0x"; };
arangodb_3_3 = common { version = "3.3.23.1"; sha256 = "0bnbiispids7jcgrgcmanf9jqgvk0vaflrvgalz587jwr2zf21k8"; };
arangodb_3_4 = common { version = "3.4.7"; sha256 = "1wr2xvi5lnl6f2ryyxdwn4wnfiaz0rrf58ja1k19m7b6w3264iim"; };
arangodb_3_5 = common { version = "3.5.0-rc.7"; sha256 = "1sdmbmyml9d3ia3706bv5901qqmh4sxk7js5b9hyfjqpcib10d1k"; };

View file

@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1qh04z1fsj1l6l12sz9yl2sy9hwlrnzac54hwrr7wvsgv90n9gbp";
};
NIX_CFLAGS_COMPILE = [ "-Wno-error=catch-value" ];
buildInputs = [ curl gnutls libgcrypt libuuid fuse ];
nativeBuildInputs = [ cmake pkgconfig ];
@ -20,4 +22,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ jbgi ];
platforms = platforms.linux;
};
}
}

View file

@ -1,24 +1,18 @@
{ stdenv, fetchFromGitHub, fetchpatch, cmake, fuse, zlib, bzip2, openssl, libxml2, icu } :
{ stdenv, fetchFromGitHub, cmake, fuse, zlib, bzip2, openssl, libxml2, icu } :
stdenv.mkDerivation rec {
pname = "darling-dmg";
version = "1.0.4";
version = "1.0.4+git20180914";
src = fetchFromGitHub {
owner = "darlinghq";
repo = "darling-dmg";
rev = "v${version}";
sha256 = "0x285p16zfnp0p6injw1frc8krif748sfgxhdd7gb75kz0dfbkrk";
rev = "97a92a6930e43cdbc9dedaee62716e3223deb027";
sha256 = "1bngr4827qnl4s2f7z39wjp13nfm3zzzykjshb43wvjz536bnqdj";
};
patches = [
(fetchpatch {
url = "https://github.com/darlinghq/darling-dmg/commit/cbb0092264b5c5cf3e92d6c2de23f02d859ebf44.patch";
sha256 = "05fhgn5c09f1rva6bvbq16nhlkblrhscbf69k04ajwdh7y98sw39";
})
];
buildInputs = [ cmake fuse openssl zlib bzip2 libxml2 icu ];
nativeBuildInputs = [ cmake ];
buildInputs = [ fuse openssl zlib bzip2 libxml2 icu ];
# compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554
CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ];

View file

@ -30,6 +30,12 @@ in rec {
# but we don't use /usr with nix, so remove only 2 items.
patches = [ ./irods_root_path.patch ];
NIX_CFLAGS_COMPILE = [
# fix build with recent llvm versions
"-Wno-deprecated-register"
"-Wno-deprecated-declarations"
];
preConfigure = common.preConfigure + ''
patchShebangs ./test
substituteInPlace plugins/database/CMakeLists.txt --replace "COMMAND cpp" "COMMAND ${gcc.cc}/bin/cpp"

View file

@ -19,6 +19,7 @@ stdenv.mkDerivation {
patchPhase = ''
sed 1i'#include <inttypes.h>' -i src/PGF.cpp
sed s/__int64/int64_t/g -i src/PGF.cpp
rm include/FreeImage.h include/FreeImagePlus.h
'';
preConfigure = "dos2unix configure.ac; sh autogen.sh";

View file

@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
"-Wno-error=format-truncation"
"-Wno-error=pointer-compare"
"-Wno-error=memset-elt-size"
"-Wno-error=restrict"
];
postPatch = ''

View file

@ -31,8 +31,12 @@ stdenv.mkDerivation rec {
sha256 = "0chk6pnn365d5kcz6vfqx1d0383ksk97icc0lzg0vvb0kvyj0ff1";
};
# readdir_r(3) is deprecated in glibc >= 2.24
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
NIX_CFLAGS_COMPILE = [
# readdir_r(3) is deprecated in glibc >= 2.24
"-Wno-error=deprecated-declarations"
# gcc8 catching polymorphic type error
"-Wno-error=catch-value"
];
patches = [ ./fix_absolute_path.patch ./fix_environment_variables.patch ./fix_scons.patch ./insert_prefetches.patch ];

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
owner = "puppetlabs";
};
CXXFLAGS = "-fpermissive";
CXXFLAGS = "-fpermissive -Wno-error=catch-value";
NIX_LDFLAGS = "-lblkid";
cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ];

View file

@ -13,6 +13,8 @@ stdenv.mkDerivation {
buildInputs = [ jdk ant saxon ];
CLASSPATH = "lib/saxon.jar";
preBuild = "ant";
installPhase = ''

View file

@ -608,7 +608,7 @@ in
arandr = callPackage ../tools/X11/arandr { };
inherit (callPackages ../servers/nosql/arangodb { }) arangodb_3_2 arangodb_3_3 arangodb_3_4 arangodb_3_5;
inherit (callPackages ../servers/nosql/arangodb { }) arangodb_3_3 arangodb_3_4 arangodb_3_5;
arangodb = arangodb_3_4;
arcanist = callPackage ../development/tools/misc/arcanist {};
@ -3825,8 +3825,6 @@ in
highlight = callPackage ../tools/text/highlight ({
lua = lua5;
} // lib.optionalAttrs stdenv.isDarwin {
inherit (llvmPackages_38) stdenv;
});
holochain-go = callPackage ../servers/holochain-go { };
@ -3914,8 +3912,8 @@ in
idevicerestore = callPackage ../tools/misc/idevicerestore { };
inherit (callPackages ../tools/filesystems/irods rec {
stdenv = llvmPackages_38.libcxxStdenv;
libcxx = llvmPackages_38.libcxx;
stdenv = llvmPackages.libcxxStdenv;
libcxx = llvmPackages.libcxx;
boost = boost160.override { inherit stdenv; };
avro-cpp_llvm = avro-cpp.override { inherit stdenv boost; };
})
@ -7427,7 +7425,6 @@ in
clang_5 = llvmPackages_5.clang;
clang_4 = llvmPackages_4.clang;
clang_39 = llvmPackages_39.clang;
clang_38 = llvmPackages_38.clang;
clang_35 = wrapCC llvmPackages_35.clang;
clang-tools = callPackage ../development/tools/clang-tools {
@ -7509,9 +7506,8 @@ in
gerbil = callPackage ../development/compilers/gerbil { stdenv = gccStdenv; };
gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; };
gccFun = callPackage ../development/compilers/gcc/7;
# Temporary solution until #40038 is fixed
gcc = if stdenv.isDarwin then gcc7 else gcc8;
gccFun = callPackage ../development/compilers/gcc/8;
gcc = gcc8;
gcc-unwrapped = gcc.cc;
gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override {
@ -7746,6 +7742,14 @@ in
profiledCompiler = false;
});
gfortran8 = wrapCC (gcc8.cc.override {
name = "gfortran";
langFortran = true;
langCC = false;
langC = false;
profiledCompiler = false;
});
gcj = gcj6;
gcj6 = wrapCC (gcc6.cc.override {
name = "gcj";
@ -8115,7 +8119,6 @@ in
llvm_5 = llvmPackages_5.llvm;
llvm_4 = llvmPackages_4.llvm;
llvm_39 = llvmPackages_39.llvm;
llvm_38 = llvmPackages_38.llvm;
llvm_35 = llvmPackages_35.llvm;
llvmPackages = recurseIntoAttrs llvmPackages_7;
@ -8126,14 +8129,6 @@ in
stdenv = gcc6Stdenv;
});
llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 ({
inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_38.tools;
targetLlvmLibraries = targetPackages.llvmPackages_38.libraries;
} // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = gcc6Stdenv;
});
llvmPackages_39 = callPackage ../development/compilers/llvm/3.9 ({
inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_39.tools;
@ -9077,6 +9072,8 @@ in
mspdebug = callPackage ../development/misc/msp430/mspdebug.nix { };
rappel = callPackage ../development/misc/rappel/default.nix { };
pharo-vms = callPackage ../development/pharo/vm { };
pharo = pharo-vms.multi-vm-wrapper;
pharo-cog32 = pharo-vms.cog32;

View file

@ -57,7 +57,9 @@ let
base64 = callPackage ../development/ocaml-modules/base64 { };
bap = callPackage ../development/ocaml-modules/bap { };
bap = callPackage ../development/ocaml-modules/bap {
llvm = pkgs.llvm_8;
};
batteries = callPackage ../development/ocaml-modules/batteries { };
@ -395,7 +397,7 @@ let
linenoise = callPackage ../development/ocaml-modules/linenoise { };
llvm = callPackage ../development/ocaml-modules/llvm {
llvm = pkgs.llvm_39;
llvm = pkgs.llvm_8;
};
logs = callPackage ../development/ocaml-modules/logs {