git.iko.soy/typeable/nixpkgs
on master help sign in
llvmPackages_git: Build from Git

The version will initially remain the same so that no additional changes to the packaging are required (i.e. this commit only includes the required changes to build from the mono repository instead of individual tarballs).

commita7f062d8980f525ca484585015fc0deccc419728 authorMichael Weiss <dev.primeos@gmail.com> dateMon 26 Apr 2021, 19:18 (6 years ago) parente458a01
10 files changed+40−77
pkgs/development/compilers/llvm/git/clang/default.nix+3−10 pkgs/development/compilers/llvm/git/compiler-rt/default.nix+4−2 pkgs/development/compilers/llvm/git/default.nix+9−11 pkgs/development/compilers/llvm/git/libcxx/default.nix+4−10 pkgs/development/compilers/llvm/git/libcxxabi/default.nix+5−9 pkgs/development/compilers/llvm/git/libunwind/default.nix+3−9 pkgs/development/compilers/llvm/git/lld/default.nix+3−10 pkgs/development/compilers/llvm/git/lldb/default.nix+3−2 pkgs/development/compilers/llvm/git/llvm/default.nix+3−12 pkgs/development/compilers/llvm/git/openmp/default.nix+3−2
pkgs/development/compilers/llvm/git/clang/default.nix+3−10
@@ -1,4 +1,4 @@
1−{ lib, stdenv, llvm_meta, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3
1+{ lib, stdenv, llvm_meta, src, cmake, libxml2, libllvm, version, python3
22, buildLlvmTools
33, fixDarwinDylibNames
44, enableManpages ? false
@@ -9,15 +9,8 @@ let
99 pname = "clang";
1010 inherit version;
1111
12− src = fetch "clang" "1vd9rhhrd8ghdg111lac7w8by71y9l14yh5zxfijsm6lj4p4avp2";
13− inherit clang-tools-extra_src;
14−
15− unpackPhase = ''
16− unpackFile $src
17− mv clang-* clang
18− sourceRoot=$PWD/clang
19− unpackFile ${clang-tools-extra_src}
20− '';
12+ inherit src;
13+ sourceRoot = "source/clang";
2114
2215 nativeBuildInputs = [ cmake python3 ]
2316 ++ lib.optional enableManpages python3.pkgs.sphinx
pkgs/development/compilers/llvm/git/compiler-rt/default.nix+4−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, llvm, libcxxabi }:
1+{ lib, stdenv, llvm_meta, version, src, cmake, python3, llvm, libcxxabi }:
22
33let
44
@@ -12,7 +12,9 @@ in
1212stdenv.mkDerivation {
1313 pname = "compiler-rt" + lib.optionalString (haveLibc) "-libc";
1414 inherit version;
15− src = fetch "compiler-rt" "0d444qihq9jhqnfv003cr704v363va72zl6qaw2algj1c85cva45";
15+
16+ inherit src;
17+ sourceRoot = "source/compiler-rt";
1618
1719 nativeBuildInputs = [ cmake python3 llvm.dev ];
1820 buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
pkgs/development/compilers/llvm/git/default.nix+9−11
@@ -1,6 +1,6 @@
11{ lowPrio, newScope, pkgs, lib, stdenv, cmake
22, gccForLibs, preLibcCrossHeaders
3−, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
3+, libxml2, python3, isl, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith
44, buildLlvmTools # tools, but from the previous stage, for cross
55, targetLlvmLibraries # libraries, but from the next stage, for cross
66# This is the default binutils, but with *this* version of LLD rather
@@ -24,13 +24,13 @@ let
2424 version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs
2525 targetConfig = stdenv.targetPlatform.config;
2626
27− fetch = name: sha256: fetchurl {
28− url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/${name}-${release_version}${candidate}.src.tar.xz";
29− inherit sha256;
27+ src = fetchFromGitHub {
28+ owner = "llvm";
29+ repo = "llvm-project";
30+ rev = "llvmorg-${version}";
31+ sha256 = "07jz8pywc2qqa1srdnqg5p2y4lx3ki1inpigarzgxc3j20r4gb58";
3032 };
3133
32− clang-tools-extra_src = fetch "clang-tools-extra" "0p3dzr0qa7mar83y66xa5m5apynf6ia0lsdsq6axwnm64ysy0hdd";
33−
3434 llvm_meta = {
3535 license = lib.licenses.ncsa;
3636 maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ];
@@ -38,7 +38,7 @@ let
3838 };
3939
4040 tools = lib.makeExtensible (tools: let
41− callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; });
41+ callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version src buildLlvmTools; });
4242 mkExtraBuildCommands0 = cc: ''
4343 rsrc="$out/resource-root"
4444 mkdir "$rsrc"
@@ -70,7 +70,7 @@ let
7070 llvm = tools.libllvm.out // { outputUnspecified = true; };
7171
7272 libclang = callPackage ./clang {
73− inherit clang-tools-extra_src llvm_meta;
73+ inherit llvm_meta;
7474 };
7575
7676 clang-unwrapped = tools.libclang.out // { outputUnspecified = true; };
@@ -116,7 +116,6 @@ let
116116
117117 lld = callPackage ./lld {
118118 inherit llvm_meta;
119− inherit (libraries) libunwind;
120119 };
121120
122121 lldb = callPackage ./lldb {
@@ -214,7 +213,7 @@ let
214213 });
215214
216215 libraries = lib.makeExtensible (libraries: let
217− callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
216+ callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version src; });
218217 in {
219218
220219 compiler-rt-libc = callPackage ./compiler-rt {
@@ -256,7 +255,6 @@ let
256255
257256 libunwind = callPackage ./libunwind {
258257 inherit llvm_meta;
259− inherit (buildLlvmTools) llvm;
260258 stdenv = if stdenv.hostPlatform.useLLVM or false
261259 then overrideCC stdenv buildLlvmTools.clangNoLibcxx
262260 else stdenv;
pkgs/development/compilers/llvm/git/libcxx/default.nix+4−10
@@ -1,19 +1,13 @@
1−{ lib, stdenv, llvm_meta, fetch, cmake, python3, libcxxabi, llvm, fixDarwinDylibNames, version
1+{ lib, stdenv, llvm_meta, src, cmake, python3, libcxxabi, fixDarwinDylibNames, version
22, enableShared ? !stdenv.hostPlatform.isStatic
33}:
44
5−stdenv.mkDerivation {
5+stdenv.mkDerivation rec {
66 pname = "libcxx";
77 inherit version;
88
9− src = fetch "libcxx" "1wf3ww29xkx7prs7pdwicy5qqfapib26110jgmkjrbka9z57bjvx";
10−
11− postUnpack = ''
12− unpackFile ${libcxxabi.src}
13− mv libcxxabi-* libcxxabi
14− unpackFile ${llvm.src}
15− mv llvm-* llvm
16− '';
9+ inherit src;
10+ sourceRoot = "source/${pname}";
1711
1812 outputs = [ "out" "dev" ];
1913
pkgs/development/compilers/llvm/git/libcxxabi/default.nix+5−9
@@ -1,21 +1,17 @@
1−{ lib, stdenv, llvm_meta, cmake, python3, fetch, libcxx, libunwind, llvm, version
1+{ lib, stdenv, llvm_meta, cmake, python3, src, libunwind, version
22, enableShared ? !stdenv.hostPlatform.isStatic
33}:
44
5−stdenv.mkDerivation {
5+stdenv.mkDerivation rec {
66 pname = "libcxxabi";
77 inherit version;
88
9− src = fetch "libcxxabi" "1cbmzspwjlr8f6sp73pw6ivf4dpg6rpc61by0q1m2zca2k6yif3a";
9+ inherit src;
10+ sourceRoot = "source/${pname}";
1011
1112 outputs = [ "out" "dev" ];
1213
13− postUnpack = ''
14− unpackFile ${libcxx.src}
15− mv libcxx-* libcxx
16− unpackFile ${llvm.src}
17− mv llvm-* llvm
18− '' + lib.optionalString stdenv.isDarwin ''
14+ postUnpack = lib.optionalString stdenv.isDarwin ''
1915 export TRIPLE=x86_64-apple-darwin
2016 '' + lib.optionalString stdenv.hostPlatform.isMusl ''
2117 patch -p1 -d libcxx -i ${../../libcxx-0001-musl-hacks.patch}
pkgs/development/compilers/llvm/git/libunwind/default.nix+3−9
@@ -1,4 +1,4 @@
1−{ lib, stdenv, llvm_meta, version, fetch, libcxx, llvm, cmake
1+{ lib, stdenv, llvm_meta, version, src, cmake
22, enableShared ? !stdenv.hostPlatform.isStatic
33}:
44
@@ -6,14 +6,8 @@ stdenv.mkDerivation rec {
66 pname = "libunwind";
77 inherit version;
88
9− src = fetch pname "1x8wpmsrsgnwj2v5ih52ylni7r6n8gzkcj6hx65zbxski2rablly";
10−
11− postUnpack = ''
12− unpackFile ${libcxx.src}
13− mv libcxx-* libcxx
14− unpackFile ${llvm.src}
15− mv llvm-* llvm
16− '';
9+ inherit src;
10+ sourceRoot = "source/${pname}";
1711
1812 patches = [
1913 ./gnu-install-dirs.patch
pkgs/development/compilers/llvm/git/lld/default.nix+3−10
@@ -1,7 +1,6 @@
11{ lib, stdenv, llvm_meta
22, buildLlvmTools
3−, fetch
4−, libunwind
3+, src
54, cmake
65, libxml2
76, libllvm
@@ -12,19 +11,13 @@ stdenv.mkDerivation rec {
1211 pname = "lld";
1312 inherit version;
1413
15− src = fetch pname "1zakyxk5bwnh7jarckcd4rbmzi58jgn2dbah5j5cwcyfyfbx9drc";
14+ inherit src;
15+ sourceRoot = "source/${pname}";
1616
1717 patches = [
1818 ./gnu-install-dirs.patch
1919 ];
2020
21− postPatch = ''
22− substituteInPlace MachO/CMakeLists.txt --replace \
23− '(''${LLVM_MAIN_SRC_DIR}/' '('
24− mkdir -p libunwind/include
25− tar -xf "${libunwind.src}" --wildcards -C libunwind/include --strip-components=2 "libunwind-*/include/"
26− '';
27−
2821 nativeBuildInputs = [ cmake ];
2922 buildInputs = [ libllvm libxml2 ];
3023
pkgs/development/compilers/llvm/git/lldb/default.nix+3−2
@@ -1,6 +1,6 @@
11{ lib, stdenv, llvm_meta
22, runCommand
3−, fetch
3+, src
44, cmake
55, zlib
66, ncurses
@@ -26,7 +26,8 @@ stdenv.mkDerivation (rec {
2626 pname = "lldb";
2727 inherit version;
2828
29− src = fetch pname "1v85qyq3snk81vjmwq5q7xikyyqsfpqy2c4qmr81mps4avsw1g0l";
29+ inherit src;
30+ sourceRoot = "source/${pname}";
3031
3132 patches = [
3233 ./procfs.patch
pkgs/development/compilers/llvm/git/llvm/default.nix+3−12
@@ -1,6 +1,6 @@
11{ lib, stdenv, llvm_meta
22, pkgsBuildBuild
3−, fetch
3+, src
44, fetchpatch
55, cmake
66, python3
@@ -34,17 +34,8 @@ in stdenv.mkDerivation (rec {
3434 pname = "llvm";
3535 inherit version;
3636
37− src = fetch pname "0l4b79gwfvxild974aigcq1yigypjsk2j5p59syhl6ksd744gp29";
38− polly_src = fetch "polly" "1ixl9yj526n8iqh9ckyiah2vzravs9d1akybqq7rvy32n9vgr6hd";
39−
40− unpackPhase = ''
41− unpackFile $src
42− mv llvm-${release_version}* llvm
43− sourceRoot=$PWD/llvm
44− '' + optionalString enablePolly ''
45− unpackFile $polly_src
46− mv polly-* $sourceRoot/tools/polly
47− '';
37+ inherit src;
38+ sourceRoot = "source/${pname}";
4839
4940 outputs = [ "out" "lib" "dev" "python" ];
5041
pkgs/development/compilers/llvm/git/openmp/default.nix+3−2
@@ -1,7 +1,7 @@
11{ lib
22, stdenv
33, llvm_meta
4−, fetch
4+, src
55, cmake
66, llvm
77, perl
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
1212 pname = "openmp";
1313 inherit version;
1414
15− src = fetch pname "0z8n1wanby6aq3i7d91mgk72hb33zfl5blayk0a22cs7l8i706zb";
15+ inherit src;
16+ sourceRoot = "source/${pname}";
1617
1718 nativeBuildInputs = [ cmake perl ];
1819 buildInputs = [ llvm ];