Merge staging into staging-next

This commit is contained in:
Frederik Rietdijk 2021-04-02 13:50:00 +02:00
commit cfed720512
209 changed files with 772 additions and 586 deletions

View file

@ -556,10 +556,8 @@ in {
install -m 0700 -d /root install -m 0700 -d /root
install -m 0755 -d /home install -m 0755 -d /home
${pkgs.perl}/bin/perl -w \ ${pkgs.perl.withPackages (p: [ p.FileSlurp p.JSON ])}/bin/perl \
-I${pkgs.perlPackages.FileSlurp}/${pkgs.perl.libPrefix} \ -w ${./update-users-groups.pl} ${spec}
-I${pkgs.perlPackages.JSON}/${pkgs.perl.libPrefix} \
${./update-users-groups.pl} ${spec}
''; '';
# for backwards compatibility # for backwards compatibility

View file

@ -34,7 +34,7 @@ let
name = "nixos-generate-config"; name = "nixos-generate-config";
src = ./nixos-generate-config.pl; src = ./nixos-generate-config.pl;
path = lib.optionals (lib.elem "btrfs" config.boot.supportedFilesystems) [ pkgs.btrfs-progs ]; path = lib.optionals (lib.elem "btrfs" config.boot.supportedFilesystems) [ pkgs.btrfs-progs ];
perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/${pkgs.perl.libPrefix}"; perl = "${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl";
inherit (config.system.nixos-generate-config) configuration desktopConfiguration; inherit (config.system.nixos-generate-config) configuration desktopConfiguration;
xserverEnabled = config.services.xserver.enable; xserverEnabled = config.services.xserver.enable;
}; };

View file

@ -14,10 +14,8 @@ let
dir = "bin"; dir = "bin";
src = ./command-not-found.pl; src = ./command-not-found.pl;
isExecutable = true; isExecutable = true;
inherit (pkgs) perl;
inherit (cfg) dbPath; inherit (cfg) dbPath;
perlFlags = concatStrings (map (path: "-I ${path}/${pkgs.perl.libPrefix} ") perl = pkgs.perl.withPackages (p: [ p.DBDSQLite p.StringShellQuote ]);
[ pkgs.perlPackages.DBI pkgs.perlPackages.DBDSQLite pkgs.perlPackages.StringShellQuote ]);
}; };
in in

View file

@ -1,4 +1,4 @@
#! @perl@/bin/perl -w @perlFlags@ #! @perl@/bin/perl -w
use strict; use strict;
use DBI; use DBI;

View file

@ -1,4 +1,4 @@
#! @perl@ #! @perl@/bin/perl
use strict; use strict;
use warnings; use warnings;

View file

@ -113,8 +113,7 @@ let
configurationName = config.boot.loader.grub.configurationName; configurationName = config.boot.loader.grub.configurationName;
# Needed by switch-to-configuration. # Needed by switch-to-configuration.
perl = pkgs.perl.withPackages (p: with p; [ FileSlurp NetDBus XMLParser XMLTwig ]);
perl = "${pkgs.perl}/bin/perl " + (concatMapStringsSep " " (lib: "-I${lib}/${pkgs.perl.libPrefix}") (with pkgs.perlPackages; [ FileSlurp NetDBus XMLParser XMLTwig ]));
}; };
# Handle assertions and warnings # Handle assertions and warnings

View file

@ -728,13 +728,17 @@ in
utillinux = pkgs.util-linux; utillinux = pkgs.util-linux;
btrfsprogs = pkgs.btrfs-progs; btrfsprogs = pkgs.btrfs-progs;
}; };
perl = pkgs.perl.withPackages (p: with p; [
FileSlurp FileCopyRecursive
XMLLibXML XMLSAX XMLSAXBase
ListCompare JSON
]);
in pkgs.writeScript "install-grub.sh" ('' in pkgs.writeScript "install-grub.sh" (''
#!${pkgs.runtimeShell} #!${pkgs.runtimeShell}
set -e set -e
export PERL5LIB=${with pkgs.perlPackages; makePerlPath [ FileSlurp FileCopyRecursive XMLLibXML XMLSAX XMLSAXBase ListCompare JSON ]}
${optionalString cfg.enableCryptodisk "export GRUB_ENABLE_CRYPTODISK=y"} ${optionalString cfg.enableCryptodisk "export GRUB_ENABLE_CRYPTODISK=y"}
'' + flip concatMapStrings cfg.mirroredBoots (args: '' '' + flip concatMapStrings cfg.mirroredBoots (args: ''
${pkgs.perl}/bin/perl ${install-grub-pl} ${grubConfig args} $@ ${perl}/bin/perl ${install-grub-pl} ${grubConfig args} $@
'') + cfg.extraInstallCommands); '') + cfg.extraInstallCommands);
system.build.grub = grub; system.build.grub = grub;

View file

@ -154,7 +154,7 @@ in
'' ''
# Set up the statically computed bits of /etc. # Set up the statically computed bits of /etc.
echo "setting up /etc..." echo "setting up /etc..."
${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/${pkgs.perl.libPrefix} ${./setup-etc.pl} ${etc}/etc ${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl ${./setup-etc.pl} ${etc}/etc
''; '';
}; };

View file

