Merge branch 'staging'
Master is seeing a very large rebuild now, and this version of staging seemed rather fine already (only a few thousand builds remaining now). I really didn't want to wait a few more days because of this.
This commit is contained in:
commit
92ee3b02e8
|
@ -120,14 +120,6 @@ stdenv.mkDerivation ({
|
|||
# prevent a retained dependency on the bootstrap tools in the stdenv-linux
|
||||
# bootstrap.
|
||||
BASH_SHELL = "/bin/sh";
|
||||
|
||||
# Workaround for this bug:
|
||||
# http://sourceware.org/bugzilla/show_bug.cgi?id=411
|
||||
# I.e. when gcc is compiled with --with-arch=i686, then the
|
||||
# preprocessor symbol `__i686' will be defined to `1'. This causes
|
||||
# the symbol __i686.get_pc_thunk.dx to be mangled.
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.system == "i686-linux") "-U__i686"
|
||||
+ " -Wno-error=strict-prototypes";
|
||||
}
|
||||
|
||||
# Remove the `gccCross' attribute so that the *native* glibc store path
|
||||
|
|
|
@ -62,3 +62,16 @@ diff -ru3 cmake-3.4.3/Modules/Platform/UnixPaths.cmake cmake-3.4.3-new/Modules/P
|
|||
)
|
||||
|
||||
# Enable use of lib64 search path variants by default.
|
||||
diff -ur cmake-3.7.2-orig/Modules/Platform/WindowsPaths.cmake cmake-3.7.2/Modules/Platform/WindowsPaths.cmake
|
||||
--- cmake-3.7.2-orig/Modules/Platform/WindowsPaths.cmake 2017-04-26 09:08:39.095674666 -0700
|
||||
+++ cmake-3.7.2/Modules/Platform/WindowsPaths.cmake 2017-04-28 22:32:10.379015998 -0700
|
||||
@@ -66,7 +66,7 @@
|
||||
|
||||
if(CMAKE_CROSSCOMPILING AND NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
|
||||
# MinGW (useful when cross compiling from linux with CMAKE_FIND_ROOT_PATH set)
|
||||
- list(APPEND CMAKE_SYSTEM_PREFIX_PATH /)
|
||||
+ # list(APPEND CMAKE_SYSTEM_PREFIX_PATH /)
|
||||
endif()
|
||||
|
||||
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
|
||||
diff -ur cmake-3.7.2-orig/Source/cmFindPackageCommand.cxx cmake-3.7.2/Source/cmFindPackageCommand.cxx
|
||||
|
|
|
@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
postInstall = ''
|
||||
ln -s bash "$out/bin/sh"
|
||||
moveToOutput lib/bash/Makefile.inc "$dev"
|
||||
rm $out/lib/bash/Makefile.inc
|
||||
'';
|
||||
|
||||
postFixup = if interactive
|
||||
|
|
|
@ -21,11 +21,11 @@ assert scpSupport -> libssh2 != null;
|
|||
assert c-aresSupport -> c-ares != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "curl-7.53.1";
|
||||
name = "curl-7.54.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://curl.haxx.se/download/${name}.tar.bz2";
|
||||
sha256 = "1s1hyndva0yp62xy96pcp4anzrvw6cl0abjajim17sbmdp00fwhw";
|
||||
sha256 = "01pz0air8xiwiww981z94980zgcbz8482jxy6b6afzsh7ksbl3pm";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "dev" "out" "man" "devdoc" ];
|
||||
|
|
|
@ -14121,11 +14121,11 @@ in {
|
|||
|
||||
markupsafe = buildPythonPackage rec {
|
||||
name = "markupsafe-${version}";
|
||||
version = "0.23";
|
||||
version = "1.0";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/M/MarkupSafe/MarkupSafe-${version}.tar.gz";
|
||||
sha256 = "a4ec1aff59b95a14b45eb2e23761a0179e98319da5a7eb76b56ea8cdc7b871c3";
|
||||
sha256 = "0rdn1s8x9ni7ss8rfiacj7x1085lx8mh2zdwqslnw8xc3l4nkgm6";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
Loading…
Reference in New Issue