diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-03-01 09:06:20 +0100 |
---|---|---|
committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-03-01 09:06:20 +0100 |
commit | 2fcb11a2442b27834db87b2f62511037c31b5e36 (patch) | |
tree | e9d38370aac7632cd35207180dc7c87d2bb6171d /pkgs/development/tools | |
parent | 456ff62ff820bbb2debd4568a775d88e61fd8bd1 (diff) | |
parent | fc4a8f63c4e46652d484b127162641be36481363 (diff) |
Merge staging-next into master
Diffstat (limited to 'pkgs/development/tools')
8 files changed, 72 insertions, 26 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/application-services.patch b/pkgs/development/tools/build-managers/cmake/application-services.patch index c83f56ae5720c..78077f9eaa520 100644 --- a/pkgs/development/tools/build-managers/cmake/application-services.patch +++ b/pkgs/development/tools/build-managers/cmake/application-services.patch @@ -1,6 +1,24 @@ -diff -ur cmake-3.12.1/Source/cmGlobalXCodeGenerator.cxx cmake-3.12.1-patched/Source/cmGlobalXCodeGenerator.cxx ---- cmake-3.12.1/Source/cmGlobalXCodeGenerator.cxx 2018-08-09 21:14:08.000000000 +0900 -+++ cmake-3.12.1-patched/Source/cmGlobalXCodeGenerator.cxx 2018-08-12 02:47:28.719691934 +0900 +diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt +index 8aff8f6..af1852d 100644 +--- a/Source/CMakeLists.txt ++++ b/Source/CMakeLists.txt +@@ -791,12 +791,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc" + endif() + endif() + +-# On Apple we need CoreFoundation and CoreServices +-if(APPLE) +- target_link_libraries(CMakeLib "-framework CoreFoundation") +- target_link_libraries(CMakeLib "-framework CoreServices") +-endif() +- + if(WIN32 AND NOT UNIX) + # We need the rpcrt4 library on Windows. + # We need the crypt32 library on Windows for crypto/cert APIs. +diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx +index e353a37..b06f842 100644 +--- a/Source/cmGlobalXCodeGenerator.cxx ++++ b/Source/cmGlobalXCodeGenerator.cxx @@ -35,11 +35,6 @@ struct cmLinkImplementation; @@ -13,3 +31,19 @@ diff -ur cmake-3.12.1/Source/cmGlobalXCodeGenerator.cxx cmake-3.12.1-patched/Sou #if defined(CMAKE_BUILD_WITH_CMAKE) # include "cmXMLParser.h" +diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt +index d7af6e2..d4808fc 100644 +--- a/Utilities/cmlibarchive/CMakeLists.txt ++++ b/Utilities/cmlibarchive/CMakeLists.txt +@@ -1662,11 +1662,6 @@ IF(MSVC) + ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE) + ENDIF(MSVC) + +-# We need CoreServices on Mac OS. +-IF(APPLE) +- LIST(APPEND ADDITIONAL_LIBS "-framework CoreServices") +-ENDIF(APPLE) +- + add_subdirectory(libarchive) + + install(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmlibarchive) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 68d4118f0491c..54fe8e4af5a08 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, fetchpatch, pkgconfig , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash +, buildPackages # darwin attributes -, ps +, cf-private, ps , isBootstrap ? false , useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin) , useNcurses ? false, ncurses @@ -16,10 +17,10 @@ with stdenv.lib; let os = stdenv.lib.optionalString; - majorVersion = "3.12"; - minorVersion = "1"; - # from https://cmake.org/files/v3.12/cmake-3.12.1-SHA-256.txt - sha256 = "1ckswlaid3p2is1a80fmr4hgwpfsiif66giyx1z9ayhxx0n5qgf5"; + majorVersion = "3.13"; + minorVersion = "4"; + # from https://cmake.org/files/v3.13/cmake-3.13.4-SHA-256.txt for cmake-3.13.4.tar.gz + sha256 = "fdd928fee35f472920071d1c7f1a6a2b72c9b25e04f7a37b409349aef3f20e9b"; version = "${majorVersion}.${minorVersion}"; in @@ -33,11 +34,6 @@ stdenv.mkDerivation rec { inherit sha256; }; - prePatch = optionalString (!useSharedLibraries) '' - substituteInPlace Utilities/cmlibarchive/CMakeLists.txt \ - --replace '"-framework CoreServices"' '""' - ''; - patches = [ # Don't search in non-Nix locations such as /usr, but do search in our libc. ./search-path.patch @@ -56,11 +52,14 @@ stdenv.mkDerivation rec { buildInputs = [ setupHook pkgconfig ] + ++ optional stdenv.isDarwin cf-private # needed for CFBundleCopyExecutableURL ++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ] ++ optional useNcurses ncurses ++ optional useQt4 qt4 ++ optional withQt5 qtbase; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + propagatedBuildInputs = optional stdenv.isDarwin ps; preConfigure = '' @@ -71,7 +70,8 @@ stdenv.mkDerivation rec { --subst-var-by libc_lib ${getLib stdenv.cc.libc} substituteInPlace Modules/FindCxxTest.cmake \ --replace "$""{PYTHON_EXECUTABLE}" ${stdenv.shell} - configureFlags="--parallel=''${NIX_BUILD_CORES:-1} $configureFlags" + # BUILD_CC and BUILD_CXX are used to bootstrap cmake + configureFlags="--parallel=''${NIX_BUILD_CORES:-1} CC=$BUILD_CC CXX=$BUILD_CXX $configureFlags" ''; configureFlags = [ @@ -95,6 +95,11 @@ stdenv.mkDerivation rec { # Avoid depending on frameworks. ++ optional (!useNcurses) "-DBUILD_CursesDialog=OFF"; + # make install attempts to use the just-built cmake + preInstall = optional (stdenv.hostPlatform != stdenv.buildPlatform) '' + sed -i 's|bin/cmake|${buildPackages.cmake}/bin/cmake|g' Makefile + ''; + dontUseCmakeConfigure = true; enableParallelBuilding = true; diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index 8cce2b88317d6..796747bf6e9cb 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -20,6 +20,13 @@ stdenv.mkDerivation rec { url = "https://github.com/ninja-build/ninja/commit/9aa947471fcfc607bec6d92a1a6eed5c692edbaf.patch"; sha256 = "0zsg46jflsh644jccrcgyfalr7fkzrv041kyi8644nyk923gcrl9"; }) + # https://github.com/ninja-build/ninja/issues/1510 - fix w/musl, possibly BSDs? + # + (fetchpatch { + name = "fix-issue-1510.patch"; + url = https://github.com/makepost/ninja/commit/567815df38a2ff54ad7478a90bd75c91e434236a.patch; + sha256 = "0zd0xyi7h2066nw1dsk76c7yf71b0f7v4p5nljda7jxi01vpdh69"; + }) ]; nativeBuildInputs = [ python re2c ] ++ optionals buildDocs [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin ]; diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix index 02bf9c23cbac4..9757d8cda8d13 100644 --- a/pkgs/development/tools/build-managers/pants/default.nix +++ b/pkgs/development/tools/build-managers/pants/default.nix @@ -3,21 +3,21 @@ with stdenv.lib; with pythonPackages; -let - version = "1.7.0"; -in buildPythonApplication rec { - inherit version; +buildPythonApplication rec { pname = "pantsbuild.pants"; - name = "${pname}-${version}"; + version = "1.7.0"; src = fetchPypi { inherit pname version; sha256 = "1d7ff1383287c8e72f2c9855cfef982d362274a64e2707a93c070f988ba80a37"; }; + # No tests + doCheck = false; + prePatch = '' sed -E -i "s/'([[:alnum:].-]+)[=><][[:digit:]=><.,]*'/'\\1'/g" setup.py - substituteInPlace setup.py --replace "requests[security]<2.19,>=2.5.0" "requests[security]<2.20,>=2.5.0" + substituteInPlace setup.py --replace "requests[security]<2.19,>=2.5.0" "requests[security]<2.22,>=2.5.0" ''; # Unnecessary, and causes some really weird behavior around .class files, which @@ -36,6 +36,6 @@ in buildPythonApplication rec { homepage = "https://www.pantsbuild.org/"; license = licenses.asl20; maintainers = with maintainers; [ copumpkin ]; - platforms = platforms.unix; + broken = true; }; } diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index e70971b670c2f..b23745a7b493a 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec { }; checkInputs = with pythonPackages; [ - pytest pytestflakes webtest mock + pytest pytest-flakes webtest mock devpi-server tox sphinx wheel git mercurial detox setuptools diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index ae27ff72c8440..b96f65c2ecc2b 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -14,7 +14,7 @@ in python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook libxml2 ]; - buildInputs = [ glib gtk3 gnome3.defaultIconTheme libwnck3 gobject-introspection ]; + buildInputs = [ glib gtk3 gnome3.adwaita-icon-theme libwnck3 gobject-introspection ]; propagatedBuildInputs = with python3Packages; [ pygobject3 pep8 ]; diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index 09d7daa97bff8..57fed5c9e8d17 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bison"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0sz6rzmfz5scian0a28lrvkrsd0108dmxrxpqh4nyi2ahlglbma1"; + sha256 = "1lfvns1f6xamz9905fakzkxh4zmk1wa9w33vxcq78fc5841ivnhg"; }; nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 254b3d2283ed6..296d45723b247 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { pkgconfig shared-mime-info wrapGAppsHook - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; buildInputs = [ glib gtk3 pango polkit systemd.dev systemd.lib ]; |