@ -6,7 +6,7 @@ let
makeScript = name: service: pkgs.writeScript "${name}-runner" makeScript = name: service: pkgs.writeScript "${name}-runner"
'' ''
#! ${pkgs.perl}/bin/perl -w -I${pkgs.perlPackages.FileSlurp}/${pkgs.perl.libPrefix} #! ${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl -w
use File::Slurp; use File::Slurp;

View file

@ -7,11 +7,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mpg123-1.26.4"; name = "mpg123-1.26.5";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/mpg123/${name}.tar.bz2"; url = "mirror://sourceforge/mpg123/${name}.tar.bz2";
sha256 = "sha256-CBmRVA33pmaykEmthw8pPPoohjs2SIq01Yzqp7WEZFQ="; sha256 = "sha256-UCqX4Nk1vn432YczgCHY8wG641wohPKoPVnEtSRm7wY=";
}; };
outputs = [ "out" "conplay" ]; outputs = [ "out" "conplay" ];

View file

@ -12,27 +12,19 @@ let
else if stdenv.hostPlatform.system == "aarch64-linux" then "aarch64" else if stdenv.hostPlatform.system == "aarch64-linux" then "aarch64"
else if stdenv.hostPlatform.system == "powerpc64le-linux" then "ppc64le" else if stdenv.hostPlatform.system == "powerpc64le-linux" then "ppc64le"
else throw "ImageMagick is not supported on this platform."; else throw "ImageMagick is not supported on this platform.";
cfg = {
version = "7.0.11-3";
sha256 = "sha256-y937OxAHNTbWa96oQmTpp/ivxtPVL16hr4SvzZWugQo=";
patches = [];
};
in in
stdenv.mkDerivation { stdenv.mkDerivation rec {
pname = "imagemagick"; pname = "imagemagick";
inherit (cfg) version; version = "7.0.11-5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ImageMagick"; owner = "ImageMagick";
repo = "ImageMagick"; repo = "ImageMagick";
rev = cfg.version; rev = version;
inherit (cfg) sha256; sha256 = "sha256-HJUC8lUHORZMHvSv1/EYM+JOsd89quFaU1Fz08AckG8=";
}; };
patches = cfg.patches;
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
outputMan = "out"; # it's tiny outputMan = "out"; # it's tiny

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, makeWrapper { lib, stdenv, fetchurl, makeWrapper
, xorg, imlib2, libjpeg, libpng , xorg, imlib2, libjpeg, libpng
, curl, libexif, jpegexiforient, perlPackages , curl, libexif, jpegexiforient, perl
, enableAutoreload ? !stdenv.hostPlatform.isDarwin }: , enableAutoreload ? !stdenv.hostPlatform.isDarwin }:
with lib; with lib;
@ -31,14 +31,7 @@ stdenv.mkDerivation rec {
--add-flags '--theme=feh' --add-flags '--theme=feh'
''; '';
checkInputs = [ perlPackages.perl perlPackages.TestCommand ]; checkInputs = lib.singleton (perl.withPackages (p: [ p.TestCommand ]));
preCheck = ''
export PERL5LIB="${perlPackages.TestCommand}/${perlPackages.perl.libPrefix}"
'';
postCheck = ''
unset PERL5LIB
'';
doCheck = true; doCheck = true;
meta = { meta = {

View file

@ -19,11 +19,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-usage"; pname = "gnome-usage";
version = "3.38.0"; version = "3.38.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0mqs39yi2cqwkzlmmgzrszsva5hbdpws6zk4lbi4w2cjzl185mcl"; sha256 = "mMdm4X4VZXEfx0uaJP0u0NX618y0VRlhLdTiFHaO05M=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -2,15 +2,15 @@
buildGoModule rec { buildGoModule rec {
pname = "istioctl"; pname = "istioctl";
version = "1.9.1"; version = "1.9.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "istio"; owner = "istio";
repo = "istio"; repo = "istio";
rev = version; rev = version;
sha256 = "sha256-WcIcI+y8tTY0YfyuR/DUCjN1xbGpCOBWvEHBo+q2EV8="; sha256 = "sha256-co/0ogI48FxrwVGwIuMqeFPFYtQF4/rv9V6b225TZc4=";
}; };
vendorSha256 = "sha256-pSiJfQTvJ6OisdrWTH6mOcAn/wBA1OcVaGtOwBe1qvQ="; vendorSha256 = "sha256-yJHYyRPl1V1WNV0nJoR3bRTTGRTQaT/tG4TSQeL5U88=";
doCheck = false; doCheck = false;

View file

@ -24,7 +24,7 @@ assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport; assert svnSupport -> perlSupport;
let let
version = "2.31.0"; version = "2.31.1";
svn = subversionClient.override { perlBindings = perlSupport; }; svn = subversionClient.override { perlBindings = perlSupport; };
gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
@ -36,7 +36,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
sha256 = "0h4sg3xqa9pd2agrd7m18sqg319ls978d39qswyf30rjvg5n5wg8"; sha256 = "10367n5sv4nsgaxy486pbp7nscx34vjk8vrb06jm9ffm8ix42qcz";
}; };
outputs = [ "out" ] ++ lib.optional withManual "doc"; outputs = [ "out" ] ++ lib.optional withManual "doc";

View file

@ -3,7 +3,7 @@
inherit (lib) removeSuffix splitString last; inherit (lib) removeSuffix splitString last;
base = last (splitString ":" (baseNameOf (removeSuffix "/" url))); base = last (splitString ":" (baseNameOf (removeSuffix "/" url)));
matched = builtins.match "(.*).git" base; matched = builtins.match "(.*)\\.git" base;
short = builtins.substring 0 7 rev; short = builtins.substring 0 7 rev;

View file

@ -257,18 +257,9 @@ rec {
# print "Howdy!\n" if true; # print "Howdy!\n" if true;
# '' # ''
writePerl = name: { libraries ? [] }: writePerl = name: { libraries ? [] }:
let makeScriptWriter {
perl-env = pkgs.buildEnv { interpreter = "${pkgs.perl.withPackages (p: libraries)}/bin/perl";
name = "perl-environment"; } name;
paths = libraries;
pathsToLink = [
"/${pkgs.perl.libPrefix}"
];
};
in
makeScriptWriter {
interpreter = "${pkgs.perl}/bin/perl -I ${perl-env}/${pkgs.perl.libPrefix}";
} name;
# writePerlBin takes the same arguments as writePerl but outputs a directory (like writeScriptBin) # writePerlBin takes the same arguments as writePerl but outputs a directory (like writeScriptBin)
writePerlBin = name: writePerlBin = name:

View file

@ -10,7 +10,8 @@
with lib; with lib;
let let
version = "3.60"; version = "3.63";
underscoreVersion = builtins.replaceStrings ["."] ["_"] version; underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
in in
@ -19,7 +20,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/nss-${version}.tar.gz"; url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/nss-${version}.tar.gz";
sha256 = "hKvVV1q4dMU65RG9Rh5dCGjRobOE7kB1MVTN0dWQ/j0="; sha256 = "0892xbjcaw6g4rd2rs4qa37nbda248cjrgxa4faaw0licbpjyb8q";
}; };
certdata2pem = fetchurl { certdata2pem = fetchurl {

View file

@ -52,10 +52,10 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
patches = [ patches = [
./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory
./find-darwin-sdk-version.patch # don't test for macOS being >= 10.15 ./find-darwin-sdk-version.patch # don't test for macOS being >= 10.15
]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks

View file

@ -29,7 +29,7 @@ let
''; '';
in { in {
llvm = callPackage ./llvm.nix { }; llvm = callPackage ./llvm { };
clang-unwrapped = callPackage ./clang { clang-unwrapped = callPackage ./clang {
inherit (tools) lld; inherit (tools) lld;
@ -77,9 +77,9 @@ let
extraBuildCommands = mkExtraBuildCommands cc; extraBuildCommands = mkExtraBuildCommands cc;
}; };
lld = callPackage ./lld.nix {}; lld = callPackage ./lld {};
lldb = callPackage ./lldb.nix {}; lldb = callPackage ./lldb {};
# Below, is the LLVM bootstrapping logic. It handles building a # Below, is the LLVM bootstrapping logic. It handles building a
# fully LLVM toolchain from scratch. No GCC toolchain should be # fully LLVM toolchain from scratch. No GCC toolchain should be
@ -163,7 +163,7 @@ let
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
in { in {
compiler-rt = callPackage ./compiler-rt.nix ({} // compiler-rt = callPackage ./compiler-rt ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt; stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt;
})); }));
@ -177,7 +177,7 @@ let
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
})); }));
libcxxabi = callPackage ./libc++abi.nix ({} // libcxxabi = callPackage ./libc++abi ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
libunwind = libraries.libunwind; libunwind = libraries.libunwind;
@ -185,7 +185,7 @@ let
openmp = callPackage ./openmp.nix {}; openmp = callPackage ./openmp.nix {};
libunwind = callPackage ./libunwind.nix ({} // libunwind = callPackage ./libunwind ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
})); }));

