Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
10k staging builds are not yet finished on Hydra (mostly darwin),
but we now have a 20k jobs rebuilding directly on master, so we would
never get to merge this way...
  • Loading branch information
vcunat committed Sep 12, 2017
2 parents 7786aab + ab62b7e commit 422adc3
Showing 67 changed files with 423 additions and 1,538 deletions.
2 changes: 1 addition & 1 deletion nixos/modules/hardware/raid/hpsa.nix
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ let
for file in $out/bin/*; do
chmod +w $file
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \

This comment has been minimized.

Copy link
@FRidh

FRidh Sep 12, 2017

Member

@Ericson2314 is this a left-over of the revert of your commit?

This comment has been minimized.

Copy link
@FRidh

FRidh Sep 12, 2017

Member

Note its also in 17.09.

This comment has been minimized.

Copy link
@Ericson2314

Ericson2314 Sep 12, 2017

Member

Yes it is. Good catch.

This comment has been minimized.

Copy link
@vcunat

vcunat Sep 13, 2017

Author Member

Thanks. Resolved in both branches: 0b131df

--set-rpath ${lib.makeLibraryPath [ pkgs.stdenv.cc.cc ]} \
$file
done
8 changes: 4 additions & 4 deletions pkgs/applications/graphics/inkscape/default.nix
Original file line number Diff line number Diff line change
@@ -10,11 +10,11 @@ let
in

stdenv.mkDerivation rec {
name = "inkscape-0.92.1";
name = "inkscape-0.92.2";

src = fetchurl {
url = "https://media.inkscape.org/dl/resources/file/${name}.tar_XlpI7qT.bz2";
sha256 = "01chr3vh728dkg7l7lilwgmh5nrp784khdhjgpqjbq9dh2zhax15";
url = "https://media.inkscape.org/dl/resources/file/${name}.tar.bz2";
sha256 = "1lyghk6yarcv9nwkh6k366p6hb7rfilqcvbyji09hki59khd0a56";
};

unpackPhase = ''
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {

meta = with stdenv.lib; {
license = "GPL";
homepage = http://www.inkscape.org;
homepage = https://www.inkscape.org;
description = "Vector graphics editor";
platforms = platforms.all;
longDescription = ''
108 changes: 108 additions & 0 deletions pkgs/build-support/binutils-wrapper/macos-sierra-reexport-hack.bash
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
#! @shell@

set -eu -o pipefail

path_backup="$PATH"
if [ -n "@coreutils_bin@" ]; then
PATH="@coreutils_bin@/bin"
fi

declare -r recurThreshold=300

declare overflowCount=0
for ((n=0; n < $#; ++n)); do
case "${!n}" in
-l*) let overflowCount+=1 ;;
-reexport-l*) let overflowCount+=1 ;;
*) ;;
esac
done

declare -a allArgs=()

if (( "$overflowCount" <= "$recurThreshold" )); then
allArgs=("$@")
else
declare -a childrenLookup=() childrenLink=()

while (( $# )); do
case "$1" in
-L/*)
childrenLookup+=("$1")
allArgs+=("$1")
;;
-L)
echo "cctools LD does not support '-L foo' or '-l foo'" >&2
exit 1
;;
-l)
echo "cctools LD does not support '-L foo' or '-l foo'" >&2
exit 1
;;
-lazy_library | -lazy_framework | -lto_library)
# We aren't linking any "azy_library", "to_library", etc.
allArgs+=("$1")
;;
-lazy-l | -weak-l) allArgs+=("$1") ;;
# We can't so easily prevent header issues from these.
-lSystem) allArgs+=("$1") ;;
# Special case as indirection seems like a bad idea for something
# so fundamental. Can be removed for simplicity.
-l?* | -reexport-l?*) childrenLink+=("$1") ;;
*) allArgs+=("$1") ;;
esac

shift
done

declare n=0
while (( $n < "${#childrenLink[@]}" )); do
if [[ "${childrenLink[n]}" = -l* ]]; then
childrenLink[n]="-reexport${childrenLink[n]}"
fi
let ++n
done
unset n

declare -r outputNameLibless=$(basename $( \
if [[ -z "${outputName:+isUndefined}" ]]; then
echo unnamed
elif [[ "${outputName:0:3}" = lib ]]; then
echo "${outputName:3}"
else
echo "${outputName}"
fi))
declare -ra children=("$outputNameLibless-reexport-delegate-0" \
"$outputNameLibless-reexport-delegate-1")
mkdir -p "$out/lib"
PATH="$PATH:@out@/bin"
symbolBloatObject=$outputNameLibless-symbol-hack.o
if [[ ! -e $symbolBloatObject ]]; then
# `-Q` means use GNU Assembler rather than Clang, avoiding an awkward
# dependency cycle.
printf '.private_extern _______child_hack_foo\nchild_hack_foo:\n' \
| @binPrefix@as -Q -- -o $symbolBloatObject
fi
# first half of libs
@binPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \
-o "$out/lib/lib${children[0]}.dylib" \
-install_name "$out/lib/lib${children[0]}.dylib" \
"${childrenLookup[@]}" "$symbolBloatObject" \
"${childrenLink[@]:0:$((${#childrenLink[@]} / 2 ))}"
# second half of libs
@binPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \
-o "$out/lib/lib${children[1]}.dylib" \
-install_name "$out/lib/lib${children[1]}.dylib" \
"${childrenLookup[@]}" "$symbolBloatObject" \
"${childrenLink[@]:$((${#childrenLink[@]} / 2 ))}"
allArgs+=("-L$out/lib" "-l${children[0]}" "-l${children[1]}")
fi
PATH="$path_backup"
exec @prog@ "${allArgs[@]}"
6 changes: 0 additions & 6 deletions pkgs/build-support/cc-wrapper/add-flags.sh
Original file line number Diff line number Diff line change
@@ -5,11 +5,6 @@
# wrapped binary just inherit the work of the forker's wrapper script.

var_templates=(
NIX_CC_WRAPPER+START_HOOK
NIX_CC_WRAPPER+EXEC_HOOK
NIX_LD_WRAPPER+START_HOOK
NIX_LD_WRAPPER+EXEC_HOOK

NIX+CFLAGS_COMPILE
NIX+CFLAGS_LINK
NIX+CXXSTDLIB_COMPILE
@@ -19,7 +14,6 @@ var_templates=(
NIX+LDFLAGS
NIX+LDFLAGS_BEFORE
NIX+LDFLAGS_AFTER
NIX+LDFLAGS_HARDEN

NIX+SET_BUILD_ID
NIX+DONT_SET_RPATH
4 changes: 3 additions & 1 deletion pkgs/build-support/cc-wrapper/add-hardening.sh
Original file line number Diff line number Diff line change
@@ -43,6 +43,7 @@ if [[ -z "${hardeningDisableMap[all]:-}" ]]; then
hardeningCFlags+=('-fPIE')
if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then
if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling LDFlags -pie >&2; fi
hardeningCFlags+=('-pie')
hardeningLDFlags+=('-pie')
fi
;;
@@ -67,7 +68,8 @@ if [[ -z "${hardeningDisableMap[all]:-}" ]]; then
hardeningLDFlags+=('-z' 'now')
;;
*)
echo "Hardening flag unknown: $flag" >&2
# Ignore unsupported. Checked in Nix that at least *some*
# tool supports each flag.
;;
esac
fi
10 changes: 1 addition & 9 deletions pkgs/build-support/cc-wrapper/cc-wrapper.sh
Original file line number Diff line number Diff line change
@@ -15,10 +15,6 @@ if [ -z "${NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then
source @out@/nix-support/add-flags.sh
fi

if [ -n "$NIX_CC_WRAPPER_@infixSalt@_START_HOOK" ]; then
source "$NIX_CC_WRAPPER_@infixSalt@_START_HOOK"
fi

source @out@/nix-support/utils.sh


@@ -138,7 +134,7 @@ if [ "$dontLink" != 1 ]; then

# Add the flags that should only be passed to the compiler when
# linking.
extraAfter+=($NIX_@infixSalt@_CFLAGS_LINK "${hardeningLDFlags[@]}")
extraAfter+=($NIX_@infixSalt@_CFLAGS_LINK)

# Add the flags that should be passed to the linker (and prevent
# `ld-wrapper' from adding NIX_@infixSalt@_LDFLAGS again).
@@ -175,10 +171,6 @@ if [ -n "${NIX_DEBUG:-}" ]; then
printf " %q\n" ${extraAfter+"${extraAfter[@]}"} >&2
fi

if [ -n "$NIX_CC_WRAPPER_@infixSalt@_EXEC_HOOK" ]; then
source "$NIX_CC_WRAPPER_@infixSalt@_EXEC_HOOK"
fi

PATH="$path_backup"
# Old bash workaround, see above.
exec @prog@ \
8 changes: 0 additions & 8 deletions pkgs/build-support/cc-wrapper/gnat-wrapper.sh
Original file line number Diff line number Diff line change
@@ -17,10 +17,6 @@ if [ -z "${NIX_@infixSalt@_GNAT_WRAPPER_FLAGS_SET:-}" ]; then
source @out@/nix-support/add-flags.sh
fi

if [ -n "$NIX_@infixSalt@_GNAT_WRAPPER_START_HOOK" ]; then
source "$NIX_@infixSalt@_GNAT_WRAPPER_START_HOOK"
fi

source @out@/nix-support/utils.sh


@@ -122,9 +118,5 @@ if [ -n "${NIX_DEBUG:-}" ]; then
printf " %q\n" "${extraAfter[@]}" >&2
fi

if [ -n "$NIX_@infixSalt@_GNAT_WRAPPER_EXEC_HOOK" ]; then
source "$NIX_@infixSalt@_GNAT_WRAPPER_EXEC_HOOK"
fi

PATH="$path_backup"
exec @prog@ "${extraBefore[@]}" "${params[@]}" "${extraAfter[@]}"
4 changes: 0 additions & 4 deletions pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh
Original file line number Diff line number Diff line change
@@ -33,8 +33,4 @@ if [ -n "${NIX_DEBUG:-}" ]; then
printf " %q\n" "${extraAfter[@]}" >&2
fi

if [ -n "$NIX_@infixSalt@_GNAT_WRAPPER_EXEC_HOOK" ]; then
source "$NIX_@infixSalt@_GNAT_WRAPPER_EXEC_HOOK"
fi

exec @prog@ "${extraBefore[@]}" "$@" "${extraAfter[@]}"
14 changes: 5 additions & 9 deletions pkgs/build-support/cc-wrapper/ld-wrapper.sh
Original file line number Diff line number Diff line change
@@ -14,10 +14,6 @@ if [ -z "${NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then
source @out@/nix-support/add-flags.sh
fi

if [ -n "$NIX_LD_WRAPPER_@infixSalt@_START_HOOK" ]; then
source "$NIX_LD_WRAPPER_@infixSalt@_START_HOOK"
fi

source @out@/nix-support/utils.sh


@@ -65,7 +61,7 @@ if [ -z "${NIX_@infixSalt@_LDFLAGS_SET:-}" ]; then
extraBefore+=($NIX_@infixSalt@_LDFLAGS_BEFORE)
fi

extraAfter+=($NIX_@infixSalt@_LDFLAGS_AFTER $NIX_@infixSalt@_LDFLAGS_HARDEN)
extraAfter+=($NIX_@infixSalt@_LDFLAGS_AFTER)

declare -a libDirs
declare -A libs
@@ -145,6 +141,10 @@ if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ]; then
fi
done
done

if [ -n "${NIX_COREFOUNDATION_RPATH:-}" ]; then
extraAfter+=(-rpath $NIX_COREFOUNDATION_RPATH)
fi
fi


@@ -166,10 +166,6 @@ if [ -n "${NIX_DEBUG:-}" ]; then
printf " %q\n" ${extraAfter+"${extraAfter[@]}"} >&2
fi

if [ -n "$NIX_LD_WRAPPER_@infixSalt@_EXEC_HOOK" ]; then
source "$NIX_LD_WRAPPER_@infixSalt@_EXEC_HOOK"
fi

PATH="$path_backup"
# Old bash workaround, see above.
exec @prog@ \
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ updateSourceDateEpoch() {
# Get the last modification time of all regular files, sort them,
# and get the most recent. Maybe we should use
# https://github.com/0-wiz-0/findnewest here.
local -a res=($(find "$path" -type f -print0 | xargs -0 -r stat -c '%Y %n' | sort -n | tail -n1))
local time="${res[0]}"
local -a res=($(find "$path" -type f -not -newer "$NIX_BUILD_TOP/.." -printf '%T@ %p\0' | sort -n --zero-terminated | tail -n1 --zero-terminated))
local time="${res[0]//\.[0-9]*/}" # remove the fraction part
local newestFile="${res[1]}"

