public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-next'

Browse Source 
Security fixes for a few packages are included.
This commit is contained in:
Vladimír Čunát
2018-08-21 15:36:02 +02:00
parent 690a8017de cad8fc3447
commit 765d695b89
196 changed files with 9556 additions and 16487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/tools/misc/automake/automake-1.11.x.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, autoconf, makeWrapper }:
{ stdenv, fetchurl, perl, autoconf }:
stdenv.mkDerivation rec {
name = "automake-1.11.6";
@@ -17,11 +17,12 @@ stdenv.mkDerivation rec {
patches = [ ./fix-test-autoconf-2.69.patch ./fix-perl-5.26.patch ];
buildInputs = [perl autoconf makeWrapper];
buildInputs = [ perl autoconf ];
# Disable indented log output from Make, otherwise "make.test" will
# fail.
preCheck = "unset NIX_INDENT_MAKE";
doCheck = false; # takes _a lot_ of time, fails 11 of 782 tests
# Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
# "fixed" path in generated files!

5
pkgs/development/tools/misc/automake/automake-1.16.x.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, autoconf, doCheck ? false }:
{ stdenv, fetchurl, perl, autoconf }:
stdenv.mkDerivation rec {
name = "automake-1.16.1";
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
# Disable indented log output from Make, otherwise "make.test" will
# fail.
preCheck = "unset NIX_INDENT_MAKE";
inherit doCheck;
doCheck = false; # takes _a lot_ of time, fails 3 out of 2698 tests, all seem to be related to paths
doInstallCheck = false; # runs the same thing, fails the same tests
# The test suite can run in parallel.
enableParallelBuilding = true;

5
pkgs/development/tools/misc/binutils/default.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, buildPackages
, fetchurl, zlib, autoreconfHook264
, hostPlatform, targetPlatform
, hostPlatform, buildPlatform, targetPlatform
, noSysDirs, gold ? true, bison ? null
}:
@@ -121,6 +121,9 @@ stdenv.mkDerivation rec {
doCheck = false; # fails
# else fails with "./sanity.sh: line 36: $out/bin/size: not found"
doInstallCheck = buildPlatform == hostPlatform && hostPlatform == targetPlatform;
enableParallelBuilding = true;
passthru = {

9
pkgs/development/tools/misc/elfutils/default.nix
View File

@@ -10,7 +10,11 @@ stdenv.mkDerivation rec {
sha256 = "1zq0l12k64hrbjmdjc4llrad96c25i427hpma1id9nk87w9qqvdp";
};
patches = ./debug-info-from-env.patch;
patches = [ ./debug-info-from-env.patch ];
postPatch = ''
patchShebangs tests
'';
hardeningDisable = [ "format" ];
@@ -63,6 +67,9 @@ stdenv.mkDerivation rec {
cp version.h $out/include
'';
doCheck = false; # fails 3 out of 174 tests
doInstallCheck = false; # fails 70 out of 174 tests
meta = {
homepage = https://sourceware.org/elfutils/;
description = "A set of utilities to handle ELF objects";

2
pkgs/development/tools/misc/intel-gpu-tools/default.nix
View File

@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
'';
preBuild = ''
patchShebangs tests
patchShebangs debugger/system_routine/pre_cpp.py
substituteInPlace tools/Makefile.am --replace '$(CAIRO_CFLAGS)' '$(CAIRO_CFLAGS) $(GLIB_CFLAGS)'
substituteInPlace tests/Makefile.am --replace '$(CAIRO_CFLAGS)' '$(CAIRO_CFLAGS) $(GLIB_CFLAGS)'

2
pkgs/development/tools/misc/patchelf/default.nix
View File

@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
setupHook = [ ./setup-hook.sh ];
#doCheck = true; # problems when loading libc.so.6
doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6
meta = {
homepage = https://nixos.org/patchelf.html;

9
pkgs/development/tools/misc/rman/default.nix
View File

@@ -8,7 +8,12 @@ stdenv.mkDerivation {
sha256 = "0prdld6nbkdlkcgc2r1zp13h2fh8r0mlwxx423dnc695ddlk18b8";
};
makeFlags = "BINDIR=$(out)/bin MANDIR=$(out)/share/man";
postPatch = ''
substituteInPlace Makefile \
--replace ginstall install
'';
makeFlags = [ "BINDIR=$(out)/bin" "MANDIR=$(out)/share/man" ];
preInstall = ''
mkdir -p $out/bin
@@ -17,6 +22,8 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ];
doCheck = false; # "check" target is probably meant to do "installcheck" or something
meta = {
description = "Parse formatted man pages and man page source from most flavors of UNIX and converts them to HTML, ASCII, TkMan, DocBook, and other formats";
license = "artistic";

4
pkgs/development/tools/misc/strace/default.nix
View File

@@ -16,6 +16,10 @@ stdenv.mkDerivation rec {
configureFlags = stdenv.lib.optional (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV) "--enable-mpers=check";
# fails 1 out of 523 tests with
# "strace-k.test: failed test: ../../strace -e getpid -k ../stack-fcall output mismatch"
doCheck = false;
meta = with stdenv.lib; {
homepage = https://strace.io/;
description = "A system call tracer for Linux";

4
pkgs/development/tools/misc/texinfo/common.nix
View File

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
buildInputs = [ xz.bin ]
++ optionals stdenv.isSunOS [ libiconv gawk ]
++ optionals interactive [ ncurses procps ];
++ optional interactive ncurses;
configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ]
++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
@@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
installTargets="install install-tex";
'';
checkInputs = [ procps ];
doCheck = interactive
&& !stdenv.isDarwin
&& !stdenv.isSunOS; # flaky

3
pkgs/development/tools/parsing/bison/2.x.nix
View File

@@ -8,8 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "0c9li3iaslzzr3zig6m3zlmb4r8i0wfvkcrvdyiqxasb09mjkqh8";
};
nativeBuildInputs = [ m4 ] ++ stdenv.lib.optional doCheck perl;
nativeBuildInputs = [ m4 ];
propagatedBuildInputs = [ m4 ];
checkInputs = [ perl ];
patches = lib.optional stdenv.isDarwin ./darwin-vasnprintf.patch;

6
pkgs/development/tools/parsing/flex/2.5.35.nix
View File

@@ -8,6 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "0wh06nix8bd4w1aq4k2fbbkdq5i30a9lxz3xczf3ff28yy0kfwzm";
};
postPatch = ''
patchShebangs tests
'';
nativeBuildInputs = [ flex bison texinfo help2man autoreconfHook ];
propagatedBuildInputs = [ m4 ];
@@ -17,6 +21,8 @@ stdenv.mkDerivation rec {
"ac_cv_func_realloc_0_nonnull=yes"
];
doCheck = false; # fails 2 out of 46 tests
meta = with stdenv.lib; {
branch = "2.5.35";
homepage = http://flex.sourceforge.net/;

11
pkgs/development/tools/parsing/flex/2.6.1.nix
View File

@@ -8,6 +8,12 @@ stdenv.mkDerivation rec {
sha256 = "0fy14c35yz2m1n1m4f02by3501fn0cca37zn7jp8lpp4b3kgjhrw";
};
postPatch = ''
patchShebangs tests
'' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
substituteInPlace Makefile.in --replace "tests" " ";
'';
buildInputs = [ bison ];
propagatedBuildInputs = [ m4 ];
@@ -21,11 +27,6 @@ stdenv.mkDerivation rec {
sed -i Makefile -e 's/-no-undefined//;'
'';
# disable tests which can't run on build machine
postPatch = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
substituteInPlace Makefile.in --replace "tests" " ";
'';
meta = with stdenv.lib; {
homepage = https://github.com/westes/flex;
description = "A fast lexical analyser generator";

5
pkgs/development/tools/parsing/flex/default.nix
View File

@@ -19,7 +19,10 @@ stdenv.mkDerivation rec {
+ "/tools/flex/patches/200-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch";
sha256 = "1aarhcmz7mfrgh15pkj6f7ikxa2m0mllw1i1vscsf1kw5d05lw6f";
})];
postPatch = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
postPatch = ''
patchShebangs tests
'' + stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
substituteInPlace Makefile.in --replace "tests" " "
substituteInPlace doc/Makefile.am --replace 'flex.1: $(top_srcdir)/configure.ac' 'flex.1: '

4
pkgs/development/tools/parsing/re2c/default.nix
View File

@@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
preCheck = ''
patchShebangs run_tests.sh
'';
meta = with stdenv.lib; {
description = "Tool for writing very fast and very flexible scanners";
homepage = "http://re2c.org";

3
pkgs/development/tools/xcbuild/platforms.nix
View File

@@ -294,8 +294,7 @@ runCommand "Platforms" {} ''
install -D ${writeText "PackageTypes.xcspec" (toPlist {} PackageTypes)} $platform/Developer/Library/Xcode/Specifications/PackageTypes.xcspec
install -D ${writeText "ProductTypes.xcspec" (toPlist {} ProductTypes)} $platform/Developer/Library/Xcode/Specifications/ProductTypes.xcspec
# per-platform bins go here
mkdir -p $platform/usr/bin
ln -s $platform $platform/usr
mkdir -p $platform/Developer
ln -s ${sdks} $platform/Developer/SDKs

9
pkgs/development/tools/xcbuild/sdks.nix
View File

@@ -1,4 +1,5 @@
{ runCommand, lib, toolchainName, sdkName, writeText, version, xcodePlatform }:
{ stdenv, runCommand, lib, toolchainName, sdkName
, writeText, version, xcodePlatform, libcxx, symlinkJoin }:
let
inherit (lib.generators) toPlist;
@@ -18,11 +19,11 @@ let
};
in
runCommand "SDKs" {
inherit version;
} ''
runCommand "SDKs" {} ''
sdk=$out/${sdkName}.sdk
install -D ${writeText "SDKSettings.plist" (toPlist {} SDKSettings)} $sdk/SDKSettings.plist
install -D ${writeText "SystemVersion.plist" (toPlist {} SystemVersion)} $sdk/System/Library/CoreServices/SystemVersion.plist
ln -s $sdk $sdk/usr
ln -s $sdk $out/${xcodePlatform}.sdk
''

56
pkgs/development/tools/xcbuild/toolchains.nix
View File

@@ -1,4 +1,4 @@
{ runCommand, toolchainName, fetchurl, makeWrapper, stdenv
{ runCommand, toolchainName, fetchurl, stdenv
, buildPackages, lib, writeText }:
let
@@ -20,52 +20,52 @@ let
};
in
runCommand "Toolchains" {
nativeBuildInputs = [ makeWrapper ];
} (''
runCommand "Toolchains" {} (''
toolchain=$out/XcodeDefault.xctoolchain
mkdir -p $toolchain
install -D ${writeText "ToolchainInfo.plist" (toPlist {} ToolchainInfo)} $toolchain/ToolchainInfo.plist
mkdir -p $toolchain/usr/include
mkdir -p $toolchain/usr/lib
mkdir -p $toolchain/usr/libexec
mkdir -p $toolchain/usr/share
mkdir -p $toolchain/usr/bin
ln -s $toolchain $toolchain/usr
mkdir -p $toolchain/include
mkdir -p $toolchain/lib
mkdir -p $toolchain/libexec
mkdir -p $toolchain/share
mkdir -p $toolchain/bin
for bin in ${getBin stdenv.cc}/bin/*; do
ln -s $bin $toolchain/usr/bin
ln -s $bin $toolchain/bin
done
for bin in ${getBin stdenv.cc.bintools.bintools}/bin/*; do
if ! [ -e "$toolchain/usr/bin/$(basename $bin)" ]; then
ln -s $bin $toolchain/usr/bin
if ! [ -e "$toolchain/bin/$(basename $bin)" ]; then
ln -s $bin $toolchain/bin
fi
done
ln -s ${buildPackages.yacc}/bin/yacc $toolchain/usr/bin/yacc
ln -s ${buildPackages.yacc}/bin/bison $toolchain/usr/bin/bison
ln -s ${buildPackages.flex}/bin/flex $toolchain/usr/bin/flex
ln -s ${buildPackages.flex}/bin/flex++ $toolchain/usr/bin/flex++
ln -s $toolchain/bin/flex $toolchain/usr/bin/lex
ln -s ${buildPackages.yacc}/bin/yacc $toolchain/bin/yacc
ln -s ${buildPackages.yacc}/bin/bison $toolchain/bin/bison
ln -s ${buildPackages.flex}/bin/flex $toolchain/bin/flex
ln -s ${buildPackages.flex}/bin/flex++ $toolchain/bin/flex++
ln -s $toolchain/bin/flex $toolchain/bin/lex
ln -s ${buildPackages.m4}/bin/m4 $toolchain/usr/bin/m4
ln -s $toolchain/usr/bin/m4 $toolchain/usr/bin/gm4
ln -s ${buildPackages.m4}/bin/m4 $toolchain/bin/m4
ln -s $toolchain/bin/m4 $toolchain/bin/gm4
ln -s ${buildPackages.unifdef}/bin/unifdef $toolchain/usr/bin/unifdef
ln -s ${buildPackages.unifdef}/bin/unifdefall $toolchain/usr/bin/unifdefall
ln -s ${buildPackages.unifdef}/bin/unifdef $toolchain/bin/unifdef
ln -s ${buildPackages.unifdef}/bin/unifdefall $toolchain/bin/unifdefall
ln -s ${buildPackages.gperf}/bin/gperf $toolchain/usr/bin/gperf
ln -s ${buildPackages.indent}/bin/indent $toolchain/usr/bin/indent
ln -s ${buildPackages.ctags}/bin/ctags $toolchain/usr/bin/ctags
ln -s ${buildPackages.gperf}/bin/gperf $toolchain/bin/gperf
ln -s ${buildPackages.indent}/bin/indent $toolchain/bin/indent
ln -s ${buildPackages.ctags}/bin/ctags $toolchain/bin/ctags
'' + optionalString stdenv.isDarwin ''
for bin in ${getBin buildPackages.darwin.cctools}/bin/*; do
if ! [ -e "$toolchain/usr/bin/$(basename $bin)" ]; then
ln -s $bin $toolchain/usr/bin
if ! [ -e "$toolchain/bin/$(basename $bin)" ]; then
ln -s $bin $toolchain/bin
fi
done
ln -s ${buildPackages.darwin.bootstrap_cmds}/bin/mig $toolchain/usr/bin
ln -s ${mkdep-darwin-src} $toolchain/usr/bin/mkdep
ln -s ${buildPackages.darwin.bootstrap_cmds}/bin/mig $toolchain/bin
ln -s ${mkdep-darwin-src} $toolchain/bin/mkdep
'')

23
pkgs/development/tools/xcbuild/wrapper.nix
View File

@@ -1,4 +1,4 @@
{ lib, buildPackages, makeWrapper, writeText, runCommand
{ stdenv, lib, buildPackages, makeWrapper, writeText, runCommand
, CoreServices, ImageIO, CoreGraphics
, targetPlatform
, xcodePlatform ? targetPlatform.xcodePlatform or "MacOSX"
@@ -36,14 +36,14 @@ let
'';
xcode-select = writeText "xcode-select" ''
#!/usr/bin/env sh
#!${stdenv.shell}
while [ $# -gt 0 ]; do
case "$1" in
-h | --help) ;; # noop
-s | --switch) shift;; # noop
-r | --reset) ;; # noop
-v | --version) echo xcode-select version ${xcodeSelectVersion} ;;
-p | --print-path) echo @DEVELOPER_DIR@ ;;
-p | -print-path | --print-path) echo @DEVELOPER_DIR@ ;;
--install) ;; # noop
esac
shift
@@ -51,7 +51,7 @@ done
'';
xcrun = writeText "xcrun" ''
#!/usr/bin/env sh
#!${stdenv.shell}
while [ $# -gt 0 ]; do
case "$1" in
--sdk | -sdk) shift ;;
@@ -86,16 +86,20 @@ runCommand "xcodebuild-${xcbuild.version}" {
inherit (xcbuild) meta;
# ensure that the toolchain goes in PATH
propagatedBuildInputs = [ "${toolchains}/XcodeDefault.xctoolchain/usr" ];
propagatedBuildInputs = [ "${toolchains}/XcodeDefault.xctoolchain" ];
passthru = { inherit xcbuild; };
passthru = {
inherit xcbuild;
toolchain = "${toolchains}/XcodeDefault.xctoolchain";
sdk = "${sdks}/${sdkName}";
platform = "${platforms}/${xcodePlatform}.platform";
};
preferLocalBuild = true;
} ''
mkdir -p $out/bin
mkdir -p $out/usr
ln -s $out/bin $out/usr/bin
ln -s $out $out/usr
mkdir -p $out/Library/Xcode
ln -s ${xcbuild}/Library/Xcode/Specifications $out/Library/Xcode/Specifications
@@ -108,7 +112,8 @@ runCommand "xcodebuild-${xcbuild.version}" {
--add-flags "DERIVED_DATA_DIR=." \
--set DEVELOPER_DIR "$out" \
--set SDKROOT ${sdkName} \
--run '[ "$1" = "-version" ] && (echo Xcode ${xcodeVer}; echo Build version ${sdkBuildVersion}) && exit 0'
--run '[ "$1" = "-version" ] && [ "$#" -eq 1 ] && (echo Xcode ${xcodeVer}; echo Build version ${sdkBuildVersion}) && exit 0' \
--run '[ "$1" = "-license" ] && exit 0'
substitute ${xcode-select} $out/bin/xcode-select \
--subst-var-by DEVELOPER_DIR $out