View file

@ -21,7 +21,7 @@ stdenv.mkDerivation {
"-DLIBCXXABI_ENABLE_SHARED=OFF" "-DLIBCXXABI_ENABLE_SHARED=OFF"
]; ];
patches = [ ./libcxxabi-no-threads.patch ]; patches = [ ./no-threads.patch ];
postUnpack = '' postUnpack = ''
unpackFile ${libcxx.src} unpackFile ${libcxx.src}
@ -32,7 +32,7 @@ stdenv.mkDerivation {
'' + lib.optionalString stdenv.hostPlatform.isMusl '' '' + lib.optionalString stdenv.hostPlatform.isMusl ''
patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
'' + lib.optionalString stdenv.hostPlatform.isWasm '' '' + lib.optionalString stdenv.hostPlatform.isWasm ''
patch -p1 -d $(ls -d llvm-*) -i ${./libcxxabi-wasm.patch} patch -p1 -d $(ls -d llvm-*) -i ${./wasm.patch}
''; '';
installPhase = if stdenv.isDarwin installPhase = if stdenv.isDarwin

View file

@ -22,7 +22,7 @@ stdenv.mkDerivation (rec {
src = fetch pname "051p5b04y6z3g730rmc2n2v71lipbw7k69riww3a6sl74myfiaq7"; src = fetch pname "051p5b04y6z3g730rmc2n2v71lipbw7k69riww3a6sl74myfiaq7";
patches = [ ./lldb-procfs.patch ]; patches = [ ./procfs.patch ];
nativeBuildInputs = [ cmake python3 which swig lit ] nativeBuildInputs = [ cmake python3 which swig lit ]
++ lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; ++ lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ];

View file

@ -62,15 +62,15 @@ in stdenv.mkDerivation (rec {
'' ''
# Patch llvm-config to return correct library path based on --link-{shared,static}. # Patch llvm-config to return correct library path based on --link-{shared,static}.
+ optionalString (enableSharedLibraries) '' + optionalString (enableSharedLibraries) ''
substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib substitute '${./outputs.patch}' ./outputs.patch --subst-var lib
patch -p1 < ./llvm-outputs.patch patch -p1 < ./outputs.patch
'' + '' '' + ''
# FileSystem permissions tests fail with various special bits # FileSystem permissions tests fail with various special bits
substituteInPlace unittests/Support/CMakeLists.txt \ substituteInPlace unittests/Support/CMakeLists.txt \
--replace "Path.cpp" "" --replace "Path.cpp" ""
rm unittests/Support/Path.cpp rm unittests/Support/Path.cpp
'' + optionalString stdenv.hostPlatform.isMusl '' '' + optionalString stdenv.hostPlatform.isMusl ''
patch -p1 -i ${../TLI-musl.patch} patch -p1 -i ${../../TLI-musl.patch}
substituteInPlace unittests/Support/CMakeLists.txt \ substituteInPlace unittests/Support/CMakeLists.txt \
--replace "add_subdirectory(DynamicLibrary)" "" --replace "add_subdirectory(DynamicLibrary)" ""
rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp

View file

@ -50,10 +50,10 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
patches = [ patches = [
./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory
./compiler-rt-X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config ./X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config
]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks

View file

@ -31,7 +31,7 @@ let
''; '';
in { in {
llvm = callPackage ./llvm.nix { }; llvm = callPackage ./llvm { };
clang-unwrapped = callPackage ./clang { clang-unwrapped = callPackage ./clang {
inherit (tools) lld; inherit (tools) lld;
@ -79,9 +79,9 @@ let
extraBuildCommands = mkExtraBuildCommands cc; extraBuildCommands = mkExtraBuildCommands cc;
}; };
lld = callPackage ./lld.nix {}; lld = callPackage ./lld {};
lldb = callPackage ./lldb.nix {}; lldb = callPackage ./lldb {};
# Below, is the LLVM bootstrapping logic. It handles building a # Below, is the LLVM bootstrapping logic. It handles building a
# fully LLVM toolchain from scratch. No GCC toolchain should be # fully LLVM toolchain from scratch. No GCC toolchain should be
@ -165,7 +165,7 @@ let
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
in { in {
compiler-rt = callPackage ./compiler-rt.nix ({} // compiler-rt = callPackage ./compiler-rt ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt; stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt;
})); }));
@ -179,7 +179,7 @@ let
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
})); }));
libcxxabi = callPackage ./libc++abi.nix ({} // libcxxabi = callPackage ./libc++abi ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
libunwind = libraries.libunwind; libunwind = libraries.libunwind;
@ -187,7 +187,7 @@ let
openmp = callPackage ./openmp.nix {}; openmp = callPackage ./openmp.nix {};
libunwind = callPackage ./libunwind.nix ({} // libunwind = callPackage ./libunwind ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
})); }));