# Update $SOURCE_DATE_EPOCH if the most recent file we found is newer.
14 changes: 4 additions & 10 deletions pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
, bash, gtk3, glib, makeWrapper, cracklib, libnotify
, itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python
, bash, gtk3, glib, wrapGAppsHook, cracklib, libnotify
, itstool, gnome3, gdk_pixbuf, libxml2, python
, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }:

stdenv.mkDerivation rec {
@@ -16,14 +16,8 @@ stdenv.mkDerivation rec {
libxslt libtool libsecret libpwquality cracklib
libnotify libdvdread libcanberra_gtk3 docbook_xsl
gdk_pixbuf gnome3.defaultIconTheme
librsvg udisks2 gnome3.gnome_settings_daemon
gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];

preFixup = ''
wrapProgram "$out/bin/gnome-disks" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
'';
udisks2 gnome3.gnome_settings_daemon
gnome3.gsettings_desktop_schemas wrapGAppsHook libxml2 ];

meta = with stdenv.lib; {
homepage = https://en.wikipedia.org/wiki/GNOME_Disks;
2 changes: 1 addition & 1 deletion pkgs/development/compilers/gcc/4.5/default.nix
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ let version = "4.5.4";

/* Cross-gcc settings */
gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null targetPlatform;
gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null targetPlatformt;
gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null targetPlatform;
gccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null targetPlatform;
withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
6 changes: 3 additions & 3 deletions pkgs/development/compilers/nasm/default.nix
Original file line number Diff line number Diff line change
@@ -2,17 +2,17 @@

stdenv.mkDerivation rec {
name = "nasm-${version}";
version = "2.12.02";
version = "2.13.01";

src = fetchurl {
url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2";
sha256 = "097318bjxvmffbjfd1k89parc04xf5jfxg2rr93581lccwf8kc00";
sha256 = "1ylqs4sqh0paia970v6hpdgq5icxns9zlg21qql232bz1apppy88";
};

meta = with stdenv.lib; {
homepage = http://www.nasm.us/;
description = "An 80x86 and x86-64 assembler designed for portability and modularity";
platforms = platforms.unix;
maintainers = with maintainers; [ pSub ];
maintainers = with maintainers; [ pSub willibutz ];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/interpreters/ruby/default.nix
Original file line number Diff line number Diff line change
@@ -83,7 +83,7 @@ let

enableParallelBuilding = true;

hardeningDisable = lib.optional isRuby20 [ "format" ];
hardeningDisable = lib.optional isRuby20 "format";

patches =
(import ./patchsets.nix {
4 changes: 3 additions & 1 deletion pkgs/development/libraries/gettext/default.nix
Original file line number Diff line number Diff line change
@@ -45,7 +45,9 @@ stdenv.mkDerivation rec {
fi
'';

nativeBuildInputs = [ xz xz.bin ] ++ stdenv.lib.optional (!stdenv.isLinux && !hostPlatform.isCygwin) libiconv; # HACK, see #10874 (and 14664)
nativeBuildInputs = [ xz xz.bin ];
# HACK, see #10874 (and 14664)
buildInputs = stdenv.lib.optional (!stdenv.isLinux && !hostPlatform.isCygwin) libiconv;

enableParallelBuilding = true;

5 changes: 2 additions & 3 deletions pkgs/development/libraries/glew/1.10.nix
Original file line number Diff line number Diff line change
@@ -13,9 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r";
};

nativeBuildInputs = [ x11 libXmu libXi ];
propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h
buildInputs = [] ++ optionals stdenv.isDarwin [ AGL ];
buildInputs = [ x11 libXmu libXi ] ++ optionals stdenv.isDarwin [ AGL ];
propagatedBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h

patchPhase = ''
sed -i 's|lib64|lib|' config/Makefile.linux
4 changes: 2 additions & 2 deletions pkgs/development/libraries/glew/default.nix
Original file line number Diff line number Diff line change
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {

outputs = [ "bin" "out" "dev" "doc" ];

nativeBuildInputs = [ xlibsWrapper libXmu libXi ];
propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h
buildInputs = [ xlibsWrapper libXmu libXi ];
propagatedBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h

patchPhase = ''
sed -i 's|lib64|lib|' config/Makefile.linux
Binary file added pkgs/development/libraries/glibc/2.25-49.patch.gz
Binary file not shown.
Loading

0 comments on commit 422adc3

Please sign in to comment.