Merge #84442: staging-next branch

This commit is contained in:
Vladimír Čunát
2020-04-18 23:11:00 +02:00
250 changed files with 401 additions and 325 deletions
+3 -3
View File
@@ -73,7 +73,7 @@ let
'';
# Splicer will pull out correct variations
libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
++ [libffi]
++ stdenv.lib.optional (!enableIntegerSimple) gmp
++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
@@ -160,10 +160,10 @@ stdenv.mkDerivation (rec {
"--with-system-libffi"
"--with-ffi-includes=${targetPackages.libffi.dev}/include"
"--with-ffi-libraries=${targetPackages.libffi.out}/lib"
] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
"--with-gmp-includes=${targetPackages.gmp.dev}/include"
"--with-gmp-libraries=${targetPackages.gmp.out}/lib"
] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
"--with-iconv-includes=${libiconv}/include"
"--with-iconv-libraries=${libiconv}/lib"
] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
+2 -2
View File
@@ -30,11 +30,11 @@ in
stdenv.mkDerivation rec {
pname = "go";
version = "1.14";
version = "1.14.1";
src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "12a3nzj4k4p5ica447sjfva9pvvj84a03b4xlg3mhl2nmm33wr3d";
sha256 = "0xkna02clggcdgl5xxwani62krnf64x6p3hk9k5v9ldh2lhmglia";
};
# perl is used for testing go vet
@@ -95,7 +95,7 @@ let
meta = {
description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
homepage = "http://llvm.org/";
homepage = "https://llvm.org/";
license = stdenv.lib.licenses.ncsa;
platforms = stdenv.lib.platforms.all;
};
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
];
meta = {
homepage = "http://libcxx.llvm.org/";
homepage = "https://libcxx.llvm.org/";
description = "A new implementation of the C++ standard library, targeting C++11";
license = with stdenv.lib.licenses; [ ncsa mit ];
platforms = stdenv.lib.platforms.all;
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
# this should be done in CMake, but having trouble figuring out
# the magic combination of necessary CMake variables
# if you fancy a try, take a look at
# http://www.cmake.org/Wiki/CMake_RPATH_handling
# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
install_name_tool -id $out/$file $file
done
make install
@@ -58,7 +58,7 @@ stdenv.mkDerivation {
'';
meta = {
homepage = "http://libcxxabi.llvm.org/";
homepage = "https://libcxxabi.llvm.org/";
description = "A new implementation of low level support for a standard C++ library";
license = with stdenv.lib.licenses; [ ncsa mit ];
maintainers = with stdenv.lib.maintainers; [ vlstill ];
+1 -1
View File
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
meta = {
description = "The LLVM Linker";
homepage = "http://lld.llvm.org/";
homepage = "https://lld.llvm.org/";
license = stdenv.lib.licenses.ncsa;
platforms = stdenv.lib.platforms.all;
};
+1 -1
View File
@@ -71,7 +71,7 @@ stdenv.mkDerivation (rec {
meta = with stdenv.lib; {
description = "A next-generation high-performance debugger";
homepage = "http://lldb.llvm.org";
homepage = "https://lldb.llvm.org";
license = licenses.ncsa;
platforms = platforms.all;
};
+1 -1
View File
@@ -161,7 +161,7 @@ in stdenv.mkDerivation (rec {
meta = {
description = "Collection of modular and reusable compiler and toolchain technologies";
homepage = "http://llvm.org/";
homepage = "https://llvm.org/";
license = stdenv.lib.licenses.ncsa;
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
platforms = stdenv.lib.platforms.all;
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Components required to build an executable OpenMP program";
homepage = "http://openmp.llvm.org/";
homepage = "https://openmp.llvm.org/";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.all;
};
@@ -83,7 +83,7 @@ let
meta = {
description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
homepage = "http://llvm.org/";
homepage = "https://llvm.org/";
license = stdenv.lib.licenses.ncsa;
platforms = stdenv.lib.platforms.all;
};
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
];
meta = {
homepage = "http://libcxx.llvm.org/";
homepage = "https://libcxx.llvm.org/";
description = "A new implementation of the C++ standard library, targeting C++11";
license = with stdenv.lib.licenses; [ ncsa mit ];
platforms = stdenv.lib.platforms.unix;
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
# this should be done in CMake, but having trouble figuring out
# the magic combination of necessary CMake variables
# if you fancy a try, take a look at
# http://www.cmake.org/Wiki/CMake_RPATH_handling
# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
install_name_tool -id $out/$file $file
done
make install
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
'';
meta = {
homepage = "http://libcxxabi.llvm.org/";
homepage = "https://libcxxabi.llvm.org/";
description = "A new implementation of low level support for a standard C++ library";
license = with stdenv.lib.licenses; [ ncsa mit ];
maintainers = with stdenv.lib.maintainers; [ vlstill ];
+1 -1
View File
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
meta = {
description = "The LLVM Linker";
homepage = "http://lld.llvm.org/";
homepage = "https://lld.llvm.org/";
license = stdenv.lib.licenses.ncsa;
platforms = stdenv.lib.platforms.all;
badPlatforms = [ "x86_64-darwin" ];
+1 -1
View File
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "A next-generation high-performance debugger";
homepage = "http://llvm.org/";
homepage = "https://llvm.org/";
license = licenses.ncsa;
platforms = platforms.all;
};
+1 -1
View File
@@ -151,7 +151,7 @@ stdenv.mkDerivation ({
requiredSystemFeatures = [ "big-parallel" ];
meta = {
description = "Collection of modular and reusable compiler and toolchain technologies";
homepage = "http://llvm.org/";
homepage = "https://llvm.org/";
license = stdenv.lib.licenses.ncsa;
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
platforms = stdenv.lib.platforms.all;
+1 -1
View File
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
meta = {
description = "Components required to build an executable OpenMP program";
homepage = "http://openmp.llvm.org/";
homepage = "https://openmp.llvm.org/";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.all;
};
@@ -83,7 +83,7 @@ let
meta = {
description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
homepage = "http://llvm.org/";
homepage = "https://llvm.org/";
license = stdenv.lib.licenses.ncsa;
platforms = stdenv.lib.platforms.all;
};
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
];
meta = {
homepage = "http://libcxx.llvm.org/";
homepage = "https://libcxx.llvm.org/";
description = "A new implementation of the C++ standard library, targeting C++11";
license = with stdenv.lib.licenses; [ ncsa mit ];
platforms = stdenv.lib.platforms.unix;
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
# this should be done in CMake, but having trouble figuring out
# the magic combination of necessary CMake variables
# if you fancy a try, take a look at
# http://www.cmake.org/Wiki/CMake_RPATH_handling
# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
install_name_tool -id $out/$file $file
done
make install
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
'';
meta = {
homepage = "http://libcxxabi.llvm.org/";
homepage = "https://libcxxabi.llvm.org/";
description = "A new implementation of low level support for a standard C++ library";
license = with stdenv.lib.licenses; [ ncsa mit ];
maintainers = with stdenv.lib.maintainers; [ vlstill ];
+1 -1
View File
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
meta = {
description = "The LLVM Linker";
homepage = "http://lld.llvm.org/";
homepage = "https://lld.llvm.org/";
license = stdenv.lib.licenses.ncsa;
platforms = stdenv.lib.platforms.all;
};
+1 -1
View File
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "A next-generation high-performance debugger";
homepage = "http://llvm.org/";
homepage = "https://llvm.org/";
license = licenses.ncsa;
platforms = platforms.all;
};
+1 -1
View File
@@ -149,7 +149,7 @@ stdenv.mkDerivation ({
meta = {
description = "Collection of modular and reusable compiler and toolchain technologies";
homepage = "http://llvm.org/";
homepage = "https://llvm.org/";
license = stdenv.lib.licenses.ncsa;
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
platforms = stdenv.lib.platforms.all;
+1 -1
View File
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
meta = {
description = "Components required to build an executable OpenMP program";
homepage = "http://openmp.llvm.org/";
homepage = "https://openmp.llvm.org/";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.all;
};
@@ -93,7 +93,7 @@ let
meta = {
description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
homepage = "http://llvm.org/";
homepage = "https://llvm.org/";
license = stdenv.lib.licenses.ncsa;
platforms = stdenv.lib.platforms.all;
};
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
];
meta = {
homepage = "http://libcxx.llvm.org/";
homepage = "https://libcxx.llvm.org/";
description = "A new implementation of the C++ standard library, targeting C++11";
license = with stdenv.lib.licenses; [ ncsa mit ];
platforms = stdenv.lib.platforms.unix;
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
# this should be done in CMake, but having trouble figuring out
# the magic combination of necessary CMake variables
# if you fancy a try, take a look at
# http://www.cmake.org/Wiki/CMake_RPATH_handling
# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
install_name_tool -id $out/$file $file
done
make install
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
'';
meta = {
homepage = "http://libcxxabi.llvm.org/";
homepage = "https://libcxxabi.llvm.org/";
description = "A new implementation of low level support for a standard C++ library";
license = with stdenv.lib.licenses; [ ncsa mit ];
maintainers = with stdenv.lib.maintainers; [ vlstill ];
+1 -1
View File
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
meta = {
description = "The LLVM Linker";
homepage = "http://lld.llvm.org/";
homepage = "https://lld.llvm.org/";
license = stdenv.lib.licenses.ncsa;
platforms = stdenv.lib.platforms.all;
};
+1 -1
View File
@@ -61,7 +61,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "A next-generation high-performance debugger";
homepage = "http://llvm.org/";
homepage = "https://llvm.org/";
license = licenses.ncsa;
platforms = platforms.all;
};
+1 -1
View File
@@ -170,7 +170,7 @@ in stdenv.mkDerivation ({
meta = {
description = "Collection of modular and reusable compiler and toolchain technologies";
homepage = "http://llvm.org/";
homepage = "https://llvm.org/";
license = stdenv.lib.licenses.ncsa;
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
platforms = stdenv.lib.platforms.all;
+1 -1
View File
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
meta = {
description = "Components required to build an executable OpenMP program";
homepage = "http://openmp.llvm.org/";
homepage = "https://openmp.llvm.org/";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.all;
};
@@ -103,7 +103,7 @@ let
meta = {
description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
homepage = "http://llvm.org/";
homepage = "https://llvm.org/";
license = stdenv.lib.licenses.ncsa;
platforms = stdenv.lib.platforms.all;
};
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
];
meta = {
homepage = "http://libcxx.llvm.org/";
homepage = "https://libcxx.llvm.org/";
description = "A new implementation of the C++ standard library, targeting C++11";
license = with stdenv.lib.licenses; [ ncsa mit ];
platforms = stdenv.lib.platforms.all;
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
# this should be done in CMake, but having trouble figuring out
# the magic combination of necessary CMake variables
# if you fancy a try, take a look at
# http://www.cmake.org/Wiki/CMake_RPATH_handling
# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
install_name_tool -id $out/$file $file
done
make install
@@ -58,7 +58,7 @@ stdenv.mkDerivation {
'';
meta = {
homepage = "http://libcxxabi.llvm.org/";
homepage = "https://libcxxabi.llvm.org/";
description = "A new implementation of low level support for a standard C++ library";
license = with stdenv.lib.licenses; [ ncsa mit ];
maintainers = with stdenv.lib.maintainers; [ vlstill ];
+1 -1
View File
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
meta = {
description = "The LLVM Linker";
homepage = "http://lld.llvm.org/";
homepage = "https://lld.llvm.org/";
license = stdenv.lib.licenses.ncsa;
platforms = stdenv.lib.platforms.all;
};
+1 -1
View File
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "A next-generation high-performance debugger";
homepage = "http://llvm.org/";
homepage = "https://llvm.org/";
license = licenses.ncsa;
platforms = platforms.all;
};
+1 -1
View File
@@ -145,7 +145,7 @@ in stdenv.mkDerivation ({
meta = {
description = "Collection of modular and reusable compiler and toolchain technologies";
homepage = "http://llvm.org/";
homepage = "https://llvm.org/";
license = stdenv.lib.licenses.ncsa;
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
platforms = stdenv.lib.platforms.all;
+1 -1
View File
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
meta = {
description = "Components required to build an executable OpenMP program";
homepage = "http://openmp.llvm.org/";
homepage = "https://openmp.llvm.org/";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.all;
};
@@ -98,7 +98,7 @@ let
meta = {
description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
homepage = "http://llvm.org/";
homepage = "https://llvm.org/";
license = stdenv.lib.licenses.ncsa;
platforms = stdenv.lib.platforms.all;
};
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
];
meta = {
homepage = "http://libcxx.llvm.org/";
homepage = "https://libcxx.llvm.org/";
description = "A new implementation of the C++ standard library, targeting C++11";
license = with stdenv.lib.licenses; [ ncsa mit ];
platforms = stdenv.lib.platforms.all;
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
# this should be done in CMake, but having trouble figuring out
# the magic combination of necessary CMake variables
# if you fancy a try, take a look at
# http://www.cmake.org/Wiki/CMake_RPATH_handling
# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
install_name_tool -id $out/$file $file
done
make install
@@ -58,7 +58,7 @@ stdenv.mkDerivation {
'';
meta = {
homepage = "http://libcxxabi.llvm.org/";
homepage = "https://libcxxabi.llvm.org/";
description = "A new implementation of low level support for a standard C++ library";
license = with stdenv.lib.licenses; [ ncsa mit ];
maintainers = with stdenv.lib.maintainers; [ vlstill ];
+1 -1
View File
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
meta = {
description = "The LLVM Linker";
homepage = "http://lld.llvm.org/";
homepage = "https://lld.llvm.org/";
license = stdenv.lib.licenses.ncsa;
platforms = stdenv.lib.platforms.all;
};
+1 -1
View File
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A next-generation high-performance debugger";
homepage = "http://llvm.org/";
homepage = "https://llvm.org/";
license = licenses.ncsa;
platforms = platforms.all;
};
+1 -1
View File
@@ -162,7 +162,7 @@ in stdenv.mkDerivation (rec {
meta = {
description = "Collection of modular and reusable compiler and toolchain technologies";
homepage = "http://llvm.org/";
homepage = "https://llvm.org/";
license = stdenv.lib.licenses.ncsa;
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
platforms = stdenv.lib.platforms.all;
+1 -1
View File
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Components required to build an executable OpenMP program";
homepage = "http://openmp.llvm.org/";
homepage = "https://openmp.llvm.org/";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.all;
};