View file

@ -21,7 +21,7 @@ stdenv.mkDerivation {
"-DLIBCXXABI_ENABLE_SHARED=OFF" "-DLIBCXXABI_ENABLE_SHARED=OFF"
]; ];
patches = [ ./libcxxabi-no-threads.patch ]; patches = [ ./no-threads.patch ];
postUnpack = '' postUnpack = ''
unpackFile ${libcxx.src} unpackFile ${libcxx.src}
@ -33,7 +33,7 @@ stdenv.mkDerivation {
'' + lib.optionalString stdenv.hostPlatform.isMusl '' '' + lib.optionalString stdenv.hostPlatform.isMusl ''
patch -p1 -d libcxx -i ${../libcxx-0001-musl-hacks.patch} patch -p1 -d libcxx -i ${../libcxx-0001-musl-hacks.patch}
'' + lib.optionalString stdenv.hostPlatform.isWasm '' '' + lib.optionalString stdenv.hostPlatform.isWasm ''
patch -p1 -d llvm -i ${./libcxxabi-wasm.patch} patch -p1 -d llvm -i ${./wasm.patch}
''; '';
installPhase = if stdenv.isDarwin installPhase = if stdenv.isDarwin

View file

@ -22,7 +22,7 @@ stdenv.mkDerivation (rec {
src = fetch pname "1vlyg015dyng43xqb8cg2l6r9ix8klibxsajazbfnckdnh54hwxj"; src = fetch pname "1vlyg015dyng43xqb8cg2l6r9ix8klibxsajazbfnckdnh54hwxj";
patches = [ ./lldb-procfs.patch ]; patches = [ ./procfs.patch ];
nativeBuildInputs = [ cmake python3 which swig lit ] nativeBuildInputs = [ cmake python3 which swig lit ]
++ lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; ++ lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ];

View file

@ -62,8 +62,8 @@ in stdenv.mkDerivation (rec {
'' ''
# Patch llvm-config to return correct library path based on --link-{shared,static}. # Patch llvm-config to return correct library path based on --link-{shared,static}.
+ optionalString (enableSharedLibraries) '' + optionalString (enableSharedLibraries) ''
substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib substitute '${./outputs.patch}' ./outputs.patch --subst-var lib
patch -p1 < ./llvm-outputs.patch patch -p1 < ./outputs.patch
'' + '' '' + ''
# FileSystem permissions tests fail with various special bits # FileSystem permissions tests fail with various special bits
substituteInPlace unittests/Support/CMakeLists.txt \ substituteInPlace unittests/Support/CMakeLists.txt \

View file

@ -51,11 +51,12 @@ stdenv.mkDerivation {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
patches = [ patches = [
./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory
../7/compiler-rt-glibc.patch # https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce
../../common/compiler-rt/glibc.patch
] ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
++ lib.optional (stdenv.hostPlatform.libc == "glibc") ./compiler-rt-sys-ustat.patch ++ lib.optional (stdenv.hostPlatform.libc == "glibc") ./sys-ustat.patch
++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
# to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra

View file

@ -28,7 +28,7 @@ let
''; '';
in { in {
llvm = callPackage ./llvm.nix { }; llvm = callPackage ./llvm { };
clang-unwrapped = callPackage ./clang { clang-unwrapped = callPackage ./clang {
inherit clang-tools-extra_src; inherit clang-tools-extra_src;
@ -68,16 +68,16 @@ let
extraBuildCommands = mkExtraBuildCommands cc; extraBuildCommands = mkExtraBuildCommands cc;
}; };
lld = callPackage ./lld.nix {}; lld = callPackage ./lld {};
lldb = callPackage ./lldb.nix {}; lldb = callPackage ./lldb {};
}); });
libraries = lib.makeExtensible (libraries: let libraries = lib.makeExtensible (libraries: let
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
in { in {
compiler-rt = callPackage ./compiler-rt.nix {}; compiler-rt = callPackage ./compiler-rt {};
stdenv = overrideCC stdenv buildLlvmTools.clang; stdenv = overrideCC stdenv buildLlvmTools.clang;
@ -85,7 +85,7 @@ let
libcxx = callPackage ./libc++ {}; libcxx = callPackage ./libc++ {};
libcxxabi = callPackage ./libc++abi.nix {}; libcxxabi = callPackage ./libc++abi {};
openmp = callPackage ./openmp.nix {}; openmp = callPackage ./openmp.nix {};
}); });

View file

@ -16,6 +16,8 @@
}: }:
let let
inherit (lib) optional optionals optionalString;
# Used when creating a versioned symlinks of libLLVM.dylib # Used when creating a versioned symlinks of libLLVM.dylib
versionSuffixes = with lib; versionSuffixes = with lib;
let parts = splitVersion release_version; in let parts = splitVersion release_version; in
@ -35,10 +37,10 @@ stdenv.mkDerivation ({
''; '';
outputs = [ "out" "python" ] outputs = [ "out" "python" ]
++ lib.optional enableSharedLibraries "lib"; ++ optional enableSharedLibraries "lib";
nativeBuildInputs = [ cmake python3 ] nativeBuildInputs = [ cmake python3 ]
++ lib.optional enableManpages python3.pkgs.sphinx; ++ optional enableManpages python3.pkgs.sphinx;
buildInputs = [ libxml2 libffi ]; buildInputs = [ libxml2 libffi ];
@ -58,24 +60,24 @@ stdenv.mkDerivation ({
# stripLen = 1; # stripLen = 1;
#}) #})
]; ];
postPatch = lib.optionalString stdenv.isDarwin '' postPatch = optionalString stdenv.isDarwin ''
substituteInPlace cmake/modules/AddLLVM.cmake \ substituteInPlace cmake/modules/AddLLVM.cmake \
--replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \
--replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' "" --replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' ""
'' ''
# Patch llvm-config to return correct library path based on --link-{shared,static}. # Patch llvm-config to return correct library path based on --link-{shared,static}.
+ lib.optionalString (enableSharedLibraries) '' + optionalString (enableSharedLibraries) ''
substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib substitute '${./outputs.patch}' ./outputs.patch --subst-var lib
patch -p1 < ./llvm-outputs.patch patch -p1 < ./outputs.patch
'' + '' '' + ''
# FileSystem permissions tests fail with various special bits # FileSystem permissions tests fail with various special bits
substituteInPlace unittests/Support/CMakeLists.txt \ substituteInPlace unittests/Support/CMakeLists.txt \
--replace "Path.cpp" "" --replace "Path.cpp" ""
rm unittests/Support/Path.cpp rm unittests/Support/Path.cpp
'' + lib.optionalString stdenv.isAarch64 '' '' + optionalString stdenv.isAarch64 ''
patch -p0 < ${../aarch64.patch} patch -p0 < ${../../aarch64.patch}
'' + lib.optionalString stdenv.hostPlatform.isMusl '' '' + optionalString stdenv.hostPlatform.isMusl ''
patch -p1 -i ${../TLI-musl.patch} patch -p1 -i ${../../TLI-musl.patch}
substituteInPlace unittests/Support/CMakeLists.txt \ substituteInPlace unittests/Support/CMakeLists.txt \
--replace "add_subdirectory(DynamicLibrary)" "" --replace "add_subdirectory(DynamicLibrary)" ""
rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
@ -98,18 +100,18 @@ stdenv.mkDerivation ({
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
"-DTARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}"
] ]
++ lib.optional enableSharedLibraries ++ optional enableSharedLibraries
"-DLLVM_LINK_LLVM_DYLIB=ON" "-DLLVM_LINK_LLVM_DYLIB=ON"
++ lib.optionals enableManpages [ ++ optionals enableManpages [
"-DLLVM_BUILD_DOCS=ON" "-DLLVM_BUILD_DOCS=ON"
"-DLLVM_ENABLE_SPHINX=ON" "-DLLVM_ENABLE_SPHINX=ON"
"-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_MAN=ON"
"-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_OUTPUT_HTML=OFF"
"-DSPHINX_WARNINGS_AS_ERRORS=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
] ]
++ lib.optional (!isDarwin) ++ optional (!isDarwin)
"-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
++ lib.optionals (isDarwin) [ ++ optionals (isDarwin) [
"-DLLVM_ENABLE_LIBCXX=ON" "-DLLVM_ENABLE_LIBCXX=ON"
"-DCAN_TARGET_i386=false" "-DCAN_TARGET_i386=false"
]; ];
@ -126,14 +128,14 @@ stdenv.mkDerivation ({
mkdir -p $python/share mkdir -p $python/share
mv $out/share/opt-viewer $python/share/opt-viewer mv $out/share/opt-viewer $python/share/opt-viewer
'' ''
+ lib.optionalString enableSharedLibraries '' + optionalString enableSharedLibraries ''
moveToOutput "lib/libLLVM-*" "$lib" moveToOutput "lib/libLLVM-*" "$lib"
moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
moveToOutput "lib/libLTO${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" moveToOutput "lib/libLTO${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
--replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-" --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-"
'' ''
+ lib.optionalString (stdenv.isDarwin && enableSharedLibraries) '' + optionalString (stdenv.isDarwin && enableSharedLibraries) ''
substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
--replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" \ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" \
--replace "\''${_IMPORT_PREFIX}/lib/libLTO.dylib" "$lib/lib/libLTO.dylib" --replace "\''${_IMPORT_PREFIX}/lib/libLTO.dylib" "$lib/lib/libLTO.dylib"

View file

@ -51,10 +51,11 @@ stdenv.mkDerivation {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
patches = [ patches = [
./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory
../7/compiler-rt-glibc.patch # https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce
../../common/compiler-rt/glibc.patch
] ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
# to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra

View file

@ -28,7 +28,7 @@ let
''; '';
in { in {
llvm = callPackage ./llvm.nix { }; llvm = callPackage ./llvm { };
clang-unwrapped = callPackage ./clang { clang-unwrapped = callPackage ./clang {
inherit clang-tools-extra_src; inherit clang-tools-extra_src;
@ -69,16 +69,16 @@ let
extraBuildCommands = mkExtraBuildCommands cc; extraBuildCommands = mkExtraBuildCommands cc;
}; };
lld = callPackage ./lld.nix {}; lld = callPackage ./lld {};
lldb = callPackage ./lldb.nix {}; lldb = callPackage ./lldb {};
}); });
libraries = lib.makeExtensible (libraries: let libraries = lib.makeExtensible (libraries: let
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
in { in {
compiler-rt = callPackage ./compiler-rt.nix {}; compiler-rt = callPackage ./compiler-rt {};
stdenv = overrideCC stdenv buildLlvmTools.clang; stdenv = overrideCC stdenv buildLlvmTools.clang;
@ -86,7 +86,7 @@ let
libcxx = callPackage ./libc++ {}; libcxx = callPackage ./libc++ {};
libcxxabi = callPackage ./libc++abi.nix {}; libcxxabi = callPackage ./libc++abi {};
openmp = callPackage ./openmp.nix {}; openmp = callPackage ./openmp.nix {};
}); });

View file

@ -67,15 +67,15 @@ stdenv.mkDerivation ({
'' ''
# Patch llvm-config to return correct library path based on --link-{shared,static}. # Patch llvm-config to return correct library path based on --link-{shared,static}.
+ optionalString (enableSharedLibraries) '' + optionalString (enableSharedLibraries) ''
substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib substitute '${./outputs.patch}' ./outputs.patch --subst-var lib
patch -p1 < ./llvm-outputs.patch patch -p1 < ./outputs.patch
'' + '' '' + ''
# FileSystem permissions tests fail with various special bits # FileSystem permissions tests fail with various special bits
substituteInPlace unittests/Support/CMakeLists.txt \ substituteInPlace unittests/Support/CMakeLists.txt \
--replace "Path.cpp" "" --replace "Path.cpp" ""
rm unittests/Support/Path.cpp rm unittests/Support/Path.cpp
'' + optionalString stdenv.hostPlatform.isMusl '' '' + optionalString stdenv.hostPlatform.isMusl ''
patch -p1 -i ${../TLI-musl.patch} patch -p1 -i ${../../TLI-musl.patch}
substituteInPlace unittests/Support/CMakeLists.txt \ substituteInPlace unittests/Support/CMakeLists.txt \
--replace "add_subdirectory(DynamicLibrary)" "" --replace "add_subdirectory(DynamicLibrary)" ""
rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp

View file

@ -52,12 +52,11 @@ stdenv.mkDerivation {
patches = [ patches = [
# https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce # https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce
./compiler-rt-glibc.patch ../../common/compiler-rt/glibc.patch
./codesign.patch # Revert compiler-rt commit that makes codesign mandatory
./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
] ++ lib.optional (useLLVM) ./crtbegin-and-end.patch ] ++ lib.optional (useLLVM) ./crtbegin-and-end.patch
++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
# to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra

View file

@ -28,8 +28,9 @@ let
''; '';
in { in {
llvm = callPackage ./llvm.nix { }; llvm = callPackage ./llvm { };
llvm-polly = callPackage ./llvm.nix { enablePolly = true; };
llvm-polly = callPackage ./llvm { enablePolly = true; };
clang-unwrapped = callPackage ./clang { clang-unwrapped = callPackage ./clang {
inherit (tools) lld; inherit (tools) lld;
@ -75,9 +76,9 @@ let
extraBuildCommands = mkExtraBuildCommands cc; extraBuildCommands = mkExtraBuildCommands cc;
}; };
lld = callPackage ./lld.nix {}; lld = callPackage ./lld {};
lldb = callPackage ./lldb.nix {}; lldb = callPackage ./lldb {};
# Below, is the LLVM bootstrapping logic. It handles building a # Below, is the LLVM bootstrapping logic. It handles building a
# fully LLVM toolchain from scratch. No GCC toolchain should be # fully LLVM toolchain from scratch. No GCC toolchain should be
@ -159,7 +160,7 @@ let
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
in { in {
compiler-rt = callPackage ./compiler-rt.nix { compiler-rt = callPackage ./compiler-rt {
stdenv = if stdenv.hostPlatform.useLLVM or false stdenv = if stdenv.hostPlatform.useLLVM or false
then overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt then overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt
else stdenv; else stdenv;
@ -174,7 +175,7 @@ let
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
})); }));
libcxxabi = callPackage ./libc++abi.nix ({} // libcxxabi = callPackage ./libc++abi ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
libunwind = libraries.libunwind; libunwind = libraries.libunwind;

View file

@ -76,15 +76,15 @@ in stdenv.mkDerivation ({
'' ''
# Patch llvm-config to return correct library path based on --link-{shared,static}. # Patch llvm-config to return correct library path based on --link-{shared,static}.
+ optionalString (enableSharedLibraries) '' + optionalString (enableSharedLibraries) ''
substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib substitute '${./outputs.patch}' ./outputs.patch --subst-var lib
patch -p1 < ./llvm-outputs.patch patch -p1 < ./outputs.patch
'' + '' '' + ''
# FileSystem permissions tests fail with various special bits # FileSystem permissions tests fail with various special bits
substituteInPlace unittests/Support/CMakeLists.txt \ substituteInPlace unittests/Support/CMakeLists.txt \
--replace "Path.cpp" "" --replace "Path.cpp" ""
rm unittests/Support/Path.cpp rm unittests/Support/Path.cpp
'' + optionalString stdenv.hostPlatform.isMusl '' '' + optionalString stdenv.hostPlatform.isMusl ''
patch -p1 -i ${../TLI-musl.patch} patch -p1 -i ${../../TLI-musl.patch}
substituteInPlace unittests/Support/CMakeLists.txt \ substituteInPlace unittests/Support/CMakeLists.txt \
--replace "add_subdirectory(DynamicLibrary)" "" --replace "add_subdirectory(DynamicLibrary)" ""
rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp

View file

@ -51,11 +51,12 @@ stdenv.mkDerivation {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
patches = [ patches = [
../7/compiler-rt-glibc.patch # https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce
./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory ../../common/compiler-rt/glibc.patch
./codesign.patch # Revert compiler-rt commit that makes codesign mandatory
]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
++ lib.optional (useLLVM) ./crtbegin-and-end.patch ++ lib.optional (useLLVM) ./crtbegin-and-end.patch
++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
# to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra

View file

@ -28,8 +28,9 @@ let
''; '';
in { in {
llvm = callPackage ./llvm.nix { }; llvm = callPackage ./llvm { };
llvm-polly = callPackage ./llvm.nix { enablePolly = true; };
llvm-polly = callPackage ./llvm { enablePolly = true; };
clang-unwrapped = callPackage ./clang { clang-unwrapped = callPackage ./clang {
inherit (tools) lld; inherit (tools) lld;
@ -76,9 +77,9 @@ let
extraBuildCommands = mkExtraBuildCommands cc; extraBuildCommands = mkExtraBuildCommands cc;
}; };
lld = callPackage ./lld.nix {}; lld = callPackage ./lld {};
lldb = callPackage ./lldb.nix {}; lldb = callPackage ./lldb {};
# Below, is the LLVM bootstrapping logic. It handles building a # Below, is the LLVM bootstrapping logic. It handles building a
# fully LLVM toolchain from scratch. No GCC toolchain should be # fully LLVM toolchain from scratch. No GCC toolchain should be
@ -162,7 +163,7 @@ let
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
in { in {
compiler-rt = callPackage ./compiler-rt.nix ({} // compiler-rt = callPackage ./compiler-rt ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt; stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt;
})); }));
@ -176,7 +177,7 @@ let
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
})); }));
libcxxabi = callPackage ./libc++abi.nix ({} // libcxxabi = callPackage ./libc++abi ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
libunwind = libraries.libunwind; libunwind = libraries.libunwind;
@ -184,7 +185,7 @@ let
openmp = callPackage ./openmp.nix {}; openmp = callPackage ./openmp.nix {};
libunwind = callPackage ./libunwind.nix ({} // libunwind = callPackage ./libunwind ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
})); }));

View file

@ -21,7 +21,7 @@ stdenv.mkDerivation {
"-DLIBCXXABI_ENABLE_SHARED=OFF" "-DLIBCXXABI_ENABLE_SHARED=OFF"
]; ];
patches = [ ./libcxxabi-no-threads.patch ]; patches = [ ./no-threads.patch ];
postUnpack = '' postUnpack = ''
unpackFile ${libcxx.src} unpackFile ${libcxx.src}
@ -32,7 +32,7 @@ stdenv.mkDerivation {
'' + lib.optionalString stdenv.hostPlatform.isMusl '' '' + lib.optionalString stdenv.hostPlatform.isMusl ''
patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
'' + lib.optionalString stdenv.hostPlatform.isWasm '' '' + lib.optionalString stdenv.hostPlatform.isWasm ''
patch -p1 -d $(ls -d llvm-*) -i ${./libcxxabi-wasm.patch} patch -p1 -d $(ls -d llvm-*) -i ${./wasm.patch}
''; '';
installPhase = if stdenv.isDarwin installPhase = if stdenv.isDarwin

View file

@ -71,15 +71,15 @@ in stdenv.mkDerivation ({
'' ''
# Patch llvm-config to return correct library path based on --link-{shared,static}. # Patch llvm-config to return correct library path based on --link-{shared,static}.
+ optionalString (enableSharedLibraries) '' + optionalString (enableSharedLibraries) ''
substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib substitute '${./outputs.patch}' ./outputs.patch --subst-var lib
patch -p1 < ./llvm-outputs.patch patch -p1 < ./outputs.patch
'' + '' '' + ''
# FileSystem permissions tests fail with various special bits # FileSystem permissions tests fail with various special bits
substituteInPlace unittests/Support/CMakeLists.txt \ substituteInPlace unittests/Support/CMakeLists.txt \
--replace "Path.cpp" "" --replace "Path.cpp" ""
rm unittests/Support/Path.cpp rm unittests/Support/Path.cpp
'' + optionalString stdenv.hostPlatform.isMusl '' '' + optionalString stdenv.hostPlatform.isMusl ''
patch -p1 -i ${../TLI-musl.patch} patch -p1 -i ${../../TLI-musl.patch}
substituteInPlace unittests/Support/CMakeLists.txt \ substituteInPlace unittests/Support/CMakeLists.txt \
--replace "add_subdirectory(DynamicLibrary)" "" --replace "add_subdirectory(DynamicLibrary)" ""
rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp

View file

@ -51,10 +51,11 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
patches = [ patches = [
../7/compiler-rt-glibc.patch # https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce
./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory ../../common/compiler-rt/glibc.patch
./codesign.patch # Revert compiler-rt commit that makes codesign mandatory
]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
++ lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
# to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra

View file

@ -28,8 +28,9 @@ let
''; '';
in { in {
llvm = callPackage ./llvm.nix { }; llvm = callPackage ./llvm { };
llvm-polly = callPackage ./llvm.nix { enablePolly = true; };
llvm-polly = callPackage ./llvm { enablePolly = true; };
clang-unwrapped = callPackage ./clang { clang-unwrapped = callPackage ./clang {
inherit (tools) lld; inherit (tools) lld;
@ -76,9 +77,9 @@ let
extraBuildCommands = mkExtraBuildCommands cc; extraBuildCommands = mkExtraBuildCommands cc;
}; };
lld = callPackage ./lld.nix {}; lld = callPackage ./lld {};
lldb = callPackage ./lldb.nix {}; lldb = callPackage ./lldb {};
# Below, is the LLVM bootstrapping logic. It handles building a # Below, is the LLVM bootstrapping logic. It handles building a
# fully LLVM toolchain from scratch. No GCC toolchain should be # fully LLVM toolchain from scratch. No GCC toolchain should be
@ -162,7 +163,7 @@ let
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
in { in {
compiler-rt = callPackage ./compiler-rt.nix ({} // compiler-rt = callPackage ./compiler-rt ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt; stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt;
})); }));
@ -176,7 +177,7 @@ let
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
})); }));
libcxxabi = callPackage ./libc++abi.nix ({} // libcxxabi = callPackage ./libc++abi ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
libunwind = libraries.libunwind; libunwind = libraries.libunwind;
@ -184,7 +185,7 @@ let
openmp = callPackage ./openmp.nix {}; openmp = callPackage ./openmp.nix {};
libunwind = callPackage ./libunwind.nix ({} // libunwind = callPackage ./libunwind ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
})); }));

Some files were not shown because too many files have changed in this diff Show more