diff --git a/doc/stdenv/stdenv.xml b/doc/stdenv/stdenv.xml
index ee93f39318b8..818e6c5da00c 100644
--- a/doc/stdenv/stdenv.xml
+++ b/doc/stdenv/stdenv.xml
@@ -2018,6 +2018,9 @@ addEnvHooks "$hostOffset" myBashFunction
In certain situations you may want to run the main command (autoPatchelf) of the setup hook on a file or a set of directories instead of unconditionally patching all outputs. This can be done by setting the dontAutoPatchelf environment variable to a non-empty value.
+
+ By default autoPatchelf will fail as soon as any ELF file requires a dependency which cannot be resolved via the given build inputs. In some situations you might prefer to just leave missing dependencies unpatched and continue to patch the rest. This can be achieved by setting the autoPatchelfIgnoreMissingDeps environment variable to a non-empty value.
+
The autoPatchelf command also recognizes a --no-recurse command line flag, which prevents it from recursing into subdirectories.
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 9bcf517e1d9e..2216fe9199db 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -13,8 +13,8 @@ let
else throw "ImageMagick is not supported on this platform.";
cfg = {
- version = "7.0.10-17";
- sha256 = "15cj9qkikx13j6gfqaawi4nh09lnzg3asf5mdcswx6z6yhbf90zx";
+ version = "7.0.10-19";
+ sha256 = "12ilfdbxllkaa3bs9z86d2nkklqz5c0l57kqj91l2ixjlvra64w0";
patches = [];
};
in
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index b021c186b5c5..948b4ddd54db 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -34,8 +34,6 @@ stdenv.mkDerivation rec {
"-DUSE_KWALLET=OFF"
];
- # Reduce the risk of collisions
- postInstall = "rm -r $out/share/doc";
# darktable changed its rpath handling in commit
# 83c70b876af6484506901e6b381304ae0d073d3c and as a result the
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 0eda0739eab1..98f72cf803db 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -177,7 +177,7 @@ stdenv.mkDerivation ({
BINDGEN_CFLAGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \
$(< ${stdenv.cc}/nix-support/cc-cflags) \
- ${stdenv.cc.default_cxx_stdlib_compile} \
+ $(< ${stdenv.cc}/nix-support/libcxx-cxxflags) \
${lib.optionalString stdenv.cc.isClang "-idirafter ${stdenv.cc.cc}/lib/clang/${lib.getVersion stdenv.cc.cc}/include"} \
${lib.optionalString stdenv.cc.isGNU "-isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc} -isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/${stdenv.hostPlatform.config}"} \
$NIX_CFLAGS_COMPILE"
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 007ac280068b..6cb27055ddbc 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -177,7 +177,7 @@ stdenv.mkDerivation rec {
BINDGEN_CFLAGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \
$(< ${stdenv.cc}/nix-support/cc-cflags) \
- ${stdenv.cc.default_cxx_stdlib_compile} \
+ $(< ${stdenv.cc}/nix-support/libcxx-cxxflags) \
${
lib.optionalString stdenv.cc.isClang
"-idirafter ${stdenv.cc.cc}/lib/clang/${
diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index d59cdff34fd9..ab4fc0908ba8 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -72,9 +72,6 @@ in stdenv.mkDerivation {
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation";
- # Reduce the risk of collisions
- postInstall = "rm -r $out/share/doc";
-
meta = {
description = "A fast, easy and free BitTorrent client";
longDescription = ''
diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix
index d025554835ef..14ca503f2e91 100644
--- a/pkgs/applications/video/vdr/default.nix
+++ b/pkgs/applications/video/vdr/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fontconfig, libjpeg, libcap, freetype, fribidi, pkgconfig
-, gettext, systemd, perl, lib
+, gettext, systemd, perl, lib, fetchpatch
, enableSystemd ? true
, enableBidi ? true
}: stdenv.mkDerivation rec {
@@ -12,6 +12,11 @@
sha256 = "1p51b14aqzncx3xpfg0rjplc48pg7520035i5p6r5zzkqhszihr5";
};
+ patches = [
+ # Derived from http://git.tvdr.de/?p=vdr.git;a=commit;h=930c2cd2eb8947413e88404fa94c66e4e1db5ad6
+ ./glibc2.31-compat.patch
+ ];
+
enableParallelBuilding = true;
postPatch = "substituteInPlace Makefile --replace libsystemd-daemon libsystemd";
diff --git a/pkgs/applications/video/vdr/glibc2.31-compat.patch b/pkgs/applications/video/vdr/glibc2.31-compat.patch
new file mode 100644
index 000000000000..9a52d4b290b1
--- /dev/null
+++ b/pkgs/applications/video/vdr/glibc2.31-compat.patch
@@ -0,0 +1,15 @@
+diff --git a/eit.c b/eit.c
+index 50d8229..373dbca 100644
+--- a/eit.c
++++ b/eit.c
+@@ -391,7 +391,9 @@ cTDT::cTDT(const u_char *Data)
+ if (abs(diff) > MAX_TIME_DIFF) {
+ mutex.Lock();
+ if (abs(diff) > MAX_ADJ_DIFF) {
+- if (stime(&dvbtim) == 0)
++ timespec ts = { 0 };
++ ts.tv_sec = dvbtim;
++ if (clock_settime(CLOCK_REALTIME, &ts) == 0)
+ isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim);
+ else
+ esyslog("ERROR while setting system time: %m");
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index 9e31ca6a8a21..786f0f9c5983 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -132,15 +132,15 @@ stdenv.mkDerivation {
ldPath="${bintools_bin}/bin"
''
+ # Solaris needs an additional ld wrapper.
+ optionalString (targetPlatform.isSunOS && nativePrefix != "") ''
- # Solaris needs an additional ld wrapper.
ldPath="${nativePrefix}/bin"
exec="$ldPath/${targetPrefix}ld"
wrap ld-solaris ${./ld-solaris-wrapper.sh}
'')
+ # Create a symlink to as (the assembler).
+ ''
- # Create a symlink to as (the assembler).
if [ -e $ldPath/${targetPrefix}as ]; then
ln -s $ldPath/${targetPrefix}as $out/bin/${targetPrefix}as
fi
@@ -200,26 +200,29 @@ stdenv.mkDerivation {
];
postFixup =
+ ##
+ ## General libc support
+ ##
optionalString (libc != null) (''
- ##
- ## General libc support
- ##
-
- echo "-L${libc_lib}${libc.libdir or "/lib"}" > $out/nix-support/libc-ldflags
+ touch "$out/nix-support/libc-ldflags"
+ echo "-L${libc_lib}${libc.libdir or "/lib"}" >> $out/nix-support/libc-ldflags
echo "${libc_lib}" > $out/nix-support/orig-libc
echo "${libc_dev}" > $out/nix-support/orig-libc-dev
+ ''
- ##
- ## Dynamic linker support
- ##
-
+ ##
+ ## Dynamic linker support
+ ##
+ + ''
if [[ -z ''${dynamicLinker+x} ]]; then
echo "Don't know the name of the dynamic linker for platform '${targetPlatform.config}', so guessing instead." >&2
local dynamicLinker="${libc_lib}/lib/ld*.so.?"
fi
+ ''
- # Expand globs to fill array of options
+ # Expand globs to fill array of options
+ + ''
dynamicLinker=($dynamicLinker)
case ''${#dynamicLinker[@]} in
@@ -228,58 +231,56 @@ stdenv.mkDerivation {
*) echo "Multiple dynamic linkers found for platform '${targetPlatform.config}'." >&2;;
esac
- if [ -n "''${dynamicLinker:-}" ]; then
+ if [ -n "''${dynamicLinker-}" ]; then
echo $dynamicLinker > $out/nix-support/dynamic-linker
'' + (if targetPlatform.isDarwin then ''
printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook
- '' else ''
+ '' else ''
if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then
echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32
fi
-
- local ldflagsBefore=(-dynamic-linker "$dynamicLinker")
- '') + ''
- fi
-
+ ''
# The dynamic linker is passed in `ldflagsBefore' to allow
# explicit overrides of the dynamic linker by callers to ld
# (the *last* value counts, so ours should come first).
- printWords "''${ldflagsBefore[@]}" > $out/nix-support/libc-ldflags-before
+ + ''
+ echo -dynamic-linker "$dynamicLinker" >> $out/nix-support/libc-ldflags-before
+ '') + ''
+ fi
'')
+ # Ensure consistent LC_VERSION_MIN_MACOSX and remove LC_UUID.
+ optionalString stdenv.targetPlatform.isMacOS ''
- # Ensure consistent LC_VERSION_MIN_MACOSX and remove LC_UUID.
echo "-macosx_version_min 10.12 -sdk_version 10.12 -no_uuid" >> $out/nix-support/libc-ldflags-before
''
- + optionalString (!nativeTools) ''
- ##
- ## User env support
- ##
+ ##
+ ## User env support
+ ##
- # Propagate the underling unwrapped bintools so that if you
- # install the wrapper, you get tools like objdump (same for any
- # binaries of libc).
+ # Propagate the underling unwrapped bintools so that if you
+ # install the wrapper, you get tools like objdump (same for any
+ # binaries of libc).
+ + optionalString (!nativeTools) ''
printWords ${bintools_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages
''
+ ##
+ ## Man page and info support
+ ##
+ optionalString propagateDoc (''
- ##
- ## Man page and info support
- ##
-
ln -s ${bintools.man} $man
'' + optionalString (bintools ? info) ''
ln -s ${bintools.info} $info
'')
- + ''
- ##
- ## Hardening support
- ##
+ ##
+ ## Hardening support
+ ##
- # some linkers on some platforms don't support specific -z flags
+ # some linkers on some platforms don't support specific -z flags
+ + ''
export hardening_unsupported_flags=""
if [[ "$($ldPath/${targetPrefix}ld -z now 2>&1 || true)" =~ un(recognized|known)\ option ]]; then
hardening_unsupported_flags+=" bindnow"
@@ -304,15 +305,18 @@ stdenv.mkDerivation {
''
+ ''
+ for flags in "$out/nix-support"/*flags*; do
+ substituteInPlace "$flags" --replace $'\n' ' '
+ done
+
substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh
substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash
-
- ##
- ## Extra custom steps
- ##
''
+ ##
+ ## Extra custom steps
+ ##
+ extraBuildCommands;
inherit dynamicLinker expand-response-params;
diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh
index 3398f11e8c21..04be3f408ee1 100644
--- a/pkgs/build-support/cc-wrapper/add-flags.sh
+++ b/pkgs/build-support/cc-wrapper/add-flags.sh
@@ -37,6 +37,14 @@ if [ -e @out@/nix-support/libc-cflags ]; then
NIX_CFLAGS_COMPILE_@suffixSalt@="$(< @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE_@suffixSalt@"
fi
+if [ -e @out@/nix-support/libcxx-cxxflags ]; then
+ NIX_CXXSTDLIB_COMPILE_@suffixSalt@+=" $(< @out@/nix-support/libcxx-cxxflags)"
+fi
+
+if [ -e @out@/nix-support/libcxx-ldflags ]; then
+ NIX_CXXSTDLIB_LINK_@suffixSalt@+=" $(< @out@/nix-support/libcxx-ldflags)"
+fi
+
if [ -e @out@/nix-support/cc-cflags ]; then
NIX_CFLAGS_COMPILE_@suffixSalt@="$(< @out@/nix-support/cc-cflags) $NIX_CFLAGS_COMPILE_@suffixSalt@"
fi
diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
index cf00202221e6..3f9f099f3bc1 100644
--- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
@@ -129,7 +129,7 @@ fi
if [[ "$isCpp" = 1 ]]; then
if [[ "$cppInclude" = 1 ]]; then
- NIX_CFLAGS_COMPILE_@suffixSalt@+=" ${NIX_CXXSTDLIB_COMPILE_@suffixSalt@:-@default_cxx_stdlib_compile@}"
+ NIX_CFLAGS_COMPILE_@suffixSalt@+=" $NIX_CXXSTDLIB_COMPILE_@suffixSalt@"
fi
NIX_CFLAGS_LINK_@suffixSalt@+=" $NIX_CXXSTDLIB_LINK_@suffixSalt@"
fi
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index da16a23f9dff..1fef3c459086 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -48,12 +48,6 @@ let
# The wrapper scripts use 'cat' and 'grep', so we may need coreutils.
coreutils_bin = if nativeTools then "" else getBin coreutils;
- default_cxx_stdlib_compile = if (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools && cc ? gcc) && !(targetPlatform.useLLVM or false) then
- "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/${targetPlatform.config}"
- else if targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false) && !(targetPlatform.useLLVM or false) then
- "-isystem ${libcxx}/include/c++/v1"
- else "";
-
# The "suffix salt" is a arbitrary string added in the end of env vars
# defined by cc-wrapper's hooks so that multiple cc-wrappers can be used
# without interfering. For the moment, it is defined as the target triple,
@@ -68,7 +62,7 @@ let
# older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu
isGccArchSupported = arch:
- if cc.isGNU or false then
+ if isGNU then
{ skylake = versionAtLeast ccVersion "6.0";
skylake-avx512 = versionAtLeast ccVersion "6.0";
cannonlake = versionAtLeast ccVersion "8.0";
@@ -76,7 +70,7 @@ let
icelake-server = versionAtLeast ccVersion "8.0";
knm = versionAtLeast ccVersion "8.0";
}.${arch} or true
- else if cc.isClang or false then
+ else if isClang then
{ cannonlake = versionAtLeast ccVersion "5.0";
icelake-client = versionAtLeast ccVersion "7.0";
icelake-server = versionAtLeast ccVersion "7.0";
@@ -116,7 +110,7 @@ stdenv.mkDerivation {
# Binutils, and Apple's "cctools"; "bintools" as an attempt to find an
# unused middle-ground name that evokes both.
inherit bintools;
- inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile;
+ inherit libc nativeTools nativeLibc nativePrefix isGNU isClang;
emacsBufferSetup = pkgs: ''
; We should handle propagation here too
@@ -160,21 +154,21 @@ stdenv.mkDerivation {
ccPath="${cc}/bin"
'')
+ # Create symlinks to everything in the bintools wrapper.
+ ''
- # Create symlinks to everything in the bintools wrapper.
for bbin in $bintools/bin/*; do
mkdir -p "$out/bin"
ln -s "$bbin" "$out/bin/$(basename $bbin)"
done
+ ''
- # We export environment variables pointing to the wrapped nonstandard
- # cmds, lest some lousy configure script use those to guess compiler
- # version.
+ # We export environment variables pointing to the wrapped nonstandard
+ # cmds, lest some lousy configure script use those to guess compiler
+ # version.
+ + ''
export named_cc=${targetPrefix}cc
export named_cxx=${targetPrefix}c++
- export default_cxx_stdlib_compile="${default_cxx_stdlib_compile}"
-
if [ -e $ccPath/${targetPrefix}gcc ]; then
wrap ${targetPrefix}gcc $wrapper $ccPath/${targetPrefix}gcc
ln -s ${targetPrefix}gcc $out/bin/${targetPrefix}cc
@@ -226,7 +220,7 @@ stdenv.mkDerivation {
strictDeps = true;
propagatedBuildInputs = [ bintools ] ++ extraTools ++ optionals cc.langD or false [ zlib ];
- depsTargetTargetPropagated = extraPackages;
+ depsTargetTargetPropagated = optional (libcxx != null) libcxx ++ extraPackages;
wrapperName = "CC_WRAPPER";
@@ -236,12 +230,19 @@ stdenv.mkDerivation {
];
postFixup =
+ # Ensure flags files exists, as some other programs cat them. (That these
+ # are considered an exposed interface is a bit dubious, but fine for now.)
''
- # Backwards compatability for packages expecting this file, e.g. with
- # `$NIX_CC/nix-support/dynamic-linker`.
- #
- # TODO(@Ericson2314): Remove this after stable release and force
- # everyone to refer to bintools-wrapper directly.
+ touch "$out/nix-support/cc-cflags"
+ touch "$out/nix-support/cc-ldflags"
+ ''
+
+ # Backwards compatability for packages expecting this file, e.g. with
+ # `$NIX_CC/nix-support/dynamic-linker`.
+ #
+ # TODO(@Ericson2314): Remove this after stable release and force
+ # everyone to refer to bintools-wrapper directly.
+ + ''
if [[ -f "$bintools/nix-support/dynamic-linker" ]]; then
ln -s "$bintools/nix-support/dynamic-linker" "$out/nix-support"
fi
@@ -250,22 +251,42 @@ stdenv.mkDerivation {
fi
''
- + optionalString (libc != null) (''
- ##
- ## General libc support
- ##
+ ##
+ ## General Clang support
+ ##
+ + optionalString isClang ''
- # The "-B${libc_lib}/lib/" flag is a quick hack to force gcc to link
- # against the crt1.o from our own glibc, rather than the one in
- # /usr/lib. (This is only an issue when using an `impure'
- # compiler/linker, i.e., one that searches /usr/lib and so on.)
- #
- # Unfortunately, setting -B appears to override the default search
- # path. Thus, the gcc-specific "../includes-fixed" directory is
- # now longer searched and glibc's header fails to
- # compile, because it uses "#include_next " to find the
- # limits.h file in ../includes-fixed. To remedy the problem,
- # another -idirafter is necessary to add that directory again.
+ echo "-target ${targetPlatform.config}" >> $out/nix-support/cc-cflags
+ ''
+
+ ##
+ ## GCC libs for non-GCC support
+ ##
+ + optionalString (isClang && libcxx == null && cc ? gcc) ''
+
+ echo "-B${cc.gcc}/lib/gcc/${targetPlatform.config}/${cc.gcc.version}" >> $out/nix-support/cc-cflags
+ echo "-L${cc.gcc}/lib/gcc/${targetPlatform.config}/${cc.gcc.version}" >> $out/nix-support/cc-ldflags
+ echo "-L${cc.gcc.lib}/${targetPlatform.config}/lib" >> $out/nix-support/cc-ldflags
+ ''
+
+ ##
+ ## General libc support
+ ##
+
+ # The "-B${libc_lib}/lib/" flag is a quick hack to force gcc to link
+ # against the crt1.o from our own glibc, rather than the one in
+ # /usr/lib. (This is only an issue when using an `impure'
+ # compiler/linker, i.e., one that searches /usr/lib and so on.)
+ #
+ # Unfortunately, setting -B appears to override the default search
+ # path. Thus, the gcc-specific "../includes-fixed" directory is
+ # now longer searched and glibc's header fails to
+ # compile, because it uses "#include_next " to find the
+ # limits.h file in ../includes-fixed. To remedy the problem,
+ # another -idirafter is necessary to add that directory again.
+ + optionalString (libc != null) (''
+ touch "$out/nix-support/libc-cflags"
+ touch "$out/nix-support/libc-ldflags"
echo "-B${libc_lib}${libc.libdir or "/lib/"}" >> $out/nix-support/libc-cflags
'' + optionalString (!(cc.langD or false)) ''
echo "-idirafter ${libc_dev}${libc.incdir or "/include"}" >> $out/nix-support/libc-cflags
@@ -279,15 +300,39 @@ stdenv.mkDerivation {
echo "${libc_dev}" > $out/nix-support/orig-libc-dev
'')
- + optionalString (!nativeTools) ''
- ##
- ## Initial CFLAGS
- ##
+ ##
+ ## General libc++ support
+ ##
- # GCC shows ${cc_solib}/lib in `gcc -print-search-dirs', but not
- # ${cc_solib}/lib64 (even though it does actually search there...)..
- # This confuses libtool. So add it to the compiler tool search
- # path explicitly.
+ # We have a libc++ directly, we have one via "smuggled" GCC, or we have one
+ # bundled with the C compiler because it is GCC
+ + optionalString (libcxx != null || cc.gcc.langCC or false || (isGNU && cc.langCC or false)) ''
+ touch "$out/nix-support/libcxx-cxxflags"
+ touch "$out/nix-support/libcxx-ldflags"
+ '' + optionalString (libcxx == null && cc ? gcc) ''
+ for dir in ${cc.gcc}/include/c++/*; do
+ echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags
+ done
+ for dir in ${cc.gcc}/include/c++/*/${targetPlatform.config}; do
+ echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags
+ done
+ ''
+ + optionalString (libcxx.isLLVM or false) (''
+ echo "-isystem ${libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags
+ echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags
+ '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux ''
+ echo "-lc++abi" >> $out/nix-support/libcxx-ldflags
+ '')
+
+ ##
+ ## Initial CFLAGS
+ ##
+
+ # GCC shows ${cc_solib}/lib in `gcc -print-search-dirs', but not
+ # ${cc_solib}/lib64 (even though it does actually search there...)..
+ # This confuses libtool. So add it to the compiler tool search
+ # path explicitly.
+ + optionalString (!nativeTools) ''
if [ -e "${cc_solib}/lib64" -a ! -L "${cc_solib}/lib64" ]; then
ccLDFlags+=" -L${cc_solib}/lib64"
ccCFlags+=" -B${cc_solib}/lib64"
@@ -296,32 +341,34 @@ stdenv.mkDerivation {
ccCFlags+=" -B${cc_solib}/lib"
'' + optionalString cc.langAda or false ''
+ touch "$out/nix-support/gnat-cflags"
+ touch "$out/nix-support/gnat-ldflags"
basePath=$(echo $cc/lib/*/*/*)
ccCFlags+=" -B$basePath -I$basePath/adainclude"
gnatCFlags="-I$basePath/adainclude -I$basePath/adalib"
- echo "$gnatCFlags" > $out/nix-support/gnat-cflags
+ echo "$gnatCFlags" >> $out/nix-support/gnat-cflags
'' + ''
- echo "$ccLDFlags" > $out/nix-support/cc-ldflags
- echo "$ccCFlags" > $out/nix-support/cc-cflags
+ echo "$ccLDFlags" >> $out/nix-support/cc-ldflags
+ echo "$ccCFlags" >> $out/nix-support/cc-cflags
'' + optionalString (targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false)) ''
echo " -L${libcxx}/lib" >> $out/nix-support/cc-ldflags
- '' + optionalString propagateDoc ''
- ##
- ## Man page and info support
- ##
+ ''
+ ##
+ ## Man page and info support
+ ##
+ + optionalString propagateDoc ''
ln -s ${cc.man} $man
ln -s ${cc.info} $info
'' + optionalString (cc.langD or false) ''
echo "-B${zlib}${zlib.libdir or "/lib/"}" >> $out/nix-support/libc-cflags
''
+ ##
+ ## Hardening support
+ ##
+ ''
- ##
- ## Hardening support
- ##
-
export hardening_unsupported_flags="${builtins.concatStringsSep " " (cc.hardeningUnsupportedFlags or [])}"
''
@@ -389,19 +436,18 @@ stdenv.mkDerivation {
# There are a few tools (to name one libstdcxx5) which do not work
# well with multi line flags, so make the flags single line again
+ ''
- if [ -e "$out/nix-support/libc-cflags" ]; then
- substituteInPlace "$out/nix-support/libc-cflags" --replace $'\n' ' '
- fi
+ for flags in "$out/nix-support"/*flags*; do
+ substituteInPlace "$flags" --replace $'\n' ' '
+ done
substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh
substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash
-
- ##
- ## Extra custom steps
- ##
''
+ ##
+ ## Extra custom steps
+ ##
+ extraBuildCommands;
inherit expand-response-params;
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 8d3a7ba6929c..9e9f2cb4e3bc 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -199,7 +199,7 @@ stdenv.mkDerivation (args // {
-executable ! \( -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \))
'';
- checkPhase = args.checkPhase or (let
+ installCheckPhase = args.checkPhase or (let
argstr = "${stdenv.lib.optionalString (checkType == "release") "--release"} --target ${rustTarget} --frozen";
in ''
${stdenv.lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"}
diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh
index 72970623ed79..4f7c0c14304c 100644
--- a/pkgs/build-support/setup-hooks/auto-patchelf.sh
+++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh
@@ -141,7 +141,7 @@ autoPatchelfFile() {
# This makes sure the builder fails if we didn't find a dependency, because
# the stdenv setup script is run with set -e. The actual error is emitted
# earlier in the previous loop.
- [ $depNotFound -eq 0 ]
+ [ $depNotFound -eq 0 -o -n "$autoPatchelfIgnoreMissingDeps" ]
if [ -n "$rpath" ]; then
echo "setting RPATH to: $rpath" >&2
diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index 2e95495c96fd..bfa47e3b20e1 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -61,7 +61,7 @@ _multioutConfig() {
local shareDocName="$(sed -n "s/^PACKAGE_TARNAME='\(.*\)'$/\1/p" < "$confScript")"
fi
# PACKAGE_TARNAME sometimes contains garbage.
- if [ -n "$shareDocName" ] || echo "$shareDocName" | grep -q '[^a-zA-Z0-9_-]'; then
+ if [ -z "$shareDocName" ] || echo "$shareDocName" | grep -q '[^a-zA-Z0-9_-]'; then
shareDocName="$(echo "$name" | sed 's/-[^a-zA-Z].*//')"
fi
fi
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json
index 80a16465af25..41e7a8eac7df 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json
+++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json
@@ -5,39 +5,45 @@
"hotspot": {
"aarch64": {
"build": "10",
- "sha256": "04b77f6754aed68528f39750c5cfd6a439190206aff216aa081d62a0e1a794fa",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.6_10.tar.gz",
- "version": "11.0.6"
+ "sha256": "3b8b8bba6a0472ec7de5271cbf67f11e6ab525de6dd5d4729300375f1d56b7a1",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.7_10.tar.gz",
+ "version": "11.0.7"
},
"armv6l": {
"build": "10",
- "sha256": "ab5b76203e54fe7a5221535f6f407efa43153de029a746f60af3cffb7cb5080b",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jdk_arm_linux_hotspot_11.0.6_10.tar.gz",
- "version": "11.0.6"
+ "sha256": "45c235af67498f87e3dc99642771e57547cf226335eaee8a55d195173e66a2e9",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_arm_linux_hotspot_11.0.7_10.tar.gz",
+ "version": "11.0.7"
},
"armv7l": {
"build": "10",
- "sha256": "ab5b76203e54fe7a5221535f6f407efa43153de029a746f60af3cffb7cb5080b",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jdk_arm_linux_hotspot_11.0.6_10.tar.gz",
- "version": "11.0.6"
+ "sha256": "45c235af67498f87e3dc99642771e57547cf226335eaee8a55d195173e66a2e9",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_arm_linux_hotspot_11.0.7_10.tar.gz",
+ "version": "11.0.7"
},
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
"build": "10",
- "sha256": "330d19a2eaa07ed02757d7a785a77bab49f5ee710ea03b4ee2fa220ddd0feffc",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.6_10.tar.gz",
- "version": "11.0.6"
+ "sha256": "ee60304d782c9d5654bf1a6b3f38c683921c1711045e1db94525a51b7024a2ca",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.7_10.tar.gz",
+ "version": "11.0.7"
}
},
"openj9": {
+ "aarch64": {
+ "build": "10",
+ "sha256": "0be01fdcae330e26c489d8d0d0c98c535a2af8cbd0cdcda211776ab9fcd05086",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10_openj9-0.20.0/OpenJDK11U-jdk_aarch64_linux_openj9_11.0.7_10_openj9-0.20.0.tar.gz",
+ "version": "11.0.7"
+ },
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
"build": "10",
- "sha256": "1530172ee98edd129954fcdca1bf725f7b30c8bfc3cdc381c88de96b7d19e690",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10_openj9-0.18.1/OpenJDK11U-jdk_x64_linux_openj9_11.0.6_10_openj9-0.18.1.tar.gz",
- "version": "11.0.6"
+ "sha256": "526e89f3014fec473b24c10c2464c1343e23703114983fd171b68b1599bba561",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10_openj9-0.20.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.7_10_openj9-0.20.0.tar.gz",
+ "version": "11.0.7"
}
}
},
@@ -45,27 +51,45 @@
"hotspot": {
"aarch64": {
"build": "10",
- "sha256": "7ed04ed9ed7271528e7f03490f1fd7dfbbc2d391414bd6fe4dd80ec3bad76d30",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.6_10.tar.gz",
- "version": "11.0.6"
+ "sha256": "cfe504e9e9621b831a5cfd800a2005dafe90a1d11aa14ee35d7b674d68685698",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.7_10.tar.gz",
+ "version": "11.0.7"
+ },
+ "armv6l": {
+ "build": "10",
+ "sha256": "581bae8efcaa40e209a780baa6f96b7c8c9397965bc6d54533f4fd8599d5c742",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jre_arm_linux_hotspot_11.0.7_10.tar.gz",
+ "version": "11.0.7"
+ },
+ "armv7l": {
+ "build": "10",
+ "sha256": "581bae8efcaa40e209a780baa6f96b7c8c9397965bc6d54533f4fd8599d5c742",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jre_arm_linux_hotspot_11.0.7_10.tar.gz",
+ "version": "11.0.7"
},
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
"build": "10",
- "sha256": "c5a4e69e2be0e3e5f5bb7c759960b20650967d0f571baad4a7f15b2c03bda352",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jre_x64_linux_hotspot_11.0.6_10.tar.gz",
- "version": "11.0.6"
+ "sha256": "74b493dd8a884dcbee29682ead51b182d9d3e52b40c3d4cbb3167c2fd0063503",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jre_x64_linux_hotspot_11.0.7_10.tar.gz",
+ "version": "11.0.7"
}
},
"openj9": {
+ "aarch64": {
+ "build": "10",
+ "sha256": "37ae26443abb02d2ab041eced9be948f0d20db03183aaf3c159ef682eeeabf9b",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10_openj9-0.20.0/OpenJDK11U-jre_aarch64_linux_openj9_11.0.7_10_openj9-0.20.0.tar.gz",
+ "version": "11.0.7"
+ },
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
"build": "10",
- "sha256": "056e4b5f7166f5daa44f36b06c735913bda52831d2e77fa2ac371505c66d10c1",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10_openj9-0.18.1/OpenJDK11U-jre_x64_linux_openj9_11.0.6_10_openj9-0.18.1.tar.gz",
- "version": "11.0.6"
+ "sha256": "08258a767a6953bde21d15ef3c08e776d83257afa4acc52b55c70e1ac02f0489",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10_openj9-0.20.0/OpenJDK11U-jre_x64_linux_openj9_11.0.7_10_openj9-0.20.0.tar.gz",
+ "version": "11.0.7"
}
}
}
@@ -77,9 +101,9 @@
"vmType": "hotspot",
"x86_64": {
"build": "10",
- "sha256": "b87102274d983bf6bb0aa6c2c623301d0ff5eb7f61043ffd04abb00f962c2dcd",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jdk_x64_mac_hotspot_11.0.6_10.tar.gz",
- "version": "11.0.6"
+ "sha256": "0ab1e15e8bd1916423960e91b932d2b17f4c15b02dbdf9fa30e9423280d9e5cc",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_x64_mac_hotspot_11.0.7_10.tar.gz",
+ "version": "11.0.7"
}
},
"openj9": {
@@ -87,9 +111,9 @@
"vmType": "openj9",
"x86_64": {
"build": "10",
- "sha256": "9a5c5b3bb51a82e666c46b2d1bbafa8c2bbc3aae50194858c8f96c5d43a96f64",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10_openj9-0.18.1/OpenJDK11U-jdk_x64_mac_openj9_11.0.6_10_openj9-0.18.1.tar.gz",
- "version": "11.0.6"
+ "sha256": "a0de749c37802cc233ac58ffde68191a4dc985c71b626e7c0ff53944f743427f",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10.2_openj9-0.20.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.7_10_openj9-0.20.0.tar.gz",
+ "version": "11.0.7"
}
}
},
@@ -99,9 +123,9 @@
"vmType": "hotspot",
"x86_64": {
"build": "10",
- "sha256": "ab3c2038a32c62843500109d2efb8f5dacdfa1de3cbb713c8226f26dc603cc33",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10/OpenJDK11U-jre_x64_mac_hotspot_11.0.6_10.tar.gz",
- "version": "11.0.6"
+ "sha256": "931a81f4bed38c48b364db57d4ebdd6e4b4ea1466e9bd0eaf8e0f1e47c4569e9",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jre_x64_mac_hotspot_11.0.7_10.tar.gz",
+ "version": "11.0.7"
}
},
"openj9": {
@@ -109,9 +133,9 @@
"vmType": "openj9",
"x86_64": {
"build": "10",
- "sha256": "130850133d9701393352c2ce13ab541b4f900ff1f5ddf8257cda624968aada9f",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.6%2B10_openj9-0.18.1/OpenJDK11U-jre_x64_mac_openj9_11.0.6_10_openj9-0.18.1.tar.gz",
- "version": "11.0.6"
+ "sha256": "0941d739e3230d1d83dc1ee54cff6d17d90331e4f275d00739cb78fba41c5b96",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10.2_openj9-0.20.0/OpenJDK11U-jre_x64_mac_openj9_11.0.7_10_openj9-0.20.0.tar.gz",
+ "version": "11.0.7"
}
}
}
@@ -122,68 +146,68 @@
"jdk": {
"hotspot": {
"aarch64": {
- "build": "33",
- "sha256": "74f4110333ac4239564ed864b1d7d69b7af32af39efcfbde9816e1486cb5ae07",
- "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_aarch64_linux_hotspot_13_33.tar.gz",
- "version": "13.0.0"
+ "build": "8",
+ "sha256": "0e6081cb51f8a6f3062bef4f4c45dbe1fccfd3f3b4b5d52522a3edb76581e3af",
+ "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_aarch64_linux_hotspot_13.0.2_8.tar.gz",
+ "version": "13.0.2"
},
"armv6l": {
- "build": "33",
- "sha256": "477e1b8d26a220d6d570765e9e0a4a34dbb489fab63a420d0859d173efc59adb",
- "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_arm_linux_hotspot_13_33.tar.gz",
- "version": "13.0.0"
+ "build": "8",
+ "sha256": "9beec080f2b2a7f6883b024272f4e8d5a0b027325e83647be318215781af1d1a",
+ "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_arm_linux_hotspot_13.0.2_8.tar.gz",
+ "version": "13.0.2"
},
"armv7l": {
- "build": "33",
- "sha256": "477e1b8d26a220d6d570765e9e0a4a34dbb489fab63a420d0859d173efc59adb",
- "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_arm_linux_hotspot_13_33.tar.gz",
- "version": "13.0.0"
+ "build": "8",
+ "sha256": "9beec080f2b2a7f6883b024272f4e8d5a0b027325e83647be318215781af1d1a",
+ "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_arm_linux_hotspot_13.0.2_8.tar.gz",
+ "version": "13.0.2"
},
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
- "build": "33",
- "sha256": "e562caeffa89c834a69a44242d802eae3523875e427f07c05b1902c152638368",
- "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_x64_linux_hotspot_13_33.tar.gz",
- "version": "13.0.0"
+ "build": "8",
+ "sha256": "9ccc063569f19899fd08e41466f8c4cd4e05058abdb5178fa374cb365dcf5998",
+ "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_linux_hotspot_13.0.2_8.tar.gz",
+ "version": "13.0.2"
}
},
"openj9": {
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
- "build": "33",
- "sha256": "68ebab0021c719694be8fc868478725a69c5c515cdb62e2933eefe87ba6437df",
- "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33_openj9-0.16.0/OpenJDK13U-jdk_x64_linux_openj9_13_33_openj9-0.16.0.tar.gz",
- "version": "13.0.0"
+ "build": "8",
+ "sha256": "aeecf6d30d0c847db81d07793cf97e5dc44890c29366d7d9f8f9f397f6c52590",
+ "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
+ "version": "13.0.2"
}
}
},
"jre": {
"hotspot": {
"aarch64": {
- "build": "33",
- "sha256": "2365b7fbba8d9125fb091933aad9f38f8cc1fbb0217cdec9ec75d2000f6d451a",
- "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jre_aarch64_linux_hotspot_13_33.tar.gz",
- "version": "13.0.0"
+ "build": "8",
+ "sha256": "6c4b69d1609f4c65c576c80d6aa101de80048f8ce5566f890e8fff5349228bae",
+ "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_aarch64_linux_hotspot_13.0.2_8.tar.gz",
+ "version": "13.0.2"
},
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
- "build": "33",
- "sha256": "73800a0d7c4e81df408a8518d282aa2c001ce4ee15541574c639dfc3564f708f",
- "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jre_x64_linux_hotspot_13_33.tar.gz",
- "version": "13.0.0"
+ "build": "8",
+ "sha256": "897f16fe8e056395209e35d2384013bd1ff250e717465769079e3f4793628c34",
+ "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_x64_linux_hotspot_13.0.2_8.tar.gz",
+ "version": "13.0.2"
}
},
"openj9": {
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
- "build": "33",
- "sha256": "2ee59be5062a81daa7be85be161cab6b245f9a2e2cbd4769ae9edefaac41e31d",
- "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33_openj9-0.16.0/OpenJDK13U-jre_x64_linux_openj9_13_33_openj9-0.16.0.tar.gz",
- "version": "13.0.0"
+ "build": "8",
+ "sha256": "a0ab38607811e282f64082edc68a2dea3fa6a5113391efb124a6d7d02883110a",
+ "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_x64_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
+ "version": "13.0.2"
}
}
}
@@ -194,20 +218,20 @@
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
- "build": "33",
- "sha256": "f948be96daba250b6695e22cb51372d2ba3060e4d778dd09c89548889783099f",
- "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_x64_mac_hotspot_13_33.tar.gz",
- "version": "13.0.0"
+ "build": "8",
+ "sha256": "0ddb24efdf5aab541898d19b7667b149a1a64a8bd039b708fc58ee0284fa7e07",
+ "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_mac_hotspot_13.0.2_8.tar.gz",
+ "version": "13.0.2"
}
},
"openj9": {
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
- "build": "33",
- "sha256": "583e0defd5c062550896ead7cac383be16f1a81d9b6492dfec26da9af5dcc1c0",
- "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33_openj9-0.16.0/OpenJDK13U-jdk_x64_mac_openj9_13_33_openj9-0.16.0.tar.gz",
- "version": "13.0.0"
+ "build": "8",
+ "sha256": "dd8d92eec98a3455ec5cd065a0a6672cc1aef280c6a68c507c372ccc1d98fbaa",
+ "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_mac_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
+ "version": "13.0.2"
}
}
},
@@ -216,20 +240,20 @@
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
- "build": "33",
- "sha256": "1c23efba7908de9a611a98e755602f45381a8f7c957adb3fc4012ab1369a352c",
- "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jre_x64_mac_hotspot_13_33.tar.gz",
- "version": "13.0.0"
+ "build": "8",
+ "sha256": "3149b9ebf0db1eaf2dc152df9efae82003e7971efb1cf550060e6a4798fe8c5c",
+ "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_x64_mac_hotspot_13.0.2_8.tar.gz",
+ "version": "13.0.2"
}
},
"openj9": {
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
- "build": "33",
- "sha256": "33a60b78138d50cb02325156c7d1fcf588697749a4401f6c11a3cbefa3033127",
- "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33_openj9-0.16.0/OpenJDK13U-jre_x64_mac_openj9_13_33_openj9-0.16.0.tar.gz",
- "version": "13.0.0"
+ "build": "8",
+ "sha256": "6a8a636fca4c7e368241e232a37cd73c9867cdec8f0869fd158b1f58c6128cc2",
+ "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_x64_mac_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
+ "version": "13.0.2"
}
}
}
@@ -241,51 +265,39 @@
"hotspot": {
"aarch64": {
"build": "9",
- "sha256": "35799a2fd4b467115aff1bc3a54853b5131ba9068e53e1ab0fbe5521a3f2ba83",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u232b09.tar.gz",
- "version": "8.0.232"
+ "sha256": "536bf397d98174b376da9ed49d2f659d65c7310318d8211444f4b7ba7c15e453",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u252b09.tar.gz",
+ "version": "8.0.252"
},
"armv6l": {
"build": "9",
- "sha256": "fdd9f61f1b2df74242da54ee3b3231b0123782a917e9673351276da439c7cab1",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_arm_linux_hotspot_8u232b09.tar.gz",
- "version": "8.0.232"
+ "sha256": "5b401ad3c9b246281bd6df34b1abaf75e10e5cad9c6b26b55232b016e90e411a",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_arm_linux_hotspot_8u252b09.tar.gz",
+ "version": "8.0.252"
},
"armv7l": {
"build": "9",
- "sha256": "fdd9f61f1b2df74242da54ee3b3231b0123782a917e9673351276da439c7cab1",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_arm_linux_hotspot_8u232b09.tar.gz",
- "version": "8.0.232"
- },
- "armv6l": {
- "build": "10",
- "sha256": "7b3d6ade8c25adca01095ba66642132d8c87a1a8caf3883850e34778453afcec",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u222b10.tar.gz",
- "version": "8.0.222"
- },
- "armv7l": {
- "build": "10",
- "sha256": "7b3d6ade8c25adca01095ba66642132d8c87a1a8caf3883850e34778453afcec",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u222b10.tar.gz",
- "version": "8.0.222"
+ "sha256": "5b401ad3c9b246281bd6df34b1abaf75e10e5cad9c6b26b55232b016e90e411a",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_arm_linux_hotspot_8u252b09.tar.gz",
+ "version": "8.0.252"
},
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
- "build": "8",
- "sha256": "f39b523c724d0e0047d238eb2bb17a9565a60574cf651206c867ee5fc000ab43",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u242b08.tar.gz",
- "version": "8.0.242"
+ "build": "9",
+ "sha256": "2b59b5282ff32bce7abba8ad6b9fde34c15a98f949ad8ae43e789bbd78fc8862",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_x64_linux_hotspot_8u252b09.tar.gz",
+ "version": "8.0.252"
}
},
"openj9": {
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
- "build": "8",
- "sha256": "ca785af638b24f9d4df896f5a9f557cc9f1e5fa5e2b1174d6b906e3fd5474c2e",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08_openj9-0.18.1/OpenJDK8U-jdk_x64_linux_openj9_8u242b08_openj9-0.18.1.tar.gz",
- "version": "8.0.242"
+ "build": "9",
+ "sha256": "910ae847109a6dd1b6cf69baa7615ea2cce8cff787e5a9349a5331ce7604f3a5",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09_openj9-0.20.0/OpenJDK8U-jdk_x64_linux_openj9_8u252b09_openj9-0.20.0.tar.gz",
+ "version": "8.0.252"
}
}
},
@@ -293,51 +305,39 @@
"hotspot": {
"aarch64": {
"build": "9",
- "sha256": "4540db665260fdc84ae2f191e21beec9168a70a4227718bee5edd317707e2fda",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jre_aarch64_linux_hotspot_8u232b09.tar.gz",
- "version": "8.0.232"
+ "sha256": "30bba4425497f5b4aabcba7b45db69d582d278fb17357d64c22c9dc6b2d29ca1",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jre_aarch64_linux_hotspot_8u252b09.tar.gz",
+ "version": "8.0.252"
},
"armv6l": {
"build": "9",
- "sha256": "8ab786fc2fa0a282f5cf57f6040f1976c32c3c5e480e900ce5925de6543f6688",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jre_arm_linux_hotspot_8u232b09.tar.gz",
- "version": "8.0.232"
+ "sha256": "107699a88f611e0c2d57816be25821ef9b17db860b14402c4e9e5bf0b9cf16fd",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jre_arm_linux_hotspot_8u252b09.tar.gz",
+ "version": "8.0.252"
},
"armv7l": {
"build": "9",
- "sha256": "8ab786fc2fa0a282f5cf57f6040f1976c32c3c5e480e900ce5925de6543f6688",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jre_arm_linux_hotspot_8u232b09.tar.gz",
- "version": "8.0.232"
- },
- "armv6l": {
- "build": "10",
- "sha256": "19de77b74812b90851816bdb991d6473488a10d3ac293c6accf46ae9b1f714a0",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jre_arm_linux_hotspot_8u222b10.tar.gz",
- "version": "8.0.222"
- },
- "armv7l": {
- "build": "10",
- "sha256": "19de77b74812b90851816bdb991d6473488a10d3ac293c6accf46ae9b1f714a0",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jre_arm_linux_hotspot_8u222b10.tar.gz",
- "version": "8.0.222"
+ "sha256": "107699a88f611e0c2d57816be25821ef9b17db860b14402c4e9e5bf0b9cf16fd",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jre_arm_linux_hotspot_8u252b09.tar.gz",
+ "version": "8.0.252"
},
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
- "build": "8",
- "sha256": "5edfaefdbb0469d8b24d61c8aef80c076611053b1738029c0232b9a632fe2708",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jre_x64_linux_hotspot_8u242b08.tar.gz",
- "version": "8.0.242"
+ "build": "9",
+ "sha256": "a93be303ed62398dba9acb0376fb3caf8f488fcde80dc62d0a8e46256b3adfb1",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jre_x64_linux_hotspot_8u252b09.tar.gz",
+ "version": "8.0.252"
}
},
"openj9": {
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
- "build": "8",
- "sha256": "985d3134b64c6196d4c9ddbc87af0c62b0e643cef71b29f3d25a8c7811811745",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08_openj9-0.18.1/OpenJDK8U-jre_x64_linux_openj9_8u242b08_openj9-0.18.1.tar.gz",
- "version": "8.0.242"
+ "build": "9",
+ "sha256": "5c0ab4691ff5f8e69bb14462f2afb8d73d751b01048eacf4b426ed6d6646dc63",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09_openj9-0.20.0/OpenJDK8U-jre_x64_linux_openj9_8u252b09_openj9-0.20.0.tar.gz",
+ "version": "8.0.252"
}
}
}
@@ -348,20 +348,20 @@
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
- "build": "8",
- "sha256": "06675b7d65bce0313ee1f2e888dd44267e8afeced75e0b39b5ad1f5fdff54e0b",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_x64_mac_hotspot_8u242b08.tar.gz",
- "version": "8.0.242"
+ "build": "9",
+ "sha256": "2caed3ec07d108bda613f9b4614b22a8bdd196ccf2a432a126161cd4077f07a5",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09.1/OpenJDK8U-jdk_x64_mac_hotspot_8u252b09.tar.gz",
+ "version": "8.0.252"
}
},
"openj9": {
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
- "build": "8",
- "sha256": "665dc9c8239b7270b007ab9dd7522570e2686e327d89caf57a6aa6e5c6450078",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08_openj9-0.18.1/OpenJDK8U-jdk_x64_mac_openj9_8u242b08_openj9-0.18.1.tar.gz",
- "version": "8.0.242"
+ "build": "9",
+ "sha256": "f522061a23290bce3423e49025a95b6e78d6f30e2741817e83c8fdba4c0c4ae7",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09.2_openj9-0.20.0/OpenJDK8U-jdk_x64_mac_openj9_8u252b09_openj9-0.20.0.tar.gz",
+ "version": "8.0.252"
}
}
},
@@ -370,23 +370,23 @@
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
- "build": "8",
- "sha256": "fae3777e3441dc7384c339a9054aa7efc40cd2c501625a535c2d4648367ccca3",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jre_x64_mac_hotspot_8u242b08.tar.gz",
- "version": "8.0.242"
+ "build": "9",
+ "sha256": "f8206f0fef194c598de6b206a4773b2e517154913ea0e26c5726091562a034c8",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09.1/OpenJDK8U-jre_x64_mac_hotspot_8u252b09.tar.gz",
+ "version": "8.0.252"
}
},
"openj9": {
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
- "build": "8",
- "sha256": "d4a924558ddda0aed671a67f71714b71c25871a7659fd4c505851cf5ee866de5",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08_openj9-0.18.1/OpenJDK8U-jre_x64_mac_openj9_8u242b08_openj9-0.18.1.tar.gz",
- "version": "8.0.242"
+ "build": "9",
+ "sha256": "55cce54a39c5748360e2e3fe8edf04469b75a0783514853a5745463979b43c80",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09.2_openj9-0.20.0/OpenJDK8U-jre_x64_mac_openj9_8u252b09_openj9-0.20.0.tar.gz",
+ "version": "8.0.252"
}
}
}
}
}
-}
+}
\ No newline at end of file
diff --git a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix
index 520a34afe58d..b74c5c7e9e45 100644
--- a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix
+++ b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix
@@ -2,6 +2,7 @@
let
rev = emscriptenVersion;
+ haveGcc = stdenv.cc.isGNU || stdenv.cc.cc ? gcc;
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in
stdenv.mkDerivation rec {
@@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
#"-DLLVM_CONFIG=${llvm}/bin/llvm-config"
"-DLLVM_BUILD_TESTS=ON"
"-DCLANG_INCLUDE_TESTS=ON"
- ] ++ (stdenv.lib.optional stdenv.isLinux
+ ] ++ (stdenv.lib.optional (stdenv.isLinux && haveGcc)
# necessary for clang to find crtend.o
"-DGCC_INSTALL_PREFIX=${gcc}"
);
@@ -42,6 +43,7 @@ stdenv.mkDerivation rec {
passthru = {
isClang = true;
+ } // stdenv.lib.optionalAttrs haveGcc {
inherit gcc;
};
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 0a35ed023c6f..6f4fd415fc09 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -63,6 +63,7 @@ let majorVersion = "4";
patches =
[ ../use-source-date-epoch.patch ../parallel-bconfig.patch ./parallel-strsignal.patch
+ ./libsanitizer.patch
(fetchpatch {
name = "avoid-ustat-glibc-2.28.patch";
url = "https://gitweb.gentoo.org/proj/gcc-patches.git/plain/4.9.4/gentoo/100_all_avoid-ustat-glibc-2.28.patch?id=55fcb515620a8f7d3bb77eba938aa0fcf0d67c96";
diff --git a/pkgs/development/compilers/gcc/4.9/libsanitizer.patch b/pkgs/development/compilers/gcc/4.9/libsanitizer.patch
new file mode 100644
index 000000000000..f1a438a4e5f0
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.9/libsanitizer.patch
@@ -0,0 +1,24 @@
+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+index aec950454..5bda9b3a3 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+@@ -156,18 +156,13 @@ namespace __sanitizer {
+ #elif defined(__sparc__)
+ # if defined(__arch64__)
+ unsigned mode;
+- unsigned short __pad1;
+-# else
+- unsigned short __pad1;
+- unsigned short mode;
+ unsigned short __pad2;
+ # endif
+ unsigned short __seq;
+ unsigned long long __unused1;
+ unsigned long long __unused2;
+ #else
+- unsigned short mode;
+- unsigned short __pad1;
++ unsigned int mode;
+ unsigned short __seq;
+ unsigned short __pad2;
+ #if defined(__x86_64__) && !defined(_LP64)
diff --git a/pkgs/development/compilers/gcc/6/0001-Fix-build-for-glibc-2.31.patch b/pkgs/development/compilers/gcc/6/0001-Fix-build-for-glibc-2.31.patch
new file mode 100644
index 000000000000..0cd04e218caf
--- /dev/null
+++ b/pkgs/development/compilers/gcc/6/0001-Fix-build-for-glibc-2.31.patch
@@ -0,0 +1,62 @@
+From 8b55f1047cf3491429c1af607e5dac08a81db6e1 Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch
+Date: Thu, 20 Feb 2020 15:08:36 +0100
+Subject: [PATCH] Fix build for glibc 2.31
+
+---
+ .../sanitizer_platform_limits_posix.cc | 5 +++--
+ .../sanitizer_platform_limits_posix.h | 15 +--------------
+ 2 files changed, 4 insertions(+), 16 deletions(-)
+
+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+index 069d8d557..c49c28c6e 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -1130,8 +1130,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
+ #ifndef __GLIBC_PREREQ
+ #define __GLIBC_PREREQ(x, y) 0
+ #endif
+-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)
+-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */
++#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31)
++/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit
++ on many architectures. */
+ CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
+ #endif
+
+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+index 304d04e39..568081a79 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+@@ -200,27 +200,14 @@ namespace __sanitizer {
+ unsigned __seq;
+ u64 __unused1;
+ u64 __unused2;
+-#elif defined(__mips__) || defined(__aarch64__)
+- unsigned int mode;
+- unsigned short __seq;
+- unsigned short __pad1;
+- unsigned long __unused1;
+- unsigned long __unused2;
+ #elif defined(__sparc__)
+-# if defined(__arch64__)
+ unsigned mode;
+- unsigned short __pad1;
+-# else
+- unsigned short __pad1;
+- unsigned short mode;
+ unsigned short __pad2;
+-# endif
+ unsigned short __seq;
+ unsigned long long __unused1;
+ unsigned long long __unused2;
+ #else
+- unsigned short mode;
+- unsigned short __pad1;
++ unsigned int mode;
+ unsigned short __seq;
+ unsigned short __pad2;
+ #if defined(__x86_64__) && !defined(_LP64)
+--
+2.25.0
+
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index f3b15eac55d2..f1bc490bd772 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -65,7 +65,7 @@ let majorVersion = "6";
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
patches =
- [ ../use-source-date-epoch.patch ]
+ [ ../use-source-date-epoch.patch ./0001-Fix-build-for-glibc-2.31.patch ]
++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
++ optional noSysDirs ../no-sys-dirs.patch
++ optional langAda ../gnat-cflags.patch
diff --git a/pkgs/development/compilers/gcc/7/0001-Fix-build-for-glibc-2.31.patch b/pkgs/development/compilers/gcc/7/0001-Fix-build-for-glibc-2.31.patch
new file mode 100644
index 000000000000..d8aad14942bf
--- /dev/null
+++ b/pkgs/development/compilers/gcc/7/0001-Fix-build-for-glibc-2.31.patch
@@ -0,0 +1,62 @@
+From 2d03b6eaf823fc2db6a32b4a95e18f8a7474b47f Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch
+Date: Thu, 20 Feb 2020 01:56:42 +0100
+Subject: [PATCH] Fix build for glibc 2.31
+
+---
+ .../sanitizer_platform_limits_posix.cc | 5 +++--
+ .../sanitizer_platform_limits_posix.h | 15 +--------------
+ 2 files changed, 4 insertions(+), 16 deletions(-)
+
+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+index 97eae3fc7..4089d4695 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -1145,8 +1145,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid);
+ CHECK_SIZE_AND_OFFSET(ipc_perm, gid);
+ CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);
+ CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
+-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)
+-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */
++#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31)
++/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit
++ on many architectures. */
+ CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
+ #endif
+
+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+index c13932283..3456fb2db 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+@@ -204,27 +204,14 @@ namespace __sanitizer {
+ unsigned __seq;
+ u64 __unused1;
+ u64 __unused2;
+-#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__)
+- unsigned int mode;
+- unsigned short __seq;
+- unsigned short __pad1;
+- unsigned long __unused1;
+- unsigned long __unused2;
+ #elif defined(__sparc__)
+-# if defined(__arch64__)
+ unsigned mode;
+- unsigned short __pad1;
+-# else
+- unsigned short __pad1;
+- unsigned short mode;
+ unsigned short __pad2;
+-# endif
+ unsigned short __seq;
+ unsigned long long __unused1;
+ unsigned long long __unused2;
+ #else
+- unsigned short mode;
+- unsigned short __pad1;
++ unsigned int mode;
+ unsigned short __seq;
+ unsigned short __pad2;
+ #if defined(__x86_64__) && !defined(_LP64)
+--
+2.25.0
+
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 89933c22edd4..dcd129ff25a7 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -53,6 +53,8 @@ let majorVersion = "7";
./riscv-pthread-reentrant.patch
# https://gcc.gnu.org/ml/gcc-patches/2018-03/msg00297.html
./riscv-no-relax.patch
+
+ ./0001-Fix-build-for-glibc-2.31.patch
]
++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
++ optionals targetPlatform.isNetBSD [
diff --git a/pkgs/development/compilers/gcc/libstdc++-hook.sh b/pkgs/development/compilers/gcc/libstdc++-hook.sh
deleted file mode 100644
index f5b4123b64d9..000000000000
--- a/pkgs/development/compilers/gcc/libstdc++-hook.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-# See pkgs/build-support/setup-hooks/role.bash
-getHostRole
-
-export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/@targetConfig@"
diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix
index 48e4d9bdc6c4..a158e1d4d3bc 100644
--- a/pkgs/development/compilers/go/1.13.nix
+++ b/pkgs/development/compilers/go/1.13.nix
@@ -186,8 +186,11 @@ stdenv.mkDerivation rec {
export PATH=$(pwd)/bin:$PATH
+ ${optionalString (stdenv.buildPlatform != stdenv.targetPlatform) ''
# Independent from host/target, CC should produce code for the building system.
+ # We only set it when cross-compiling.
export CC=${buildPackages.stdenv.cc}/bin/cc
+ ''}
ulimit -a
'';
diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix
index 95a602025d9f..6ddd61253a4e 100644
--- a/pkgs/development/compilers/go/1.14.nix
+++ b/pkgs/development/compilers/go/1.14.nix
@@ -193,8 +193,11 @@ stdenv.mkDerivation rec {
export PATH=$(pwd)/bin:$PATH
+ ${optionalString (stdenv.buildPlatform != stdenv.targetPlatform) ''
# Independent from host/target, CC should produce code for the building system.
+ # We only set it when cross-compiling.
export CC=${buildPackages.stdenv.cc}/bin/cc
+ ''}
ulimit -a
'';
diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix
index 4181ab29bd7f..870d5110d145 100644
--- a/pkgs/development/compilers/llvm/10/default.nix
+++ b/pkgs/development/compilers/llvm/10/default.nix
@@ -1,4 +1,4 @@
-{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook
+{ lowPrio, newScope, pkgs, stdenv, cmake
, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
, buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross
@@ -57,23 +57,17 @@ let
libstdcxxClang = wrapCCWith rec {
cc = tools.clang-unwrapped;
+ libcxx = null; # libstdcxx is smuggled in with clang.gcc
extraPackages = [
- libstdcxxHook
targetLlvmLibraries.compiler-rt
];
- extraBuildCommands = ''
- echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags
- echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags
- echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags
- echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags
- '' + mkExtraBuildCommands cc;
+ extraBuildCommands = mkExtraBuildCommands cc;
};
libcxxClang = wrapCCWith rec {
cc = tools.clang-unwrapped;
libcxx = targetLlvmLibraries.libcxx;
extraPackages = [
- targetLlvmLibraries.libcxx
targetLlvmLibraries.libcxxabi
targetLlvmLibraries.compiler-rt
];
@@ -100,14 +94,12 @@ let
inherit (tools) bintools;
};
extraPackages = [
- targetLlvmLibraries.libcxx
targetLlvmLibraries.libcxxabi
targetLlvmLibraries.compiler-rt
] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [
targetLlvmLibraries.libunwind
];
extraBuildCommands = ''
- echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags
echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
'' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) ''
@@ -127,7 +119,6 @@ let
targetLlvmLibraries.compiler-rt
];
extraBuildCommands = ''
- echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags
echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
echo "-nostdlib++" >> $out/nix-support/cc-cflags
@@ -145,7 +136,6 @@ let
targetLlvmLibraries.compiler-rt
];
extraBuildCommands = ''
- echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags
echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
'' + mkExtraBuildCommands cc;
@@ -161,7 +151,6 @@ let
extraPackages = [ ];
extraBuildCommands = ''
echo "-nostartfiles" >> $out/nix-support/cc-cflags
- echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
'';
};
diff --git a/pkgs/development/compilers/llvm/10/libc++/default.nix b/pkgs/development/compilers/llvm/10/libc++/default.nix
index ed76ce77a8bb..872865ec474b 100644
--- a/pkgs/development/compilers/llvm/10/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/10/libc++/default.nix
@@ -39,12 +39,9 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
- linkCxxAbi = stdenv.isLinux;
-
- setupHooks = [
- ../../../../../build-support/setup-hooks/role.bash
- ./setup-hook.sh
- ];
+ passthru = {
+ isLLVM = true;
+ };
meta = {
homepage = "https://libcxx.llvm.org/";
diff --git a/pkgs/development/compilers/llvm/10/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/10/libc++/setup-hook.sh
deleted file mode 100644
index 3a274aecc23d..000000000000
--- a/pkgs/development/compilers/llvm/10/libc++/setup-hook.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# See pkgs/build-support/setup-hooks/role.bash
-getHostRole
-
-linkCxxAbi="@linkCxxAbi@"
-export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem @out@/include/c++/v1"
-export NIX_CXXSTDLIB_LINK${role_post}=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/5/compiler-rt.nix b/pkgs/development/compilers/llvm/5/compiler-rt.nix
index 624034b52286..32d6dd3d4795 100644
--- a/pkgs/development/compilers/llvm/5/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/5/compiler-rt.nix
@@ -47,6 +47,7 @@ stdenv.mkDerivation {
patches = [
./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
+ ../7/compiler-rt-glibc.patch
] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
++ stdenv.lib.optional (stdenv.hostPlatform.libc == "glibc") ./compiler-rt-sys-ustat.patch
++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix
index e7083a6ed13a..5a992f4a3504 100644
--- a/pkgs/development/compilers/llvm/5/default.nix
+++ b/pkgs/development/compilers/llvm/5/default.nix
@@ -1,4 +1,4 @@
-{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook
+{ lowPrio, newScope, pkgs, stdenv, cmake
, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith
, buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross
@@ -51,25 +51,17 @@ let
libstdcxxClang = wrapCCWith rec {
cc = tools.clang-unwrapped;
- extraTools = [
- libstdcxxHook
- ];
+ libcxx = null; # libstdcxx is smuggled in with clang.gcc
extraPackages = [
targetLlvmLibraries.compiler-rt
];
- extraBuildCommands = ''
- echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags
- echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags
- echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags
- echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags
- '' + mkExtraBuildCommands cc;
+ extraBuildCommands = mkExtraBuildCommands cc;
};
libcxxClang = wrapCCWith rec {
cc = tools.clang-unwrapped;
libcxx = targetLlvmLibraries.libcxx;
extraPackages = [
- targetLlvmLibraries.libcxx
targetLlvmLibraries.libcxxabi
targetLlvmLibraries.compiler-rt
];
diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix
index 88ad3c29c3e2..f8185fc3ff4b 100644
--- a/pkgs/development/compilers/llvm/5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/5/libc++/default.nix
@@ -37,12 +37,9 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
- linkCxxAbi = stdenv.isLinux;
-
- setupHooks = [
- ../../../../../build-support/setup-hooks/role.bash
- ./setup-hook.sh
- ];
+ passthru = {
+ isLLVM = true;
+ };
meta = {
homepage = "https://libcxx.llvm.org/";
diff --git a/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh
deleted file mode 100644
index 3a274aecc23d..000000000000
--- a/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# See pkgs/build-support/setup-hooks/role.bash
-getHostRole
-
-linkCxxAbi="@linkCxxAbi@"
-export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem @out@/include/c++/v1"
-export NIX_CXXSTDLIB_LINK${role_post}=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix
index 13abf6d95611..89f25cad2c54 100644
--- a/pkgs/development/compilers/llvm/6/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix
@@ -47,6 +47,7 @@ stdenv.mkDerivation {
patches = [
./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
+ ../7/compiler-rt-glibc.patch
] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix
index b544a4f6ba69..2316fbfc3fb2 100644
--- a/pkgs/development/compilers/llvm/6/default.nix
+++ b/pkgs/development/compilers/llvm/6/default.nix
@@ -1,4 +1,4 @@
-{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook
+{ lowPrio, newScope, pkgs, stdenv, cmake
, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith
, buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross
@@ -51,25 +51,17 @@ let
libstdcxxClang = wrapCCWith rec {
cc = tools.clang-unwrapped;
- extraTools = [
- libstdcxxHook
- ];
+ libcxx = null; # libstdcxx is smuggled in with clang.gcc
extraPackages = [
targetLlvmLibraries.compiler-rt
];
- extraBuildCommands = ''
- echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags
- echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags
- echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags
- echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags
- '' + mkExtraBuildCommands cc;
+ extraBuildCommands = mkExtraBuildCommands cc;
};
libcxxClang = wrapCCWith rec {
cc = tools.clang-unwrapped;
libcxx = targetLlvmLibraries.libcxx;
extraPackages = [
- targetLlvmLibraries.libcxx
targetLlvmLibraries.libcxxabi
targetLlvmLibraries.compiler-rt
];
diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix
index 57f1431f4711..a922bcfaf0ea 100644
--- a/pkgs/development/compilers/llvm/6/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/6/libc++/default.nix
@@ -37,12 +37,9 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
- linkCxxAbi = stdenv.isLinux;
-
- setupHooks = [
- ../../../../../build-support/setup-hooks/role.bash
- ./setup-hook.sh
- ];
+ passthru = {
+ isLLVM = true;
+ };
meta = {
homepage = "https://libcxx.llvm.org/";
diff --git a/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh
deleted file mode 100644
index 3a274aecc23d..000000000000
--- a/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# See pkgs/build-support/setup-hooks/role.bash
-getHostRole
-
-linkCxxAbi="@linkCxxAbi@"
-export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem @out@/include/c++/v1"
-export NIX_CXXSTDLIB_LINK${role_post}=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/7/compiler-rt-glibc.patch b/pkgs/development/compilers/llvm/7/compiler-rt-glibc.patch
new file mode 100644
index 000000000000..2d211795fc80
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/compiler-rt-glibc.patch
@@ -0,0 +1,48 @@
+diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+index 54da635..c5dc1cd 100644
+--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -1158,8 +1158,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid);
+ CHECK_SIZE_AND_OFFSET(ipc_perm, gid);
+ CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);
+ CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
+-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)
+-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */
++#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31)
++/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit
++ on many architectures. */
+ CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
+ #endif
+
+diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+index f89a113..f6f986f 100644
+--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.h
++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+@@ -213,26 +213,13 @@ namespace __sanitizer {
+ u64 __unused1;
+ u64 __unused2;
+ #elif defined(__sparc__)
+-#if defined(__arch64__)
+ unsigned mode;
+- unsigned short __pad1;
+-#else
+- unsigned short __pad1;
+- unsigned short mode;
+ unsigned short __pad2;
+-#endif
+ unsigned short __seq;
+ unsigned long long __unused1;
+ unsigned long long __unused2;
+-#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__)
+- unsigned int mode;
+- unsigned short __seq;
+- unsigned short __pad1;
+- unsigned long __unused1;
+- unsigned long __unused2;
+ #else
+- unsigned short mode;
+- unsigned short __pad1;
++ unsigned int mode;
+ unsigned short __seq;
+ unsigned short __pad2;
+ #if defined(__x86_64__) && !defined(_LP64)
diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix
index 84ca6af3b36d..97a5d73f3041 100644
--- a/pkgs/development/compilers/llvm/7/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix
@@ -46,6 +46,9 @@ stdenv.mkDerivation {
outputs = [ "out" "dev" ];
patches = [
+ # https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce
+ ./compiler-rt-glibc.patch
+
./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
] ++ stdenv.lib.optional (useLLVM) ./crtbegin-and-end.patch
++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix
index 0b71c3a28d23..b83c0d2ceedd 100644
--- a/pkgs/development/compilers/llvm/7/default.nix
+++ b/pkgs/development/compilers/llvm/7/default.nix
@@ -1,4 +1,4 @@
-{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook
+{ lowPrio, newScope, pkgs, stdenv, cmake
, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
, buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross
@@ -58,25 +58,17 @@ let
libstdcxxClang = wrapCCWith rec {
cc = tools.clang-unwrapped;
- extraTools = [
- libstdcxxHook
- ];
+ libcxx = null; # libstdcxx is smuggled in with clang.gcc
extraPackages = [
targetLlvmLibraries.compiler-rt
];
- extraBuildCommands = ''
- echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags
- echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags
- echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags
- echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags
- '' + mkExtraBuildCommands cc;
+ extraBuildCommands = mkExtraBuildCommands cc;
};
libcxxClang = wrapCCWith rec {
cc = tools.clang-unwrapped;
libcxx = targetLlvmLibraries.libcxx;
extraPackages = [
- targetLlvmLibraries.libcxx
targetLlvmLibraries.libcxxabi
targetLlvmLibraries.compiler-rt
];
@@ -87,48 +79,77 @@ let
lldb = callPackage ./lldb.nix {};
+ # Below, is the LLVM bootstrapping logic. It handles building a
+ # fully LLVM toolchain from scratch. No GCC toolchain should be
+ # pulled in. As a consequence, it is very quick to build different
+ # targets provided by LLVM and we can also build for what GCC
+ # doesn’t support like LLVM. Probably we should move to some other
+ # file.
+
bintools = callPackage ./bintools.nix {};
lldClang = wrapCCWith rec {
cc = tools.clang-unwrapped;
+ libcxx = targetLlvmLibraries.libcxx;
bintools = wrapBintoolsWith {
inherit (tools) bintools;
};
extraPackages = [
- # targetLlvmLibraries.libcxx
- # targetLlvmLibraries.libcxxabi
+ targetLlvmLibraries.libcxxabi
targetLlvmLibraries.compiler-rt
];
extraBuildCommands = ''
- echo "-target ${stdenv.targetPlatform.config} -rtlib=compiler-rt" >> $out/nix-support/cc-cflags
+ echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags
+ echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
+ '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) ''
+ echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags
+ '' + stdenv.lib.optionalString stdenv.targetPlatform.isWasm ''
+ echo "-fno-exceptions" >> $out/nix-support/cc-cflags
+ '' + mkExtraBuildCommands cc;
+ };
+
+ lldClangNoLibcxx = wrapCCWith rec {
+ cc = tools.clang-unwrapped;
+ libcxx = null;
+ bintools = wrapBintoolsWith {
+ inherit (tools) bintools;
+ };
+ extraPackages = [
+ targetLlvmLibraries.compiler-rt
+ ];
+ extraBuildCommands = ''
+ echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags
+ echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
+ echo "-nostdlib++" >> $out/nix-support/cc-cflags
'' + mkExtraBuildCommands cc;
};
lldClangNoLibc = wrapCCWith rec {
cc = tools.clang-unwrapped;
+ libcxx = null;
bintools = wrapBintoolsWith {
inherit (tools) bintools;
libc = null;
};
extraPackages = [
- # targetLlvmLibraries.libcxx
- # targetLlvmLibraries.libcxxabi
targetLlvmLibraries.compiler-rt
];
extraBuildCommands = ''
- echo "-target ${stdenv.targetPlatform.config} -rtlib=compiler-rt" >> $out/nix-support/cc-cflags
+ echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags
+ echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
'' + mkExtraBuildCommands cc;
};
lldClangNoCompilerRt = wrapCCWith {
cc = tools.clang-unwrapped;
+ libcxx = null;
bintools = wrapBintoolsWith {
inherit (tools) bintools;
libc = null;
};
extraPackages = [ ];
extraBuildCommands = ''
- echo "-nostartfiles -target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
+ echo "-nostartfiles" >> $out/nix-support/cc-cflags
'';
};
@@ -148,9 +169,16 @@ let
libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
- libcxx = callPackage ./libc++ {};
+ libcxx = callPackage ./libc++ ({} //
+ (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+ stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
+ }));
- libcxxabi = callPackage ./libc++abi.nix {};
+ libcxxabi = callPackage ./libc++abi.nix ({} //
+ (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+ stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
+ libunwind = libraries.libunwind;
+ }));
openmp = callPackage ./openmp.nix {};
});
diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix
index 96cb671fa431..83c05cf0e634 100644
--- a/pkgs/development/compilers/llvm/7/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/7/libc++/default.nix
@@ -37,12 +37,9 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
- linkCxxAbi = stdenv.isLinux;
-
- setupHooks = [
- ../../../../../build-support/setup-hooks/role.bash
- ./setup-hook.sh
- ];
+ passthru = {
+ isLLVM = true;
+ };
meta = {
homepage = "https://libcxx.llvm.org/";
diff --git a/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh
deleted file mode 100644
index 3a274aecc23d..000000000000
--- a/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# See pkgs/build-support/setup-hooks/role.bash
-getHostRole
-
-linkCxxAbi="@linkCxxAbi@"
-export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem @out@/include/c++/v1"
-export NIX_CXXSTDLIB_LINK${role_post}=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix
index 15e55800dc8e..a907d4086550 100644
--- a/pkgs/development/compilers/llvm/8/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix
@@ -46,6 +46,7 @@ stdenv.mkDerivation {
outputs = [ "out" "dev" ];
patches = [
+ ../7/compiler-rt-glibc.patch
./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
++ stdenv.lib.optional (useLLVM) ./crtbegin-and-end.patch
diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix
index d9383d042bbc..34b1f5e641b8 100644
--- a/pkgs/development/compilers/llvm/8/default.nix
+++ b/pkgs/development/compilers/llvm/8/default.nix
@@ -1,4 +1,4 @@
-{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook
+{ lowPrio, newScope, pkgs, stdenv, cmake
, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
, buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross
@@ -58,25 +58,17 @@ let
libstdcxxClang = wrapCCWith rec {
cc = tools.clang-unwrapped;
- extraTools = [
- libstdcxxHook
- ];
+ libcxx = null; # libstdcxx is smuggled in with clang.gcc
extraPackages = [
targetLlvmLibraries.compiler-rt
];
- extraBuildCommands = ''
- echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags
- echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags
- echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags
- echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags
- '' + mkExtraBuildCommands cc;
+ extraBuildCommands = mkExtraBuildCommands cc;
};
libcxxClang = wrapCCWith rec {
cc = tools.clang-unwrapped;
libcxx = targetLlvmLibraries.libcxx;
extraPackages = [
- targetLlvmLibraries.libcxx
targetLlvmLibraries.libcxxabi
targetLlvmLibraries.compiler-rt
];
@@ -103,14 +95,12 @@ let
inherit (tools) bintools;
};
extraPackages = [
- targetLlvmLibraries.libcxx
targetLlvmLibraries.libcxxabi
targetLlvmLibraries.compiler-rt
] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [
targetLlvmLibraries.libunwind
];
extraBuildCommands = ''
- echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags
echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
'' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) ''
@@ -130,7 +120,6 @@ let
targetLlvmLibraries.compiler-rt
];
extraBuildCommands = ''
- echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags
echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
echo "-nostdlib++" >> $out/nix-support/cc-cflags
@@ -148,7 +137,6 @@ let
targetLlvmLibraries.compiler-rt
];
extraBuildCommands = ''
- echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags
echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
'' + mkExtraBuildCommands cc;
@@ -164,7 +152,6 @@ let
extraPackages = [ ];
extraBuildCommands = ''
echo "-nostartfiles" >> $out/nix-support/cc-cflags
- echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
'';
};
diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libc++/default.nix
index 24bca6aafcd1..9c0c7951c794 100644
--- a/pkgs/development/compilers/llvm/8/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/8/libc++/default.nix
@@ -43,12 +43,9 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
- linkCxxAbi = stdenv.isLinux;
-
- setupHooks = [
- ../../../../../build-support/setup-hooks/role.bash
- ./setup-hook.sh
- ];
+ passthru = {
+ isLLVM = true;
+ };
meta = {
homepage = "https://libcxx.llvm.org/";
diff --git a/pkgs/development/compilers/llvm/8/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/8/libc++/setup-hook.sh
deleted file mode 100644
index 3a274aecc23d..000000000000
--- a/pkgs/development/compilers/llvm/8/libc++/setup-hook.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# See pkgs/build-support/setup-hooks/role.bash
-getHostRole
-
-linkCxxAbi="@linkCxxAbi@"
-export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem @out@/include/c++/v1"
-export NIX_CXXSTDLIB_LINK${role_post}=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/9/compiler-rt.nix b/pkgs/development/compilers/llvm/9/compiler-rt.nix
index 0183754a2fd4..394f66ff7f1a 100644
--- a/pkgs/development/compilers/llvm/9/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/9/compiler-rt.nix
@@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
patches = [
+ ../7/compiler-rt-glibc.patch
./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch;
diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix
index 3b6db967b6a2..5d93ca8709fa 100644
--- a/pkgs/development/compilers/llvm/9/default.nix
+++ b/pkgs/development/compilers/llvm/9/default.nix
@@ -1,4 +1,4 @@
-{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook
+{ lowPrio, newScope, pkgs, stdenv, cmake
, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
, buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross
@@ -58,25 +58,17 @@ let
libstdcxxClang = wrapCCWith rec {
cc = tools.clang-unwrapped;
- extraTools = [
- libstdcxxHook
- ];
+ libcxx = null; # libstdcxx is smuggled in with clang.gcc
extraPackages = [
targetLlvmLibraries.compiler-rt
];
- extraBuildCommands = ''
- echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags
- echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags
- echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags
- echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags
- '' + mkExtraBuildCommands cc;
+ extraBuildCommands = mkExtraBuildCommands cc;
};
libcxxClang = wrapCCWith rec {
cc = tools.clang-unwrapped;
libcxx = targetLlvmLibraries.libcxx;
extraPackages = [
- targetLlvmLibraries.libcxx
targetLlvmLibraries.libcxxabi
targetLlvmLibraries.compiler-rt
];
@@ -103,14 +95,12 @@ let
inherit (tools) bintools;
};
extraPackages = [
- targetLlvmLibraries.libcxx
targetLlvmLibraries.libcxxabi
targetLlvmLibraries.compiler-rt
] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [
targetLlvmLibraries.libunwind
];
extraBuildCommands = ''
- echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags
echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
'' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) ''
@@ -130,7 +120,6 @@ let
targetLlvmLibraries.compiler-rt
];
extraBuildCommands = ''
- echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags
echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
echo "-nostdlib++" >> $out/nix-support/cc-cflags
@@ -148,7 +137,6 @@ let
targetLlvmLibraries.compiler-rt
];
extraBuildCommands = ''
- echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags
echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
'' + mkExtraBuildCommands cc;
@@ -164,7 +152,6 @@ let
extraPackages = [ ];
extraBuildCommands = ''
echo "-nostartfiles" >> $out/nix-support/cc-cflags
- echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
'';
};
diff --git a/pkgs/development/compilers/llvm/9/libc++/default.nix b/pkgs/development/compilers/llvm/9/libc++/default.nix
index f3081d1f2699..cec6de61ca99 100644
--- a/pkgs/development/compilers/llvm/9/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/9/libc++/default.nix
@@ -39,12 +39,9 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
- linkCxxAbi = stdenv.isLinux;
-
- setupHooks = [
- ../../../../../build-support/setup-hooks/role.bash
- ./setup-hook.sh
- ];
+ passthru = {
+ isLLVM = true;
+ };
meta = {
homepage = "https://libcxx.llvm.org/";
diff --git a/pkgs/development/compilers/llvm/9/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/9/libc++/setup-hook.sh
deleted file mode 100644
index 3a274aecc23d..000000000000
--- a/pkgs/development/compilers/llvm/9/libc++/setup-hook.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# See pkgs/build-support/setup-hooks/role.bash
-getHostRole
-
-linkCxxAbi="@linkCxxAbi@"
-export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem @out@/include/c++/v1"
-export NIX_CXXSTDLIB_LINK${role_post}=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix
index e4d99dcec955..c510f372666a 100644
--- a/pkgs/development/compilers/mono/generic.nix
+++ b/pkgs/development/compilers/mono/generic.nix
@@ -1,4 +1,5 @@
{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256, autoconf, libtool, automake, cmake, which
+, gnumake42
, enableParallelBuilding ? true
, srcArchiveSuffix ? "tar.bz2"
, extraPatches ? []
@@ -16,6 +17,7 @@ stdenv.mkDerivation rec {
url = "https://download.mono-project.com/sources/mono/${pname}-${version}.${srcArchiveSuffix}";
};
+ nativeBuildInputs = [ gnumake42 ];
buildInputs =
[ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib python autoconf libtool automake cmake which
]
diff --git a/pkgs/development/compilers/rust/0001-Allow-getting-no_std-from-the-config-file.patch b/pkgs/development/compilers/rust/0001-Allow-getting-no_std-from-the-config-file.patch
deleted file mode 100644
index 0b9359221a78..000000000000
--- a/pkgs/development/compilers/rust/0001-Allow-getting-no_std-from-the-config-file.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 036c87c82793f1da9f98445e8e27462cc19bbe0a Mon Sep 17 00:00:00 2001
-From: John Ericson
-Date: Sat, 22 Feb 2020 14:38:38 -0500
-Subject: [PATCH] Allow getting `no_std` from the config file
-
-Currently, it is only set correctly in the sanity checking implicit
-default fallback code. Having a config file at all will for force
-`no_std = false`.
----
- src/bootstrap/config.rs | 3 +++
- src/bootstrap/sanity.rs | 4 +---
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
-index 110c8b844d5..83a6934d477 100644
---- a/src/bootstrap/config.rs
-+++ b/src/bootstrap/config.rs
-@@ -350,6 +350,7 @@ struct TomlTarget {
- musl_root: Option,
- wasi_root: Option,
- qemu_rootfs: Option,
-+ no_std: Option,
- }
-
- impl Config {
-@@ -610,6 +611,8 @@ impl Config {
- target.musl_root = cfg.musl_root.clone().map(PathBuf::from);
- target.wasi_root = cfg.wasi_root.clone().map(PathBuf::from);
- target.qemu_rootfs = cfg.qemu_rootfs.clone().map(PathBuf::from);
-+ target.no_std
-+ = cfg.no_std.unwrap_or(triple.contains("-none-") || triple.contains("nvptx"));
-
- config.target_config.insert(INTERNER.intern_string(triple.clone()), target);
- }
-diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
-index 8ff7056e628..76e721ed8e3 100644
---- a/src/bootstrap/sanity.rs
-+++ b/src/bootstrap/sanity.rs
-@@ -194,9 +194,7 @@ pub fn check(build: &mut Build) {
-
- if target.contains("-none-") || target.contains("nvptx") {
- if build.no_std(*target).is_none() {
-- let target = build.config.target_config.entry(target.clone()).or_default();
--
-- target.no_std = true;
-+ build.config.target_config.entry(target.clone()).or_default();
- }
-
- if build.no_std(*target) == Some(false) {
---
-2.24.1
-
diff --git a/pkgs/development/compilers/rust/1_42.nix b/pkgs/development/compilers/rust/1_42.nix
deleted file mode 100644
index 8717aaf76a23..000000000000
--- a/pkgs/development/compilers/rust/1_42.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-# New rust versions should first go to staging.
-# Things to check after updating:
-# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin:
-# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github
-# This testing can be also done by other volunteers as part of the pull
-# request review, in case platforms cannot be covered.
-# 2. The LLVM version used for building should match with rust upstream.
-# 3. Firefox and Thunderbird should still build on x86_64-linux.
-
-{ stdenv, lib
-, buildPackages
-, newScope, callPackage
-, CoreFoundation, Security
-, llvmPackages_5
-, pkgsBuildTarget, pkgsBuildBuild
-} @ args:
-
-import ./default.nix {
- rustcVersion = "1.42.0";
- rustcSha256 = "0x9lxs82may6c0iln0b908cxyn1cv7h03n5cmbx3j1bas4qzks6j";
-
- # Note: the version MUST be one version prior to the version we're
- # building
- bootstrapVersion = "1.41.0";
-
- # fetch hashes by running `print-hashes.sh 1.42.0`
- bootstrapHashes = {
- i686-unknown-linux-gnu = "a93a34f9cf3d35de2496352cb615b42b792eb09db3149b3a278efd2c58fa7897";
- x86_64-unknown-linux-gnu = "343ba8ef7397eab7b3bb2382e5e4cb08835a87bff5c8074382c0b6930a41948b";
- arm-unknown-linux-gnueabihf = "d0b33fcc97eeb96d716b30573c7e66affdf9077ecdecb30df2498b49f8284047";
- armv7-unknown-linux-gnueabihf = "3c8e787fb4f4f304a065e78c38010f0b5722d809f9dafb0e904084bf0f54f7be";
- aarch64-unknown-linux-gnu = "79ddfb5e2563d0ee09a567fbbe121a2aed3c3bc61255b2787f2dd42183a10f27";
- i686-apple-darwin = "628134b3fbaf5c0e7a25bd9a2b8d25f6e68bb256c8b04a3332ec979f5a1cd339";
- x86_64-apple-darwin = "b6504003ab70b11f278e0243a43ba9d6bf75e8ad6819b4058a2b6e3991cc8d7a";
- };
-
- selectRustPackage = pkgs: pkgs.rust_1_42;
-
- rustcPatches = [
- ./0001-Allow-getting-no_std-from-the-config-file.patch
- ];
-}
-
-(builtins.removeAttrs args [ "fetchpatch" ])
diff --git a/pkgs/development/compilers/rust/1_43.nix b/pkgs/development/compilers/rust/1_44.nix
similarity index 51%
rename from pkgs/development/compilers/rust/1_43.nix
rename to pkgs/development/compilers/rust/1_44.nix
index a1a9d17fcd55..9fc268d152b1 100644
--- a/pkgs/development/compilers/rust/1_43.nix
+++ b/pkgs/development/compilers/rust/1_44.nix
@@ -16,24 +16,24 @@
} @ args:
import ./default.nix {
- rustcVersion = "1.43.0";
- rustcSha256 = "18akhk0wz1my6y9vhardriy2ysc482z0fnjdcgs9gy59kmnarxkm";
+ rustcVersion = "1.44.1";
+ rustcSha256 = "0ww4z2v3gxgn3zddqzwqya1gln04p91ykbrflnpdbmcd575n8bky";
# Note: the version MUST be one version prior to the version we're
# building
- bootstrapVersion = "1.42.0";
+ bootstrapVersion = "1.43.1";
- # fetch hashes by running `print-hashes.sh 1.43.0`
+ # fetch hashes by running `print-hashes.sh 1.44.1`
bootstrapHashes = {
- i686-unknown-linux-gnu = "1c89c12c8fc1a45dcbcb9ee2e21cc634b8453f1d4cdd658269263de686aab4e4";
- x86_64-unknown-linux-gnu = "7d1e07ad9c8a33d8d039def7c0a131c5917aa3ea0af3d0cc399c6faf7b789052";
- arm-unknown-linux-gnueabihf = "6cf776b910d08fb0d1f88be94464e7b20a50f9d8b2ec6372c3c385aec0b70e7a";
- armv7-unknown-linux-gnueabihf = "a36e7f2bd148e325a7b8e7131b4226266cf522b1a2b12d585dad9c38ef68f4d9";
- aarch64-unknown-linux-gnu = "fdd39f856a062af265012861949ff6654e2b7103be034d046bec84ebe46e8d2d";
- x86_64-apple-darwin = "db1055c46e0d54b99da05e88c71fea21b3897e74a4f5ff9390e934f3f050c0a8";
+ i686-unknown-linux-gnu = "0626fa8a6a2387021413d740543f7496656d81115e2284e4ef73217128398990";
+ x86_64-unknown-linux-gnu = "25cd71b95bba0daef56bad8c943a87368c4185b90983f4412f46e3e2418c0505";
+ arm-unknown-linux-gnueabihf = "16b9c4861565a195323d144fd0f54c0ae794ee3d2a867682f8aedbdacaad5a6c";
+ armv7-unknown-linux-gnueabihf = "0c32a5958a358a031e6ca52074cfd45256688dc334db315199f5dbbf7562e5b1";
+ aarch64-unknown-linux-gnu = "fbb612387a64c9da2869725afffc1f66a72d6e7ba6667ba717cd52c33080b7fb";
+ x86_64-apple-darwin = "e1c3e1426a9e615079159d6b619319235e3ca7b395e7603330375bfffcbb7003";
};
- selectRustPackage = pkgs: pkgs.rust_1_43;
+ selectRustPackage = pkgs: pkgs.rust_1_44;
rustcPatches = [
];
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index dfea7f6c8ef6..e820b982620a 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -38,6 +38,11 @@ rustPlatform.buildRustPackage {
--set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt"
installManPage src/tools/cargo/src/etc/man/*
+
+ installShellCompletion --bash --name cargo \
+ src/tools/cargo/src/etc/cargo.bashcomp.sh
+
+ installShellCompletion --zsh src/tools/cargo/src/etc/_cargo
'';
checkPhase = ''
diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
index 0cd1f704421e..b838aa59177e 100644
--- a/pkgs/development/compilers/swift/default.nix
+++ b/pkgs/development/compilers/swift/default.nix
@@ -182,6 +182,9 @@ stdenv.mkDerivation {
'';
patchPhase = ''
+ # Glibc 2.31 fix
+ patch -p1 -i ${./patches/swift-llvm.patch}
+
# Just patch all the things for now, we can focus this later
patchShebangs $SWIFT_SOURCE_ROOT
@@ -258,7 +261,7 @@ stdenv.mkDerivation {
buildPhase = ''
# gcc-6.4.0/include/c++/6.4.0/cstdlib:75:15: fatal error: 'stdlib.h' file not found
- export NIX_CFLAGS_COMPILE="$( echo ${clang.default_cxx_stdlib_compile} ) $NIX_CFLAGS_COMPILE"
+ export NIX_CFLAGS_COMPILE="$(< $NIX_CC/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE"
# During the Swift build, a full local LLVM build is performed and the resulting clang is invoked.
# This compiler is not using the Nix wrappers, so it needs some help to find things.
export NIX_LDFLAGS_BEFORE="-rpath ${clang.cc.gcc.lib}/lib -L${clang.cc.gcc.lib}/lib $NIX_LDFLAGS_BEFORE"
diff --git a/pkgs/development/compilers/swift/patches/swift-llvm.patch b/pkgs/development/compilers/swift/patches/swift-llvm.patch
new file mode 100644
index 000000000000..fcd9533fd72a
--- /dev/null
+++ b/pkgs/development/compilers/swift/patches/swift-llvm.patch
@@ -0,0 +1,48 @@
+diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+index bc6675bf4..2f3514b64 100644
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -1129,8 +1129,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid);
+ CHECK_SIZE_AND_OFFSET(ipc_perm, gid);
+ CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);
+ CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
+-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)
+-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */
++#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31)
++/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit
++ on many architectures. */
+ CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
+ #endif
+
+diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+index de69852d3..652d5cb3b 100644
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+@@ -204,26 +204,13 @@ namespace __sanitizer {
+ u64 __unused1;
+ u64 __unused2;
+ #elif defined(__sparc__)
+-#if defined(__arch64__)
+ unsigned mode;
+- unsigned short __pad1;
+-#else
+- unsigned short __pad1;
+- unsigned short mode;
+ unsigned short __pad2;
+-#endif
+ unsigned short __seq;
+ unsigned long long __unused1;
+ unsigned long long __unused2;
+-#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__)
+- unsigned int mode;
+- unsigned short __seq;
+- unsigned short __pad1;
+- unsigned long __unused1;
+- unsigned long __unused2;
+ #else
+- unsigned short mode;
+- unsigned short __pad1;
++ unsigned int mode;
+ unsigned short __seq;
+ unsigned short __pad2;
+ #if defined(__x86_64__) && !defined(_LP64)
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 0d8b382167e5..a478871bd9ad 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -127,7 +127,7 @@ let
export GOSUMDB=off
export GOPROXY=off
cd "$modRoot"
- if [ -n "${go-modules}" ]; then
+ if [ -n "${go-modules}" ]; then
rm -rf vendor
ln -s ${go-modules} vendor
fi
diff --git a/pkgs/development/interpreters/python/cpython/3.8/0001-On-all-posix-systems-not-just-Darwin-set-LDSHARED-if.patch b/pkgs/development/interpreters/python/cpython/3.8/0001-On-all-posix-systems-not-just-Darwin-set-LDSHARED-if.patch
new file mode 100644
index 000000000000..0c26300d9c06
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/3.8/0001-On-all-posix-systems-not-just-Darwin-set-LDSHARED-if.patch
@@ -0,0 +1,33 @@
+From 1911995b1a1252d80bf2b9651840e185a1a6baf5 Mon Sep 17 00:00:00 2001
+From: Hong Xu
+Date: Thu, 25 Jul 2019 10:25:55 -0700
+Subject: [PATCH] On all posix systems, not just Darwin, set LDSHARED (if not
+ set) according to CC
+
+This patch is slightly different from https://bugs.python.org/issue24935
+, except that we now handle LDSHARED according to CC on all posix
+systems, not just Darwin or Linux.
+---
+ Lib/distutils/sysconfig.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
+index 37feae5df7..9fdce6896d 100644
+--- a/Lib/distutils/sysconfig.py
++++ b/Lib/distutils/sysconfig.py
+@@ -199,10 +199,10 @@ def customize_compiler(compiler):
+
+ if 'CC' in os.environ:
+ newcc = os.environ['CC']
+- if (sys.platform == 'darwin'
++ if (os.name == 'posix'
+ and 'LDSHARED' not in os.environ
+ and ldshared.startswith(cc)):
+- # On OS X, if CC is overridden, use that as the default
++ # On POSIX systems, if CC is overridden, use that as the default
+ # command for LDSHARED as well
+ ldshared = newcc + ldshared[len(cc):]
+ cc = newcc
+--
+2.25.1
+
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 694f661a9669..e6c8b301c0b0 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -140,6 +140,9 @@ in with passthru; stdenv.mkDerivation {
sha256 = "1h18lnpx539h5lfxyk379dxwr8m2raigcjixkf133l4xy3f4bzi2";
}
)
+ ] ++ [
+ # LDSHARED now uses $CC instead of gcc. Fixes cross-compilation of extension modules.
+ ./3.8/0001-On-all-posix-systems-not-just-Darwin-set-LDSHARED-if.patch
];
postPatch = ''
diff --git a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh b/pkgs/development/interpreters/python/hooks/pip-install-hook.sh
index 4eefe22d3f28..770739b36bde 100644
--- a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/pip-install-hook.sh
@@ -11,7 +11,9 @@ pipInstallPhase() {
export PYTHONPATH="$out/@pythonSitePackages@:$PYTHONPATH"
pushd dist || return 1
- @pythonInterpreter@ -m pip install ./*.whl --no-index --prefix="$out" --no-cache $pipInstallFlags --build tmpbuild
+ mkdir tmpbuild
+ NIX_PIP_INSTALL_TMPDIR=tmpbuild @pythonInterpreter@ -m pip install ./*.whl --no-index --prefix="$out" --no-cache $pipInstallFlags
+ rm -rf tmpbuild
popd || return 1
runHook postInstall
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index 5f3d42b4da37..40fe1c42d7a6 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -42,9 +42,14 @@ stdenv.mkDerivation rec {
substituteInPlace include/SDL_opengl_glext.h \
--replace "typedef ptrdiff_t GLsizeiptr;" "typedef signed long int khronos_ssize_t; typedef khronos_ssize_t GLsizeiptr;" \
--replace "typedef ptrdiff_t GLintptr;" "typedef signed long int khronos_intptr_t; typedef khronos_intptr_t GLintptr;"
+
+ substituteInPlace configure \
+ --replace 'WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`' 'WAYLAND_SCANNER=`pkg-config --variable=wayland_scanner wayland-scanner`'
'';
- nativeBuildInputs = [ pkgconfig ];
+ depsBuildBuild = [ pkgconfig ];
+
+ nativeBuildInputs = [ pkgconfig wayland ];
propagatedBuildInputs = dlopenPropagatedBuildInputs;
diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index 4c7e5321f555..3f36b87af704 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -1,5 +1,5 @@
{ fetchurl, fetchpatch, stdenv, pkgconfig, libdaemon, dbus, perlPackages
-, expat, gettext, intltool, glib, libiconv
+, expat, gettext, intltool, glib, libiconv, writeShellScriptBin
, gtk3Support ? false, gtk3 ? null
, qt4 ? null
, qt4Support ? false
@@ -9,6 +9,11 @@
assert qt4Support -> qt4 != null;
+let
+ # despite the configure script claiming it supports $PKG_CONFIG, it doesnt respect it
+ pkgconfig-helper = writeShellScriptBin "pkg-config" ''exec $PKG_CONFIG "$@"'';
+in
+
stdenv.mkDerivation rec {
name = "avahi${stdenv.lib.optionalString withLibdnssdCompat "-compat"}-${version}";
version = "0.7";
@@ -18,6 +23,11 @@ stdenv.mkDerivation rec {
sha256 = "0128n7jlshw4bpx0vg8lwj8qwdisjxi7mvniwfafgnkzzrfrpaap";
};
+ prePatch = ''
+ substituteInPlace configure \
+ --replace pkg-config "$PKG_CONFIG"
+ '';
+
patches = [
./no-mkdir-localstatedir.patch
(fetchpatch {
@@ -35,7 +45,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs =
stdenv.lib.optionals withPython (with python.pkgs; [ python pygobject3 dbus-python ]);
- nativeBuildInputs = [ pkgconfig gettext intltool glib ];
+ nativeBuildInputs = [ pkgconfig pkgconfig-helper gettext intltool glib ];
configureFlags =
[ "--disable-qt3" "--disable-gdbm" "--disable-mono"
diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix
index 85905778e803..e6a25ea6d7ce 100644
--- a/pkgs/development/libraries/c-blosc/default.nix
+++ b/pkgs/development/libraries/c-blosc/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "c-blosc";
- version = "1.18.1";
+ version = "1.19.0";
src = fetchFromGitHub {
owner = "Blosc";
repo = "c-blosc";
rev = "v${version}";
- sha256 = "1ywq8j70149859vvs19wgjq89d6xsvvmvm2n1dmkzpchxgrvnw70";
+ sha256 = "03z0wybw7w5yvakn1dzfmn8vz586hbqy2mq1vz1zg15md4x6zvbx";
};
buildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix
index 0a51e7e592b1..e98fa465e0b4 100644
--- a/pkgs/development/libraries/check/default.nix
+++ b/pkgs/development/libraries/check/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "check";
- version = "0.14.0";
+ version = "0.15.0";
src = fetchurl {
url = "https://github.com/libcheck/check/releases/download/${version}/check-${version}.tar.gz";
- sha256 = "02zkfiyklckmivrfvdsrlzvzphkdsgjrz3igncw05dv5pshhq3xx";
+ sha256 = "0q5cs6rqbq8a1m9ij3dxnsjcs31mvg0b2i77g0iykqd6iz3f78mf";
};
# Test can randomly fail: https://hydra.nixos.org/build/7243912
diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix
index 1a6d67ba8052..7040ad0f4510 100644
--- a/pkgs/development/libraries/faad2/default.nix
+++ b/pkgs/development/libraries/faad2/default.nix
@@ -1,44 +1,24 @@
-{stdenv, fetchurl
+{stdenv, fetchFromGitHub, autoreconfHook
, drmSupport ? false # Digital Radio Mondiale
}:
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "faad2";
- version = "2.8.8";
+ version = "2.9.2";
- src = fetchurl {
- url = "mirror://sourceforge/faac/${pname}-${version}.tar.gz";
- sha256 = "1db37ydb6mxhshbayvirm5vz6j361bjim4nkpwjyhmy4ddfinmhl";
+ src = fetchFromGitHub {
+ owner = "knik0";
+ repo = "faad2";
+ rev = builtins.replaceStrings [ "." ] [ "_" ] version;
+ sha256 = "0rdi6bmyryhkwf4mpprrsp78m6lv1nppav2f0lf1ywifm92ng59c";
};
- patches = let
- fp = { ver ? "2.8.8-3", pname, name ? (pname + ".patch"), sha256 }: fetchurl {
- url = "https://salsa.debian.org/multimedia-team/faad2/raw/debian/${ver}"
- + "/debian/patches/${pname}.patch?inline=false";
- inherit name sha256;
- };
- in [
- (fp {
- # critical bug addressed in vlc 3.0.7 (but we use system-provided faad)
- pname = "0004-Fix-a-couple-buffer-overflows";
- sha256 = "1mwycdfagz6wpda9j3cp7lf93crgacpa8rwr58p3x0i5cirnnmwq";
- })
- (fp {
- name = "CVE-2018-20362.patch";
- pname = "0009-syntax.c-check-for-syntax-element-inconsistencies";
- sha256 = "1z849l5qyvhyn5pvm6r07fa50nrn8nsqnrka2nnzgkhxlhvzpa81";
- })
- (fp {
- name = "CVE-2018-20194.patch";
- pname = "0010-sbr_hfadj-sanitize-frequency-band-borders";
- sha256 = "1b1kbz4mv0zhpq8h3djnvqafh1gn12nikk9v3jrxyryywacirah4";
- })
- ];
-
configureFlags = []
++ optional drmSupport "--with-drm";
+ nativeBuildInputs = [ autoreconfHook ];
+
meta = {
description = "An open source MPEG-4 and MPEG-2 AAC decoder";
homepage = "https://www.audiocoding.com/faad2.html";
diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix
index 763caa811e34..0ce0f56d710e 100644
--- a/pkgs/development/libraries/farstream/default.nix
+++ b/pkgs/development/libraries/farstream/default.nix
@@ -29,6 +29,11 @@ stdenv.mkDerivation rec {
url = "https://gitlab.freedesktop.org/farstream/farstream/commit/73891c28fa27d5e65a71762e826f13747d743588.patch";
sha256 = "19pw1m8xhxyf5yhl6k898w240ra2k0m28gfv858x70c4wl786lrn";
})
+ # Fix build with newer gnumake.
+ (fetchpatch {
+ url = "https://gitlab.freedesktop.org/farstream/farstream/-/commit/54987d44.diff";
+ sha256 = "02pka68p2j1wg7768rq7afa5wl9xv82wp86q7izrmwwnxdmz4zyg";
+ })
];
buildInputs = [
diff --git a/pkgs/development/libraries/glibc/2.27-CVE-2019-19126.patch b/pkgs/development/libraries/glibc/2.27-CVE-2019-19126.patch
deleted file mode 100644
index 2c558f53b735..000000000000
--- a/pkgs/development/libraries/glibc/2.27-CVE-2019-19126.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Adapted from https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=patch;h=4d5cfeb510125345cb41431afc9022492994cffa, omitting changes to NEWS
-diff --git a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
-index 1943691..ac694c0 100644
---- a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
-+++ b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
-@@ -31,7 +31,8 @@
- environment variable, LD_PREFER_MAP_32BIT_EXEC. */
- #define EXTRA_LD_ENVVARS \
- case 21: \
-- if (memcmp (envline, "PREFER_MAP_32BIT_EXEC", 21) == 0) \
-+ if (!__libc_enable_secure \
-+ && memcmp (envline, "PREFER_MAP_32BIT_EXEC", 21) == 0) \
- GLRO(dl_x86_cpu_features).feature[index_arch_Prefer_MAP_32BIT_EXEC] \
- |= bit_arch_Prefer_MAP_32BIT_EXEC; \
- break;
---
-2.9.3
-
diff --git a/pkgs/development/libraries/glibc/2.31-cve-2020-10029.patch b/pkgs/development/libraries/glibc/2.31-cve-2020-10029.patch
new file mode 100644
index 000000000000..8334398e8912
--- /dev/null
+++ b/pkgs/development/libraries/glibc/2.31-cve-2020-10029.patch
@@ -0,0 +1,79 @@
+diff --git a/sysdeps/ieee754/ldbl-96/Makefile b/sysdeps/ieee754/ldbl-96/Makefile
+index 995e90d6da..318628aed6 100644
+--- a/sysdeps/ieee754/ldbl-96/Makefile
++++ b/sysdeps/ieee754/ldbl-96/Makefile
+@@ -17,5 +17,6 @@
+ # .
+
+ ifeq ($(subdir),math)
+-tests += test-canonical-ldbl-96 test-totalorderl-ldbl-96
++tests += test-canonical-ldbl-96 test-totalorderl-ldbl-96 test-sinl-pseudo
++CFLAGS-test-sinl-pseudo.c += -fstack-protector-all
+ endif
+diff --git a/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c b/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c
+index 5f742321ae..bcdf20179f 100644
+--- a/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c
++++ b/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c
+@@ -210,6 +210,18 @@ __ieee754_rem_pio2l (long double x, long double *y)
+ return 0;
+ }
+
++ if ((i0 & 0x80000000) == 0)
++ {
++ /* Pseudo-zero and unnormal representations are not valid
++ representations of long double. We need to avoid stack
++ corruption in __kernel_rem_pio2, which expects input in a
++ particular normal form, but those representations do not need
++ to be consistently handled like any particular floating-point
++ value. */
++ y[1] = y[0] = __builtin_nanl ("");
++ return 0;
++ }
++
+ /* Split the 64 bits of the mantissa into three 24-bit integers
+ stored in a double array. */
+ exp = j0 - 23;
+--- /dev/null
++++ b/sysdeps/ieee754/ldbl-96/test-sinl-pseudo.c
+@@ -0,0 +1,41 @@
++/* Test sinl for pseudo-zeros and unnormals for ldbl-96 (bug 25487).
++ Copyright (C) 2020 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ . */
++
++#include
++#include
++#include
++
++static int
++do_test (void)
++{
++ for (int i = 0; i < 64; i++)
++ {
++ uint64_t sig = i == 63 ? 0 : 1ULL << i;
++ long double ld;
++ SET_LDOUBLE_WORDS (ld, 0x4141,
++ sig >> 32, sig & 0xffffffffULL);
++ /* The requirement is that no stack overflow occurs when the
++ pseudo-zero or unnormal goes through range reduction. */
++ volatile long double ldr;
++ ldr = sinl (ld);
++ (void) ldr;
++ }
++ return 0;
++}
++
++#include
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 36b6bea61cd4..8afea21729a1 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -36,9 +36,9 @@
} @ args:
let
- version = "2.30";
+ version = "2.31";
patchSuffix = "";
- sha256 = "1bxqpg91d02qnaz837a5kamm0f43pr1il4r9pknygywsar713i72";
+ sha256 = "05zxkyz9bv3j9h0xyid1rhvh3klhsmrpkf3bcs6frvlgyr2gwilj";
in
assert withLinuxHeaders -> linuxHeaders != null;
@@ -108,8 +108,8 @@ stdenv.mkDerivation ({
})
./fix-x64-abi.patch
- ./2.27-CVE-2019-19126.patch
./2.30-cve-2020-1752.patch
+ ./2.31-cve-2020-10029.patch
]
++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch
++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch;
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
index ad978e903f8f..a19e8ca6a5b4 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
@@ -56,5 +56,7 @@ stdenv.mkDerivation rec {
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
+ # https://github.com/NixOS/nixpkgs/pull/91090#issuecomment-653753497
+ broken = true;
};
}
diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix
index d9cb91e4fb3b..fcb599e00f57 100644
--- a/pkgs/development/libraries/libpcap/default.nix
+++ b/pkgs/development/libraries/libpcap/default.nix
@@ -29,7 +29,9 @@ stdenv.mkDerivation rec {
'';
postInstall = ''
- rm -f $out/lib/libpcap.a
+ if [ "$dontDisableStatic" -ne "1" ]; then
+ rm -f $out/lib/libpcap.a
+ fi
'';
meta = {
diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index d0bd2ecc009b..7f690f0997b0 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -7,29 +7,16 @@
stdenv.mkDerivation rec {
name = "libva-${lib.optionalString minimal "minimal-"}${version}";
- version = "2.7.1"; # Also update the hash for libva-utils!
+ version = "2.8.0"; # Also update the hash for libva-utils!
# update libva-utils and vaapiIntel as well
src = fetchFromGitHub {
owner = "intel";
repo = "libva";
rev = version;
- sha256 = "0ywasac7z3hwggj8szp83sbxi2naa0a3amblx64y7i1hyyrn0csq";
+ sha256 = "190cq173jzp5rkrczi8gzbwa0y3xk253v4wd205a5ilfngm7srns";
};
- patches = [
- (fetchpatch { # meson: Allow for libdir and includedir to be absolute paths
- url = "https://github.com/intel/libva/commit/de902e2905abff635f3bb151718cc52caa3f669c.patch";
- sha256 = "1lpc8qzvsxnlsh9g0ab5lja204zxz8rr2p973pfihcw7dcxc3gia";
- })
- ];
-
- postPatch = ''
- # Remove the execute bit from all source code files
- # https://github.com/intel/libva/commit/dbd2cd635f33af1422cbc2079af0a7e68671c102
- chmod -x va/va{,_dec_av1,_trace,_vpp}.h
- '';
-
outputs = [ "dev" "out" ];
nativeBuildInputs = [ meson pkg-config ninja wayland ];
diff --git a/pkgs/development/libraries/libva-utils/default.nix b/pkgs/development/libraries/libva/utils.nix
similarity index 93%
rename from pkgs/development/libraries/libva-utils/default.nix
rename to pkgs/development/libraries/libva/utils.nix
index 90f1849aee02..5b9f4cdd8aa3 100644
--- a/pkgs/development/libraries/libva-utils/default.nix
+++ b/pkgs/development/libraries/libva/utils.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "intel";
repo = "libva-utils";
rev = version;
- sha256 = "13a0dccphi4cpr2cx45kg4djxsssi3d1fcjrkx27b16xiayp5lx9";
+ sha256 = "081hw2jnj64bpqwh9p41n5caqzm6dnj1ggnvvc5wrf4m2z1h2bjb";
};
nativeBuildInputs = [ meson ninja pkg-config ];
diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix
index 682a547d8f33..aaf6390d00a5 100644
--- a/pkgs/development/libraries/opencl-headers/default.nix
+++ b/pkgs/development/libraries/opencl-headers/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "opencl-headers-${version}";
- version = "2020.03.13";
+ version = "2020.06.16";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "OpenCL-Headers";
rev = "v${version}";
- sha256 = "1d9ibiwicaj17757h9yyjc9i2hny8d8npn4spbjscins8972z3hw";
+ sha256 = "0viiwhfqccw90r3mr45ab3wyhabpdrihplj5842brn5ny0ayh73z";
};
installPhase = ''
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index a4274f064e56..b60eb4fbaabd 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
"STRIP="
"prefix=$(out)"
"moduledir=$(out)/lib/modules"
- ] ++ stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ];
+ "CC=${stdenv.cc.targetPrefix}cc"
+ ];
configureFlags = [
"--enable-overlays"
@@ -40,8 +41,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
postBuild = ''
- make $makeFlags -C contrib/slapd-modules/passwd/sha2
- make $makeFlags -C contrib/slapd-modules/passwd/pbkdf2
+ make $makeFlags CC=$CC -C contrib/slapd-modules/passwd/sha2
+ make $makeFlags CC=$CC -C contrib/slapd-modules/passwd/pbkdf2
'';
doCheck = false; # needs a running LDAP server
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 1c972e5440ce..8512806e4556 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -3,8 +3,9 @@
, libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng
, libmng, which, libGLU, openssl, dbus, cups, pkgconfig
, libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi
-, buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base
-, buildWebkit ? (stdenv.isLinux || stdenv.isDarwin)
+, buildMultimedia ? false # ancient gstreamer is broken
+, alsaLib, gstreamer, gst-plugins-base
+, buildWebkit ? false
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, flashplayerFix ? false, gdk-pixbuf
, gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2
diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix
index cf8a9aaa7326..5c65c84e54dd 100644
--- a/pkgs/development/libraries/sqlite/analyzer.nix
+++ b/pkgs/development/libraries/sqlite/analyzer.nix
@@ -6,11 +6,11 @@ in
stdenv.mkDerivation rec {
pname = "sqlite-analyzer";
- version = "3.32.2";
+ version = "3.32.3";
src = assert version == sqlite.version; fetchurl {
url = "https://sqlite.org/2020/sqlite-src-${archiveVersion version}.zip";
- sha256 = "1jqhs896cvp9l399mjpbv1x2qbfvq875l1vrgnl3zc4ffdjxs9z0";
+ sha256 = "1fgmslzf013ry3a7g2vms7zyg24gs53gfj308r6ki4inbn3g04lk";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 35d3d062ab78..cd0042e722a6 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -10,12 +10,12 @@ in
stdenv.mkDerivation rec {
pname = "sqlite";
- version = "3.32.2";
+ version = "3.32.3";
# NB! Make sure to update analyzer.nix src (in the same directory).
src = fetchurl {
url = "https://sqlite.org/2020/sqlite-autoconf-${archiveVersion version}.tar.gz";
- sha256 = "1130bcd70s2vlsq0d638pb5qrw9kwqvjswnp2dfypghx9hjz3gid";
+ sha256 = "0rlbaq177gcgk5dswd3akbhv2nvvzljrbhgy18hklbhw7h90f5d3";
};
outputs = [ "bin" "dev" "out" ];
diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix
index da29eacdc0e9..f125ac9dca0b 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchurl, pkgconfig
, libXinerama, libSM, libXxf86vm
, gtk2, GConf ? null, gtk3
-, xorgproto, gstreamer, gst-plugins-base, setfile
+, xorgproto, gst_all_1, setfile
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, withMesa ? libGLSupported
, libGLU ? null, libGL ? null
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base
+ libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base
] ++ optionals withGtk2 [ gtk2 GConf ]
++ optional (!withGtk2) gtk3
++ optional withMesa libGLU
diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix
index 790968a88f76..c62a11f91bde 100644
--- a/pkgs/development/libraries/wxwidgets/3.1/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchurl, pkgconfig
, libXinerama, libSM, libXxf86vm
, gtk2, GConf ? null, gtk3
-, xorgproto, gstreamer, gst-plugins-base, setfile
+, xorgproto, gst_all_1, setfile
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, withMesa ? libGLSupported, libGLU ? null, libGL ? null
, compat28 ? false, compat30 ? true, unicode ? true
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base
+ libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base
] ++ optionals withGtk2 [ gtk2 GConf ]
++ optional (!withGtk2) gtk3
++ optional withMesa libGLU
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index ef50bf31a367..33a4fb93cbab 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -18,6 +18,7 @@ let
nativeBuildInputs = [ autoreconfHook ];
doCheck = true;
+ AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git
patches = stdenv.lib.optionals stdenv.isDarwin [ ./skip-flaky-darwin-test.patch ];
@@ -37,5 +38,5 @@ let
};
};
in {
- xapian_1_4 = generic "1.4.15" "1sjhz6vgql801rdgl6vrsjj0vy1mwlkcxjx6nr7h27m031cyjs5i";
+ xapian_1_4 = generic "1.4.16" "4937f2f49ff27e39a42150e928c8b45877b0bf456510f0785f50159a5cb6bf70";
}
diff --git a/pkgs/development/perl-modules/perl-POE-1.367-pod_linkcheck.patch b/pkgs/development/perl-modules/perl-POE-1.367-pod_linkcheck.patch
deleted file mode 100644
index e2f604985beb..000000000000
--- a/pkgs/development/perl-modules/perl-POE-1.367-pod_linkcheck.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit 6d985026
-Author: Michael Brantley
-Date: Tue Feb 20 07:12:06 2018 -0500
-
- Update broken Pod links in lib/POE/Filter/HTTPD.pm
-
- Update Pod links to refer only to the utf8 module and not its methods,
- fix a mis-capitalized internal reference, and convert the dangling
- "MaxContent" link into a code reference.
-
- Resolves bug: https://rt.cpan.org/Public/Bug/Display.html?id=124496
-
-diff --git a/lib/POE/Filter/HTTPD.pm b/lib/POE/Filter/HTTPD.pm
-index 9d4898e3..517be691 100644
---- a/lib/POE/Filter/HTTPD.pm
-+++ b/lib/POE/Filter/HTTPD.pm
-@@ -621,10 +621,10 @@ how to use these objects.
-
- HTTP headers are not allowed to have UTF-8 characters; they must be
- ISO-8859-1. POE::Filter::HTTPD will convert all UTF-8 into the MIME encoded
--equivalent. It uses L for detection-8 and
-+equivalent. It uses C for detection-8 and
- L for convertion. If L is not
- installed, no conversion happens. If L is
--not installed, L is used instead. In this last case, you will
-+not installed, C is used instead. In this last case, you will
- see a warning if you try to send UTF-8 headers.
-
-
-@@ -651,8 +651,8 @@ streaming mode this filter will return either an HTTP::Request object or a
- block of content. The HTTP::Request object's content will return empty.
- The blocks of content will be parts of the request's body, up to
- Content-Length in size. You distinguish between request objects and content
--blocks using C (See L below). This
--option supersedes L.
-+blocks using C (See L below). This
-+option supersedes C.
-
- =head1 CAVEATS
-
diff --git a/pkgs/development/perl-modules/perl-POE-1.367-pod_no404s.patch b/pkgs/development/perl-modules/perl-POE-1.367-pod_no404s.patch
deleted file mode 100644
index 097a7677e517..000000000000
--- a/pkgs/development/perl-modules/perl-POE-1.367-pod_no404s.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-commit 32571a21
-Author: Michael Brantley
-Date: Tue Feb 20 07:07:22 2018 -0500
-
- Update old URLs referenced in Pod
-
- Remove mention of old URLs, replace mention of canonical SVN repo with
- the new git-based one at github.com.
-
- Resolves bug: https://rt.cpan.org/Public/Bug/Display.html?id=124495
-
-diff --git a/lib/POE.pm b/lib/POE.pm
-index 80e7feac..0554ff70 100644
---- a/lib/POE.pm
-+++ b/lib/POE.pm
-@@ -465,7 +465,7 @@ code snippets there as well.
- The following command will fetch the most current version of POE into
- the "poe" subdirectory:
-
-- svn co https://poe.svn.sourceforge.net/svnroot/poe poe
-+ git clone https://github.com/rcaputo/poe.git
-
- =head2 SourceForge
-
-@@ -535,18 +535,9 @@ https://rt.cpan.org/Dist/Display.html?Status=Active&Queue=POE
-
- =head2 Repositories and Changes
-
--Thanks to the magic of distributed version control, POE is hosted at
--three locations for redundancy. You can browse the source at any one
--of:
--
--https://github.com/rcaputo/poe
--
--https://gitorious.org/poe
--
--http://poe.git.sourceforge.net/git/gitweb-index.cgi
--
--Complete change logs can also be browsed at those sites. They all
--provide RSS news feeds for those who want to follow development in
-+You can browse the POE source and complete change logs at
-+https://github.com/rcaputo/poe. It also provides an RSS
-+news feed for those who want to follow development in
- near-realtime.
-
- =head2 Other Resources
diff --git a/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch b/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch
index add6d9df3b7f..f66ed0dfe019 100644
--- a/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch
+++ b/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch
@@ -16,28 +16,30 @@ diff --git a/Makefile.PL b/Makefile.PL
index 505d1df..fc38b76 100644
--- a/Makefile.PL
+++ b/Makefile.PL
-@@ -29,12 +29,17 @@ foreach (@ARGV) {
+@@ -28,12 +28,18 @@ foreach (@ARGV) {
@ARGV = @replacement_args;
unless (
-- check_lib( # fill in what you prompted the user for here
-- lib => [qw(expat)],
-- header => ['expat.h'],
-- incpath => $expat_incpath,
-- ( $expat_libpath ? ( libpath => $expat_libpath ) : () ),
-- )
-+ #check_lib( # fill in what you prompted the user for here
-+ # lib => [qw(expat)],
-+ # header => ['expat.h'],
-+ # incpath => $expat_incpath,
-+ # ( $expat_libpath ? ( libpath => $expat_libpath ) : () ),
-+ #)
-+ # The check_lib implementation fails horribly with cross-compilation.
-+ # We are giving known good paths to expat.
-+ # And in all cases, the previous behaviour of not actually failing
-+ # seemed to work just fine :/.
-+ false
- ) {
+- check_lib( # fill in what you prompted the user for here
+- lib => [qw(expat)],
+- header => ['expat.h'],
+- incpath => $expat_incpath,
+- ($expat_libpath?
+- (libpath => $expat_libpath):()),
+- )) {
++ #check_lib( # fill in what you prompted the user for here
++ # lib => [qw(expat)],
++ # header => ['expat.h'],
++ # incpath => $expat_incpath,
++ # ($expat_libpath?
++ # (libpath => $expat_libpath):()),
++ #)
++ # The check_lib implementation fails horribly with cross-compilation.
++ # We are giving known good paths to expat.
++ # And in all cases, the previous behaviour of not actually failing
++ # seemed to work just fine :/.
++ false
++ ) {
warn <<'Expat_Not_Installed;';
--
diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix
index a3ed2c6b8aee..850070b1c008 100644
--- a/pkgs/development/python-modules/bokeh/default.nix
+++ b/pkgs/development/python-modules/bokeh/default.nix
@@ -33,11 +33,11 @@
buildPythonPackage rec {
pname = "bokeh";
- version = "2.0.2";
+ version = "2.1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "d9248bdb0156797abf6d04b5eac581dcb121f5d1db7acbc13282b0609314893a";
+ sha256 = "2dfabf228f55676b88acc464f416e2b13ee06470a8ad1dd3e609bb789425fbad";
};
patches = [
diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix
index 7b54d8cd5f1b..796ddaace8b1 100644
--- a/pkgs/development/python-modules/holoviews/default.nix
+++ b/pkgs/development/python-modules/holoviews/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "holoviews";
- version = "1.13.2";
+ version = "1.13.3";
src = fetchPypi {
inherit pname version;
- sha256 = "00i8732qib86xqa3652vkr178ib3682cls4jcv5g52y0rlkd8bfg";
+ sha256 = "e6753651a8598f21fc2c20e8456865ecec276cfea1519182a76d957506727934";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix
index 692daa7b2f38..9700737f485e 100644
--- a/pkgs/development/python-modules/ipython/default.nix
+++ b/pkgs/development/python-modules/ipython/default.nix
@@ -22,12 +22,12 @@
buildPythonPackage rec {
pname = "ipython";
- version = "7.15.0";
+ version = "7.16.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "0ef1433879816a960cd3ae1ae1dc82c64732ca75cec8dab5a4e29783fb571d0e";
+ sha256 = "9f4fcb31d3b2c533333893b9172264e4821c1ac91839500f31bd43f2c59b3ccf";
};
prePatch = lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix
index 008a74dfb3ed..24d7ee4f71ca 100644
--- a/pkgs/development/python-modules/jupyter_client/default.nix
+++ b/pkgs/development/python-modules/jupyter_client/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "jupyter_client";
- version = "6.1.3";
+ version = "6.1.5";
src = fetchPypi {
inherit pname version;
- sha256 = "3a32fa4d0b16d1c626b30c3002a62dfd86d6863ed39eaba3f537fade197bb756";
+ sha256 = "5099cda1ac86b27b655a715c51e15bdc8bd9595b2b17adb41a2bd446bbbafc4a";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix
index 3a7f381e51c5..c96975412b96 100644
--- a/pkgs/development/python-modules/llvmlite/default.nix
+++ b/pkgs/development/python-modules/llvmlite/default.nix
@@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "llvmlite";
- version = "0.32.1";
+ version = "0.33.0";
disabled = isPyPy || !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "41262a47b8cbba5a09203b15b65fbdf11192f92aa226c81e99115acdee8f3b8d";
+ sha256 = "9c8aae96f7fba10d9ac864b443d1e8c7ee4765c31569a2b201b3d0b67d8fc596";
};
nativeBuildInputs = [ llvm ];
diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix
index 2f8c57e00338..0c75fc4ac5ac 100644
--- a/pkgs/development/python-modules/nbformat/default.nix
+++ b/pkgs/development/python-modules/nbformat/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "nbformat";
- version = "5.0.6";
+ version = "5.0.7";
src = fetchPypi {
inherit pname version;
- sha256 = "049af048ed76b95c3c44043620c17e56bc001329e07f83fec4f177f0e3d7b757";
+ sha256 = "54d4d6354835a936bad7e8182dcd003ca3dc0cedfee5a306090e04854343b340";
};
LC_ALL="en_US.utf8";
diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index 909a37c78295..19d25a8e697d 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -13,14 +13,14 @@
}:
buildPythonPackage rec {
- version = "0.49.1";
+ version = "0.50.0";
pname = "numba";
# uses f-strings
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "89e1ad8215918036b0ffc53501888d44ed44c1f2cb09a9e047d06af5cd7e7a5a";
+ sha256 = "c9e5752821530694294db41ee19a4b00e5826c689821907f6c2ece9a02756b29";
};
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
diff --git a/pkgs/development/python-modules/numpy/1.16.nix b/pkgs/development/python-modules/numpy/1.16.nix
new file mode 100644
index 000000000000..af419c5e0a41
--- /dev/null
+++ b/pkgs/development/python-modules/numpy/1.16.nix
@@ -0,0 +1,94 @@
+{ lib
+, fetchPypi
+, python
+, buildPythonPackage
+, gfortran
+, pytest
+, blas
+, lapack
+, writeTextFile
+, isPyPy
+, cython
+, setuptoolsBuildHook
+ }:
+
+assert (!blas.isILP64) && (!lapack.isILP64);
+
+let
+ cfg = writeTextFile {
+ name = "site.cfg";
+ text = (lib.generators.toINI {} {
+ ${blas.implementation} = {
+ include_dirs = "${lib.getDev blas}/include:${lib.getDev lapack}/include";
+ library_dirs = "${blas}/lib:${lapack}/lib";
+ libraries = "lapack,lapacke,blas,cblas";
+ };
+ lapack = {
+ include_dirs = "${lib.getDev lapack}/include";
+ library_dirs = "${lapack}/lib";
+ };
+ blas = {
+ include_dirs = "${lib.getDev blas}/include";
+ library_dirs = "${blas}/lib";
+ };
+ });
+ };
+in buildPythonPackage rec {
+ pname = "numpy";
+ version = "1.16.5";
+ format = "pyproject.toml";
+
+ src = fetchPypi {
+ inherit pname version;
+ extension = "zip";
+ sha256 = "8bb452d94e964b312205b0de1238dd7209da452343653ab214b5d681780e7a0c";
+ };
+
+ nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ];
+ buildInputs = [ blas lapack ];
+
+ patches = lib.optionals python.hasDistutilsCxxPatch [
+ # We patch cpython/distutils to fix https://bugs.python.org/issue1222585
+ # Patching of numpy.distutils is needed to prevent it from undoing the
+ # patch to distutils.
+ ./numpy-distutils-C++_1.16.patch
+ ];
+
+ preConfigure = ''
+ sed -i 's/-faltivec//' numpy/distutils/system_info.py
+ export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES
+ '';
+
+ preBuild = ''
+ ln -s ${cfg} site.cfg
+ '';
+
+ enableParallelBuilding = true;
+
+ doCheck = !isPyPy; # numpy 1.16+ hits a bug in pypy's ctypes, using either numpy or pypy HEAD fixes this (https://github.com/numpy/numpy/issues/13807)
+
+ checkPhase = ''
+ runHook preCheck
+ pushd dist
+ ${python.interpreter} -c 'import numpy; numpy.test("fast", verbose=10)'
+ popd
+ runHook postCheck
+ '';
+
+ passthru = {
+ # just for backwards compatibility
+ blas = blas.provider;
+ blasImplementation = blas.implementation;
+ inherit cfg;
+ };
+
+ # Disable test
+ # - test_large_file_support: takes a long time and can cause the machine to run out of disk space
+ NOSE_EXCLUDE="test_large_file_support";
+
+ meta = {
+ description = "Scientific tools for Python";
+ homepage = "https://numpy.org/";
+ maintainers = with lib.maintainers; [ fridh ];
+ };
+}
diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index 0c9bac973203..990671f1633a 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -35,13 +35,13 @@ let
};
in buildPythonPackage rec {
pname = "numpy";
- version = "1.18.5";
+ version = "1.19.0";
format = "pyproject.toml";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "34e96e9dae65c4839bd80012023aadd6ee2ccb73ce7fdf3074c62f301e63120b";
+ sha256 = "76766cc80d6128750075378d3bb7812cf146415bd29b588616f72c943c00d598";
};
nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ];
diff --git a/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch b/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch
index 771da8cf3ffa..6c75f34ce07a 100644
--- a/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch
+++ b/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch
@@ -1,8 +1,7 @@
diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py
-index 6ed5eec..82a88b5 100644
--- a/numpy/distutils/unixccompiler.py
+++ b/numpy/distutils/unixccompiler.py
-@@ -44,8 +44,6 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts
+@@ -37,8 +37,6 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts
if opt not in llink_s:
self.linker_so = llink_s.split() + opt.split()
@@ -11,7 +10,7 @@ index 6ed5eec..82a88b5 100644
# gcc style automatic dependencies, outputs a makefile (-MF) that lists
# all headers needed by a c file as a side effect of compilation (-MMD)
if getattr(self, '_auto_depends', False):
-@@ -54,8 +52,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts
+@@ -47,8 +45,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts
deps = []
try:
@@ -26,6 +25,6 @@ index 6ed5eec..82a88b5 100644
+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps +
+ extra_postargs, display = display)
+
- except DistutilsExecError:
- msg = str(get_exception())
+ except DistutilsExecError as e:
+ msg = str(e)
raise CompileError(msg)
diff --git a/pkgs/development/python-modules/numpy/numpy-distutils-C++_1.16.patch b/pkgs/development/python-modules/numpy/numpy-distutils-C++_1.16.patch
new file mode 100644
index 000000000000..b2626ea26e5b
--- /dev/null
+++ b/pkgs/development/python-modules/numpy/numpy-distutils-C++_1.16.patch
@@ -0,0 +1,30 @@
+diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py
+--- a/numpy/distutils/unixccompiler.py
++++ b/numpy/distutils/unixccompiler.py
+@@ -44,8 +44,6 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts
+ if opt not in llink_s:
+ self.linker_so = llink_s.split() + opt.split()
+
+- display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src)
+-
+ # gcc style automatic dependencies, outputs a makefile (-MF) that lists
+ # all headers needed by a c file as a side effect of compilation (-MMD)
+ if getattr(self, '_auto_depends', False):
+@@ -54,8 +52,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts
+ deps = []
+
+ try:
+- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps +
+- extra_postargs, display = display)
++ if self.detect_language(src) == 'c++':
++ display = '%s: %s' % (os.path.basename(self.compiler_so_cxx[0]), src)
++ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + deps +
++ extra_postargs, display = display)
++ else:
++ display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src)
++ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps +
++ extra_postargs, display = display)
++
+ except DistutilsExecError:
+ msg = str(get_exception())
+ raise CompileError(msg)
diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index 5d7bb4a6d696..a2d16f603f5d 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -30,11 +30,11 @@ let
in buildPythonPackage rec {
pname = "pandas";
- version = "1.0.4";
+ version = "1.0.5";
src = fetchPypi {
inherit pname version;
- sha256 = "b35d625282baa7b51e82e52622c300a1ca9f786711b2af7cbe64f1e6831f4126";
+ sha256 = "69c5d920a0b2a9838e677f78f4dde506b95ea8e4d30da25859db6469ded84fa8";
};
checkInputs = [ pytest glibcLocales moto hypothesis ];
@@ -95,6 +95,9 @@ in buildPythonPackage rec {
"order_without_freq"
# tries to import from pandas.tests post install
"util_in_top_level"
+ # Fails with 1.0.5
+ "test_constructor_list_frames"
+ "test_constructor_with_embedded_frames"
] ++ optionals isDarwin [
"test_locale"
"test_clipboard"
diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix
index 27c2134f4f3e..0fc7bf7ee291 100644
--- a/pkgs/development/python-modules/panel/default.nix
+++ b/pkgs/development/python-modules/panel/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "panel";
- version = "0.9.5";
+ version = "0.9.7";
src = fetchPypi {
inherit pname version;
- sha256 = "53340615f30f67f3182793695ebe52bf25e7bbb0751aba6f29763244350d0f42";
+ sha256 = "2e86d82bdd5e7664bf49558eedad62b664d5403ec9e422e5ddfcf69e3bd77318";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix
index e4ace129d996..fa566c8951ab 100644
--- a/pkgs/development/python-modules/pip/default.nix
+++ b/pkgs/development/python-modules/pip/default.nix
@@ -25,6 +25,10 @@ buildPythonPackage rec {
name = "${pname}-${version}-source";
};
+ # Remove when solved https://github.com/NixOS/nixpkgs/issues/81441
+ # Also update pkgs/development/interpreters/python/hooks/pip-install-hook.sh accordingly
+ patches = [ ./reproducible.patch ];
+
nativeBuildInputs = [ bootstrapped-pip ];
# pip detects that we already have bootstrapped_pip "installed", so we need
diff --git a/pkgs/development/python-modules/pip/reproducible.patch b/pkgs/development/python-modules/pip/reproducible.patch
new file mode 100644
index 000000000000..528ac2b49b03
--- /dev/null
+++ b/pkgs/development/python-modules/pip/reproducible.patch
@@ -0,0 +1,13 @@
+diff --git a/src/pip/_internal/operations/install/wheel.py b/src/pip/_internal/operations/install/wheel.py
+index e7315ee4..4e36b03d 100644
+--- a/src/pip/_internal/operations/install/wheel.py
++++ b/src/pip/_internal/operations/install/wheel.py
+@@ -615,6 +615,8 @@ def install_wheel(
+ direct_url=None, # type: Optional[DirectUrl]
+ ):
+ # type: (...) -> None
++ _temp_dir_for_testing = (
++ _temp_dir_for_testing or os.environ.get("NIX_PIP_INSTALL_TMPDIR"))
+ with TempDirectory(
+ path=_temp_dir_for_testing, kind="unpacked-wheel"
+ ) as unpacked_dir, ZipFile(wheel_path, allowZip64=True) as z:
diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix
index e1b6abb7527d..766952ee267d 100644
--- a/pkgs/development/python-modules/pyopencl/default.nix
+++ b/pkgs/development/python-modules/pyopencl/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "pyopencl";
- version = "2020.1";
+ version = "2020.2";
checkInputs = [ pytest ];
buildInputs = [ opencl-headers ocl-icd pybind11 ];
@@ -25,7 +25,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "7513f7054f4eeb5361de1f5113883145fc67dbabde73a2148f221ae05af4d22c";
+ sha256 = "afd9f22547bcd879b9e54252fc885b45034ebfd1890e630827f1afb408a03d23";
};
# py.test is not needed during runtime, so remove it from `install_requires`
diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix
index 4cadba28a8a6..ca6a19220d5f 100644
--- a/pkgs/development/python-modules/qtconsole/default.nix
+++ b/pkgs/development/python-modules/qtconsole/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "qtconsole";
- version = "4.7.4";
+ version = "4.7.5";
src = fetchPypi {
inherit pname version;
- sha256 = "1zgm57011kpbh6388p8cqwkcgqwlmb7rc9cy3zn9rrnna48byj7x";
+ sha256 = "f5cb275d30fc8085e2d1d18bc363e5ba0ce6e559bf37d7d6727b773134298754";
};
checkInputs = [ nose ] ++ lib.optionals isPy27 [mock];
diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index ace6c248ab2c..1a94aa9659b2 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -9,11 +9,11 @@ let
});
in buildPythonPackage rec {
pname = "scipy";
- version = "1.4.1";
+ version = "1.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "dee1bbf3a6c8f73b6b218cb28eed8dd13347ea2f87d572ce19b289d6fd3fbc59";
+ sha256 = "4ff72877d19b295ee7f7727615ea8238f2d59159df0bdd98f91754be4a2767f0";
};
checkInputs = [ nose pytest ];
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 69b89a376fc2..b618ec6f634b 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -13,7 +13,7 @@
let
pname = "setuptools";
- version = "46.1.3";
+ version = "47.3.1";
# Create an sdist of setuptools
sdist = stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ let
owner = "pypa";
repo = pname;
rev = "v${version}";
- sha256 = "1f6bp3qy5zvykimadk8k11k3629hmnwlw2cfw4vwcsvdarhig673";
+ sha256 = "0sy3p4ibgqx67hzn1f254jh8070a8kl9g2la62p3c74k2x7p0r7f";
name = "${pname}-${version}-source";
};
diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix
index 343aaddfbb5d..cee258dbd3a6 100644
--- a/pkgs/development/python-modules/supervisor/default.nix
+++ b/pkgs/development/python-modules/supervisor/default.nix
@@ -14,6 +14,13 @@ buildPythonPackage rec {
sha256 = "64082ebedf6d36ff409ab2878f1aad5c9035f916c5f15a9a1ec7dffc6dfbbed8";
};
+ patches = [
+ # SOMAXCONN limit of glibc-2.31 has been increased from 128 to 4096:
+ # * https://sourceware.org/git/?p=glibc.git;a=commit;h=96958e2700f5b4f4d1183a0606b2b9848a53ea44
+ # * https://github.com/Supervisor/supervisor/issues/1346
+ ./glibc-2.31.patch
+ ];
+
# wants to write to /tmp/foo which is likely already owned by another
# nixbld user on hydra
doCheck = !stdenv.isDarwin;
diff --git a/pkgs/development/python-modules/supervisor/glibc-2.31.patch b/pkgs/development/python-modules/supervisor/glibc-2.31.patch
new file mode 100644
index 000000000000..b2d9564eea1f
--- /dev/null
+++ b/pkgs/development/python-modules/supervisor/glibc-2.31.patch
@@ -0,0 +1,13 @@
+diff --git a/supervisor/tests/base.py b/supervisor/tests/base.py
+index 643e609..8aa45e7 100644
+--- a/supervisor/tests/base.py
++++ b/supervisor/tests/base.py
+@@ -358,7 +358,7 @@ class DummySocketConfig:
+ return not self.__eq__(other)
+
+ def get_backlog(self):
+- return 128
++ return 4096
+
+ def create_and_bind(self):
+ return DummySocket(self.fd)
diff --git a/pkgs/development/python-modules/tornado/4.nix b/pkgs/development/python-modules/tornado/4.nix
new file mode 100644
index 000000000000..6d889a09d25e
--- /dev/null
+++ b/pkgs/development/python-modules/tornado/4.nix
@@ -0,0 +1,37 @@
+{ lib
+, python
+, buildPythonPackage
+, fetchPypi
+, backports_abc
+, backports_ssl_match_hostname
+, certifi
+, singledispatch
+, futures
+, isPy27
+}:
+
+buildPythonPackage rec {
+ pname = "tornado";
+ version = "4.5.3";
+
+ propagatedBuildInputs = lib.optionals isPy27 [ backports_abc certifi singledispatch backports_ssl_match_hostname futures ];
+
+ # We specify the name of the test files to prevent
+ # https://github.com/NixOS/nixpkgs/issues/14634
+ checkPhase = ''
+ ${python.interpreter} -m unittest discover *_test.py
+ '';
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d";
+ };
+
+ __darwinAllowLocalNetworking = true;
+
+ meta = {
+ description = "A web framework and asynchronous networking library";
+ homepage = "https://www.tornadoweb.org/";
+ license = lib.licenses.asl20;
+ };
+}
diff --git a/pkgs/development/python-modules/tornado/5.nix b/pkgs/development/python-modules/tornado/5.nix
new file mode 100644
index 000000000000..da270331978d
--- /dev/null
+++ b/pkgs/development/python-modules/tornado/5.nix
@@ -0,0 +1,37 @@
+{ lib
+, python
+, buildPythonPackage
+, fetchPypi
+, backports_abc
+, backports_ssl_match_hostname
+, certifi
+, singledispatch
+, futures
+, isPy27
+}:
+
+buildPythonPackage rec {
+ pname = "tornado";
+ version = "5.1.1";
+
+ propagatedBuildInputs = lib.optionals isPy27 [ backports_abc certifi singledispatch backports_ssl_match_hostname futures ];
+
+ # We specify the name of the test files to prevent
+ # https://github.com/NixOS/nixpkgs/issues/14634
+ checkPhase = ''
+ ${python.interpreter} -m unittest discover *_test.py
+ '';
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409";
+ };
+
+ __darwinAllowLocalNetworking = true;
+
+ meta = {
+ description = "A web framework and asynchronous networking library";
+ homepage = "https://www.tornadoweb.org/";
+ license = lib.licenses.asl20;
+ };
+}
diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix
index 102cf0fed574..8d9cadeb3e54 100644
--- a/pkgs/development/python-modules/tornado/default.nix
+++ b/pkgs/development/python-modules/tornado/default.nix
@@ -2,35 +2,11 @@
, python
, buildPythonPackage
, fetchPypi
-, backports_abc
-, backports_ssl_match_hostname
-, certifi
-, singledispatch
-, pythonOlder
-, futures
-, version ? "5.1"
}:
-let
- versionMap = {
- "4.5.3" = {
- sha256 = "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d";
- };
- "5.1" = {
- sha256 = "4f66a2172cb947387193ca4c2c3e19131f1c70fa8be470ddbbd9317fd0801582";
- };
- };
-in
-
-with versionMap.${version};
-
buildPythonPackage rec {
pname = "tornado";
- inherit version;
-
- propagatedBuildInputs = [ backports_abc certifi singledispatch ]
- ++ lib.optional (pythonOlder "3.5") backports_ssl_match_hostname
- ++ lib.optional (pythonOlder "3.2") futures;
+ version = "6.0.4";
# We specify the name of the test files to prevent
# https://github.com/NixOS/nixpkgs/issues/14634
@@ -39,14 +15,15 @@ buildPythonPackage rec {
'';
src = fetchPypi {
- inherit pname sha256 version;
+ inherit pname version;
+ sha256 = "0fe2d45ba43b00a41cd73f8be321a44936dc1aba233dee979f17a042b83eb6dc";
};
__darwinAllowLocalNetworking = true;
meta = {
description = "A web framework and asynchronous networking library";
- homepage = "http://www.tornadoweb.org/";
+ homepage = "https://www.tornadoweb.org/";
license = lib.licenses.asl20;
};
}
diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix
index 138c24ebbe3c..7d326ea152b8 100644
--- a/pkgs/development/python-modules/tqdm/default.nix
+++ b/pkgs/development/python-modules/tqdm/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "tqdm";
- version = "4.46.1";
+ version = "4.47.0";
src = fetchPypi {
inherit pname version;
- sha256 = "cd140979c2bebd2311dfb14781d8f19bd5a9debb92dcab9f6ef899c987fcf71f";
+ sha256 = "63ef7a6d3eb39f80d6b36e4867566b3d8e5f1fe3d6cb50c5e9ede2b3198ba7b7";
};
checkInputs = [ nose coverage glibcLocales flake8 ];
diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix
index b3dddbbba68e..47f9fe1a034e 100644
--- a/pkgs/development/python-modules/twine/default.nix
+++ b/pkgs/development/python-modules/twine/default.nix
@@ -8,16 +8,18 @@
, requests_toolbelt
, setuptools_scm
, tqdm
+, colorama
+, rfc3986
}:
buildPythonPackage rec {
pname = "twine";
- version = "3.1.1";
+ version = "3.2.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "d561a5e511f70275e5a485a6275ff61851c16ffcb3a95a602189161112d9f160";
+ sha256 = "34352fd52ec3b9d29837e6072d5a2a7c6fe4290e97bba46bb8d478b5c598f7ab";
};
nativeBuildInputs = [ setuptools_scm ];
@@ -29,6 +31,8 @@ buildPythonPackage rec {
requests
requests_toolbelt
tqdm
+ colorama
+ rfc3986
] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
# Requires network
diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix
new file mode 100644
index 000000000000..f01f38ecd233
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/default.nix
@@ -0,0 +1,59 @@
+{ stdenv, fetchurl, guileSupport ? false, pkgconfig ? null , guile ? null }:
+
+assert guileSupport -> ( pkgconfig != null && guile != null );
+
+let
+ version = "4.3";
+in
+stdenv.mkDerivation {
+ pname = "gnumake";
+ inherit version;
+
+ src = fetchurl {
+ url = "mirror://gnu/make/make-${version}.tar.gz";
+ sha256 = "06cfqzpqsvdnsxbysl5p2fgdgxgl9y4p7scpnrfa8z2zgkjdspz0";
+ };
+
+ patches = [
+ # Purity: don't look for library dependencies (of the form `-lfoo') in /lib
+ # and /usr/lib. It's a stupid feature anyway. Likewise, when searching for
+ # included Makefiles, don't look in /usr/include and friends.
+ ./impure-dirs.patch
+ ];
+
+ nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ];
+ buildInputs = stdenv.lib.optionals guileSupport [ guile ];
+
+ configureFlags = stdenv.lib.optional guileSupport "--with-guile"
+
+ # Make uses this test to decide whether it should keep track of
+ # subseconds. Apple made this possible with APFS and macOS 10.13.
+ # However, we still support macOS 10.11 and 10.12. Binaries built
+ # in Nixpkgs will be unable to use futimens to set mtime less than
+ # a second. So, tell Make to ignore nanoseconds in mtime here by
+ # overriding the autoconf test for the struct.
+ # See https://github.com/NixOS/nixpkgs/issues/51221 for discussion.
+ ++ stdenv.lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no";
+
+ outputs = [ "out" "man" "info" ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://www.gnu.org/software/make/";
+ description = "A tool to control the generation of non-source files from sources";
+ license = licenses.gpl3Plus;
+
+ longDescription = ''
+ Make is a tool which controls the generation of executables and
+ other non-source files of a program from the program's source files.
+
+ Make gets its knowledge of how to build your program from a file
+ called the makefile, which lists each of the non-source files and
+ how to compute it from other files. When you write a program, you
+ should write a makefile for it, so that it is possible to use Make
+ to build and install the program.
+ '';
+
+ platforms = platforms.all;
+ maintainers = [ maintainers.vrthra ];
+ };
+}
diff --git a/pkgs/development/tools/build-managers/gnumake/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/impure-dirs.patch
new file mode 100644
index 000000000000..6c7d9d2463c3
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/impure-dirs.patch
@@ -0,0 +1,25 @@
+diff -Naur a/src/read.c b/src/read.c
+--- a/src/read.c
++++ b/src/read.c
+@@ -109,9 +109,6 @@
+ #endif
+ INCLUDEDIR,
+ #ifndef _AMIGA
+- "/usr/gnu/include",
+- "/usr/local/include",
+- "/usr/include",
+ #endif
+ 0
+ };
+diff -Naur a/src/remake.c b/src/remake.c
+--- a/src/remake.c
++++ b/src/remake.c
+@@ -1601,8 +1601,6 @@
+ static const char *dirs[] =
+ {
+ #ifndef _AMIGA
+- "/lib",
+- "/usr/lib",
+ #endif
+ #if defined(WINDOWS32) && !defined(LIBDIR)
+ /*
diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index 9440463e83f3..4ad7f8300665 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -3,11 +3,11 @@
# TODO: Look at the hardcoded paths to kernel, modules etc.
stdenv.mkDerivation rec {
pname = "elfutils";
- version = "0.176";
+ version = "0.180";
src = fetchurl {
url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2";
- sha256 = "08qhrl4g6qqr4ga46jhh78y56a47p3msa5b2x1qhzbxhf71lfmzb";
+ sha256 = "17an1f67bfzxin482nbcxdl5qvywm27i9kypjyx8ilarbkivc9xq";
};
patches = [ ./debug-info-from-env.patch ];
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
configureFlags =
[ "--program-prefix=eu-" # prevent collisions with binutils
"--enable-deterministic-archives"
+ "--disable-debuginfod"
];
enableParallelBuilding = true;
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index 23700a2ddc2d..cbae92dd6d13 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ perl ];
- buildInputs = stdenv.lib.optional libunwind.supportsHost libunwind; # support -k
+ buildInputs = [ perl.out ] ++ stdenv.lib.optional libunwind.supportsHost libunwind; # support -k
- postPatch = "patchShebangs strace-graph";
+ postPatch = "patchShebangs --host strace-graph";
configureFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "--enable-mpers=check";
diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix
index bdd916ccdda7..fd772ff40b29 100644
--- a/pkgs/development/tools/rust/rustup/default.nix
+++ b/pkgs/development/tools/rust/rustup/default.nix
@@ -39,7 +39,9 @@ rustPlatform.buildRustPackage rec {
)
];
- doCheck = !stdenv.isAarch64 && !stdenv.isDarwin;
+ # Disable tests until they can be run with --features no-self-update
+ doCheck = false;
+ #doCheck = !stdenv.isAarch64 && !stdenv.isDarwin;
postInstall = ''
pushd $out/bin
diff --git a/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/pkgs/misc/cups/drivers/cups-bjnp/default.nix
index e9fac1c73e2f..9dbfdd8b8030 100644
--- a/pkgs/misc/cups/drivers/cups-bjnp/default.nix
+++ b/pkgs/misc/cups/drivers/cups-bjnp/default.nix
@@ -11,7 +11,11 @@ stdenv.mkDerivation rec {
preConfigure = ''configureFlags="--with-cupsbackenddir=$out/lib/cups/backend"'';
buildInputs = [cups];
- NIX_CFLAGS_COMPILE = [ "-include stdio.h" "-Wno-error=stringop-truncation" ];
+ NIX_CFLAGS_COMPILE = [
+ "-include stdio.h"
+ "-Wno-error=stringop-truncation"
+ "-Wno-error=deprecated-declarations"
+ ];
meta = {
description = "CUPS back-end for Canon printers";
diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix
index a9950a14b4d9..bfc2c338769c 100644
--- a/pkgs/misc/emulators/retroarch/default.nix
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -43,9 +43,6 @@ stdenv.mkDerivation rec {
libXdmcp libXext libXxf86vm mesa udev
wayland libxkbcommon ];
- # we use prefix-less pkg-config
- PKG_CONF_PATH = "pkg-config";
-
enableParallelBuilding = true;
configureFlags = stdenv.lib.optionals stdenv.isLinux [ "--enable-kms" "--enable-egl" ];
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index a10595591875..eca15faf1ad6 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -99,9 +99,6 @@ stdenv.mkDerivation rec {
cp -r Resource "$out/share/ghostscript/${version}"
- mkdir -p "$doc/share/doc/ghostscript"
- mv "$doc/share/doc/${version}" "$doc/share/doc/ghostscript/"
-
ln -s "${fonts}" "$out/share/ghostscript/fonts"
'' + stdenv.lib.optionalString stdenv.isDarwin ''
for file in $out/lib/*.dylib* ; do
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index b2ff6c79f5aa..d38939349003 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -98,8 +98,6 @@ self: super: {
# These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper).
# The linked ruby code shows generates the required '.clang_complete' for cmake based projects
# https://gist.github.com/Mic92/135e83803ed29162817fce4098dec144
- # as an alternative you can execute the following command:
- # $ eval echo $(nix-instantiate --eval --expr 'with (import ) {}; clang.default_cxx_stdlib_compile')
preFixup = ''
substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \
--replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc.lib}/lib/libclang.so'"
diff --git a/pkgs/os-specific/linux/busybox/0001-Fix-build-with-glibc-2.31.patch b/pkgs/os-specific/linux/busybox/0001-Fix-build-with-glibc-2.31.patch
new file mode 100644
index 000000000000..029333b57e4d
--- /dev/null
+++ b/pkgs/os-specific/linux/busybox/0001-Fix-build-with-glibc-2.31.patch
@@ -0,0 +1,71 @@
+From c29b637b55c93214993f40b1a223233d40b8a7d6 Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch
+Date: Wed, 19 Feb 2020 22:32:28 +0100
+Subject: [PATCH] Fix build with glibc 2.31
+
+This is derived from the corresponding upstream patch[1], however this
+one doesn't apply cleanly on busybox-1.31.1, so I rebased the patch
+locally and added it directly to nixpkgs.
+
+[1] https://git.busybox.net/busybox/patch/?id=d3539be8f27b8cbfdfee460fe08299158f08bcd9
+---
+ coreutils/date.c | 2 +-
+ libbb/missing_syscalls.c | 8 --------
+ util-linux/rdate.c | 8 ++++++--
+ 3 files changed, 7 insertions(+), 11 deletions(-)
+
+diff --git a/coreutils/date.c b/coreutils/date.c
+index 3414d38..931b7f9 100644
+--- a/coreutils/date.c
++++ b/coreutils/date.c
+@@ -303,7 +303,7 @@ int date_main(int argc UNUSED_PARAM, char **argv)
+ ts.tv_sec = validate_tm_time(date_str, &tm_time);
+
+ /* if setting time, set it */
+- if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) {
++ if ((opt & OPT_SET) && clock_settime(CLOCK_REALTIME, &ts) < 0) {
+ bb_perror_msg("can't set date");
+ }
+ }
+diff --git a/libbb/missing_syscalls.c b/libbb/missing_syscalls.c
+index 87cf59b..dc40d91 100644
+--- a/libbb/missing_syscalls.c
++++ b/libbb/missing_syscalls.c
+@@ -15,14 +15,6 @@ pid_t getsid(pid_t pid)
+ return syscall(__NR_getsid, pid);
+ }
+
+-int stime(const time_t *t)
+-{
+- struct timeval tv;
+- tv.tv_sec = *t;
+- tv.tv_usec = 0;
+- return settimeofday(&tv, NULL);
+-}
+-
+ int sethostname(const char *name, size_t len)
+ {
+ return syscall(__NR_sethostname, name, len);
+diff --git a/util-linux/rdate.c b/util-linux/rdate.c
+index 70f829e..878375d 100644
+--- a/util-linux/rdate.c
++++ b/util-linux/rdate.c
+@@ -95,9 +95,13 @@ int rdate_main(int argc UNUSED_PARAM, char **argv)
+ if (!(flags & 2)) { /* no -p (-s may be present) */
+ if (time(NULL) == remote_time)
+ bb_error_msg("current time matches remote time");
+- else
+- if (stime(&remote_time) < 0)
++ else {
++ struct timespec ts;
++ ts.tv_sec = remote_time;
++ ts.tv_nsec = 0;
++ if (clock_settime(CLOCK_REALTIME, &ts) < 0)
+ bb_perror_msg_and_die("can't set time of day");
++ }
+ }
+
+ if (flags != 1) /* not lone -s */
+--
+2.25.0
+
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 430066831b87..cbdedaa62a78 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -49,6 +49,7 @@ stdenv.mkDerivation rec {
patches = [
./busybox-in-store.patch
+ ./0001-Fix-build-with-glibc-2.31.patch
] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch;
postPatch = "patchShebangs .";
diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix
index 5811e9358b01..137e88cd6e87 100644
--- a/pkgs/os-specific/linux/crda/default.nix
+++ b/pkgs/os-specific/linux/crda/default.nix
@@ -31,7 +31,9 @@ stdenv.mkDerivation rec {
postPatch = ''
patchShebangs utils/
- substituteInPlace Makefile --replace ldconfig true
+ substituteInPlace Makefile \
+ --replace ldconfig true \
+ --replace pkg-config $PKG_CONFIG
sed -i crda.c \
-e "/\/usr\/.*\/regulatory.bin/d" \
-e "s|/lib/crda|${wireless-regdb}/lib/crda|g"
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index aa23a162a929..fafa8fe6e836 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "util-linux";
- version = "2.35.1";
+ version = "2.35.2";
src = fetchurl {
url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1yfpy6bkab4jw61mpx48gfy24yrqp4a7arvpis8csrkk53fkxpnr";
+ sha256 = "12mm5qvkq1vpllfv99gq93lkxlvysp1yxgh1392dkg7nh8g47dr1";
};
patches = [
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index e15efd4b47d1..513249cb7ad5 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -61,6 +61,11 @@ stdenv.mkDerivation rec {
++ lib.optional zeroconfSupport avahi
);
+ prePatch = ''
+ substituteInPlace bootstrap.sh \
+ --replace pkg-config $PKG_CONFIG
+ '';
+
autoreconfPhase = ''
# Performs an autoreconf
patchShebangs bootstrap.sh
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index b69de041fd23..9de6ef63bfea 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -90,11 +90,11 @@ in rec {
inherit shell;
inherit (last) stdenvNoCC;
- extraPackages = lib.optional (libcxx != null) libcxx;
+ extraPackages = [];
nativeTools = false;
nativeLibc = false;
- inherit buildPackages coreutils gnugrep bintools;
+ inherit buildPackages coreutils gnugrep bintools libcxx;
libc = last.pkgs.darwin.Libsystem;
isClang = true;
cc = { name = "${name}-clang"; outPath = bootstrapTools; };
@@ -168,8 +168,9 @@ in rec {
ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib/libc++.dylib
ln -s ${bootstrapTools}/include/c++ $out/include/c++
'';
- linkCxxAbi = false;
- setupHook = ../../development/compilers/llvm/7/libc++/setup-hook.sh;
+ passthru = {
+ isLLVM = true;
+ };
};
libcxxabi = stdenv.mkDerivation {
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index 5a6dafae2980..f79dc2396658 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -20,10 +20,6 @@ stdenv.mkDerivation rec {
# for python cross-compiling
_PYTHON_HOST_PLATFORM = stdenv.hostPlatform.config;
- # The i686 case is a quick hack; I don't know what's wrong.
- postConfigure = stdenv.lib.optionalString (!stdenv.isi686) ''
- export LDSHARED="$LD -shared"
- '';
# gcc bug with -O1 on ARM with gcc 4.8
# This should be fine on all platforms so apply universally
diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index 730234998ed4..8e284b25c08d 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -12,6 +12,12 @@ stdenv.mkDerivation rec {
sha256 = "1lgs2w2sgamzf27kz5h7pajz7v62554q21fbs11n4mfrfrm2hpgh";
};
+ patches = [
+ # https://github.com/file/file/commit/85b7ab83257b3191a1a7ca044589a092bcef2bb3
+ # Without the RCS id change to avoid conflicts. Remove on next bump.
+ ./webassembly-format-fix.patch
+ ];
+
nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file;
buildInputs = [ zlib ]
++ stdenv.lib.optional stdenv.hostPlatform.isWindows libgnurx;
diff --git a/pkgs/tools/misc/file/webassembly-format-fix.patch b/pkgs/tools/misc/file/webassembly-format-fix.patch
new file mode 100644
index 000000000000..5eca833e4d71
--- /dev/null
+++ b/pkgs/tools/misc/file/webassembly-format-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/src/funcs.c b/src/funcs.c
+index 299b8f022..ecbfa28c5 100644
+--- a/src/funcs.c
++++ b/src/funcs.c
+@@ -93,7 +93,7 @@ file_checkfmt(char *msg, size_t mlen, const char *fmt)
+ if (*++p == '%')
+ continue;
+ // Skip uninteresting.
+- while (strchr("0.'+- ", *p) != NULL)
++ while (strchr("#0.'+- ", *p) != NULL)
+ p++;
+ if (*p == '*') {
+ if (msg)
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 11a928a3ef13..68de06610721 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -29,14 +29,14 @@ assert gssSupport -> libkrb5 != null;
stdenv.mkDerivation rec {
pname = "curl";
- version = "7.70.0";
+ version = "7.71.0";
src = fetchurl {
urls = [
"https://curl.haxx.se/download/${pname}-${version}.tar.bz2"
"https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2"
];
- sha256 = "1l19b2xmzwjl2fqlbv46kwlz1823miaxczyx2a5lz8k7mmigw2x5";
+ sha256 = "0hfkbp51vj51s28sq2wnw5jn2f6r7ycdy78lli49ba414jn003v0";
};
outputs = [ "bin" "dev" "out" "man" "devdoc" ];
diff --git a/pkgs/tools/networking/dsniff/default.nix b/pkgs/tools/networking/dsniff/default.nix
index 4fe381cdd7a7..50de41b921c0 100644
--- a/pkgs/tools/networking/dsniff/default.nix
+++ b/pkgs/tools/networking/dsniff/default.nix
@@ -14,7 +14,7 @@ let
};
pcap = symlinkJoin {
inherit (libpcap) name;
- paths = [ libpcap ];
+ paths = [ (libpcap.overrideAttrs(old: { dontDisableStatic = true; })) ];
postBuild = ''
cp -rs $out/include/pcap $out/include/net
# prevent references to libpcap
diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix
index 839e14a20d8a..fd0cc5f582a2 100644
--- a/pkgs/tools/system/datefudge/default.nix
+++ b/pkgs/tools/system/datefudge/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchgit, fetchpatch }:
stdenv.mkDerivation {
pname = "datefudge";
@@ -10,15 +10,20 @@ stdenv.mkDerivation {
sha256 = "0r9g8v9xnv60hq3j20wqy34kyig3sc2pisjxl4irn7jjx85f1spv";
};
- patchPhase = ''
+ patches = [
+ (fetchpatch {
+ url = "https://src.fedoraproject.org/rpms/datefudge/raw/master/f/datefudge_1.23-tz.patch";
+ sha256 = "19c2fvhm06wnp3059b0rnd7dqdchkan8iycjh8jk8y25j870zkvn";
+ })
+ ];
+
+ postPatch = ''
substituteInPlace Makefile \
--replace "/usr" "/" \
--replace "-o root -g root" ""
substituteInPlace datefudge.sh \
--replace "@LIBDIR@" "$out/lib/"
- '';
-
- preInstallPhase = "mkdir -P $out/lib/datefudge";
+ '';
installFlags = [ "DESTDIR=$(out)" ];
diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix
index 3323ac248974..dd898de0fc26 100644
--- a/pkgs/tools/system/efibootmgr/default.nix
+++ b/pkgs/tools/system/efibootmgr/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
# We have no LTO here since commit 22284b07.
postPatch = if stdenv.isi686 then "sed '/^CFLAGS/s/-flto//' -i Make.defaults" else null;
- makeFlags = [ "EFIDIR=nixos" ];
+ makeFlags = [ "EFIDIR=nixos" "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config" ];
installFlags = [ "prefix=$(out)" ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a68232fef04a..6cd260467f40 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -264,6 +264,7 @@ mapAliases ({
libudev = udev; # added 2018-04-25
libusb = libusb1; # added 2020-04-28
libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10
+ libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used."; # 2020-06-22
libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09
links = links2; # added 2016-01-31
linux_rpi0 = linux_rpi1;
@@ -703,23 +704,6 @@ mapAliases ({
# added 2020-02-09
dina-font-pcf = dina-font;
- /* Cleanup before 20.09 */
- llvm_4 = throw ''
- The LLVM versions 3.5, 3.9 and 4.0 have been removed in NixOS 20.03
- due to a lack of compatibility with glibc 2.30!
- '';
- llvm_39 = llvm_4;
- llvm_35 = llvm_4;
- lld_4 = llvm_4;
-
- llvmPackages_4 = llvm_4;
- llvmPackages_39 = llvm_4;
- llvmPackages_35 = llvm_4;
-
- clang_39 = llvm_4;
- clang_35 = llvm_4;
- clang_4 = llvm_4;
-
# added 2019-04-13
# *-polly pointed to llvmPackages_latest
llvm-polly = throw "clang is now built with polly-plugin by default";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26ccd7ad6f72..f81ae96b1e08 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8271,7 +8271,6 @@ in
computecpp = wrapCCWith rec {
cc = computecpp-unwrapped;
extraPackages = [
- libstdcxxHook
llvmPackages.compiler-rt
];
extraBuildCommands = ''
@@ -8413,14 +8412,6 @@ in
stripped = false;
}));
- libstdcxxHook = makeSetupHook
- { substitutions = {
- gcc = gcc-unwrapped;
- targetConfig = stdenv.targetPlatform.config;
- };
- }
- ../development/compilers/gcc/libstdc++-hook.sh;
-
crossLibcStdenv = overrideCC stdenv
(if stdenv.hostPlatform.useLLVM or false
then buildPackages.llvmPackages_8.lldClangNoLibc
@@ -9261,17 +9252,13 @@ in
inherit (darwin) apple_sdk;
};
- rust_1_42 = callPackage ../development/compilers/rust/1_42.nix {
+ rust_1_44 = callPackage ../development/compilers/rust/1_44.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
- rust_1_43 = callPackage ../development/compilers/rust/1_43.nix {
- inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
- };
- rust = rust_1_43;
+ rust = rust_1_44;
- rustPackages_1_42 = rust_1_42.packages.stable;
- rustPackages_1_43 = rust_1_43.packages.stable;
- rustPackages = rustPackages_1_43;
+ rustPackages_1_44 = rust_1_44.packages.stable;
+ rustPackages = rustPackages_1_44;
inherit (rustPackages) cargo clippy rustc rustPlatform;
inherit (rust) makeRustPlatform;
@@ -9488,6 +9475,10 @@ in
# provide the default choice, avoiding infinite recursion.
bintools ? if stdenv.targetPlatform.isDarwin then darwin.binutils else binutils
, libc ? bintools.libc
+ , # libc++ from the default LLVM version is bound at the top level, but we
+ # want the C++ library to be explicitly chosen by the caller, and null by
+ # default.
+ libcxx ? null
, extraPackages ? stdenv.lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW) threadsCross
, ...
} @ extraArgs:
@@ -9500,7 +9491,7 @@ in
isGNU = cc.isGNU or false;
isClang = cc.isClang or false;
- inherit cc bintools libc extraPackages zlib;
+ inherit cc bintools libc libcxx extraPackages zlib;
} // extraArgs; in self);
wrapCC = cc: wrapCCWith {
@@ -10619,8 +10610,8 @@ in
gnum4 = callPackage ../development/tools/misc/gnum4 { };
m4 = gnum4;
+ gnumake = callPackage ../development/tools/build-managers/gnumake { };
gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { };
- gnumake = gnumake42;
gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep {});
@@ -13712,7 +13703,7 @@ in
libva = callPackage ../development/libraries/libva { };
libva-minimal = libva.override { minimal = true; };
- libva-utils = callPackage ../development/libraries/libva-utils { };
+ libva-utils = callPackage ../development/libraries/libva/utils.nix { };
libva1 = callPackage ../development/libraries/libva/1.0.0.nix { };
libva1-minimal = libva1.override { minimal = true; };
@@ -22632,7 +22623,6 @@ in
thonny = callPackage ../applications/editors/thonny { };
thunderbird = callPackage ../applications/networking/mailreaders/thunderbird {
- inherit (rustPackages_1_42) rustc;
libpng = libpng_apng;
gtk3Support = true;
};
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 06a384bf4e6d..aa50da11edfe 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11,8 +11,8 @@
, perl, overrides, buildPerl, shortenPerlShebang
}:
-# cpan2nix assumes that perl-packages.nix will be used only with perl 5.28.2 or above
-assert stdenv.lib.versionAtLeast perl.version "5.28.2";
+# cpan2nix assumes that perl-packages.nix will be used only with perl 5.28.3 or above
+assert stdenv.lib.versionAtLeast perl.version "5.28.3";
let
inherit (stdenv.lib) maintainers;
self = _self // (overrides pkgs);
@@ -162,10 +162,10 @@ let
AlienBuild = buildPerlPackage {
pname = "Alien-Build";
- version = "1.98";
+ version = "2.26";
src = fetchurl {
- url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.98.tar.gz";
- sha256 = "12w9da57616gmcj69yv7cjv423cj957dm0f84cn2q093g64kjmif";
+ url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-2.26.tar.gz;
+ sha256 = "0wfgfj6rvscqs3ixpybgrdmmnpxvf194iwbnl89jkqc25ipmc15i";
};
propagatedBuildInputs = [ CaptureTiny FFICheckLib FileWhich Filechdir PathTiny PkgConfig ];
buildInputs = [ DevelHide Test2Suite ];
@@ -177,13 +177,13 @@ let
AlienGMP = buildPerlPackage {
pname = "Alien-GMP";
- version = "1.14";
+ version = "1.16";
src = fetchurl {
- url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-GMP-1.14.tar.gz";
- sha256 = "116vvh1b0d1ykkklqgfxfn89g3bw90a4cj3qrvsnkw1kk5cmn60a";
+ url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-GMP-1.16.tar.gz;
+ sha256 = "199x24pl6jnqshgnl066lhdf2fkqa6l1fml9g3qn5grmwn7d8309";
};
propagatedBuildInputs = [ AlienBuild ];
- buildInputs = [ pkgs.gmp DevelChecklib HTMLParser SortVersions Test2Suite URI ];
+ buildInputs = [ pkgs.gmp Alienm4 DevelChecklib IOSocketSSL MojoDOM58 NetSSLeay SortVersions Test2Suite URI ];
meta = {
description = "Alien package for the GNU Multiple Precision library.";
license = with stdenv.lib.licenses; [ lgpl3Plus ];
@@ -192,10 +192,10 @@ let
AlienLibxml2 = buildPerlPackage {
pname = "Alien-Libxml2";
- version = "0.12";
+ version = "0.16";
src = fetchurl {
- url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.12.tar.gz";
- sha256 = "0b3dj1510fxldhicijvw390gnh5j1k6rjzcc2jzs9f8nwfkqh6r2";
+ url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.16.tar.gz;
+ sha256 = "15rvllspikyr8412v8dpl2f2w5vxnjgnddnkz378sy2g0mc6mw2n";
};
propagatedBuildInputs = [ AlienBuild ];
buildInputs = [ pkgs.libxml2 MojoDOM58 SortVersions Test2Suite URI ];
@@ -273,6 +273,36 @@ let
buildInputs = [ LWPProtocolHttps ];
};
+ Alienm4 = buildPerlPackage {
+ pname = "Alien-m4";
+ version = "0.19";
+ src = fetchurl {
+ url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-m4-0.19.tar.gz;
+ sha256 = "1xnh8qa99dcvqcqzbpy0s5jrxvn7wa5ydz3lfd56n358l5jfzns9";
+ };
+ propagatedBuildInputs = [ AlienBuild ];
+ buildInputs = [ Alienpatch IOSocketSSL MojoDOM58 NetSSLeay SortVersions Test2Suite URI pkgs.gnum4 ];
+ meta = {
+ description = "Find or build GNU m4";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
+ Alienpatch = buildPerlPackage {
+ pname = "Alien-patch";
+ version = "0.15";
+ src = fetchurl {
+ url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-patch-0.15.tar.gz;
+ sha256 = "1l00mq56596wn09nn7fv552j2aa7sgh46bvx5xlncsnrn8jp5mpy";
+ };
+ propagatedBuildInputs = [ AlienBuild ];
+ buildInputs = [ IOSocketSSL MojoDOM58 NetSSLeay SortVersions Test2Suite URI ];
+ meta = {
+ description = "Find or build patch";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
AnyEvent = buildPerlPackage {
pname = "AnyEvent";
version = "7.17";
@@ -316,10 +346,10 @@ let
AnyEventHTTP = buildPerlPackage {
pname = "AnyEvent-HTTP";
- version = "2.24";
+ version = "2.25";
src = fetchurl {
- url = "mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-HTTP-2.24.tar.gz";
- sha256 = "0358a542baa45403d81c0a70e43e79c044ddfa1371161d043f002acef63121dd";
+ url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-HTTP-2.25.tar.gz;
+ sha256 = "5cfa53416124176f6f4cd32b00ea8ca79a2d5df51258683989cd04fe86e25013";
};
propagatedBuildInputs = [ AnyEvent commonsense ];
};
@@ -340,12 +370,12 @@ let
AnyEventRabbitMQ = buildPerlPackage {
pname = "AnyEvent-RabbitMQ";
- version = "1.19";
+ version = "1.22";
src = fetchurl {
- url = "mirror://cpan/authors/id/D/DL/DLAMBLEY/AnyEvent-RabbitMQ-1.19.tar.gz";
- sha256 = "a440ec2fa5a4018ad44739baaa9601cc460ad497282e89110ba8e3cf23312f0a";
+ url = mirror://cpan/authors/id/D/DL/DLAMBLEY/AnyEvent-RabbitMQ-1.22.tar.gz;
+ sha256 = "98c52a1fe700710f3e5bc55a38b25de625e9b2e8341d278dcf9e1b3f3d19acee";
};
- buildInputs = [ TestException ];
+ buildInputs = [ FileShareDirInstall TestException ];
propagatedBuildInputs = [ AnyEvent DevelGlobalDestruction FileShareDir ListMoreUtils NetAMQP Readonly namespaceclean ];
meta = {
description = "An asynchronous and multi channel Perl AMQP client";
@@ -378,10 +408,10 @@ let
ApacheAuthCookie = buildPerlPackage {
pname = "Apache-AuthCookie";
- version = "3.28";
+ version = "3.30";
src = fetchurl {
- url = "mirror://cpan/authors/id/M/MS/MSCHOUT/Apache-AuthCookie-3.28.tar.gz";
- sha256 = "bcd795a7f654a94ae0a6bd734ba4d8ba1085371fca486229dba49f1c2d62142b";
+ url = mirror://cpan/authors/id/M/MS/MSCHOUT/Apache-AuthCookie-3.30.tar.gz;
+ sha256 = "1f71b94d3d55a950a4b32dae4e90f6e76c8157508a7e2aee50621b179aadb1fb";
};
buildInputs = [ ApacheTest ];
propagatedBuildInputs = [ ClassLoad HTTPBody HashMultiValue WWWFormUrlEncoded ];
@@ -456,10 +486,10 @@ let
AppClusterSSH = buildPerlModule {
pname = "App-ClusterSSH";
- version = "4.14";
+ version = "4.15";
src = fetchurl {
- url = "mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-4.14.tar.gz";
- sha256 = "020p28xl9507blvr8lr7hdxk1cl8jjkz5rkrkh7g538g52sa2cmi";
+ url = mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-4.15.tar.gz;
+ sha256 = "1apk4yi9wfxrvspsfxr74jl1zr5z56ghknnmx8k5648zga1mn9z1";
};
propagatedBuildInputs = [ ExceptionClass Tk X11ProtocolOther XMLSimple ];
buildInputs = [ DataDump FileWhich Readonly TestDifferences TestTrap ];
@@ -585,13 +615,13 @@ let
};
AppSqitch = buildPerlModule {
- version = "1.0.0";
+ version = "1.1.0";
pname = "App-Sqitch";
src = fetchurl {
- url = "mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.0.0.tar.gz";
- sha256 = "f46466c1e9ad8bbabf6844fed4f6e534ea475731de61b775ad7c331db1ca9c5c";
+ url = mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.1.0.tar.gz;
+ sha256 = "ee146cd75d6300837e6ca559bb0bde247d42123c96b2c5d4b2800f38d3e3d1ab";
};
- buildInputs = [ CaptureTiny TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestNoWarnings TestWarn ];
+ buildInputs = [ CaptureTiny TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestMockObject TestNoWarnings TestWarn ];
propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl_perl ];
doCheck = false; # Can't find home directory.
meta = {
@@ -720,10 +750,10 @@ let
ArchiveTar = buildPerlPackage {
pname = "Archive-Tar";
- version = "2.32";
+ version = "2.36";
src = fetchurl {
- url = "mirror://cpan/authors/id/B/BI/BINGOS/Archive-Tar-2.32.tar.gz";
- sha256 = "92783780731ab0c9247adf43e70f4801e8317e3915ea87e38b85c8f734e8fca2";
+ url = mirror://cpan/authors/id/B/BI/BINGOS/Archive-Tar-2.36.tar.gz;
+ sha256 = "16ba52e0babe54f8c4deb11b103a46186763173607d59649130d0fffdd36968e";
};
meta = {
description = "Manipulates TAR archives";
@@ -746,10 +776,10 @@ let
ArchiveZip = buildPerlPackage {
pname = "Archive-Zip";
- version = "1.67";
+ version = "1.68";
src = fetchurl {
- url = "mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.67.tar.gz";
- sha256 = "0x17b7s5c3bqy9gx7psdqxbzkilylnwwd3c3i68vynbn9hs788my";
+ url = mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.68.tar.gz;
+ sha256 = "0l663s3a68p8r2qjy4pn1g05lx0i8js8wpz7qqln3bsvg1fihklq";
};
buildInputs = [ TestMockModule ];
meta = {
@@ -949,7 +979,7 @@ let
sha256 = "45108c239a7373d00941dcf0d171acd03e7c16a63ce6f7d9568ff052b17cf5a8";
};
buildInputs = [ TestFailWarnings TestFatal ];
- propagatedBuildInputs = [ AuthenSASLSASLprep CryptURandom Moo PBKDF2Tiny TryTiny TypeTiny namespaceclean ];
+ propagatedBuildInputs = [ AuthenSASLSASLprep CryptURandom Moo PBKDF2Tiny TypeTiny namespaceclean ];
meta = {
homepage = "https://github.com/dagolden/Authen-SCRAM";
description = "Salted Challenge Response Authentication Mechanism (RFC 5802)";
@@ -1062,10 +1092,10 @@ let
BCOW = buildPerlPackage {
pname = "B-COW";
- version = "0.002";
+ version = "0.004";
src = fetchurl {
- url = "mirror://cpan/authors/id/A/AT/ATOOMIC/B-COW-0.002.tar.gz";
- sha256 = "0z2px2x15vr1y5rxsv7d80kh186ld7a45nbm4lsbs07g8y0p7rzw";
+ url = mirror://cpan/authors/id/A/AT/ATOOMIC/B-COW-0.004.tar.gz;
+ sha256 = "0lazb25jzhdha4dmrkdxn1pw1crc6iqzspvcq315p944xmsvgbzw";
};
meta = {
description = "B::COW additional B helpers to check COW status";
@@ -1293,10 +1323,10 @@ let
BusinessISSN = buildPerlPackage {
pname = "Business-ISSN";
- version = "1.003";
+ version = "1.004";
src = fetchurl {
- url = "mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-1.003.tar.gz";
- sha256 = "1272456c19937a24bc5f9a0db9dc447043591137719ee4dc955a63be544b99d1";
+ url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-1.004.tar.gz;
+ sha256 = "97ecab15d24d11e2852bf0b28f84c8798bd38402a0a69e17be0e6689b272715e";
};
meta = {
description = "Work with International Standard Serial Numbers";
@@ -1332,10 +1362,10 @@ let
CacheFastMmap = buildPerlPackage {
pname = "Cache-FastMmap";
- version = "1.48";
+ version = "1.49";
src = fetchurl {
- url = "mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.48.tar.gz";
- sha256 = "118y5lxwa092zrii7mcwnqypff7424w1dpgfkg8zlnz7h2mmnd9c";
+ url = mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.49.tar.gz;
+ sha256 = "1azz66d4syk6b6gc95drkglajvf8igiy3449hpsm444inis9mscm";
};
};
@@ -1367,10 +1397,10 @@ let
CacheMemcachedFast = buildPerlPackage {
pname = "Cache-Memcached-Fast";
- version = "0.25";
+ version = "0.26";
src = fetchurl {
- url = "mirror://cpan/authors/id/R/RA/RAZ/Cache-Memcached-Fast-0.25.tar.gz";
- sha256 = "0ijw5hlzas1aprp3s6wzabch426m1d8cvp1wn9qphrn4jj82aakq";
+ url = mirror://cpan/authors/id/R/RA/RAZ/Cache-Memcached-Fast-0.26.tar.gz;
+ sha256 = "16m0xafidycrlcvbv3zmbr5pzvqyqyr2qb0khpry99nc4bcld3jy";
};
meta = {
description = "Perl client for B, in C language";
@@ -1675,10 +1705,10 @@ let
CatalystDevel = buildPerlPackage {
pname = "Catalyst-Devel";
- version = "1.39";
+ version = "1.40";
src = fetchurl {
- url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Devel-1.39.tar.gz";
- sha256 = "bce371ba801c7d79eff3257e0af907cf62f140de968f0d63bf55be37d702a58a";
+ url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Devel-1.40.tar.gz;
+ sha256 = "8c5f064b01fa58dce395ae46f33a0d37c4cb03472dde7c5076b6df1f99e116bb";
};
buildInputs = [ TestFatal ];
propagatedBuildInputs = [ CatalystActionRenderView CatalystPluginConfigLoader CatalystPluginStaticSimple ConfigGeneral FileChangeNotify FileCopyRecursive ModuleInstall TemplateToolkit ];
@@ -2144,10 +2174,10 @@ let
Catmandu = buildPerlModule {
pname = "Catmandu";
- version = "1.2011";
+ version = "1.2012";
src = fetchurl {
- url = "mirror://cpan/authors/id/N/NI/NICS/Catmandu-1.2011.tar.gz";
- sha256 = "0awl5qhciphnr1ihq66ssd2hzxvh1ddbr016sxb0qhxbzqv77sb9";
+ url = mirror://cpan/authors/id/N/NI/NICS/Catmandu-1.2012.tar.gz;
+ sha256 = "1dn5bqfg9vswwmvpgfziirqbjlm3gzswhknnmvg07igv1jcrk3d0";
};
propagatedBuildInputs = [ AnyURIEscape AppCmd CGIExpand ConfigOnion CpanelJSONXS DataCompare DataUtil IOHandleUtil LWP ListMoreUtils LogAny MIMETypes ModuleInfo MooXAliases ParserMGC PathIteratorRule PathTiny StringCamelCase TextCSV TextHogan Throwable TryTinyByClass URITemplate UUIDTiny YAMLLibYAML namespaceclean ];
buildInputs = [ LogAnyAdapterLog4perl LogLog4perl TestDeep TestException TestLWPUserAgent TestPod ];
@@ -2174,10 +2204,10 @@ let
CGI = buildPerlPackage {
pname = "CGI";
- version = "4.45";
+ version = "4.49";
src = fetchurl {
- url = "mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.45.tar.gz";
- sha256 = "f6c1513740ee502e947d30131da18a5595dbcd19962d3dd0ff5dedf3cd1ed407";
+ url = mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.49.tar.gz;
+ sha256 = "dd5e9ce69c6e6ed9b42f0a0daeaead1c6caad3fbba2b2a4977b076bc29556b5e";
};
buildInputs = [ TestDeep TestNoWarnings TestWarn ];
propagatedBuildInputs = [ HTMLParser ];
@@ -2268,10 +2298,10 @@ let
CGIMinimal = buildPerlModule {
pname = "CGI-Minimal";
- version = "1.29";
+ version = "1.30";
src = fetchurl {
- url = "mirror://cpan/authors/id/S/SN/SNOWHARE/CGI-Minimal-1.29.tar.gz";
- sha256 = "36c785ffacf5cdee4f1a7219ca1848b7e1700bdd71cd9116e1f00545ec88475d";
+ url = mirror://cpan/authors/id/S/SN/SNOWHARE/CGI-Minimal-1.30.tar.gz;
+ sha256 = "b94d50821b02611da6ee5423193145078c4dbb282f2b162a4b0d58094997bc47";
};
meta = {
description = "A lightweight CGI form processing package";
@@ -2305,10 +2335,10 @@ let
CGISimple = buildPerlModule {
pname = "CGI-Simple";
- version = "1.22";
+ version = "1.25";
src = fetchurl {
- url = "mirror://cpan/authors/id/M/MA/MANWAR/CGI-Simple-1.22.tar.gz";
- sha256 = "13c7iwnnavky10ab87pi8jc1kqph03s0rhvj7myn7szhbfisc4gn";
+ url = mirror://cpan/authors/id/M/MA/MANWAR/CGI-Simple-1.25.tar.gz;
+ sha256 = "0zpl7sa8jvv3zba2vcxf3qsrjk7kk2vcznfdpmxydw06x8vczrp5";
};
propagatedBuildInputs = [ IOStringy ];
meta = {
@@ -2858,10 +2888,10 @@ let
Clipboard = buildPerlModule {
pname = "Clipboard";
- version = "0.22";
+ version = "0.26";
src = fetchurl {
- url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Clipboard-0.22.tar.gz";
- sha256 = "9fdb4dfc2e9bc2f3990b5b71649094dfe83aa12172c5a1809cf7e8b3be295ca7";
+ url = mirror://cpan/authors/id/S/SH/SHLOMIF/Clipboard-0.26.tar.gz;
+ sha256 = "886ae43dc8538f9bfc4e07fdbcf09b7fbd6ee59c31f364618c859de14953c58a";
};
meta = {
description = "Clipboard - Copy and Paste with any OS";
@@ -2878,10 +2908,10 @@ let
Clone = buildPerlPackage {
pname = "Clone";
- version = "0.43";
+ version = "0.45";
src = fetchurl {
- url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Clone-0.43.tar.gz";
- sha256 = "1npf5s4b90ds6lv8gn76b2w4bdh0z5ni5zk4skgc2db5d12560lr";
+ url = mirror://cpan/authors/id/A/AT/ATOOMIC/Clone-0.45.tar.gz;
+ sha256 = "1rm9g68fklni63jdkrlgqq6yfj95fm33p2bq90p475gsi8sfxdnb";
};
meta = {
description = "Recursively copy Perl datatypes";
@@ -2918,10 +2948,10 @@ let
CodeTidyAll = buildPerlPackage {
pname = "Code-TidyAll";
- version = "0.75";
+ version = "0.78";
src = fetchurl {
- url = "mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.75.tar.gz";
- sha256 = "0gplkyds3zmiqpvw8x8kg3g81jcm58kcxvwg5yk4dm2fdkl77xqf";
+ url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.78.tar.gz;
+ sha256 = "1dmr6zkgcnc6cam204f00g5yly46cplbn9k45ginw02rv10vnpij";
};
propagatedBuildInputs = [ CaptureTiny ConfigINI FileWhich Filepushd IPCRun3 IPCSystemSimple ListCompare ListSomeUtils LogAny Moo ScopeGuard SpecioLibraryPathTiny TextDiff TimeDate TimeDurationParse ];
buildInputs = [ TestClass TestClassMost TestDeep TestDifferences TestException TestFatal TestMost TestWarn TestWarnings librelative ];
@@ -2947,10 +2977,10 @@ let
commonsense = buildPerlPackage {
pname = "common-sense";
- version = "3.74";
+ version = "3.75";
src = fetchurl {
- url = "mirror://cpan/authors/id/M/ML/MLEHMANN/common-sense-3.74.tar.gz";
- sha256 = "1wxv2s0hbjkrnssvxvsds0k213awg5pgdlrpkr6xkpnimc17s7vp";
+ url = mirror://cpan/authors/id/M/ML/MLEHMANN/common-sense-3.75.tar.gz;
+ sha256 = "0zhfp8f0czg69ycwn7r6ayg6idm5kyh2ai06g5s6s07kli61qsm8";
};
meta = {
description = "Implements some sane defaults for Perl programs";
@@ -2960,10 +2990,10 @@ let
CompressBzip2 = buildPerlPackage {
pname = "Compress-Bzip2";
- version = "2.26";
+ version = "2.27";
src = fetchurl {
- url = "mirror://cpan/authors/id/R/RU/RURBAN/Compress-Bzip2-2.26.tar.gz";
- sha256 = "5132f0c5f377a54d77ee36d332aa0ece585c22a40f2c31f2619e40262f5c4f0c";
+ url = mirror://cpan/authors/id/R/RU/RURBAN/Compress-Bzip2-2.27.tar.gz;
+ sha256 = "a284c506ac8ef5b02136a15814271dcba10400b5ce818359cf3325ccde7bb3d3";
};
meta = {
description = "Interface to Bzip2 compression library";
@@ -3067,10 +3097,10 @@ let
ConfigGitLike = buildPerlPackage {
pname = "Config-GitLike";
- version = "1.17";
+ version = "1.18";
src = fetchurl {
- url = "mirror://cpan/authors/id/A/AL/ALEXMV/Config-GitLike-1.17.tar.gz";
- sha256 = "674a07b814fdcf9d323088d093245bcd066aaee24ec0914cb4decc9a943de54e";
+ url = mirror://cpan/authors/id/A/AL/ALEXMV/Config-GitLike-1.18.tar.gz;
+ sha256 = "f7ae7440f3adab5b9ff9aa57216d84fd4a681009b9584e32da42f8bb71e332c5";
};
buildInputs = [ TestException ];
propagatedBuildInputs = [ Moo MooXTypesMooseLike ];
@@ -3127,10 +3157,10 @@ let
ConfigIniFiles = buildPerlModule {
pname = "Config-IniFiles";
- version = "3.000002";
+ version = "3.000003";
src = fetchurl {
- url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-3.000002.tar.gz";
- sha256 = "d92ed6ed2db98d5addf732c96d2a9c15d9f878c7e8b355bb7a5c1668e3f8ba09";
+ url = mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-3.000003.tar.gz;
+ sha256 = "3c457b65d98e5ff40bdb9cf814b0d5983eb0c53fb8696bda3ba035ad2acd6802";
};
propagatedBuildInputs = [ IOStringy ];
meta = {
@@ -3463,18 +3493,11 @@ let
CPAN = buildPerlPackage {
pname = "CPAN";
- version = "2.27";
+ version = "2.28";
src = fetchurl {
- url = "mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.27.tar.gz";
- sha256 = "b4b1471a2881e2d616f59e723879b4110ae485b79d5962f115119c28cf69e07f";
+ url = "mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.28.tar.gz";
+ sha256 = "39d357489283d479695027640d7fc25b42ec3c52003071d1ec94496e34af5974";
};
- patches = [
- (fetchpatch {
- url = "https://github.com/andk/cpanpm/commit/10da44f1757aff6971e3bc4ed38ab115e738c740.diff";
- name = "patch-YAML-modules-default-for-LoadBlessed-was-changed-to-false";
- sha256 = "0sr2nxkr1cwavpvpxsqcsryfd5fjv4fkxfihd03jzavv5awj79hp";
- })
- ];
propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases Expect FileHomeDir LWP LogLog4perl ModuleBuild TermReadKey YAML YAMLLibYAML YAMLSyck ];
meta = {
description = "Query, download and build perl modules from CPAN sites";
@@ -3566,10 +3589,10 @@ let
CPANPerlReleases = buildPerlPackage {
pname = "CPAN-Perl-Releases";
- version = "5.20200120";
+ version = "5.20200607";
src = fetchurl {
- url = "mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-5.20200120.tar.gz";
- sha256 = "0xhn05aiyrdcxhmps0qg9ivr9p7278mjix7719rv2k5kd2nf1jg8";
+ url = mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-5.20200607.tar.gz;
+ sha256 = "0x09ghg5s69kajpw19qs8bhdzma900ipry4zizi37qcdby3kadf1";
};
meta = {
homepage = "https://github.com/bingos/cpan-perl-releases";
@@ -3580,10 +3603,10 @@ let
CPANPLUS = buildPerlPackage {
pname = "CPANPLUS";
- version = "0.9906";
+ version = "0.9908";
src = fetchurl {
- url = "mirror://cpan/authors/id/B/BI/BINGOS/CPANPLUS-0.9906.tar.gz";
- sha256 = "0w1gi4w7xriqhh44ssgg2abk5dfxchshqfab4cs3j4ab6p8vf9j5";
+ url = mirror://cpan/authors/id/B/BI/BINGOS/CPANPLUS-0.9908.tar.gz;
+ sha256 = "1m4xas67fax947kahvg4jsnsr2r1i58c5g3f1bixh7krgnsarxjq";
};
propagatedBuildInputs = [ ArchiveExtract ModulePluggable ObjectAccessor PackageConstants TermUI ];
meta = {
@@ -3595,10 +3618,10 @@ let
CPANUploader = buildPerlPackage {
pname = "CPAN-Uploader";
- version = "0.103013";
+ version = "0.103014";
src = fetchurl {
- url = "mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103013.tar.gz";
- sha256 = "07k8ia8gvj9mrz7a2lckgd3vxjsahfr43lgrb85474dkhz94f5pq";
+ url = mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103014.tar.gz;
+ sha256 = "1pi15yj06yyzx6xzhhclfhnbssrrpj27ncya2bh21mxnjmy52kqy";
};
propagatedBuildInputs = [ FileHomeDir GetoptLongDescriptive LWPProtocolHttps TermReadKey ];
meta = {
@@ -3678,10 +3701,10 @@ let
CryptECB = buildPerlPackage {
pname = "Crypt-ECB";
- version = "2.21";
+ version = "2.22";
src = fetchurl {
- url = "mirror://cpan/authors/id/A/AP/APPEL/Crypt-ECB-2.21.tar.gz";
- sha256 = "890f8b3040220ea705ee5ca4f9bd23435a1779bc3ffa75533736e6c9c21d1015";
+ url = mirror://cpan/authors/id/A/AP/APPEL/Crypt-ECB-2.22.tar.gz;
+ sha256 = "f5af62e908cd31a34b2b813135a0718016fd003ffa0021ffbdd84c50158267aa";
};
meta = with stdenv.lib; {
description = "Use block ciphers using ECB mode";
@@ -3711,12 +3734,12 @@ let
CryptJWT = buildPerlPackage {
pname = "Crypt-JWT";
- version = "0.025";
+ version = "0.028";
src = fetchurl {
- url = "mirror://cpan/authors/id/M/MI/MIK/Crypt-JWT-0.025.tar.gz";
- sha256 = "2def87936645723de70fcc11cb380b1faddf9c5678832e4fc6116f267987087d";
+ url = mirror://cpan/authors/id/M/MI/MIK/Crypt-JWT-0.028.tar.gz;
+ sha256 = "af819a620fa9b2d0432f718fecc3e4d8458d04b932f27fcb6217e0f39027e633";
};
- propagatedBuildInputs = [ CryptX JSONMaybeXS ];
+ propagatedBuildInputs = [ CryptX JSON ];
meta = {
description = "JSON Web Token";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
@@ -4091,10 +4114,10 @@ let
CryptX = buildPerlPackage {
pname = "CryptX";
- version = "0.066";
+ version = "0.068";
src = fetchurl {
- url = "mirror://cpan/authors/id/M/MI/MIK/CryptX-0.066.tar.gz";
- sha256 = "e7e823ac4db0b452e885b0e0d5adfc8a9c5f688938f1adf3f1d91432b3238335";
+ url = mirror://cpan/authors/id/M/MI/MIK/CryptX-0.068.tar.gz;
+ sha256 = "b1806a1fa4d4b8c9265f44ac706eb0b05107d644edb24ffea1b507168e88fd59";
};
meta = {
description = "Crypto toolkit";
@@ -4302,14 +4325,14 @@ let
};
};
- DataMessagePack = buildPerlPackage {
+ DataMessagePack = buildPerlModule {
pname = "Data-MessagePack";
- version = "1.00";
+ version = "1.01";
src = fetchurl {
- url = "mirror://cpan/authors/id/S/SY/SYOHEX/Data-MessagePack-1.00.tar.gz";
- sha256 = "c9f0eeaf56ee4dfd509eccba2dd838921aebdf186ba60de166443ffc4b0ba1a2";
+ url = mirror://cpan/authors/id/S/SY/SYOHEX/Data-MessagePack-1.01.tar.gz;
+ sha256 = "8fa0ed0101d04e661821a7b78e8d62ce3e19b299275bbfed178e2ba8912663ea";
};
- buildInputs = [ FileCopyRecursive TestRequires ];
+ buildInputs = [ DevelPPPort ModuleBuildXSUtil TestRequires ];
meta = {
homepage = "https://github.com/msgpack/msgpack-perl";
description = "MessagePack serializing/deserializing";
@@ -4415,10 +4438,10 @@ let
DataSerializer = buildPerlModule {
pname = "Data-Serializer";
- version = "0.60";
+ version = "0.65";
src = fetchurl {
- url = "mirror://cpan/authors/id/N/NE/NEELY/Data-Serializer-0.60.tar.gz";
- sha256 = "0ca4s811l7f2bqkx7vnyxbpp4f0qska89g2pvsfb3k0bhhbk0jdk";
+ url = mirror://cpan/authors/id/N/NE/NEELY/Data-Serializer-0.65.tar.gz;
+ sha256 = "048zjy8valnil8yawa3vrxr005rz95gpfwvmy2jq0g830195l58j";
};
meta = {
description = "Modules that serialize data structures";
@@ -4499,7 +4522,7 @@ let
url = "mirror://cpan/authors/id/B/BA/BALDUR/Data-ULID-1.0.0.tar.gz";
sha256 = "4d757475893dbad5165f0a65c446d38b47f39019d36f77da9d29c98cbf27206f";
};
- propagatedBuildInputs = [ DateTime EncodeBase32GMP MathRandomSecure MathBigIntGMP ];
+ propagatedBuildInputs = [ DateTime EncodeBase32GMP MathRandomSecure ];
meta = {
homepage = "https://metacpan.org/release/Data-ULID";
description = "Universally Unique Lexicographically Sortable Identifier";
@@ -4547,10 +4570,10 @@ let
DataUUID = buildPerlPackage {
pname = "Data-UUID";
- version = "1.224";
+ version = "1.226";
src = fetchurl {
- url = "mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.224.tar.gz";
- sha256 = "0z7l3fc710v830n1krgrp7wzfispi5s0h10cyk65xvxv09sw2n69";
+ url = mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.226.tar.gz;
+ sha256 = "0lv4k4ibxwkw7zz9hw97s34za9nvjxb4kbmgmx5sj4fll3zmfg89";
};
};
@@ -4648,10 +4671,10 @@ let
DateManip = buildPerlPackage {
pname = "Date-Manip";
- version = "6.79";
+ version = "6.82";
src = fetchurl {
- url = "mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.79.tar.gz";
- sha256 = "0fllcvsd08wz71wyppyhgb6mingfihhsf5raraildggdwhnc9a3i";
+ url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.82.tar.gz;
+ sha256 = "0ak72kpydwhq2z03mhdfwm3ganddzb8gawzh6crpsjvb9kwvr5ps";
};
# for some reason, parsing /etc/localtime does not work anymore - make sure that the fallback "/bin/date +%Z" will work
patchPhase = ''
@@ -4678,10 +4701,10 @@ let
DateTime = buildPerlPackage {
pname = "DateTime";
- version = "1.51";
+ version = "1.52";
src = fetchurl {
- url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.51.tar.gz";
- sha256 = "1ibfq6acz1ih28vl613yygbb3r2d8ykx6di669vajhvswl6xl8ny";
+ url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.52.tar.gz;
+ sha256 = "1z1xpifh2kpyw7rlc8ivg9rl0qmabjq979gjp0s9agdjf9hqp0k7";
};
buildInputs = [ CPANMetaCheck TestFatal TestWarnings ];
propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ];
@@ -4830,10 +4853,10 @@ let
DateTimeFormatNatural = buildPerlModule {
pname = "DateTime-Format-Natural";
- version = "1.08";
+ version = "1.09";
src = fetchurl {
- url = "mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.08.tar.gz";
- sha256 = "0hfk9cqfy0j49vqllhxfikbkqjhf7jrm6zb9i2bxq2ywm8qnz1rj";
+ url = mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.09.tar.gz;
+ sha256 = "0mxhzib3wq408mqa8wgdlvxxjrmv2fn07ydbpyx6qny1867kczbc";
};
buildInputs = [ ModuleUtil TestMockTime ];
propagatedBuildInputs = [ Clone DateTime ListMoreUtils ParamsValidate boolean ];
@@ -4874,10 +4897,10 @@ let
DateTimeFormatStrptime = buildPerlPackage {
pname = "DateTime-Format-Strptime";
- version = "1.76";
+ version = "1.77";
src = fetchurl {
- url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.76.tar.gz";
- sha256 = "593c26466ed7a3d2cefe9215f1619666c5116bd3a551e0aa74b64a6353fcb50d";
+ url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.77.tar.gz;
+ sha256 = "2fa43c838ecf5356f221a91a41c81dba22e7860c5474b4a61723259898173e4a";
};
buildInputs = [ TestFatal TestWarnings ];
propagatedBuildInputs = [ DateTime ];
@@ -4946,10 +4969,10 @@ let
DateTimeTimeZone = buildPerlPackage {
pname = "DateTime-TimeZone";
- version = "2.38";
+ version = "2.39";
src = fetchurl {
- url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.38.tar.gz";
- sha256 = "0e5c99ef22471f4d262ac590ce5ce8177094d7a92f380d8eea6219f5a12dc0cd";
+ url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.39.tar.gz;
+ sha256 = "65a49083bf465b42c6a65df575efaceb87b5ba5a997d4e91e6ddba57190c8fca";
};
buildInputs = [ TestFatal TestRequires ];
propagatedBuildInputs = [ ClassSingleton ParamsValidationCompiler Specio namespaceautoclean ];
@@ -5044,12 +5067,12 @@ let
DevelCheckOS = buildPerlPackage {
pname = "Devel-CheckOS";
- version = "1.81";
+ version = "1.83";
src = fetchurl {
- url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-CheckOS-1.81.tar.gz";
- sha256 = "f3c17b56b79283b62616f938d36c57adc9df06bfaa295ff98be21e9014a23b10";
+ url = mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-CheckOS-1.83.tar.gz;
+ sha256 = "b20fb5ab55d2cf8539fdc7268d77cdbf944408e620c4969023e687ddd28c9972";
};
- propagatedBuildInputs = [ DataCompare ];
+ propagatedBuildInputs = [ FileFindRule ];
};
DevelLeak = buildPerlPackage rec {
@@ -5068,10 +5091,10 @@ let
DevelPatchPerl = buildPerlPackage {
pname = "Devel-PatchPerl";
- version = "1.84";
+ version = "2.00";
src = fetchurl {
- url = "mirror://cpan/authors/id/B/BI/BINGOS/Devel-PatchPerl-1.84.tar.gz";
- sha256 = "1nlil7mq8vc3lbsr5p3zr7jqaclkr0blhmb8sgkyc7mbvhml9jzp";
+ url = mirror://cpan/authors/id/B/BI/BINGOS/Devel-PatchPerl-2.00.tar.gz;
+ sha256 = "07yy02v86ia7j8qbn46jqan8c8d6xdqigvv5a4wmkqwln7jxmhrr";
};
propagatedBuildInputs = [ Filepushd ModulePluggable ];
meta = {
@@ -5097,10 +5120,10 @@ let
DevelPPPort = buildPerlPackage {
pname = "Devel-PPPort";
- version = "3.56";
+ version = "3.58";
src = fetchurl {
- url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.56.tar.gz";
- sha256 = "628476dbfeb7be92471e48f75fe0d36659b92493669ebd02cf04e3a13429521b";
+ url = mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.58.tar.gz;
+ sha256 = "531ff79f9e74962df2dba7b2e526b8a5208cfb6bcdc01d85732fda8c1fde0c00";
};
meta = {
description = "Perl/Pollution/Portability";
@@ -5161,7 +5184,7 @@ let
url = "mirror://cpan/authors/id/H/HM/HMBRAND/DBD-CSV-0.54.tgz";
sha256 = "bc597cd7195e5a023e2b3413d8dc614602b9b3f279f436027881796464d4f0be";
};
- propagatedBuildInputs = [ DBI TextCSV_XS SQLStatement ModuleRuntime ParamsUtil ];
+ propagatedBuildInputs = [ DBI SQLStatement TextCSV_XS ];
};
DBDMock = buildPerlModule {
@@ -5246,11 +5269,11 @@ let
DBDPg = buildPerlPackage {
pname = "DBD-Pg";
- version = "3.10.3";
+ version = "3.12.3";
src = fetchurl {
- url = "mirror://cpan/authors/id/T/TU/TURNSTEP/DBD-Pg-3.10.3.tar.gz";
- sha256 = "0swj2pkga92z15rnq9f0j9s84j5ancgas0ncd4k230bd8advlgn6";
+ url = mirror://cpan/authors/id/T/TU/TURNSTEP/DBD-Pg-3.12.3.tar.gz;
+ sha256 = "0rrlg2rwgkpcx67qf7081g7mj2shpqhj2iyxrq5fixf32nb0ad4v";
};
buildInputs = [ pkgs.postgresql ];
@@ -5306,10 +5329,10 @@ let
DBI = buildPerlPackage {
pname = "DBI";
- version = "1.642";
+ version = "1.643";
src = fetchurl {
- url = "mirror://cpan/authors/id/T/TI/TIMB/DBI-1.642.tar.gz";
- sha256 = "3f2025023a56286cebd15cb495e36ccd9b456c3cc229bf2ce1f69e9ebfc27f5d";
+ url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.643.tar.gz;
+ sha256 = "8a2b993db560a2c373c174ee976a51027dd780ec766ae17620c20393d2e836fa";
};
postInstall = stdenv.lib.optionalString (perl ? crossVersion) ''
mkdir -p $out/${perl.libPrefix}/cross_perl/${perl.version}/DBI
@@ -5449,10 +5472,10 @@ let
DBIxClassHelpers = buildPerlPackage {
pname = "DBIx-Class-Helpers";
- version = "2.034002";
+ version = "2.036000";
src = fetchurl {
- url = "mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-Helpers-2.034002.tar.gz";
- sha256 = "08ab0eae514653b7f59444a0a19188ef65351889e9aefb19a2ea5a159fe2574b";
+ url = mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-Helpers-2.036000.tar.gz;
+ sha256 = "b7b8b4891a983c034ef0b45f4112404a0a40550c4e217daeb7a22ca16861efdb";
};
buildInputs = [ DBDSQLite DateTimeFormatSQLite TestDeep TestFatal TestRoo aliased ];
propagatedBuildInputs = [ CarpClan DBIxClassCandy DBIxIntrospector SafeIsa TextBrew ];
@@ -5601,10 +5624,10 @@ let
DevelDeclare = buildPerlPackage {
pname = "Devel-Declare";
- version = "0.006019";
+ version = "0.006022";
src = fetchurl {
- url = "mirror://cpan/authors/id/E/ET/ETHER/Devel-Declare-0.006019.tar.gz";
- sha256 = "ac719dc289cbf53fbb3b090ccd3a55a9d207f24e09480423c96f7185af131808";
+ url = mirror://cpan/authors/id/E/ET/ETHER/Devel-Declare-0.006022.tar.gz;
+ sha256 = "72f29ca35646a593be98311ffddb72033ae1e8a9d8254c62aa248bd6260e596e";
};
buildInputs = [ ExtUtilsDepends TestRequires ];
propagatedBuildInputs = [ BHooksEndOfScope BHooksOPCheck SubName ];
@@ -5655,10 +5678,10 @@ let
DevelHide = buildPerlPackage {
pname = "Devel-Hide";
- version = "0.0010";
+ version = "0.0013";
src = fetchurl {
- url = "mirror://cpan/authors/id/F/FE/FERREIRA/Devel-Hide-0.0010.tar.gz";
- sha256 = "10jyv9nmv513hs75rls5yx2xn82513xnnhjir3dxiwgb1ykfyvvm";
+ url = mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-Hide-0.0013.tar.gz;
+ sha256 = "1jvyy3yasiwyjsn9ay9sja3ch4wcjc4wk5l22vjsclq29z7vphvg";
};
};
@@ -5891,13 +5914,13 @@ let
DistZilla = buildPerlPackage {
pname = "Dist-Zilla";
- version = "6.012";
+ version = "6.015";
src = fetchurl {
- url = "mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-6.012.tar.gz";
- sha256 = "0w1hhvxcdf52ln940f8i37adv2gp7l8ryf2nm6m7haynyrsk0n37";
+ url = mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-6.015.tar.gz;
+ sha256 = "06w9mdk46y4n2dshkx6laphkqk08wfw6bqpsa5q2yb4lky0yb212";
};
buildInputs = [ CPANMetaCheck TestDeep TestFailWarnings TestFatal TestFileShareDir ];
- propagatedBuildInputs = [ AppCmd CPANUploader ConfigMVPReaderINI DateTime FileCopyRecursive FileFindRule FileShareDirInstall Filepushd LogDispatchouli MooseXLazyRequire MooseXSetOnce MooseXTypesPerl PathTiny PerlPrereqScanner PodEventual SoftwareLicense TermEncoding TermUI YAMLTiny ];
+ propagatedBuildInputs = [ AppCmd CPANUploader ConfigMVPReaderINI DateTime FileCopyRecursive FileFindRule FileShareDirInstall Filepushd LogDispatchouli MooseXLazyRequire MooseXSetOnce MooseXTypesPerl PathTiny PerlPrereqScanner SoftwareLicense TermEncoding TermUI YAMLTiny ];
meta = {
homepage = "http://dzil.org/";
description = "Distribution builder; installer not included!";
@@ -6344,10 +6367,10 @@ let
EmailMIME = buildPerlPackage {
pname = "Email-MIME";
- version = "1.946";
+ version = "1.949";
src = fetchurl {
- url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-1.946.tar.gz";
- sha256 = "68ee79023165d77bec99a2e12ef89ad4e12501e6c321f6822053dc4f411c337c";
+ url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-1.949.tar.gz;
+ sha256 = "3b0adf6bb413cfe51d75f8ba79aca80deafc98dc1179aa7b2d7a79aff5a6ab9c";
};
propagatedBuildInputs = [ EmailAddressXS EmailMIMEContentType EmailMIMEEncodings EmailMessageID EmailSimple MIMETypes ModuleRuntime ];
meta = {
@@ -6375,16 +6398,17 @@ let
EmailMIMEContentType = buildPerlPackage {
pname = "Email-MIME-ContentType";
- version = "1.022";
+ version = "1.024";
src = fetchurl {
- url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-ContentType-1.022.tar.gz";
- sha256 = "9abb7280b0da62a855ae5528b14deb94341a84e721af0a7e5a2adc3534ec5310";
+ url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-ContentType-1.024.tar.gz;
+ sha256 = "42d164ac7ff4dc2ea848e710fe21fa85509a3bcbb91ed2d356e4aba951ed8835";
};
meta = {
homepage = "https://github.com/rjbs/Email-MIME-ContentType";
description = "Parse a MIME Content-Type Header";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
+ propagatedBuildInputs = [ TextUnidecode ];
};
EmailMIMEEncodings = buildPerlPackage {
@@ -6426,6 +6450,7 @@ let
sha256 = "0fb1gymqa8nlj540dmbb1rhs2b0ln3y9ippbgj0miswcw92iaayb";
};
propagatedBuildInputs = [ EmailMIME EmailSender IOAll IOString OLEStorage_Lite ];
+ preCheck = "rm t/internals.t t/plain_jpeg_attached.t"; # these tests expect EmailMIME version 1.946 and fail with 1.949 (the output difference in benign)
meta = with stdenv.lib; {
homepage = "https://www.matijs.net/software/msgconv/";
description = "A .MSG to mbox converter";
@@ -6498,10 +6523,10 @@ let
Encode = buildPerlPackage {
pname = "Encode";
- version = "3.02";
+ version = "3.06";
src = fetchurl {
- url = "mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-3.02.tar.gz";
- sha256 = "5865be4951870f62f43722818d076d7724306c75c8f268346b282351cbc820a8";
+ url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-3.06.tar.gz;
+ sha256 = "5b2dcd6861287880584e63b2e518840d483aa38da70194cf64d9957282851eea";
};
meta = {
description = "Character encodings in Perl";
@@ -6671,10 +6696,10 @@ let
EV = buildPerlPackage {
pname = "EV";
- version = "4.32";
+ version = "4.33";
src = fetchurl {
- url = "mirror://cpan/authors/id/M/ML/MLEHMANN/EV-4.32.tar.gz";
- sha256 = "b82a8b89bb9cca475f6242c8621dc2c48f24851ca61558e1bd592b8506752936";
+ url = mirror://cpan/authors/id/M/ML/MLEHMANN/EV-4.33.tar.gz;
+ sha256 = "4aee8391b88113b42187f91fd49245fdc8e9b193a15ac202f519caae2aa8ea35";
};
buildInputs = [ CanaryStability ];
propagatedBuildInputs = [ commonsense ];
@@ -6773,10 +6798,10 @@ let
ExporterTiny = buildPerlPackage {
pname = "Exporter-Tiny";
- version = "1.002001";
+ version = "1.002002";
src = fetchurl {
- url = "mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.002001.tar.gz";
- sha256 = "a82c334c02ce4b0f9ea77c67bf77738f76a9b8aa4bae5c7209d1c76453d3c48d";
+ url = mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.002002.tar.gz;
+ sha256 = "00f0b95716b18157132c6c118ded8ba31392563d19e490433e9a65382e707101";
};
meta = {
description = "An exporter with the features of Sub::Exporter but only core dependencies";
@@ -7093,10 +7118,10 @@ let
FFICheckLib = buildPerlPackage {
pname = "FFI-CheckLib";
- version = "0.26";
+ version = "0.27";
src = fetchurl {
- url = "mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.26.tar.gz";
- sha256 = "0rbzm4cisn4vdj1kc0sa6v8m1b3mjkryi5w14hk1d13zh3q3pqq6";
+ url = mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.27.tar.gz;
+ sha256 = "0x1dk4hlhvcbgwivf345phbqz0v5hawxxnby21h8bkagq93jfi4d";
};
buildInputs = [ Test2Suite ];
meta = {
@@ -7160,10 +7185,10 @@ let
FileBOM = buildPerlModule {
pname = "File-BOM";
- version = "0.16";
+ version = "0.18";
src = fetchurl {
- url = "mirror://cpan/authors/id/M/MA/MATTLAW/File-BOM-0.16.tar.gz";
- sha256 = "97091a72bb1d3a7b5cac1dfb5372962b6f8055729189d0f3fd2c959c8ff374cf";
+ url = mirror://cpan/authors/id/M/MA/MATTLAW/File-BOM-0.18.tar.gz;
+ sha256 = "28edc43fcb118e11bc458c9ae889d56d388c1d9bc29997b00b1dffd8573823a3";
};
buildInputs = [ TestException ];
propagatedBuildInputs = [ Readonly ];
@@ -7389,12 +7414,12 @@ let
FileLibMagic = buildPerlPackage {
pname = "File-LibMagic";
- version = "1.16";
+ version = "1.22";
src = fetchurl {
- url = "mirror://cpan/authors/id/D/DR/DROLSKY/File-LibMagic-1.16.tar.gz";
- sha256 = "c8a695fac1454f52e18e2e1b624c0647cf117326014023dda69fa3e1a5f33d60";
+ url = mirror://cpan/authors/id/D/DR/DROLSKY/File-LibMagic-1.22.tar.gz;
+ sha256 = "93639bd076849e93a020fea1507f0a2b3467b8792eb5c306f2aacbbfb4d080d6";
};
- buildInputs = [ pkgs.file TestFatal ];
+ buildInputs = [ pkgs.file ConfigAutoConf TestFatal ];
makeMakerFlags = "--lib=${pkgs.file}/lib";
preCheck = ''
substituteInPlace t/oo-api.t \
@@ -7440,6 +7465,21 @@ let
};
};
+ FileMap = buildPerlModule {
+ pname = "File-Map";
+ version = "0.66";
+ src = fetchurl {
+ url = mirror://cpan/authors/id/L/LE/LEONT/File-Map-0.66.tar.gz;
+ sha256 = "12d540v47jscjizcry2ir5vpp5q797vmd3gn9p91brqdbk5swfz7";
+ };
+ propagatedBuildInputs = [ PerlIOLayers SubExporterProgressive ];
+ buildInputs = [ TestFatal TestWarnings ];
+ meta = {
+ description = "Memory mapping made simple and safe.";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
FileModified = buildPerlPackage {
pname = "File-Modified";
version = "0.10";
@@ -7621,10 +7661,10 @@ let
FileSlurp = buildPerlPackage {
pname = "File-Slurp";
- version = "9999.29";
+ version = "9999.30";
src = fetchurl {
- url = "mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.29.tar.gz";
- sha256 = "1iqr7qi6rg45f4xa3fp48b30mnbw30xs9izxa5zf6fd6pgh4fvhf";
+ url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.30.tar.gz;
+ sha256 = "0irpx72dk27d7c4cjr08dq4bwwbmq8gsr39hxd44widrn0yicdra";
};
meta = {
description = "Simple and Efficient Reading/Writing/Modifying of Complete Files";
@@ -7879,10 +7919,10 @@ let
Future = buildPerlModule {
pname = "Future";
- version = "0.43";
+ version = "0.45";
src = fetchurl {
- url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-0.43.tar.gz";
- sha256 = "191qvn3jz5pk5zxykwsg1i17s45kc82rfd6kgzsv9nki1c04dzaf";
+ url = mirror://cpan/authors/id/P/PE/PEVANS/Future-0.45.tar.gz;
+ sha256 = "1h5609wd1m774h8brgm5vinz6pfmdszp2ms6ybxlyhs0p5msp36f";
};
buildInputs = [ TestFatal TestIdentity TestRefcount ];
meta = {
@@ -7893,13 +7933,13 @@ let
GamesSolitaireVerify = buildPerlModule {
pname = "Games-Solitaire-Verify";
- version = "0.2202";
+ version = "0.2403";
src = fetchurl {
- url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.2202.tar.gz";
- sha256 = "14fe240613b41c9d3e7cc560eaabd78bd13ded66d2838b738b74f7d1811d9263";
+ url = mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.2403.tar.gz;
+ sha256 = "e5ab475c82ba1cb088ad28f423ca514d46944d6ae3c3eb55e9636e9e7f1dc893";
};
buildInputs = [ DirManifest TestDifferences ];
- propagatedBuildInputs = [ ClassXSAccessor ExceptionClass ListMoreUtils PathTiny ];
+ propagatedBuildInputs = [ ClassXSAccessor ExceptionClass PathTiny ];
meta = {
description = "Verify solutions for solitaire games";
license = stdenv.lib.licenses.mit;
@@ -8014,10 +8054,10 @@ let
GetoptLongDescriptive = buildPerlPackage {
pname = "Getopt-Long-Descriptive";
- version = "0.104";
+ version = "0.105";
src = fetchurl {
- url = "mirror://cpan/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-0.104.tar.gz";
- sha256 = "878bc1782c5e196a08a52fa252bbfce1aeb0546d073eac164fc6b80b4cea1e28";
+ url = mirror://cpan/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-0.105.tar.gz;
+ sha256 = "a71cdbcf4043588b26a42a13d151c243f6eccf38e8fc0b18ffb5b53651ab8c15";
};
buildInputs = [ CPANMetaCheck TestFatal TestWarnings ];
propagatedBuildInputs = [ ParamsValidate SubExporter ];
@@ -8053,7 +8093,7 @@ let
};
GitAutofixup = buildPerlPackage rec {
- pname = "GitAutofixup";
+ pname = "App-Git-Autofixup";
version = "0.002007";
src = fetchurl {
url = "mirror://cpan/authors/id/T/TO/TORBIAK/App-Git-Autofixup-${version}.tar.gz";
@@ -8113,10 +8153,10 @@ let
Glib = buildPerlPackage {
pname = "Glib";
- version = "1.3291";
+ version = "1.3293";
src = fetchurl {
- url = "mirror://cpan/authors/id/X/XA/XAOC/Glib-1.3291.tar.gz";
- sha256 = "0whz5f87wvzq8zsva85h06mkfqim2ciq845ixlvmafwxggccv0xr";
+ url = mirror://cpan/authors/id/X/XA/XAOC/Glib-1.3293.tar.gz;
+ sha256 = "005m3inz12xcsd5sr056cm1kbhmxsx2ly88ifbdv6p6cwz0s05kk";
};
buildInputs = [ pkgs.glib ];
doCheck = false; # tests failing with glib 2.60 https://rt.cpan.org/Public/Bug/Display.html?id=128165
@@ -8214,10 +8254,10 @@ let
GnuPGInterface = buildPerlPackage {
pname = "GnuPG-Interface";
- version = "0.52";
+ version = "1.00";
src = fetchurl {
- url = "mirror://cpan/authors/id/A/AL/ALEXMV/GnuPG-Interface-0.52.tar.gz";
- sha256 = "247a9f5a88bb6745281c00d0f7d5d94e8599a92396849fd9571356dda047fd35";
+ url = mirror://cpan/authors/id/J/JE/JESSE/GnuPG-Interface-1.00.tar.gz;
+ sha256 = "97e9c809491a061b2e99fb4e50c7bf74eb42e1deb11c64b081b21b4dbe6aec2f";
};
buildInputs = [ pkgs.which pkgs.gnupg1compat ];
propagatedBuildInputs = [ MooXHandlesVia MooXlate ];
@@ -8457,10 +8497,10 @@ let
Gtk3 = buildPerlPackage {
pname = "Gtk3";
- version = "0.036";
+ version = "0.037";
src = fetchurl {
- url = "mirror://cpan/authors/id/X/XA/XAOC/Gtk3-0.036.tar.gz";
- sha256 = "1rxzhahrncv58z0n93bzlagxd8swqxiafq4qn4zv9i9jbfql8mwq";
+ url = mirror://cpan/authors/id/X/XA/XAOC/Gtk3-0.037.tar.gz;
+ sha256 = "0l9zis8l9jall1m48mgd5g4f85lsz4hcp22spal8r9wlf9af2nmz";
};
propagatedBuildInputs = [ pkgs.gtk3 CairoGObject GlibObjectIntrospection ];
meta = {
@@ -8471,10 +8511,10 @@ let
Gtk3SimpleList = buildPerlPackage {
pname = "Gtk3-SimpleList";
- version = "0.18";
+ version = "0.21";
src = fetchurl {
- url = "mirror://cpan/authors/id/T/TV/TVIGNAUD/Gtk3-SimpleList-0.18.tar.gz";
- sha256 = "09azmc7miyvw7q21rz8cxw16zbd5i1j5hpakxy376f5vmhqqjyhp";
+ url = mirror://cpan/authors/id/T/TV/TVIGNAUD/Gtk3-SimpleList-0.21.tar.gz;
+ sha256 = "1158mnr2ldq02098hqbkwfv64d83zl3a8scll9s09g7k1c86ai0x";
};
meta = {
description = "A simple interface to Gtk3's complex MVC list widget";
@@ -8662,10 +8702,10 @@ let
HTMLForm = buildPerlPackage {
pname = "HTML-Form";
- version = "6.05";
+ version = "6.07";
src = fetchurl {
- url = "mirror://cpan/authors/id/O/OA/OALDERS/HTML-Form-6.05.tar.gz";
- sha256 = "14i4ldyvdvhdhvfhh9kiq6z853q2f84biq8vcpv1k5w2r80wdiin";
+ url = mirror://cpan/authors/id/O/OA/OALDERS/HTML-Form-6.07.tar.gz;
+ sha256 = "09v29cdzwjm139c67y1np3kvx2ymg3s8n723qc0ma07lmxz8rakx";
};
propagatedBuildInputs = [ HTMLParser HTTPMessage ];
meta = {
@@ -8766,10 +8806,10 @@ let
HTMLMason = buildPerlPackage {
pname = "HTML-Mason";
- version = "1.58";
+ version = "1.59";
src = fetchurl {
- url = "mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.58.tar.gz";
- sha256 = "81dc9b199f0f3b3473c97ba0ebee4b9535cd633d4e9c1ca3818615dc03dff948";
+ url = mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.59.tar.gz;
+ sha256 = "95bed2a6c488370046aa314be4b592bd65a6522f8845da8b36a6aff9a8b439d0";
};
buildInputs = [ TestDeep ];
propagatedBuildInputs = [ CGI CacheCache ClassContainer ExceptionClass LogAny ];
@@ -9146,13 +9186,13 @@ let
HTTPMessage = buildPerlPackage {
pname = "HTTP-Message";
- version = "6.18";
+ version = "6.24";
src = fetchurl {
- url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Message-6.18.tar.gz";
- sha256 = "d060d170d388b694c58c14f4d13ed908a2807f0e581146cef45726641d809112";
+ url = mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Message-6.24.tar.gz;
+ sha256 = "554a1acf2daa401091f7012f5cb82d04d281db43fbd8f39a1fcbb7ed56dde16d";
};
buildInputs = [ TryTiny ];
- propagatedBuildInputs = [ EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ];
+ propagatedBuildInputs = [ Clone Encode EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ];
meta = {
homepage = "https://github.com/libwww-perl/HTTP-Message";
description = "HTTP style message (base class)";
@@ -9295,10 +9335,10 @@ let
HTTPTinyish = buildPerlPackage {
pname = "HTTP-Tinyish";
- version = "0.15";
+ version = "0.16";
src = fetchurl {
- url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Tinyish-0.15.tar.gz";
- sha256 = "5d65f0ee20a9e4744acdb3ef12edae78c121f53dcbc9cf00867c5725c4513aa5";
+ url = mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Tinyish-0.16.tar.gz;
+ sha256 = "1a3318b89987c2aa5dd18990a109e8af63049f87e4e1a9357583beed1c3bfbda";
};
propagatedBuildInputs = [ FileWhich IPCRun3 ];
meta = {
@@ -9323,10 +9363,10 @@ let
Imager = buildPerlPackage {
pname = "Imager";
- version = "1.011";
+ version = "1.012";
src = fetchurl {
- url = "mirror://cpan/authors/id/T/TO/TONYC/Imager-1.011.tar.gz";
- sha256 = "a3aea2f0c172c2c094baeced4a3bdaa9f54e3e85c97eea2e5f8f994ba2beedfc";
+ url = mirror://cpan/authors/id/T/TO/TONYC/Imager-1.012.tar.gz;
+ sha256 = "a321c728e3277fd15de842351e69bbef0e2a5a608a31d089e5029b8381e23f21";
};
buildInputs = [ pkgs.freetype pkgs.fontconfig pkgs.libjpeg pkgs.libpng ];
makeMakerFlags = "--incpath ${pkgs.libjpeg.dev}/include --libpath ${pkgs.libjpeg.out}/lib --incpath ${pkgs.libpng.dev}/include --libpath ${pkgs.libpng.out}/lib";
@@ -9463,13 +9503,14 @@ let
IOAsync = buildPerlModule {
pname = "IO-Async";
- version = "0.75";
+ version = "0.77";
src = fetchurl {
- url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.75.tar.gz";
- sha256 = "1mi6gfbl11rimvzgzyj8kiqf131cg1w9nwxi47fwm9sbs0x6rkjb";
+ url = mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.77.tar.gz;
+ sha256 = "153rfnbs2xwvx559h0ilfr0g9pg30avjad3cad659is9bdmfipri";
};
+ preCheck = "rm t/50resolver.t"; # this test fails with "Temporary failure in name resolution" in sandbox
propagatedBuildInputs = [ Future StructDumb ];
- buildInputs = [ TestFatal TestIdentity TestRefcount ];
+ buildInputs = [ TestFatal TestIdentity TestMetricsAny TestRefcount ];
meta = {
description = "Asynchronous event-driven programming";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
@@ -9586,11 +9627,11 @@ let
};
IOPager = buildPerlPackage {
- version = "1.01";
+ version = "1.03";
pname = "IO-Pager";
src = fetchurl {
- url = "mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-1.01.tgz";
- sha256 = "19fslzb11wn8s9hwnwpnwymnw040nmychza2dpbbcqpgnk4k5zpa";
+ url = mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-1.03.tgz;
+ sha256 = "13mmykrb391584wkw907zrmy4hg1fa9hj3zw58whdq5bjc66r1mc";
};
propagatedBuildInputs = [ pkgs.more FileWhich TermReadKey ]; # `more` used in tests
};
@@ -9635,10 +9676,10 @@ let
IOSocketSSL = buildPerlPackage {
pname = "IO-Socket-SSL";
- version = "2.066";
+ version = "2.068";
src = fetchurl {
- url = "mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.066.tar.gz";
- sha256 = "0d47064781a545304d5dcea5dfcee3acc2e95a32e1b4884d80505cde8ee6ebcd";
+ url = mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.068.tar.gz;
+ sha256 = "4420fc0056f1827b4dd1245eacca0da56e2182b4ef6fc078f107dc43c3fb8ff9";
};
propagatedBuildInputs = [ MozillaCA NetSSLeay ];
# Fix path to default certificate store.
@@ -9750,10 +9791,10 @@ let
IPCRun = buildPerlPackage {
pname = "IPC-Run";
- version = "20180523.0";
+ version = "20200505.0";
src = fetchurl {
- url = "mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-20180523.0.tar.gz";
- sha256 = "0bvckcs1629ifqfb68xkapd4a74fd5qbg6z9qs8i6rx4z3nxfl1q";
+ url = mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-20200505.0.tar.gz;
+ sha256 = "00f9wjvhn55zbk3n9il76xvsqy7ddk60lg6phg2rkpx0gwhvyvl1";
};
doCheck = false; /* attempts a network connection to localhost */
meta = {
@@ -9784,10 +9825,10 @@ let
IPCSystemSimple = buildPerlPackage {
pname = "IPC-System-Simple";
- version = "1.26";
+ version = "1.30";
src = fetchurl {
- url = "mirror://cpan/authors/id/J/JK/JKEENAN/IPC-System-Simple-1.26.tar.gz";
- sha256 = "57177f21d8e8625bba32ea454f10a1fda16f93c1baf1aa80d106ab1951b465fd";
+ url = mirror://cpan/authors/id/J/JK/JKEENAN/IPC-System-Simple-1.30.tar.gz;
+ sha256 = "22e6f5222b505ee513058fdca35ab7a1eab80539b98e5ca4a923a70a8ae9ba9e";
};
meta = {
description = "Run commands simply, with detailed diagnostics";
@@ -10004,15 +10045,16 @@ let
JSONMaybeXS = buildPerlPackage {
pname = "JSON-MaybeXS";
- version = "1.004000";
+ version = "1.004002";
src = fetchurl {
- url = "mirror://cpan/authors/id/H/HA/HAARG/JSON-MaybeXS-1.004000.tar.gz";
- sha256 = "09m1w03as6n0a00pzvaldkhm494yaf5n0g3j2cwwfx24iwpa1gar";
+ url = mirror://cpan/authors/id/E/ET/ETHER/JSON-MaybeXS-1.004002.tar.gz;
+ sha256 = "1dbpdlrk4pjwbn3wzawwsj57jqzdvi01h4kqpknwbl1n7gf2z3iv";
};
meta = {
description = "Use L with a fallback to L and L";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
+ buildInputs = [ TestNeeds ];
};
JSONPP = buildPerlPackage {
@@ -10043,10 +10085,10 @@ let
JSONParse = buildPerlPackage {
pname = "JSON-Parse";
- version = "0.55";
+ version = "0.56";
src = fetchurl {
- url = "mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.55.tar.gz";
- sha256 = "0mnjypkiga8zdxr5kbd7sf49pcbn55ivndn01p5ln4amqgdmd66w";
+ url = mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.56.tar.gz;
+ sha256 = "1d8ir74sgf8kw1a7459ghdhh92kzrzaysapjbw1sb859sfsirkqw";
};
meta = {
description = "Read JSON into a Perl variable";
@@ -10518,10 +10560,10 @@ let
ListAllUtils = buildPerlPackage {
pname = "List-AllUtils";
- version = "0.15";
+ version = "0.16";
src = fetchurl {
- url = "mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.15.tar.gz";
- sha256 = "3711fac729321d3aad8356a756fd9272094f227aa048866a3751f9d8ea6cc95d";
+ url = mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.16.tar.gz;
+ sha256 = "559b3aa911c73003a3a1ebd860d3b16e171137de8203d86be63a2390364c63dd";
};
propagatedBuildInputs = [ ListSomeUtils ListUtilsBy ];
meta = {
@@ -10611,10 +10653,10 @@ let
LocaleCodes = buildPerlPackage {
pname = "Locale-Codes";
- version = "3.62";
+ version = "3.64";
src = fetchurl {
- url = "mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.62.tar.gz";
- sha256 = "11a6d343e9c321d8ee9eee4479954a4e9c1ff2145187e74fd64952092f9dfab7";
+ url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.64.tar.gz;
+ sha256 = "4ed9ef810b68cbb3417e28b34606c1b73c205ce2128535e53b4c9bf612c3e861";
};
meta = {
description = "A distribution of modules to handle locale codes";
@@ -10928,10 +10970,10 @@ let
MCE = buildPerlPackage {
pname = "MCE";
- version = "1.865";
+ version = "1.872";
src = fetchurl {
- url = "mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.865.tar.gz";
- sha256 = "1fhrc0mig5rzywz3lki0gkpvm9l9693cwaljzwxkprdkxnvk709c";
+ url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.872.tar.gz;
+ sha256 = "0ydih6w1di5fppcr2s9lxbyf8av7ksgqg0mirrw5mfcr92924p90";
};
meta = {
description = "Many-Core Engine for Perl providing parallel processing capabilities";
@@ -11020,10 +11062,10 @@ let
LWP = buildPerlPackage {
pname = "libwww-perl";
- version = "6.43";
+ version = "6.45";
src = fetchurl {
- url = "mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.43.tar.gz";
- sha256 = "e9849d7ee6fd0e89cc999e63d7612c951afd6aeea6bc721b767870d9df4ac40d";
+ url = mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.45.tar.gz;
+ sha256 = "4391cec148d83c32482350c8ee1bc88f1b42d33921584b83017eba1591a42954";
};
propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPDaemon HTTPNegotiate NetHTTP TryTiny WWWRobotRules ];
# support cross-compilation by avoiding using `has_module` which does not work in miniperl (it requires B native module)
@@ -11186,10 +11228,10 @@ let
MailAuthenticationResults = buildPerlPackage {
pname = "Mail-AuthenticationResults";
- version = "1.20200108";
+ version = "1.20200331.1";
src = fetchurl {
- url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-AuthenticationResults-1.20200108.tar.gz";
- sha256 = "1j003bzqh7nax604f93k1s70b1im97986p6g58a6ynv92fbnhjq5";
+ url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-AuthenticationResults-1.20200331.1.tar.gz;
+ sha256 = "0qpairi9gmwinws4ay46pjnckib6217k0ig604ppkmjzilwjvf2c";
};
buildInputs = [ TestException ];
meta = {
@@ -11240,10 +11282,10 @@ let
MailMessage = buildPerlPackage {
pname = "Mail-Message";
- version = "3.008";
+ version = "3.009";
src = fetchurl {
- url = "mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.008.tar.gz";
- sha256 = "1k3d996r2aqqzbv0xx5y88blpy9rp14lhd9vzjc1hjnrl7gij63f";
+ url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.009.tar.gz;
+ sha256 = "06ngjxnw0r5s6fnwc6qd2710p5v28ssgjkghkw8nqy2glacczlir";
};
propagatedBuildInputs = [ IOStringy MIMETypes MailTools URI UserIdentity ];
meta = {
@@ -11254,14 +11296,14 @@ let
MailDKIM = buildPerlPackage {
pname = "Mail-DKIM";
- version = "0.58";
+ version = "1.20200513.1";
src = fetchurl {
- url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-0.58.tar.gz";
- sha256 = "0cgkal65qqcy57b21lgij90ba36wl66byw9i76g5yhwaa8ms8hqa";
+ url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-1.20200513.1.tar.gz;
+ sha256 = "1gbnzxns4gy02lrgfmzdvr7bc0kxgxiq850mdj2y7k75nnv28iak";
};
- propagatedBuildInputs = [ CryptOpenSSLRSA MailAuthenticationResults MailTools NetDNSResolverMock YAMLLibYAML ];
+ propagatedBuildInputs = [ CryptOpenSSLRSA MailAuthenticationResults MailTools NetDNS ];
doCheck = false; # tries to access the domain name system
- buildInputs = [ TestRequiresInternet ];
+ buildInputs = [ NetDNSResolverMock TestRequiresInternet YAMLLibYAML ];
};
MailIMAPClient = buildPerlPackage {
@@ -11855,6 +11897,20 @@ let
};
};
+ MetricsAny = buildPerlModule {
+ pname = "Metrics-Any";
+ version = "0.05";
+ src = fetchurl {
+ url = mirror://cpan/authors/id/P/PE/PEVANS/Metrics-Any-0.05.tar.gz;
+ sha256 = "1xg7y8szbfwmh72y8l1w0rz4jrd66hisl6hh3hyq31f52cs6hwvr";
+ };
+ buildInputs = [ TestFatal ];
+ meta = {
+ description = "abstract collection of monitoring metrics";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
# TODO: use CPAN version
MHonArc = buildPerlPackage rec {
pname = "MHonArc";
@@ -11941,7 +11997,7 @@ let
sha256 = "db603ccbf6653bcd28cfa824d72e511ead019fc8afb9f1854ec872db2d3cd8da";
};
doCheck = false;
- propagatedBuildInputs = [ HTMLParser LWP MIMELite URI ];
+ propagatedBuildInputs = [ LWP MIMELite ];
meta = {
description = "Provide routine to transform a HTML page in a MIME-Lite mail";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
@@ -12035,11 +12091,11 @@ let
ModernPerl = buildPerlPackage {
pname = "Modern-Perl";
- version = "1.20190727";
+ version = "1.20200211";
src = fetchurl {
- url = "mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20190727.tar.gz";
- sha256 = "2e69d7ab7e4a53153e686c25547ad914e7464d4e5604b8851931a6e63fc51b21";
+ url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20200211.tar.gz;
+ sha256 = "da1c83cee84fab9edb9e31d7f7abac43e1337b2e66015191ec4b6da59298c480";
};
meta = {
homepage = "https://github.com/chromatic/Modern-Perl";
@@ -12552,12 +12608,12 @@ let
MojoliciousPluginStatus = buildPerlPackage {
pname = "Mojolicious-Plugin-Status";
- version = "1.01";
+ version = "1.12";
src = fetchurl {
- url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-Plugin-Status-1.01.tar.gz";
- sha256 = "08hvwg395sibjjkwc9fg31ngpmzf7z0467p6b0il355xqbwjpdf6";
+ url = mirror://cpan/authors/id/S/SR/SRI/Mojolicious-Plugin-Status-1.12.tar.gz;
+ sha256 = "1hn333220ba3hxl9aks0ywx933zv6klyi3a0iw571q76z5a8r2jn";
};
- propagatedBuildInputs = [ BSDResource IPCShareLite Mojolicious Sereal ];
+ propagatedBuildInputs = [ BSDResource CpanelJSONXS FileMap FileTemp Mojolicious ];
meta = {
homepage = "https://github.com/mojolicious/mojo-status";
description = "Mojolicious server status plugin";
@@ -12633,12 +12689,13 @@ let
Mojomysql = buildPerlPackage rec {
pname = "Mojo-mysql";
- version = "1.18";
+ version = "1.19";
src = fetchurl {
- url = "mirror://cpan/authors/id/T/TE/TEKKI/Mojo-mysql-1.18.tar.gz";
- sha256 = "cc023f068f1ed158b5788758ea175aabe646b06d2f86049552bd7307457396bd";
+ url = mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojo-mysql-1.19.tar.gz;
+ sha256 = "8695494db239e6bbec67cc686e15a60a3424b9f71af5e9936729dfd2be8a3530";
};
propagatedBuildInputs = [ DBDmysql Mojolicious SQLAbstract ];
+ buildInputs = [ TestDeep ];
meta = {
homepage = "https://github.com/jhthorsen/mojo-mysql";
description = "Mojolicious and Async MySQL/MariaDB";
@@ -12680,13 +12737,13 @@ let
MojoPg = buildPerlPackage {
pname = "Mojo-Pg";
- version = "4.18";
+ version = "4.19";
src = fetchurl {
- url = "mirror://cpan/authors/id/S/SR/SRI/Mojo-Pg-4.18.tar.gz";
- sha256 = "31baacc0d6693886b3580e4b3ec6f2d053be8578809c9c1750753576bd1bda3c";
+ url = mirror://cpan/authors/id/S/SR/SRI/Mojo-Pg-4.19.tar.gz;
+ sha256 = "5061eaddddb52c9daf2cbc34bb21e9aeea6ae58a22775fdf1ffa747905ebc992";
};
- buildInputs = [ TestDeep ];
propagatedBuildInputs = [ DBDPg Mojolicious SQLAbstract ];
+ buildInputs = [ TestDeep ];
meta = {
homepage = "https://github.com/mojolicious/mojo-pg";
description = "Mojolicious <3 PostgreSQL";
@@ -12727,10 +12784,10 @@ let
Moo = buildPerlPackage {
pname = "Moo";
- version = "2.003006";
+ version = "2.004000";
src = fetchurl {
- url = "mirror://cpan/authors/id/H/HA/HAARG/Moo-2.003006.tar.gz";
- sha256 = "bcb2092ab18a45005b5e2e84465ebf3a4999d8e82a43a09f5a94d859ae7f2472";
+ url = mirror://cpan/authors/id/H/HA/HAARG/Moo-2.004000.tar.gz;
+ sha256 = "323240d000394cf38ec42e865b05cb8928f625c82c9391cd2cdc72b33c51b834";
};
buildInputs = [ TestFatal ];
propagatedBuildInputs = [ ClassMethodModifiers ModuleRuntime RoleTiny SubQuote ];
@@ -12836,10 +12893,10 @@ let
MooXStrictConstructor = buildPerlPackage {
pname = "MooX-StrictConstructor";
- version = "0.010";
+ version = "0.011";
src = fetchurl {
- url = "mirror://cpan/authors/id/H/HA/HARTZELL/MooX-StrictConstructor-0.010.tar.gz";
- sha256 = "0vvjgz7xbfmf69yav7sxsxmvklqv835xvh7h47w0apxmlkm9fjgr";
+ url = mirror://cpan/authors/id/H/HA/HARTZELL/MooX-StrictConstructor-0.011.tar.gz;
+ sha256 = "1qjkqrmzgz7lxhv14klsv0v9v6blf8js86d47ah24kpw5y12yf6s";
};
propagatedBuildInputs = [ Moo strictures ];
buildInputs = [ TestFatal ];
@@ -12979,13 +13036,13 @@ let
MooXlate = buildPerlPackage {
pname = "MooX-late";
- version = "0.016";
+ version = "0.100";
src = fetchurl {
- url = "mirror://cpan/authors/id/T/TO/TOBYINK/MooX-late-0.016.tar.gz";
- sha256 = "1fb6393e8b77c0ec1e99229bc6f5b9db362eedc172fa940b37defd9bb3415e4e";
+ url = mirror://cpan/authors/id/T/TO/TOBYINK/MooX-late-0.100.tar.gz;
+ sha256 = "2ae5b1e3da5abc0e4006278ecbcfa8fa7c224ea5529a6a688acbb229c09e6a5f";
};
buildInputs = [ TestFatal TestRequires ];
- propagatedBuildInputs = [ Moo TypeTiny ];
+ propagatedBuildInputs = [ Moo SubHandlesVia ];
meta = {
description = "Easily translate Moose code to Moo";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
@@ -13620,10 +13677,10 @@ let
Mouse = buildPerlModule {
pname = "Mouse";
- version = "2.5.9";
+ version = "2.5.10";
src = fetchurl {
- url = "mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.9.tar.gz";
- sha256 = "0wqcnm6xl7fv9r8izc9c43kr83qsr60i7y53hkickcqhxx38vmxr";
+ url = mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.10.tar.gz;
+ sha256 = "1vijm8wkyws1jhnqmx104585q3srw9z1crcpy1zlcfhm8qww53ff";
};
buildInputs = [ DevelPPPort ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny ];
perlPreHook = "export LD=$CC";
@@ -13648,10 +13705,10 @@ let
MozillaCA = buildPerlPackage {
pname = "Mozilla-CA";
- version = "20180117";
+ version = "20200520";
src = fetchurl {
- url = "mirror://cpan/authors/id/A/AB/ABH/Mozilla-CA-20180117.tar.gz";
- sha256 = "f2cc9fbe119f756313f321e0d9f1fac0859f8f154ac9d75b1a264c1afdf4e406";
+ url = mirror://cpan/authors/id/A/AB/ABH/Mozilla-CA-20200520.tar.gz;
+ sha256 = "b3ca0002310bf24a16c0d5920bdea97a2f46e77e7be3e7377e850d033387c726";
};
postPatch = ''
@@ -13835,10 +13892,10 @@ let
NetAmazonS3 = buildPerlPackage {
pname = "Net-Amazon-S3";
- version = "0.87";
+ version = "0.89";
src = fetchurl {
- url = "mirror://cpan/authors/id/L/LL/LLAP/Net-Amazon-S3-0.87.tar.gz";
- sha256 = "77d803477a0c635f311f538e163c5f10e471882c5153398012c93f4284376b8f";
+ url = mirror://cpan/authors/id/L/LL/LLAP/Net-Amazon-S3-0.89.tar.gz;
+ sha256 = "466b4d02b5b17790f1df22df92b22a3879423b3b33317388f0975a13e74b4eea";
};
buildInputs = [ TestDeep TestException TestLoadAllModules TestMockTime TestWarnings ];
propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule LWPUserAgentDetermined MIMETypes MooseXRoleParameterized MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions RefUtil RegexpCommon SubOverride TermEncoding TermProgressBarSimple XMLLibXML ];
@@ -13953,6 +14010,10 @@ let
sha256 = "19nf4xn9xhyd0sd2az9iliqldjj0k6ah2dmkyqyvq4rp2d9k5jgb";
});
+ postPatch = ''
+ substituteInPlace Makefile.PL --replace pkg-config $PKG_CONFIG
+ '';
+
meta = {
homepage = "http://www.freedesktop.org/wiki/Software/dbus";
description = "Extension for the DBus bindings";
@@ -13962,10 +14023,10 @@ let
NetDNS = buildPerlPackage {
pname = "Net-DNS";
- version = "1.21";
+ version = "1.24";
src = fetchurl {
- url = "mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.21.tar.gz";
- sha256 = "ddefe13b28084ffcc8f10a96b3c13c59449dbf6fc371c006d129630ea0ce767a";
+ url = mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.24.tar.gz;
+ sha256 = "11a6c2ba6cb1c6640f01c9bbf2036bcbe3974232e9b939ab94985230c92cde63";
};
propagatedBuildInputs = [ DigestHMAC ];
makeMakerFlags = "--noonline-tests";
@@ -13977,16 +14038,17 @@ let
NetDNSResolverMock = buildPerlPackage {
pname = "Net-DNS-Resolver-Mock";
- version = "1.20171219";
+ version = "1.20200215";
src = fetchurl {
- url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Net-DNS-Resolver-Mock-1.20171219.tar.gz";
- sha256 = "0m3rxpkv1b9121srvbqkrgzg4m8mnydiydqv34in1i1ixwrl6jn9";
+ url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Net-DNS-Resolver-Mock-1.20200215.tar.gz;
+ sha256 = "1rv745c16l3m3w6xx2hjmmgzkdklmzm9imdfiddmdr9hwm8g3xxy";
};
propagatedBuildInputs = [ NetDNS ];
meta = {
description = "Mock a DNS Resolver object for testing";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
+ buildInputs = [ TestException ];
};
NetDomainTLD = buildPerlPackage {
@@ -14182,10 +14244,10 @@ let
NetPing = buildPerlPackage {
pname = "Net-Ping";
- version = "2.72";
+ version = "2.73";
src = fetchurl {
- url = "mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.72.tar.gz";
- sha256 = "555af602f54229cd81fef7da1a81516800f3155c6dc4d07dc71be1de3253dd6a";
+ url = mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.73.tar.gz;
+ sha256 = "a5fbeafd3e65778364bead8800ae6a06d468ed68208619b5d4c1debd4d197cf2";
};
meta = {
description = "Check a remote host for reachability";
@@ -14208,13 +14270,13 @@ let
NetPrometheus = buildPerlModule {
pname = "Net-Prometheus";
- version = "0.07";
+ version = "0.11";
src = fetchurl {
- url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Prometheus-0.07.tar.gz";
- sha256 = "1dh498b26wdaip053hw52317jjmb2n2r5209a1zv5yfrlxpblqm7";
+ url = mirror://cpan/authors/id/P/PE/PEVANS/Net-Prometheus-0.11.tar.gz;
+ sha256 = "0skjkz6q68y8g9blm7i03k4wprac3djq15akmlv1kmgag3i0ky12";
};
- propagatedBuildInputs = [ RefUtil StructDumb ];
- buildInputs = [ TestFatal ];
+ propagatedBuildInputs = [ RefUtil StructDumb URI ];
+ buildInputs = [ HTTPMessage TestFatal ];
meta = {
description = "export monitoring metrics for F";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
@@ -14626,7 +14688,7 @@ let
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/OpenAPI-Client-0.24.tar.gz";
sha256 = "2420a2d1a9bc24a644c9ba12d77f1252ac2209ef0ac5a432153fe49c840faf28";
};
- propagatedBuildInputs = [ JSONValidator MojoliciousPluginOpenAPI ];
+ propagatedBuildInputs = [ MojoliciousPluginOpenAPI ];
meta = {
homepage = "https://github.com/jhthorsen/openapi-client";
description = "A client for talking to an Open API powered server";
@@ -14683,10 +14745,10 @@ let
NetOpenSSH = buildPerlPackage {
pname = "Net-OpenSSH";
- version = "0.78";
+ version = "0.79";
src = fetchurl {
- url = "mirror://cpan/authors/id/S/SA/SALVA/Net-OpenSSH-0.78.tar.gz";
- sha256 = "8f10844542a2824389decdb8edec7561d8199dc5f0250e849a0bb56f7aee880c";
+ url = mirror://cpan/authors/id/S/SA/SALVA/Net-OpenSSH-0.79.tar.gz;
+ sha256 = "4210fa64b50820f91ab4b6c0e02a579543fc071e73fbdec0f476447ca11172cc";
};
meta = {
description = "Perl SSH client package implemented on top of OpenSSH";
@@ -14934,10 +14996,10 @@ let
Parent = buildPerlPackage {
pname = "parent";
- version = "0.237";
+ version = "0.238";
src = fetchurl {
- url = "mirror://cpan/authors/id/C/CO/CORION/parent-0.237.tar.gz";
- sha256 = "1bnaadzf51g6zrpq6pvvgds2cc9d4w1vck7sapkd3hb5hmjdk28h";
+ url = mirror://cpan/authors/id/C/CO/CORION/parent-0.238.tar.gz;
+ sha256 = "1lfjqjxsvgpsn6ycah4z0qygkykj4v8ca3cdki61k2p2ygg8zx9q";
};
};
@@ -15050,7 +15112,7 @@ let
};
ParseYapp = buildPerlPackage {
- pname = "Parser-Yapp";
+ pname = "Parse-Yapp";
version = "1.21";
src = fetchurl {
url = "mirror://cpan/authors/id/W/WB/WBRASWELL/Parse-Yapp-1.21.tar.gz";
@@ -15093,10 +15155,10 @@ let
PathTiny = buildPerlPackage {
pname = "Path-Tiny";
- version = "0.112";
+ version = "0.114";
src = fetchurl {
- url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.112.tar.gz";
- sha256 = "813df2d140c65f795daefd8eca18e61194ecac7050c5406a069db86dea31cc3a";
+ url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.114.tar.gz;
+ sha256 = "cd0f88f37a58fc3667ec065767fe01e73ee6efa18a112bfd3508cf6579ca00e1";
};
meta = {
description = "File path utility";
@@ -15161,10 +15223,10 @@ let
PDFAPI2 = buildPerlPackage {
pname = "PDF-API2";
- version = "2.036";
+ version = "2.037";
src = fetchurl {
- url = "mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.036.tar.gz";
- sha256 = "070444e9fef8beb6f115994a6ac89533fe8ba02d5e240a35bb07adcbcb511774";
+ url = mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.037.tar.gz;
+ sha256 = "142803d1886d2a2919d374fb6c25681630aa26740e3f8023337f996fa6c6297e";
};
buildInputs = [ TestException TestMemoryCycle ];
propagatedBuildInputs = [ FontTTF ];
@@ -15176,10 +15238,10 @@ let
Pegex = buildPerlPackage {
pname = "Pegex";
- version = "0.74";
+ version = "0.75";
src = fetchurl {
- url = "mirror://cpan/authors/id/I/IN/INGY/Pegex-0.74.tar.gz";
- sha256 = "31f0889695d79a3ab79a6315a8a08baeb1268592bc6596c3feffb424d982dfdf";
+ url = mirror://cpan/authors/id/I/IN/INGY/Pegex-0.75.tar.gz;
+ sha256 = "4dc8d335de80b25247cdb3f946f0d10d9ba0b3c34b0ed7d00316fd068fd05edc";
};
buildInputs = [ TestPod TieIxHash ];
meta = {
@@ -15203,10 +15265,10 @@ let
Perlosnames = buildPerlPackage {
pname = "Perl-osnames";
- version = "0.11";
+ version = "0.122";
src = fetchurl {
- url = "mirror://cpan/authors/id/P/PE/PERLANCAR/Perl-osnames-0.11.tar.gz";
- sha256 = "fb22a1ed59dc2311f7f1ffca5685d90c0600020467f624f57b4dd3dba5bc659b";
+ url = mirror://cpan/authors/id/P/PE/PERLANCAR/Perl-osnames-0.122.tar.gz;
+ sha256 = "7075939d747e375178d00348d00c52ff9db2cebb18bae7473dcb09df825118a0";
};
meta = {
description = "List possible $^O ($OSNAME) values, with description";
@@ -15222,7 +15284,7 @@ let
sha256 = "2ad194f91ef24df4698369c2562d4164e9bf74f2d5565c681841abf79789ed82";
};
buildInputs = [ TestDeep ];
- propagatedBuildInputs = [ BKeywords ConfigTiny FileWhich ModulePluggable PPIxQuoteLike PPIxRegexp PPIxUtilities PerlTidy PodSpell StringFormat ];
+ propagatedBuildInputs = [ BKeywords ConfigTiny FileWhich ListMoreUtils ModulePluggable PPIxQuoteLike PPIxRegexp PPIxUtilities PerlTidy PodSpell StringFormat ];
meta = {
homepage = "http://perlcritic.com";
description = "Critique Perl source code for best-practices";
@@ -15241,6 +15303,19 @@ let
};
};
+ PerlIOLayers = buildPerlModule {
+ pname = "PerlIO-Layers";
+ version = "0.012";
+ src = fetchurl {
+ url = mirror://cpan/authors/id/L/LE/LEONT/PerlIO-Layers-0.012.tar.gz;
+ sha256 = "1psaq3kwlk7g9rxvgsacfjk2mh6cscqf4xl7ggfkzfrnz91aabal";
+ };
+ meta = {
+ description = "Querying your filehandle's capabilities";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
PerlIOeol = buildPerlPackage {
pname = "PerlIO-eol";
version = "0.17";
@@ -15455,10 +15530,10 @@ let
PlackMiddlewareDebug = buildPerlModule {
pname = "Plack-Middleware-Debug";
- version = "0.17";
+ version = "0.18";
src = fetchurl {
- url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Debug-0.17.tar.gz";
- sha256 = "a30b62f1bb94e641f7b60b5ea5335e140c553b4131ec4003b56db37f47617a26";
+ url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Debug-0.18.tar.gz;
+ sha256 = "192ef79e521c90c6eff6f4149ad2e4bfc911d2c95df78935855e90d659e9ac9a";
};
buildInputs = [ ModuleBuildTiny TestRequires ];
propagatedBuildInputs = [ ClassMethodModifiers DataDump DataDumperConcise Plack TextMicroTemplate ];
@@ -15592,14 +15667,10 @@ let
POE = buildPerlPackage {
pname = "POE";
- version = "1.367";
- patches = [
- ../development/perl-modules/perl-POE-1.367-pod_linkcheck.patch
- ../development/perl-modules/perl-POE-1.367-pod_no404s.patch
- ];
+ version = "1.368";
src = fetchurl {
- url = "mirror://cpan/authors/id/R/RC/RCAPUTO/POE-1.367.tar.gz";
- sha256 = "0b9s7yxaa2lgzyi56brgygycfjk7lz33d1ddvc1wvwwvm45p4wmp";
+ url = mirror://cpan/authors/id/B/BI/BINGOS/POE-1.368.tar.gz;
+ sha256 = "08g1vzxamqg0gmkirdcx7fycq3pwv9vbajc30qwqpm1n3rvdrcdp";
};
# N.B. removing TestPodLinkCheck from buildInputs because tests requiring
# this module don't disable themselves when "run_network_tests" is
@@ -15665,12 +15736,12 @@ let
PPIxQuoteLike = buildPerlModule {
pname = "PPIx-QuoteLike";
- version = "0.008";
+ version = "0.011";
src = fetchurl {
- url = "mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.008.tar.gz";
- sha256 = "0dzlcddvfzn7s8z1jj12ghsbzf9wm5dq84361v4vx5p6j8zhsaz4";
+ url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.011.tar.gz;
+ sha256 = "0yi0rx8nf3pz1g5d9z7mi6pzbd4y2kqj61vsgmyllk6rfyjcgmsf";
};
- propagatedBuildInputs = [ PPI ];
+ propagatedBuildInputs = [ PPI Readonly ];
meta = {
description = "Parse Perl string literals and string-literal-like things.";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
@@ -15679,12 +15750,12 @@ let
PPIxRegexp = buildPerlModule {
pname = "PPIx-Regexp";
- version = "0.068";
+ version = "0.072";
src = fetchurl {
- url = "mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.068.tar.gz";
- sha256 = "b5444b699a3c7ad79506c796559449c6f858dc62deb60e08249f96782636e5f4";
+ url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.072.tar.gz;
+ sha256 = "84a050b3b65c98a4b95f9df94fa0d8db9a931b000bb6e2946f0f8874cc2bac5c";
};
- propagatedBuildInputs = [ ListMoreUtils PPI ];
+ propagatedBuildInputs = [ PPI ];
meta = {
description = "Parse regular expressions";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
@@ -15900,10 +15971,10 @@ let
PerlPrereqScannerNotQuiteLite = buildPerlPackage {
pname = "Perl-PrereqScanner-NotQuiteLite";
- version = "0.9909";
+ version = "0.9911";
src = fetchurl {
- url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Perl-PrereqScanner-NotQuiteLite-0.9909.tar.gz";
- sha256 = "09sa86maxrqnxf84wa0cgkcs8p6xvpsv0x5dny3hz0300zgrqmq5";
+ url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Perl-PrereqScanner-NotQuiteLite-0.9911.tar.gz;
+ sha256 = "1h8sv5df7736sr7vasl6hkcvqlsqz9y61wiky6bvqa7fnlfhcyp0";
};
propagatedBuildInputs = [ DataDump ModuleCPANfile ModuleFind RegexpTrie ];
buildInputs = [ ExtUtilsMakeMakerCPANfile TestFailWarnings TestUseAllModules ];
@@ -16306,10 +16377,10 @@ let
Redis = buildPerlModule {
pname = "Redis";
- version = "1.995";
+ version = "1.996";
src = fetchurl {
- url = "mirror://cpan/authors/id/D/DA/DAMS/Redis-1.995.tar.gz";
- sha256 = "a0b07b284ff12bb852a3120723f1e63ab279df575d6c52a78f914565a9f0b906";
+ url = mirror://cpan/authors/id/D/DA/DAMS/Redis-1.996.tar.gz;
+ sha256 = "5c196d56a4d771abb2042fd52f252096497fc86f35910581e0956b5710ea74b6";
};
buildInputs = [ IOString ModuleBuildTiny TestDeep TestFatal TestSharedFork TestTCP ];
propagatedBuildInputs = [ IOSocketTimeout TryTiny ];
@@ -16370,10 +16441,10 @@ let
RegexpGrammars = buildPerlModule {
pname = "Regexp-Grammars";
- version = "1.052";
+ version = "1.057";
src = fetchurl {
- url = "mirror://cpan/authors/id/D/DC/DCONWAY/Regexp-Grammars-1.052.tar.gz";
- sha256 = "d552e7aaec956fc9ff0c56602fc95bc5c97ef815a0a8df7f42d1128f39534a62";
+ url = mirror://cpan/authors/id/D/DC/DCONWAY/Regexp-Grammars-1.057.tar.gz;
+ sha256 = "af53c19818461cd701aeb57c49dffdb463edc4bf8f658d9ea4e6d534ac177041";
};
meta = {
description = "Add grammatical parsing features to Perl 5.10 regexes";
@@ -16545,10 +16616,10 @@ let
RTClientREST = buildPerlModule {
pname = "RT-Client-REST";
- version = "0.56";
+ version = "0.60";
src = fetchurl {
- url = "mirror://cpan/authors/id/D/DJ/DJZORT/RT-Client-REST-0.56.tar.gz";
- sha256 = "798baccf11eaecbb7d2d27be0b5e4fa9cb80b34cc51cab12eb7b88facf39fd4b";
+ url = mirror://cpan/authors/id/D/DJ/DJZORT/RT-Client-REST-0.60.tar.gz;
+ sha256 = "0e6f2da3d96903491b43b19c61221cbeea88414264f907312f277daaf144248b";
};
buildInputs = [ CGI HTTPServerSimple TestException ];
meta = {
@@ -16573,10 +16644,10 @@ let
ScalarListUtils = buildPerlPackage {
pname = "Scalar-List-Utils";
- version = "1.53";
+ version = "1.55";
src = fetchurl {
- url = "mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.53.tar.gz";
- sha256 = "bd4086b066fb3b18a0be2e7d9bc100a99aa0f233ad659492340415c7b2bdae99";
+ url = mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.55.tar.gz;
+ sha256 = "4d2bdc1c72a7bc4d69d6a5cc85bc7566497c3b183c6175b832784329d58feb4b";
};
meta = {
description = "Common Scalar and List utility subroutines";
@@ -16671,12 +16742,12 @@ let
SerealDecoder = buildPerlPackage {
pname = "Sereal-Decoder";
- version = "4.008";
+ version = "4.014";
src = fetchurl {
- url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-Decoder-4.008.tar.gz";
- sha256 = "1vxgwlya7sj9mb6y278qblrjl2708d0agy7cryyqj7qf08d056rv";
+ url = mirror://cpan/authors/id/Y/YV/YVES/Sereal-Decoder-4.014.tar.gz;
+ sha256 = "0ph5k99ssm5anwsdjal7sw96pjs65lirfanfsw8gh6k40w0w6f44";
};
- buildInputs = [ TestDeep TestDifferences TestLongString TestWarn ];
+ buildInputs = [ TestDeep TestDifferences TestLongString TestMemoryGrowth TestWarn ];
preBuild = ''ls'';
meta = {
homepage = "https://github.com/Sereal/Sereal";
@@ -16688,10 +16759,10 @@ let
SerealEncoder = buildPerlPackage {
pname = "Sereal-Encoder";
- version = "4.008";
+ version = "4.014";
src = fetchurl {
- url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-Encoder-4.008.tar.gz";
- sha256 = "0vzk6d2h034qks4lby53xrfljsrx4cvkaqi7gz9frba17lvl01rq";
+ url = mirror://cpan/authors/id/Y/YV/YVES/Sereal-Encoder-4.014.tar.gz;
+ sha256 = "0044pkjkdg8y0ljmfj0bx68wf7jpfyy98kxi4z36kxarz2hcf462";
};
buildInputs = [ SerealDecoder TestDeep TestDifferences TestLongString TestWarn ];
meta = {
@@ -16704,12 +16775,12 @@ let
Sereal = buildPerlPackage {
pname = "Sereal";
- version = "4.008";
+ version = "4.014";
src = fetchurl {
- url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-4.008.tar.gz";
- sha256 = "1ima428v8mi509crr3b1rnh67ki8vbcd7iignw68mf2iaw5wmb58";
+ url = mirror://cpan/authors/id/Y/YV/YVES/Sereal-4.014.tar.gz;
+ sha256 = "02qpl3x6sh0xfby38gr80dndkah9m5r0xhk7d4a24i9hqljjaing";
};
- buildInputs = [ TestLongString TestWarn ];
+ buildInputs = [ TestDeep TestLongString TestMemoryGrowth TestWarn ];
propagatedBuildInputs = [ SerealDecoder SerealEncoder ];
meta = {
homepage = "https://github.com/Sereal/Sereal";
@@ -16963,10 +17034,10 @@ let
Specio = buildPerlPackage {
pname = "Specio";
- version = "0.45";
+ version = "0.46";
src = fetchurl {
- url = "mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.45.tar.gz";
- sha256 = "1xk1skzvmqjgk7dqfkcmp6g7fc493cyk2hp94fzpdc43cg78ifg4";
+ url = mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.46.tar.gz;
+ sha256 = "15lmxffbzj1gq7n9m80a3ka8nqxmmk3p4azp33y6wv872shjmx0b";
};
propagatedBuildInputs = [ DevelStackTrace EvalClosure MROCompat ModuleRuntime RoleTiny SubQuote TryTiny ];
buildInputs = [ TestFatal TestNeeds ];
@@ -17031,10 +17102,10 @@ let
SQLAbstract = buildPerlPackage {
pname = "SQL-Abstract";
- version = "1.86";
+ version = "1.87";
src = fetchurl {
- url = "mirror://cpan/authors/id/I/IL/ILMARI/SQL-Abstract-1.86.tar.gz";
- sha256 = "e7a7f7da5e6fa42f495860e92e9138b8a0964ca7674c95bd6ff1b1ce21aa8cdf";
+ url = mirror://cpan/authors/id/I/IL/ILMARI/SQL-Abstract-1.87.tar.gz;
+ sha256 = "e926a0a83da7efa18e57e5b2952a2ab3b7563a51733fc6dd5c89f12156481c4a";
};
buildInputs = [ TestDeep TestException TestWarn ];
propagatedBuildInputs = [ HashMerge MROCompat Moo ];
@@ -17073,8 +17144,8 @@ let
url = "mirror://cpan/authors/id/R/RE/REHSACK/SQL-Statement-1.412.tar.gz";
sha256 = "65c870883379c11b53f19ead10aaac241ccc86a90bbab77f6376fe750720e5c8";
};
- buildInputs = [ TestDeep ];
- propagatedBuildInputs = [ Clone ModuleRuntime ParamsUtil TextSoundex MathBaseConvert ];
+ buildInputs = [ MathBaseConvert TestDeep TextSoundex ];
+ propagatedBuildInputs = [ Clone ModuleRuntime ParamsUtil ];
};
SQLTokenizer = buildPerlPackage {
@@ -17088,10 +17159,10 @@ let
SQLTranslator = buildPerlPackage {
pname = "SQL-Translator";
- version = "1.60";
+ version = "1.61";
src = fetchurl {
- url = "mirror://cpan/authors/id/I/IL/ILMARI/SQL-Translator-1.60.tar.gz";
- sha256 = "6bb0cb32ca25da69df65e5de71f679f3ca90044064526fa336cabd342f220e87";
+ url = mirror://cpan/authors/id/M/MS/MSTROUT/SQL-Translator-1.61.tar.gz;
+ sha256 = "840e3c77cd48b47e1343c79ae8ef4fca46d036356d143d33528900740416dfe8";
};
buildInputs = [ FileShareDirInstall JSONMaybeXS TestDifferences TestException XMLWriter YAML ];
propagatedBuildInputs = [ CarpClan DBI FileShareDir Moo PackageVariant ParseRecDescent TryTiny ];
@@ -17376,6 +17447,7 @@ let
description = "String::Interpolate - Wrapper for builtin the Perl interpolation engine.";
license = licenses.gpl1Plus;
};
+ propagatedBuildInputs = [ PadWalker SafeHole ];
};
StringMkPasswd = buildPerlPackage {
@@ -17505,10 +17577,10 @@ let
StructDumb = buildPerlModule {
pname = "Struct-Dumb";
- version = "0.09";
+ version = "0.12";
src = fetchurl {
- url = "mirror://cpan/authors/id/P/PE/PEVANS/Struct-Dumb-0.09.tar.gz";
- sha256 = "0g9rziaqxkm00vh30g1yfwzq3b1xl23p8fbm4rszqsp641wr2z9k";
+ url = mirror://cpan/authors/id/P/PE/PEVANS/Struct-Dumb-0.12.tar.gz;
+ sha256 = "0wvzcpil9xc2wkibq3sj8i5bgq4iadx2k7hfqb8jm5p66g271kjj";
};
buildInputs = [ TestFatal ];
meta = {
@@ -17576,6 +17648,21 @@ let
};
};
+ SubHandlesVia = buildPerlPackage {
+ pname = "Sub-HandlesVia";
+ version = "0.013";
+ src = fetchurl {
+ url = mirror://cpan/authors/id/T/TO/TOBYINK/Sub-HandlesVia-0.013.tar.gz;
+ sha256 = "1q5lqjnqw29ywkiv0iqidc88ydqp1cywrgfd8mi7yarksc296a3l";
+ };
+ propagatedBuildInputs = [ ClassMethodModifiers ClassTiny RoleTiny ScalarListUtils TypeTiny ];
+ buildInputs = [ TestFatal TestRequires ];
+ meta = {
+ description = "alternative handles_via implementation";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
SubIdentify = buildPerlPackage {
pname = "Sub-Identify";
version = "0.14";
@@ -17679,6 +17766,20 @@ let
propagatedBuildInputs = [ (pkgs.subversionClient.override { inherit perl; }) ];
};
+ SafeHole = buildPerlModule {
+ pname = "Safe-Hole";
+ version = "0.14";
+ src = fetchurl {
+ url = mirror://cpan/authors/id/T/TO/TODDR/Safe-Hole-0.14.tar.gz;
+ sha256 = "01gc2lfli282dj6a2pkpxb0vmpyavs323cbdw15gxi06pn5nxxgl";
+ };
+ meta = {
+ description = "lib/Safe/Hole.pm";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ homepage = "http://github.com/toddr/Safe-Hole";
+ };
+ };
+
Swim = buildPerlPackage {
pname = "Swim";
version = "0.1.48";
@@ -17759,10 +17860,10 @@ let
SysMmap = buildPerlPackage {
pname = "Sys-Mmap";
- version = "0.19";
+ version = "0.20";
src = fetchurl {
- url = "mirror://cpan/authors/id/S/SW/SWALTERS/Sys-Mmap-0.19.tar.gz";
- sha256 = "1yh0170xfw3z7n3lynffcb6axv7wi6zb46cx03crj1cvrhjmwa89";
+ url = mirror://cpan/authors/id/T/TO/TODDR/Sys-Mmap-0.20.tar.gz;
+ sha256 = "1kz22l7sh2mibliixyshc9958bqlkzsb13agcibp7azii4ncw80q";
};
meta = with stdenv.lib; {
description = "Use mmap to map in a file as a Perl variable";
@@ -17847,16 +17948,17 @@ let
SystemCommand = buildPerlPackage {
pname = "System-Command";
- version = "1.119";
+ version = "1.121";
src = fetchurl {
- url = "mirror://cpan/authors/id/B/BO/BOOK/System-Command-1.119.tar.gz";
- sha256 = "c8c9fb1e527c52463cab1476500efea70396a0b62bea625d2d6faea994dc46e7";
+ url = mirror://cpan/authors/id/B/BO/BOOK/System-Command-1.121.tar.gz;
+ sha256 = "43de5ecd20c1da46e8a6f4fceab29e04697a2890a99bf6a91b3ca004a468a241";
};
propagatedBuildInputs = [ IPCRun ];
meta = {
description = "Object for running system commands";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
+ buildInputs = [ PodCoverageTrustPod TestCPANMeta TestPod TestPodCoverage ];
};
SysVirt = buildPerlModule rec {
@@ -17909,7 +18011,7 @@ let
sha256 = "a2f73c65d0e5676cf4aae213ba4c3f88bf85f084a2165f1e71e3ce5b19023206";
};
buildInputs = [ CodeTidyAll TestDataSplit TestDifferences TestPerlTidy TestRunPluginTrimDisplayedFilenames TestRunValgrind TestTrailingSpace TestTrap ];
- propagatedBuildInputs = [ EnvPath FileWhich GamesSolitaireVerify InlineC MooX StringShellQuote TaskTestRunAllPlugins TemplateToolkit YAMLLibYAML ];
+ propagatedBuildInputs = [ EnvPath FileWhich GamesSolitaireVerify InlineC ListMoreUtils MooX StringShellQuote TaskTestRunAllPlugins TemplateToolkit YAMLLibYAML ];
meta = {
description = "Install the CPAN dependencies of the Freecell Solver test suite";
license = stdenv.lib.licenses.mit;
@@ -18044,16 +18146,18 @@ let
TemplateToolkit = buildPerlPackage {
pname = "Template-Toolkit";
- version = "3.007";
+ version = "3.008";
src = fetchurl {
- url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Template-Toolkit-3.007.tar.gz";
- sha256 = "1jh953f1v4r494mdvzfqs1ay1bh453dmp10z4qmv0makwarjsnfp";
+ url = mirror://cpan/authors/id/A/AT/ATOOMIC/Template-Toolkit-3.008.tar.gz;
+ sha256 = "14m6kl9zrs6ycr440an7zswrmcimv2747qq0r87inwznprl0yh2j";
};
doCheck = !stdenv.isDarwin;
meta = {
description = "Comprehensive template processing system";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
+ propagatedBuildInputs = [ AppConfig ];
+ buildInputs = [ CGI TestLeakTrace ];
};
TemplateGD = buildPerlPackage {
@@ -18327,10 +18431,10 @@ let
Test2Suite = buildPerlPackage {
pname = "Test2-Suite";
- version = "0.000128";
+ version = "0.000130";
src = fetchurl {
- url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000128.tar.gz";
- sha256 = "f8e4e76900f5fb748d085aa5d18b916e07273e9ca50fb671ab8be1301cfae08c";
+ url = mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000130.tar.gz;
+ sha256 = "d462cb95024c0735fc0fdb22f92fda4f852bf85d92d89bd95e4fa212730d534a";
};
propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ];
meta = {
@@ -18508,10 +18612,10 @@ let
TestCompile = buildPerlModule {
pname = "Test-Compile";
- version = "2.3.1";
+ version = "2.4.0";
src = fetchurl {
- url = "mirror://cpan/authors/id/E/EG/EGILES/Test-Compile-v2.3.1.tar.gz";
- sha256 = "1174cff010011ae43e6462755ccd8a6cf0372ca506705c60586f7b1748ff4ddf";
+ url = mirror://cpan/authors/id/E/EG/EGILES/Test-Compile-v2.4.0.tar.gz;
+ sha256 = "eff7e320527d7a33d9b27443871c1e9d5dbeb11408fb9843c56496f67b99ad78";
};
propagatedBuildInputs = [ UNIVERSALrequire ];
meta = {
@@ -18564,10 +18668,10 @@ let
TestDeep = buildPerlPackage {
pname = "Test-Deep";
- version = "1.128";
+ version = "1.130";
src = fetchurl {
- url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-1.128.tar.gz";
- sha256 = "0bq9c0vrxbwhhy1pd2ss06fk06jal98j022mnyq6k0msdy1pwbc5";
+ url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-1.130.tar.gz;
+ sha256 = "0mkw18q5agr30djxr1y68rcfw8aq20ws872hmv88f9gnynag8r20";
};
meta = {
};
@@ -18848,10 +18952,10 @@ let
TestLWPUserAgent = buildPerlPackage {
pname = "Test-LWP-UserAgent";
- version = "0.033";
+ version = "0.034";
src = fetchurl {
- url = "mirror://cpan/authors/id/E/ET/ETHER/Test-LWP-UserAgent-0.033.tar.gz";
- sha256 = "03fjjj65fpjr4pv1532kwci1llfbsv4g9an0h7k723yqfx1wgdsb";
+ url = mirror://cpan/authors/id/E/ET/ETHER/Test-LWP-UserAgent-0.034.tar.gz;
+ sha256 = "1ybhl9zpxkz77d25h96kbgh16zy9f27n95p6j9jg52kvdg0r2lbp";
};
propagatedBuildInputs = [ LWP SafeIsa namespaceclean ];
buildInputs = [ PathTiny Plack TestDeep TestFatal TestNeeds TestRequiresInternet TestWarnings ];
@@ -18924,6 +19028,33 @@ let
};
};
+ TestMemoryGrowth = buildPerlModule {
+ pname = "Test-MemoryGrowth";
+ version = "0.03";
+ src = fetchurl {
+ url = mirror://cpan/authors/id/P/PE/PEVANS/Test-MemoryGrowth-0.03.tar.gz;
+ sha256 = "0z6lmalhq3k3p303qahs0ijp6sarf3ij88m39yhzizzf9abapvsz";
+ };
+ meta = {
+ description = "assert that code does not cause growth in memory usage";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
+ TestMetricsAny = buildPerlModule {
+ pname = "Test-Metrics-Any";
+ version = "0.01";
+ src = fetchurl {
+ url = mirror://cpan/authors/id/P/PE/PEVANS/Test-Metrics-Any-0.01.tar.gz;
+ sha256 = "0s744lv997g1wr4i4vg1d7zpzjfw334hdy45215jf6xj9s6wh1i5";
+ };
+ propagatedBuildInputs = [ MetricsAny ];
+ meta = {
+ description = "assert that code produces metrics via L";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
TestMockClass = buildPerlModule {
pname = "Test-Mock-Class";
version = "0.0303";
@@ -18956,10 +19087,10 @@ let
TestMockModule = buildPerlModule {
pname = "Test-MockModule";
- version = "0.171.0";
+ version = "0.173.0";
src = fetchurl {
- url = "mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-v0.171.0.tar.gz";
- sha256 = "1arqgb1773zym5dqlwm6kz48bfrccjhb5bjfsif0vkalwq2gvm7b";
+ url = mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-v0.173.0.tar.gz;
+ sha256 = "0hnv2ziyasrri58ys93j5qyyzgxw3jx5hvjhd72nsp4vqq6lhg6s";
};
propagatedBuildInputs = [ SUPER ];
buildInputs = [ TestWarnings ];
@@ -19048,10 +19179,10 @@ let
TestMost = buildPerlPackage {
pname = "Test-Most";
- version = "0.35";
+ version = "0.37";
src = fetchurl {
- url = "mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.35.tar.gz";
- sha256 = "0zv5dyzq55r28plffibcr7wd00abap0h2zh4s4p8snaiszsad5wq";
+ url = mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.37.tar.gz;
+ sha256 = "1isg8z6by113zn08l044w6k04y5m5bnns3rqmks8rwdr3qa70csk";
};
propagatedBuildInputs = [ ExceptionClass ];
meta = {
@@ -19146,10 +19277,10 @@ let
TestPerlTidy = buildPerlModule {
pname = "Test-PerlTidy";
- version = "20190402";
+ version = "20200412";
src = fetchurl {
- url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-PerlTidy-20190402.tar.gz";
- sha256 = "e9cb9b23ed62e8c6a47a1e18b55328aa3bfa467e05cd93e7e12b2738dd1e025f";
+ url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-PerlTidy-20200412.tar.gz;
+ sha256 = "905240447edb1930192000db659556cbf5ad5710f4376bb0a5abcd8716a4592c";
};
propagatedBuildInputs = [ PathTiny PerlTidy TextDiff ];
meta = {
@@ -19239,10 +19370,10 @@ let
TestRequires = buildPerlPackage {
pname = "Test-Requires";
- version = "0.10";
+ version = "0.11";
src = fetchurl {
- url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/Test-Requires-0.10.tar.gz";
- sha256 = "1d9f481lj12cw1ciil46xq9nq16p6a90nm7yrsalpf8asn8s6s17";
+ url = mirror://cpan/authors/id/T/TO/TOKUHIROM/Test-Requires-0.11.tar.gz;
+ sha256 = "03q49vi09b4n31kpnmq4v2dga5ja438a8f1wgkgwvvlpjmadx22b";
};
meta = {
description = "Checks to see if the module can be loaded";
@@ -19466,10 +19597,10 @@ let
TestSimple13 = buildPerlPackage {
pname = "Test-Simple";
- version = "1.302171";
+ version = "1.302175";
src = fetchurl {
- url = "mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302171.tar.gz";
- sha256 = "e27f90d2b2a6bc6ffa7675a072c2f41d5caffd99858dc69b2030940cc138368a";
+ url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302175.tar.gz;
+ sha256 = "c8c8f5c51ad6d7a858c3b61b8b658d8e789d3da5d300065df0633875b0075e49";
};
meta = {
description = "Basic utilities for writing tests";
@@ -19585,10 +19716,10 @@ let
TestTrailingSpace = buildPerlModule {
pname = "Test-TrailingSpace";
- version = "0.0302";
+ version = "0.0600";
src = fetchurl {
- url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-TrailingSpace-0.0302.tar.gz";
- sha256 = "c48a6377d84576512b47652798d9d4bb4467adacf0e6afc3df1f880f2c03b612";
+ url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-TrailingSpace-0.0600.tar.gz;
+ sha256 = "f09d263adec06700a43a24e29f5484cf6d2939914c607dec51590f4bb8fa5a11";
};
propagatedBuildInputs = [ FileFindObjectRule ];
meta = {
@@ -19626,10 +19757,10 @@ let
TestWarnings = buildPerlPackage {
pname = "Test-Warnings";
- version = "0.028";
+ version = "0.030";
src = fetchurl {
- url = "mirror://cpan/authors/id/E/ET/ETHER/Test-Warnings-0.028.tar.gz";
- sha256 = "26fda9f8d279e943d27e43a4a3a5cea8a6592cd36e7308695f8dc6602262c0e0";
+ url = mirror://cpan/authors/id/E/ET/ETHER/Test-Warnings-0.030.tar.gz;
+ sha256 = "89a4947ddf1564ae01122275584433d7f6c4370370bcf3768922d796956ae24f";
};
buildInputs = [ CPANMetaCheck PadWalker ];
meta = {
@@ -19732,10 +19863,10 @@ let
TextAligner = buildPerlModule {
pname = "Text-Aligner";
- version = "0.13";
+ version = "0.16";
src = fetchurl {
- url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Aligner-0.13.tar.gz";
- sha256 = "1vry21jrh91l2pkajnrps83bnr1fn6zshbzi80mcrnggrn9iq776";
+ url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Aligner-0.16.tar.gz;
+ sha256 = "09ap457vrlqvw2544j907fbb5crs08hd7sy4syipzxc6wny7v1aw";
};
meta = {
description = "Align text in columns";
@@ -19855,10 +19986,10 @@ let
TextCSV_XS = buildPerlPackage {
pname = "Text-CSV_XS";
- version = "1.40";
+ version = "1.43";
src = fetchurl {
- url = "mirror://cpan/authors/id/H/HM/HMBRAND/Text-CSV_XS-1.40.tgz";
- sha256 = "6a448ae1f66768fa5dec1cd2fb246bcaaa3f3ea22d555d1fee8d091833073675";
+ url = mirror://cpan/authors/id/H/HM/HMBRAND/Text-CSV_XS-1.43.tgz;
+ sha256 = "cd94538e8ae9388d9e9e5527630f38f4d2b766e30310d283f0f9c692b94230bb";
};
meta = {
description = "Comma-Separated Values manipulation routines";
@@ -20162,10 +20293,10 @@ let
TextTable = buildPerlModule {
pname = "Text-Table";
- version = "1.133";
+ version = "1.134";
src = fetchurl {
- url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.133.tar.gz";
- sha256 = "04kh5x5inq183rdg221wlqaaqi1ipyj588mxsslik6nhc14f17nd";
+ url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.134.tar.gz;
+ sha256 = "02yigisvgshpgfyqwj0xad4jg473cd80a6c210nb5h5p32dl5kxs";
};
propagatedBuildInputs = [ TextAligner ];
meta = {
@@ -20275,10 +20406,10 @@ let
Testutf8 = buildPerlPackage {
pname = "Test-utf8";
- version = "1.01";
+ version = "1.02";
src = fetchurl {
- url = "mirror://cpan/authors/id/M/MA/MARKF/Test-utf8-1.01.tar.gz";
- sha256 = "ef371b1769cd8d36d2d657e8321723d94c8f8d89e7fd7437c6648c5dc6711b7a";
+ url = mirror://cpan/authors/id/M/MA/MARKF/Test-utf8-1.02.tar.gz;
+ sha256 = "df82f09c5940830b25a49f1c8162fa24d371e602880edef8d9a4d4bfd66b8bd7";
};
meta = {
homepage = "https://github.com/2shortplanks/Test-utf8";
@@ -20552,10 +20683,10 @@ let
TimeDate = buildPerlPackage {
pname = "TimeDate";
- version = "2.31";
+ version = "2.33";
src = fetchurl {
- url = "mirror://cpan/authors/id/A/AT/ATOOMIC/TimeDate-2.31.tar.gz";
- sha256 = "10ad6l4ii2iahdpw8h0xqwasc1jblan31h597q3js4j5nbnhywjw";
+ url = mirror://cpan/authors/id/A/AT/ATOOMIC/TimeDate-2.33.tar.gz;
+ sha256 = "1cjyc0yi873597r7xcp9yz0l1c46ik2kxwfrn00zbrlx0d5rrdn0";
};
};
@@ -20690,10 +20821,10 @@ let
Tk = buildPerlPackage {
pname = "Tk";
- version = "804.034";
+ version = "804.035";
src = fetchurl {
- url = "mirror://cpan/authors/id/S/SR/SREZIC/Tk-804.034.tar.gz";
- sha256 = "fea6b144c723528a2206c8cd9175844032ee9c14ee37791f0f151e5e5b293fe2";
+ url = mirror://cpan/authors/id/S/SR/SREZIC/Tk-804.035.tar.gz;
+ sha256 = "4d2b80291ba6de34d8ec886a085a6dbd2b790b926035a087e99025614c5ffdd4";
};
makeMakerFlags = "X11INC=${pkgs.xorg.libX11.dev}/include X11LIB=${pkgs.xorg.libX11.out}/lib";
buildInputs = [ pkgs.xorg.libX11 pkgs.libpng ];
@@ -20787,10 +20918,10 @@ let
TypeTiny = buildPerlPackage {
pname = "Type-Tiny";
- version = "1.008005";
+ version = "1.010002";
src = fetchurl {
- url = "mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.008005.tar.gz";
- sha256 = "cc25eb6bd204b586b71e1f6408922b88be3c8183a1e4f99282d885904c776226";
+ url = mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.010002.tar.gz;
+ sha256 = "2ea6ea2d8b2b3bb1b94f0309fa5064d57e7734c8bb14e99218e655dc1647073a";
};
propagatedBuildInputs = [ ExporterTiny ];
meta = {
@@ -21221,10 +21352,10 @@ let
WWWMechanize = buildPerlPackage {
pname = "WWW-Mechanize";
- version = "1.95";
+ version = "2.00";
src = fetchurl {
- url = "mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-1.95.tar.gz";
- sha256 = "1w121x0xsn1bm699ncanyxqv3njqam3zzjkq8p54bqmzpikn5crs";
+ url = mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-2.00.tar.gz;
+ sha256 = "0j5bzn9jwb8rclif776gax57jxxn108swmajiqi2cpjbmlwng0ki";
};
propagatedBuildInputs = [ HTMLForm HTMLTree LWP ];
doCheck = false;
@@ -21233,7 +21364,7 @@ let
description = "Handy web browsing in a Perl object";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
- buildInputs = [ CGI HTTPServerSimple TestDeep TestFatal TestOutput TestWarnings ];
+ buildInputs = [ CGI HTTPServerSimple PathTiny TestDeep TestFatal TestOutput TestWarnings ];
};
WWWMechanizeCGI = buildPerlPackage {
@@ -21493,13 +21624,13 @@ let
XMLLibXML = buildPerlPackage {
pname = "XML-LibXML";
- version = "2.0202";
+ version = "2.0205";
src = fetchurl {
- url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0202.tar.gz";
- sha256 = "1bp2d5jpfmp35f2giwqx60q2rmzq469szkxzfcqkd742x72h4ayc";
+ url = mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0205.tar.gz;
+ sha256 = "0y12bcpnxzn8vs9zglaaxkw0kgrgmljxrxdf1cnijgxi2hkh099s";
};
SKIP_SAX_INSTALL = 1;
- buildInputs = [ AlienLibxml2 ];
+ buildInputs = [ AlienBuild AlienLibxml2 ];
propagatedBuildInputs = [ XMLSAX ];
};
@@ -21551,10 +21682,10 @@ let
XMLParser = buildPerlPackage {
pname = "XML-Parser";
- version = "2.46";
+ version = "2.44";
src = fetchurl {
- url = "mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.46.tar.gz";
- sha256 = "0pai3ik47q7rgnix9644c673fwydz52gqkxr9kxwq765j4j36cfk";
+ url = mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz;
+ sha256 = "05ij0g6bfn27iaggxf8nl5rhlwx6f6p6xmdav6rjcly3x5zd1s8s";
};
patches = [ ../development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch ];
postPatch = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
@@ -21792,12 +21923,12 @@ let
XSObjectMagic = buildPerlPackage {
pname = "XS-Object-Magic";
- version = "0.04";
+ version = "0.05";
src = fetchurl {
- url = "mirror://cpan/authors/id/F/FL/FLORA/XS-Object-Magic-0.04.tar.gz";
- sha256 = "03fghj7hq0fiicmfdxhmzfm4mzv7s097pgkd32ji7jnljvhm9six";
+ url = mirror://cpan/authors/id/E/ET/ETHER/XS-Object-Magic-0.05.tar.gz;
+ sha256 = "0njyy4y0zax4zz55y82dlm9cly1pld1lcxb281s12bp9rrhf9j9x";
};
- buildInputs = [ ExtUtilsDepends TestFatal ];
+ buildInputs = [ ExtUtilsDepends TestFatal TestSimple13 ];
meta = {
description = "XS pointer backed objects using sv_magic";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
@@ -21861,19 +21992,19 @@ let
YAMLLibYAML = buildPerlPackage {
pname = "YAML-LibYAML";
- version = "0.81";
+ version = "0.82";
src = fetchurl {
- url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.81.tar.gz";
- sha256 = "1rwmy4kywaa0hypy329gb8wbqdk01bv4179bbnjbg66kzl5ndpvh";
+ url = mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.82.tar.gz;
+ sha256 = "0j7yhxkaasccynl5iq1cqpf4x253p4bi5wsq6qbwwv2wjsiwgd02";
};
};
YAMLPP = buildPerlPackage {
pname = "YAML-PP";
- version = "0.018";
+ version = "0.022";
src = fetchurl {
- url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-PP-0.018.tar.gz";
- sha256 = "1s957svv1z4sz62s53n5ym3c0liafs2gl8r0m7xq9qgcb9dyvblx";
+ url = mirror://cpan/authors/id/T/TI/TINITA/YAML-PP-0.022.tar.gz;
+ sha256 = "1hf7kpnzais4inhvh3azr0r9886lsqr8xjb81nik0idlgpl8rzh2";
};
buildInputs = [ TestDeep TestWarn ];
meta = {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3115c41e1624..ee0153e7911b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4530,7 +4530,9 @@ in {
locustio = callPackage ../development/python-modules/locustio { };
- llvmlite = callPackage ../development/python-modules/llvmlite { llvm = pkgs.llvm_8; };
+ llvmlite = callPackage ../development/python-modules/llvmlite {
+ llvm = pkgs.llvm_9; # llvmlite always requires a specific version of llvm.
+ };
lockfile = callPackage ../development/python-modules/lockfile { };
@@ -4930,16 +4932,11 @@ in {
Nuitka = callPackage ../development/python-modules/nuitka { };
- numpy = let
- numpy_ = callPackage ../development/python-modules/numpy { };
- numpy_2 = numpy_.overridePythonAttrs(oldAttrs: rec {
- version = "1.16.5";
- src = oldAttrs.src.override {
- inherit version;
- sha256 = "8bb452d94e964b312205b0de1238dd7209da452343653ab214b5d681780e7a0c";
- };
- });
- in if pythonOlder "3.5" then numpy_2 else numpy_;
+ numpy =
+ if pythonOlder "3.5" then
+ callPackage ../development/python-modules/numpy/1.16.nix { }
+ else
+ callPackage ../development/python-modules/numpy { };
numpydoc = callPackage ../development/python-modules/numpydoc { };
@@ -6727,8 +6724,12 @@ in {
cmdtest = callPackage ../development/python-modules/cmdtest { };
- tornado = callPackage ../development/python-modules/tornado { };
- tornado_4 = callPackage ../development/python-modules/tornado { version = "4.5.3"; };
+ tornado = if isPy3k then
+ callPackage ../development/python-modules/tornado { }
+ else
+ callPackage ../development/python-modules/tornado/5.nix { };
+
+ tornado_4 = callPackage ../development/python-modules/tornado/4.nix { };
tokenlib = callPackage ../development/python-modules/tokenlib { };