From 55e334e62a5ae40f15f8d9c2384af988cef8d4b3 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 19 Apr 2017 11:31:09 -0400 Subject: [PATCH 1/5] curl: 7.53.1 -> 7.54.0 --- pkgs/tools/networking/curl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 4f8daf38d467..67c7e82b4ffb 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -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" ]; From 8328e3d3a6dc511f3ac962e4ca74f96d29ab1c5f Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 25 Apr 2017 20:25:49 -0400 Subject: [PATCH 2/5] glibc: Remove hack around long-fixed bug https://sourceware.org/bugzilla/show_bug.cgi?id=411 was solved in 2012. --- pkgs/development/libraries/glibc/common.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 66510919e34f..ec9f94d00d82 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -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 From 719417985473eabd0f3c6e1f0083b77c86ed4749 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 22 Apr 2017 23:37:56 +0300 Subject: [PATCH 3/5] bash: Remove unnecessary 'Makefile.inc' that is keeping reference to bootstrap-tools The file is an example makefile for developing bash plugins, and contains stuff like: ```` example: example.o $(SHOBJ_LD) $(SHOBJ_LDFLAGS) $(SHOBJ_XLDFLAGS) -o $@ example.o $(SHOBJ_LIBS) ```` So no package is really going to depend on that, and it's making the .dev output keep a reference to the bootstrap tools. Just nuke it. --- pkgs/shells/bash/4.4.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index 988b4f711cb3..061f183e96e3 100644 --- a/pkgs/shells/bash/4.4.nix +++ b/pkgs/shells/bash/4.4.nix @@ -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 From 934ed02750b77f8f687fb8f6e4c75d52e843519d Mon Sep 17 00:00:00 2001 From: David Grayson Date: Sat, 29 Apr 2017 09:53:31 -0700 Subject: [PATCH 4/5] cmake: Prevent it from looking for packages in / when cross-compiling for Windows. --- .../build-managers/cmake/search-path-3.2.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch b/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch index ba7438d2c0f9..623a7208a868 100644 --- a/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch +++ b/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch @@ -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 From b8463e97b63ebd5fa05c14e9f9c52edc9274e753 Mon Sep 17 00:00:00 2001 From: David Izquierdo Date: Sat, 29 Apr 2017 18:48:14 +0200 Subject: [PATCH 5/5] pythonPackages.markupsafe: 0.23 -> 1.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 78c7dd68228f..b5e9fd403ed7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14124,11 +14124,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 = {