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

Merge pull request #64236 from NixOS/staging-next

Browse Source 
Staging next
This commit is contained in:
Frederik Rietdijk
2019-07-10 08:52:04 +02:00
committed by GitHub
parent d2c3c1f2bb 74c24385cb
commit fb6260fcf7
203 changed files with 5311 additions and 3760 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/tools/analysis/checkstyle/default.nix
View File

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre ];
unpackPhase = ":";
dontUnpack = true;
installPhase = ''
runHook preInstall

4
pkgs/development/tools/analysis/egypt/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perlPackages }:
perlPackages.buildPerlPackage rec {
name = "egypt-${version}";
pname = "egypt";
version = "1.10";
src = fetchurl {
sha256 = "0r0wj6v8z9fzlh9pb5617kyjdf92ppmlbzajaarrq729bbb6ln5m";
url = "https://www.gson.org/egypt/download/${name}.tar.gz";
url = "https://www.gson.org/egypt/download/${pname}-${version}.tar.gz";
};
outputs = [ "out" ];

11
pkgs/development/tools/build-managers/cmake/application-services.patch
View File

@@ -47,3 +47,14 @@ index d7af6e2..d4808fc 100644
add_subdirectory(libarchive)
install(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmlibarchive)
index e505bdd..f45557d 100644
--- a/Utilities/cmlibuv/src/unix/darwin-proctitle.c
+++ b/Utilities/cmlibuv/src/unix/darwin-proctitle.c
@@ -30,7 +30,6 @@
#if !TARGET_OS_IPHONE
# include <CoreFoundation/CoreFoundation.h>
-# include <ApplicationServices/ApplicationServices.h>
#endif
#define S(s) pCFStringCreateWithCString(NULL, (s), kCFStringEncodingUTF8)

61
pkgs/development/tools/build-managers/cmake/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig
{ stdenv, lib, fetchurl, pkgconfig
, bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash
, buildPackages
# darwin attributes
@@ -13,25 +13,18 @@
assert withQt5 -> useQt4 == false;
assert useQt4 -> withQt5 == false;
with stdenv.lib;
let
os = stdenv.lib.optionalString;
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
stdenv.mkDerivation rec {
name = "cmake-${os isBootstrap "boot-"}${os useNcurses "cursesUI-"}${os withQt5 "qt5UI-"}${os useQt4 "qt4UI-"}${version}";
inherit majorVersion;
pname = "cmake"
+ lib.optionalString isBootstrap "-boot"
+ lib.optionalString useNcurses "-cursesUI"
+ lib.optionalString withQt5 "-qt5UI"
+ lib.optionalString useQt4 "-qt4UI";
version = "3.14.5";
src = fetchurl {
url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
inherit sha256;
url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
# compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt
sha256 = "505ae49ebe3c63c595fa5f814975d8b72848447ee13b6613b0f8b96ebda18c06";
};
patches = [
@@ -43,7 +36,7 @@ stdenv.mkDerivation rec {
# Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d
./libuv-application-services.patch
] ++ optional stdenv.isCygwin ./3.2.2-cygwin.patch;
] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch;
outputs = [ "out" ];
setOutputFlags = false;
@@ -52,21 +45,21 @@ stdenv.mkDerivation rec {
buildInputs =
[ setupHook pkgconfig ]
++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ]
++ optional useNcurses ncurses
++ optional useQt4 qt4
++ optional withQt5 qtbase;
++ lib.optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ]
++ lib.optional useNcurses ncurses
++ lib.optional useQt4 qt4
++ lib.optional withQt5 qtbase;
depsBuildBuild = [ buildPackages.stdenv.cc ];
propagatedBuildInputs = optional stdenv.isDarwin ps;
propagatedBuildInputs = lib.optional stdenv.isDarwin ps;
preConfigure = ''
fixCmakeFiles .
substituteInPlace Modules/Platform/UnixPaths.cmake \
--subst-var-by libc_bin ${getBin stdenv.cc.libc} \
--subst-var-by libc_dev ${getDev stdenv.cc.libc} \
--subst-var-by libc_lib ${getLib stdenv.cc.libc}
--subst-var-by libc_bin ${lib.getBin stdenv.cc.libc} \
--subst-var-by libc_dev ${lib.getDev stdenv.cc.libc} \
--subst-var-by libc_lib ${lib.getLib stdenv.cc.libc}
substituteInPlace Modules/FindCxxTest.cmake \
--replace "$""{PYTHON_EXECUTABLE}" ${stdenv.shell}
# BUILD_CC and BUILD_CXX are used to bootstrap cmake
@@ -74,9 +67,9 @@ stdenv.mkDerivation rec {
'';
configureFlags = [
"--docdir=share/doc/${name}"
"--docdir=share/doc/${pname}${version}"
] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup
++ optional (useQt4 || withQt5) "--qt-gui"
++ lib.optional (useQt4 || withQt5) "--qt-gui"
++ [
"--"
# We should set the proper `CMAKE_SYSTEM_NAME`.
@@ -87,15 +80,15 @@ stdenv.mkDerivation rec {
# package being built.
"-DCMAKE_CXX_COMPILER=${stdenv.cc.targetPrefix}c++"
"-DCMAKE_C_COMPILER=${stdenv.cc.targetPrefix}cc"
"-DCMAKE_AR=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar"
"-DCMAKE_RANLIB=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib"
"-DCMAKE_STRIP=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip"
"-DCMAKE_AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar"
"-DCMAKE_RANLIB=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib"
"-DCMAKE_STRIP=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip"
]
# Avoid depending on frameworks.
++ optional (!useNcurses) "-DBUILD_CursesDialog=OFF";
++ lib.optional (!useNcurses) "-DBUILD_CursesDialog=OFF";
# make install attempts to use the just-built cmake
preInstall = optional (stdenv.hostPlatform != stdenv.buildPlatform) ''
preInstall = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ''
sed -i 's|bin/cmake|${buildPackages.cmake}/bin/cmake|g' Makefile
'';
@@ -108,7 +101,7 @@ stdenv.mkDerivation rec {
doCheck = false; # fails
meta = with stdenv.lib; {
meta = with lib; {
homepage = http://www.cmake.org/;
description = "Cross-Platform Makefile Generator";
platforms = if useQt4 then qt4.meta.platforms else platforms.all;

30
pkgs/development/tools/build-managers/cmake/libuv-application-services.patch
View File

@@ -24,36 +24,6 @@ diff -ur cmake-3.12.1/Utilities/cmlibuv/CMakeLists.txt cmake-3.12.1-patched/Util
endif()
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
diff -ur cmake-3.12.1/Utilities/cmlibuv/src/unix/darwin-proctitle.c cmake-3.12.1-patched/Utilities/cmlibuv/src/unix/darwin-proctitle.c
--- cmake-3.12.1/Utilities/cmlibuv/src/unix/darwin-proctitle.c 2018-08-09 21:14:08.000000000 +0900
+++ cmake-3.12.1-patched/Utilities/cmlibuv/src/unix/darwin-proctitle.c 2018-08-13 10:01:29.000000000 +0900
@@ -26,9 +26,7 @@
#include <stdlib.h>
#include <string.h>
-#include <TargetConditionals.h>
-
-#if !TARGET_OS_IPHONE
+#if HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H
# include <CoreFoundation/CoreFoundation.h>
# include <ApplicationServices/ApplicationServices.h>
#endif
@@ -58,7 +56,7 @@
int uv__set_process_title(const char* title) {
-#if TARGET_OS_IPHONE
+#if !HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H
return uv__pthread_setname_np(title);
#else
CFStringRef (*pCFStringCreateWithCString)(CFAllocatorRef,
@@ -205,5 +203,5 @@
dlclose(application_services_handle);
return err;
-#endif /* !TARGET_OS_IPHONE */
+#endif /* HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H */
}
diff -ur cmake-3.12.1/Utilities/cmlibuv/src/unix/fsevents.c cmake-3.12.1-patched/Utilities/cmlibuv/src/unix/fsevents.c
--- cmake-3.12.1/Utilities/cmlibuv/src/unix/fsevents.c 2018-08-09 21:14:08.000000000 +0900
+++ cmake-3.12.1-patched/Utilities/cmlibuv/src/unix/fsevents.c 2018-08-13 10:01:29.000000000 +0900

23
pkgs/development/tools/build-managers/cmake/search-path.patch
View File

@@ -38,12 +38,27 @@ diff -ur cmake-3.9.1/Modules/Platform/UnixPaths.cmake cmake-3.9.1-mod/Modules/Pl
+ @libc_lib@/lib
)
list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
- /usr/include
if(CMAKE_SYSROOT_COMPILE)
set(_cmake_sysroot_compile "${CMAKE_SYSROOT_COMPILE}")
else()
set(_cmake_sysroot_compile "${CMAKE_SYSROOT}")
endif()
# Default per-language values. These may be later replaced after
# parsing the implicit directory information from compiler output.
set(_CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES_INIT
${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}
- "${_cmake_sysroot_compile}/usr/include"
+ @libc_dev@/include
)
list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
- /usr/include
set(_CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES_INIT
${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}
- "${_cmake_sysroot_compile}/usr/include"
+ @libc_dev@/include
)
set(_CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES_INIT
${CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES}
- "${_cmake_sysroot_compile}/usr/include"
+ @libc_dev@/include
)

2
pkgs/development/tools/build-managers/leiningen/default.nix
View File

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
JARNAME = "${name}-standalone.jar";
unpackPhase = "true";
dontUnpack = true;
buildInputs = [ makeWrapper ];
propagatedBuildInputs = [ jdk ];

4
pkgs/development/tools/build-managers/meson/default.nix
View File

@@ -11,12 +11,12 @@ let
};
in
python3Packages.buildPythonApplication rec {
version = "0.49.2";
pname = "meson";
version = "0.50.1";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "0ckkzq0kbnnk4rwv20lggm9a4fb5054jbv99i9pwjhid23qy7059";
sha256 = "05k3wsxjcnnq7a8n5kzxh2cdh5jdkh13xagigz5axs48j36zfai4";
};
postFixup = ''

5
pkgs/development/tools/build-managers/meson/setup-hook.sh
View File

@@ -17,10 +17,11 @@ mesonConfigurePhase() {
--includedir=${!outputInclude}/include \
--mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info \
--localedir=${!outputLib}/share/locale \
-Dauto_features=disabled \
-Dauto_features=${mesonAutoFeatures:-enabled} \
-Dwrap_mode=${mesonWrapMode:-nodownload} \
$mesonFlags"
mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-release} $mesonFlags"
mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-plain} $mesonFlags"
echo "meson flags: $mesonFlags ${mesonFlagsArray[@]}"

2
pkgs/development/tools/build-managers/mill/default.nix
View File

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
unpackPhase = "true";
dontUnpack = true;
dontConfigure = true;
dontBuild = true;

2
pkgs/development/tools/clang-tools/default.nix
View File

@@ -7,7 +7,7 @@ in
stdenv.mkDerivation {
name = "clang-tools-${version}";
unpackPhase = ":";
dontUnpack = true;
installPhase = ''
mkdir -p $out/bin
for tool in \

2
pkgs/development/tools/database/schemaspy/default.nix
View File

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0ph1l62hy163m2hgybhkccqbcj6brna1vdbr7536zc37lzjxq9rn";
};
unpackPhase = "true";
dontUnpack = true;
buildInputs = [
jre

2
pkgs/development/tools/java/jhiccup/default.nix
View File

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1hsvi8wjh615fnjf75h7b5afp04chqcgvini30vfcn3m9a5icbgy";
};
configurePhase = ":";
dontConfigure = true;
buildPhase = ":";
installPhase = ''
mkdir -p $out/bin $out/share/java

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

@@ -7,7 +7,7 @@ let
bin2c = stdenv.mkDerivation {
name = "bossa-bin2c";
src = ./bin2c.c;
unpackPhase = "true";
dontUnpack = true;
buildPhase = ''cc $src -o bin2c'';
installPhase = ''mkdir -p $out/bin; cp bin2c $out/bin/'';
};

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

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [ perl ];
# The link returns directly the script. No need for unpacking
unpackPhase = "true";
dontUnpack = true;
installPhase = ''
install -D -m755 $src $out/bin/checkbashisms

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

@@ -3,7 +3,7 @@
assert stdenv ? glibc;
perlPackages.buildPerlPackage rec {
name = "ninka-${version}";
pname = "ninka";
version = "2.0-pre";
src = fetchFromGitHub {

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

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
${python.interpreter} build.py --system-libclang --clang-completer --system-boost
'';
configurePhase = ":";
dontConfigure = true;
# remove the tests
#

2
pkgs/development/tools/parsing/antlr/3.4.nix
View File

@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1xqbam8vf04q5fasb0m2n1pn5dbp2yw763sj492ncq04c5mqcglx";
};
unpackPhase = "true";
dontUnpack = true;
installPhase = ''
mkdir -p "$out"/{lib/antlr,bin}

2
pkgs/development/tools/parsing/antlr/3.5.nix
View File

@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0srjwxipwsfzmpi0v32d1l5lzk9gi5in8ayg33sq8wyp8ygnbji6";
};
unpackPhase = "true";
dontUnpack = true;
installPhase = ''
mkdir -p "$out"/{lib/antlr,bin}

2
pkgs/development/tools/parsing/antlr/4.7.nix
View File

@@ -41,7 +41,7 @@ let
sha256 = "1236gwnzchama92apb2swmklnypj01m7bdwwfvwvl8ym85scw7gl";
};
unpackPhase = "true";
dontUnpack = true;
installPhase = ''
mkdir -p "$out"/{share/java,bin}

2
pkgs/development/tools/selenium/htmlunit-driver/default.nix
View File

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1sd3cwpamcbq9pv0mvcm8x6minqrlb4i0r12q3jg91girqswm2dp";
};
unpackPhase = "true";
dontUnpack = true;
installPhase = "install -D $src $out/share/lib/${name}/${name}.jar";

2
pkgs/development/tools/selenium/selendroid/default.nix
View File

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
inherit name;
inherit version;
unpackPhase = "true";
dontUnpack = true;
buildInputs = [ jdk makeWrapper ];

2
pkgs/development/tools/selenium/server/default.nix
View File

@@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
sha256 = "11v340nm8vzqc2bkmbjfm9a7j4dj0bi9bfk8wdpfan0fb8prf772";
};
unpackPhase = "true";
dontUnpack = true;
buildInputs = [ jre makeWrapper ];