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

llvmPackages: python2 -> python3

Browse Source
This commit is contained in:
Daiderd Jordan 2020-01-12 21:22:29 +01:00
parent 453e009947
commit d0a90de910
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
35 changed files with 100 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/llvm/4/clang/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python { stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python3
, fixDarwinDylibNames , fixDarwinDylibNames
, enableManpages ? false , enableManpages ? false
}: }:
@ -19,8 +19,8 @@ let
mv clang-tools-extra-* $sourceRoot/tools/extra mv clang-tools-extra-* $sourceRoot/tools/extra
''; '';
nativeBuildInputs = [ cmake python ] nativeBuildInputs = [ cmake python3 ]
++ stdenv.lib.optional enableManpages python.pkgs.sphinx; ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
buildInputs = [ libxml2 llvm ] buildInputs = [ libxml2 llvm ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;

10
pkgs/development/compilers/llvm/4/default.nix
View File

@ -1,5 +1,5 @@
{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook { lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook
, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith
, buildLlvmTools # tools, but from the previous stage, for cross , buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross
}: }:
@ -17,7 +17,7 @@ let
clang-tools-extra_src = fetch "clang-tools-extra" "1dhmp7ccfpr42bmvk3kp37ngjpf3a9m5d4kkpsn7d00hzi7fdl9m"; clang-tools-extra_src = fetch "clang-tools-extra" "1dhmp7ccfpr42bmvk3kp37ngjpf3a9m5d4kkpsn7d00hzi7fdl9m";
tools = stdenv.lib.makeExtensible (tools: let tools = stdenv.lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
in { in {
llvm = callPackage ./llvm.nix { llvm = callPackage ./llvm.nix {
@ -29,12 +29,12 @@ let
llvm-manpages = lowPrio (tools.llvm.override { llvm-manpages = lowPrio (tools.llvm.override {
enableManpages = true; enableManpages = true;
python = pkgs.python; # don't use python-boot python3 = pkgs.python3; # don't use python-boot
}); });
clang-manpages = lowPrio (tools.clang-unwrapped.override { clang-manpages = lowPrio (tools.clang-unwrapped.override {
enableManpages = true; enableManpages = true;
python = pkgs.python; # don't use python-boot python3 = pkgs.python3; # don't use python-boot
}); });
libclang = tools.clang-unwrapped.lib; libclang = tools.clang-unwrapped.lib;
@ -57,7 +57,7 @@ let
}); });
libraries = stdenv.lib.makeExtensible (libraries: let libraries = stdenv.lib.makeExtensible (libraries: let
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
in { in {
stdenv = overrideCC stdenv buildLlvmTools.clang; stdenv = overrideCC stdenv buildLlvmTools.clang;

4
pkgs/development/compilers/llvm/4/libc++/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: { lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "libc++"; pname = "libc++";
@ -31,7 +31,7 @@ stdenv.mkDerivation {
'' + lib.optionalString stdenv.hostPlatform.isMusl '' '' + lib.optionalString stdenv.hostPlatform.isMusl ''
patchShebangs utils/cat_files.py patchShebangs utils/cat_files.py
''; '';
nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python; nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3;
buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;

4
pkgs/development/compilers/llvm/4/lldb.nix
View File

@ -9,7 +9,7 @@
, libxml2 , libxml2
, llvm , llvm
, clang-unwrapped , clang-unwrapped
, python , python3
, version , version
, darwin , darwin
}: }:
@ -31,7 +31,7 @@ stdenv.mkDerivation {
cmake/modules/LLDBStandalone.cmake cmake/modules/LLDBStandalone.cmake
''; '';
nativeBuildInputs = [ cmake python which swig ]; nativeBuildInputs = [ cmake python3 which swig ];
buildInputs = [ ncurses zlib libedit libxml2 llvm ] buildInputs = [ ncurses zlib libedit libxml2 llvm ]
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];

6
pkgs/development/compilers/llvm/4/llvm.nix
View File

@ -2,7 +2,7 @@
, fetch , fetch
, fetchpatch , fetchpatch
, cmake , cmake
, python , python3
, libffi , libffi
, libbfd , libbfd
, libxml2 , libxml2
@ -40,8 +40,8 @@ stdenv.mkDerivation ({
outputs = [ "out" ] outputs = [ "out" ]
++ stdenv.lib.optional enableSharedLibraries "lib"; ++ stdenv.lib.optional enableSharedLibraries "lib";
nativeBuildInputs = [ cmake python ] nativeBuildInputs = [ cmake python3 ]
++ stdenv.lib.optional enableManpages python.pkgs.sphinx; ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
buildInputs = [ libxml2 libffi ]; buildInputs = [ libxml2 libffi ];

6
pkgs/development/compilers/llvm/5/clang/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python { stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3
, fixDarwinDylibNames , fixDarwinDylibNames
, enableManpages ? false , enableManpages ? false
}: }:
@ -19,8 +19,8 @@ let
mv clang-tools-extra-* $sourceRoot/tools/extra mv clang-tools-extra-* $sourceRoot/tools/extra
''; '';
nativeBuildInputs = [ cmake python ] nativeBuildInputs = [ cmake python3 ]
++ stdenv.lib.optional enableManpages python.pkgs.sphinx; ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
buildInputs = [ libxml2 llvm ] buildInputs = [ libxml2 llvm ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;

4
pkgs/development/compilers/llvm/5/compiler-rt.nix
View File

@ -1,11 +1,11 @@
{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }: { stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "compiler-rt"; pname = "compiler-rt";
inherit version; inherit version;
src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy"; src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy";
nativeBuildInputs = [ cmake python llvm ]; nativeBuildInputs = [ cmake python3 llvm ];
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
configureFlags = [ configureFlags = [

10
pkgs/development/compilers/llvm/5/default.nix
View File

@ -1,5 +1,5 @@
{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook { lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook
, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith
, buildLlvmTools # tools, but from the previous stage, for cross , buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross
}: }:
@ -16,7 +16,7 @@ let
clang-tools-extra_src = fetch "clang-tools-extra" "018b3fiwah8f8br5i26qmzh6sjvzchpn358sn8v079m49f2jldm3"; clang-tools-extra_src = fetch "clang-tools-extra" "018b3fiwah8f8br5i26qmzh6sjvzchpn358sn8v079m49f2jldm3";
tools = stdenv.lib.makeExtensible (tools: let tools = stdenv.lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
mkExtraBuildCommands = cc: '' mkExtraBuildCommands = cc: ''
rsrc="$out/resource-root" rsrc="$out/resource-root"
mkdir "$rsrc" mkdir "$rsrc"
@ -36,12 +36,12 @@ let
llvm-manpages = lowPrio (tools.llvm.override { llvm-manpages = lowPrio (tools.llvm.override {
enableManpages = true; enableManpages = true;
python = pkgs.python; # don't use python-boot python3 = pkgs.python3; # don't use python-boot
}); });
clang-manpages = lowPrio (tools.clang-unwrapped.override { clang-manpages = lowPrio (tools.clang-unwrapped.override {
enableManpages = true; enableManpages = true;
python = pkgs.python; # don't use python-boot python3 = pkgs.python3; # don't use python-boot
}); });
libclang = tools.clang-unwrapped.lib; libclang = tools.clang-unwrapped.lib;
@ -74,7 +74,7 @@ let
}); });
libraries = stdenv.lib.makeExtensible (libraries: let libraries = stdenv.lib.makeExtensible (libraries: let
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python 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.nix {};

4
pkgs/development/compilers/llvm/5/libc++/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: { lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "libc++"; pname = "libc++";
@ -25,7 +25,7 @@ stdenv.mkDerivation {
'' + lib.optionalString stdenv.hostPlatform.isMusl '' '' + lib.optionalString stdenv.hostPlatform.isMusl ''
patchShebangs utils/cat_files.py patchShebangs utils/cat_files.py
''; '';
nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python; nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3;
buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;

4
pkgs/development/compilers/llvm/5/lldb.nix
View File

@ -9,7 +9,7 @@
, libxml2 , libxml2
, llvm , llvm
, clang-unwrapped , clang-unwrapped
, python , python3
, version , version
, darwin , darwin
}: }:
@ -30,7 +30,7 @@ stdenv.mkDerivation {
cmake/modules/LLDBStandalone.cmake cmake/modules/LLDBStandalone.cmake
''; '';
nativeBuildInputs = [ cmake python which swig ]; nativeBuildInputs = [ cmake python3 which swig ];
buildInputs = [ ncurses zlib libedit libxml2 llvm ] buildInputs = [ ncurses zlib libedit libxml2 llvm ]
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];

6
pkgs/development/compilers/llvm/5/llvm.nix
View File

@ -2,7 +2,7 @@
, fetch , fetch
, fetchpatch , fetchpatch
, cmake , cmake
, python , python3
, libffi , libffi
, libbfd , libbfd
, libxml2 , libxml2
@ -37,8 +37,8 @@ stdenv.mkDerivation ({
outputs = [ "out" "python" ] outputs = [ "out" "python" ]
++ stdenv.lib.optional enableSharedLibraries "lib"; ++ stdenv.lib.optional enableSharedLibraries "lib";
nativeBuildInputs = [ cmake python ] nativeBuildInputs = [ cmake python3 ]
++ stdenv.lib.optional enableManpages python.pkgs.sphinx; ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
buildInputs = [ libxml2 libffi ]; buildInputs = [ libxml2 libffi ];

6
pkgs/development/compilers/llvm/6/clang/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python { stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3
, fixDarwinDylibNames , fixDarwinDylibNames
, enableManpages ? false , enableManpages ? false
}: }:
@ -19,8 +19,8 @@ let
mv clang-tools-extra-* $sourceRoot/tools/extra mv clang-tools-extra-* $sourceRoot/tools/extra
''; '';
nativeBuildInputs = [ cmake python ] nativeBuildInputs = [ cmake python3 ]
++ stdenv.lib.optional enableManpages python.pkgs.sphinx; ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
buildInputs = [ libxml2 llvm ] buildInputs = [ libxml2 llvm ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;

4
pkgs/development/compilers/llvm/6/compiler-rt.nix
View File

@ -1,11 +1,11 @@
{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }: { stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "compiler-rt"; pname = "compiler-rt";
inherit version; inherit version;
src = fetch "compiler-rt" "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl"; src = fetch "compiler-rt" "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl";
nativeBuildInputs = [ cmake python llvm ]; nativeBuildInputs = [ cmake python3 llvm ];
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
configureFlags = [ configureFlags = [

10
pkgs/development/compilers/llvm/6/default.nix
View File

@ -1,5 +1,5 @@
{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook { lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook
, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith
, buildLlvmTools # tools, but from the previous stage, for cross , buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross
}: }:
@ -16,7 +16,7 @@ let
clang-tools-extra_src = fetch "clang-tools-extra" "1w8ml7fyn4vyxmy59n2qm4r1k1kgwgwkaldp6m45fdv4g0kkfbhd"; clang-tools-extra_src = fetch "clang-tools-extra" "1w8ml7fyn4vyxmy59n2qm4r1k1kgwgwkaldp6m45fdv4g0kkfbhd";
tools = stdenv.lib.makeExtensible (tools: let tools = stdenv.lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
mkExtraBuildCommands = cc: '' mkExtraBuildCommands = cc: ''
rsrc="$out/resource-root" rsrc="$out/resource-root"
mkdir "$rsrc" mkdir "$rsrc"
@ -36,12 +36,12 @@ let
llvm-manpages = lowPrio (tools.llvm.override { llvm-manpages = lowPrio (tools.llvm.override {
enableManpages = true; enableManpages = true;
python = pkgs.python; # don't use python-boot python3 = pkgs.python3; # don't use python-boot
}); });
clang-manpages = lowPrio (tools.clang-unwrapped.override { clang-manpages = lowPrio (tools.clang-unwrapped.override {
enableManpages = true; enableManpages = true;
python = pkgs.python; # don't use python-boot python3 = pkgs.python3; # don't use python-boot
}); });
libclang = tools.clang-unwrapped.lib; libclang = tools.clang-unwrapped.lib;
@ -74,7 +74,7 @@ let
}); });
libraries = stdenv.lib.makeExtensible (libraries: let libraries = stdenv.lib.makeExtensible (libraries: let
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python 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.nix {};

4
pkgs/development/compilers/llvm/6/libc++/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: { lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "libc++"; pname = "libc++";
@ -25,7 +25,7 @@ stdenv.mkDerivation {
'' + lib.optionalString stdenv.hostPlatform.isMusl '' '' + lib.optionalString stdenv.hostPlatform.isMusl ''
patchShebangs utils/cat_files.py patchShebangs utils/cat_files.py
''; '';
nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python; nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3;
buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;

4
pkgs/development/compilers/llvm/6/lldb.nix
View File

@ -9,7 +9,7 @@
, libxml2 , libxml2
, llvm , llvm
, clang-unwrapped , clang-unwrapped
, python , python3
, version , version
, darwin , darwin
}: }:
@ -30,7 +30,7 @@ stdenv.mkDerivation {
cmake/modules/LLDBStandalone.cmake cmake/modules/LLDBStandalone.cmake
''; '';
nativeBuildInputs = [ cmake python which swig ]; nativeBuildInputs = [ cmake python3 which swig ];
buildInputs = [ ncurses zlib libedit libxml2 llvm ] buildInputs = [ ncurses zlib libedit libxml2 llvm ]
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];

6
pkgs/development/compilers/llvm/6/llvm.nix
View File

@ -1,7 +1,7 @@
{ stdenv { stdenv
, fetch , fetch
, cmake , cmake
, python , python3
, libffi , libffi
, libbfd , libbfd
, libxml2 , libxml2
@ -40,8 +40,8 @@ stdenv.mkDerivation ({
outputs = [ "out" "python" ] outputs = [ "out" "python" ]
++ optional enableSharedLibraries "lib"; ++ optional enableSharedLibraries "lib";
nativeBuildInputs = [ cmake python ] nativeBuildInputs = [ cmake python3 ]
++ optional enableManpages python.pkgs.sphinx; ++ optional enableManpages python3.pkgs.sphinx;
buildInputs = [ libxml2 libffi ]; buildInputs = [ libxml2 libffi ];

6
pkgs/development/compilers/llvm/7/clang/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python { stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3
, fixDarwinDylibNames , fixDarwinDylibNames
, enableManpages ? false , enableManpages ? false
, enablePolly ? false # TODO: get this info from llvm (passthru?) , enablePolly ? false # TODO: get this info from llvm (passthru?)
@ -19,8 +19,8 @@ let
mv clang-tools-extra-* $sourceRoot/tools/extra mv clang-tools-extra-* $sourceRoot/tools/extra
''; '';
nativeBuildInputs = [ cmake python ] nativeBuildInputs = [ cmake python3 ]
++ stdenv.lib.optional enableManpages python.pkgs.sphinx; ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
buildInputs = [ libxml2 llvm ] buildInputs = [ libxml2 llvm ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;

4
pkgs/development/compilers/llvm/7/compiler-rt.nix
View File

@ -1,10 +1,10 @@
{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }: { stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "compiler-rt"; pname = "compiler-rt";
inherit version; inherit version;
src = fetch "compiler-rt" "1n48p8gjarihkws0i2bay5w9bdwyxyxxbpwyng7ba58jb30dlyq5"; src = fetch "compiler-rt" "1n48p8gjarihkws0i2bay5w9bdwyxyxxbpwyng7ba58jb30dlyq5";
nativeBuildInputs = [ cmake python llvm ]; nativeBuildInputs = [ cmake python3 llvm ];
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
NIX_CFLAGS_COMPILE = [ NIX_CFLAGS_COMPILE = [

10
pkgs/development/compilers/llvm/7/default.nix
View File

@ -1,5 +1,5 @@
{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook { lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook
, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
, buildLlvmTools # tools, but from the previous stage, for cross , buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross
}: }:
@ -16,7 +16,7 @@ let
clang-tools-extra_src = fetch "clang-tools-extra" "0lb4kdh7j2fhfz8kd6iv5df7m3pikiryk1vvwsf87spc90n09q0w"; clang-tools-extra_src = fetch "clang-tools-extra" "0lb4kdh7j2fhfz8kd6iv5df7m3pikiryk1vvwsf87spc90n09q0w";
tools = stdenv.lib.makeExtensible (tools: let tools = stdenv.lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
mkExtraBuildCommands = cc: '' mkExtraBuildCommands = cc: ''
rsrc="$out/resource-root" rsrc="$out/resource-root"
mkdir "$rsrc" mkdir "$rsrc"
@ -42,12 +42,12 @@ let
llvm-manpages = lowPrio (tools.llvm.override { llvm-manpages = lowPrio (tools.llvm.override {
enableManpages = true; enableManpages = true;
python = pkgs.python; # don't use python-boot python3 = pkgs.python3; # don't use python-boot
}); });
clang-manpages = lowPrio (tools.clang-unwrapped.override { clang-manpages = lowPrio (tools.clang-unwrapped.override {
enableManpages = true; enableManpages = true;
python = pkgs.python; # don't use python-boot python3 = pkgs.python3; # don't use python-boot
}); });
libclang = tools.clang-unwrapped.lib; libclang = tools.clang-unwrapped.lib;
@ -126,7 +126,7 @@ let
}); });
libraries = stdenv.lib.makeExtensible (libraries: let libraries = stdenv.lib.makeExtensible (libraries: let
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python 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.nix {

4
pkgs/development/compilers/llvm/7/libc++/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version { lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version
, enableShared ? ! stdenv.hostPlatform.isMusl }: , enableShared ? ! stdenv.hostPlatform.isMusl }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -24,7 +24,7 @@ stdenv.mkDerivation {
'' + lib.optionalString stdenv.hostPlatform.isMusl '' '' + lib.optionalString stdenv.hostPlatform.isMusl ''
patchShebangs utils/cat_files.py patchShebangs utils/cat_files.py
''; '';
nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python; nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3;
buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;

4
pkgs/development/compilers/llvm/7/lldb.nix
View File

@ -10,7 +10,7 @@
, llvm , llvm
, clang-unwrapped , clang-unwrapped
, perl , perl
, python , python3
, version , version
, darwin , darwin
}: }:
@ -21,7 +21,7 @@ stdenv.mkDerivation {
src = fetch "lldb" "0klsscg1sczc4nw2l53xggi969k361cng2sjjrfp3bv4g5x14s4v"; src = fetch "lldb" "0klsscg1sczc4nw2l53xggi969k361cng2sjjrfp3bv4g5x14s4v";
nativeBuildInputs = [ cmake perl python which swig ]; nativeBuildInputs = [ cmake perl python3 which swig ];
buildInputs = [ ncurses zlib libedit libxml2 llvm ] buildInputs = [ ncurses zlib libedit libxml2 llvm ]
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];

6
pkgs/development/compilers/llvm/7/llvm.nix
View File

@ -2,7 +2,7 @@
, fetch , fetch
, fetchpatch , fetchpatch
, cmake , cmake
, python , python3
, libffi , libffi
, libbfd , libbfd
, libpfm , libpfm
@ -48,8 +48,8 @@ in stdenv.mkDerivation ({
outputs = [ "out" "python" ] outputs = [ "out" "python" ]
++ optional enableSharedLibraries "lib"; ++ optional enableSharedLibraries "lib";
nativeBuildInputs = [ cmake python ] nativeBuildInputs = [ cmake python3 ]
++ optional enableManpages python.pkgs.sphinx; ++ optional enableManpages python3.pkgs.sphinx;
buildInputs = [ libxml2 libffi ] buildInputs = [ libxml2 libffi ]
++ optional enablePFM libpfm; # exegesis ++ optional enablePFM libpfm; # exegesis

6
pkgs/development/compilers/llvm/8/clang/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python { stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3
, fixDarwinDylibNames , fixDarwinDylibNames
, enableManpages ? false , enableManpages ? false
, enablePolly ? false # TODO: get this info from llvm (passthru?) , enablePolly ? false # TODO: get this info from llvm (passthru?)
@ -19,8 +19,8 @@ let
mv clang-tools-extra-* $sourceRoot/tools/extra mv clang-tools-extra-* $sourceRoot/tools/extra
''; '';
nativeBuildInputs = [ cmake python ] nativeBuildInputs = [ cmake python3 ]
++ stdenv.lib.optional enableManpages python.pkgs.sphinx; ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
buildInputs = [ libxml2 llvm ] buildInputs = [ libxml2 llvm ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;

4
pkgs/development/compilers/llvm/8/compiler-rt.nix
View File

@ -1,10 +1,10 @@
{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }: { stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "compiler-rt"; pname = "compiler-rt";
inherit version; inherit version;
src = fetch "compiler-rt" "0dqqf8f930l8gag4d9qjgn1n0pj0nbv2anviqqhdi1rkhas8z0hi"; src = fetch "compiler-rt" "0dqqf8f930l8gag4d9qjgn1n0pj0nbv2anviqqhdi1rkhas8z0hi";
nativeBuildInputs = [ cmake python llvm ]; nativeBuildInputs = [ cmake python3 llvm ];
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
NIX_CFLAGS_COMPILE = [ NIX_CFLAGS_COMPILE = [

10
pkgs/development/compilers/llvm/8/default.nix
View File

@ -1,5 +1,5 @@
{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook { lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook
, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
, buildLlvmTools # tools, but from the previous stage, for cross , buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross
}: }:
@ -16,7 +16,7 @@ let
clang-tools-extra_src = fetch "clang-tools-extra" "1qf3097bc5ia8p6cpmbx985rjr3yaah5s8fc0nv7pw742yv7jw8q"; clang-tools-extra_src = fetch "clang-tools-extra" "1qf3097bc5ia8p6cpmbx985rjr3yaah5s8fc0nv7pw742yv7jw8q";
tools = stdenv.lib.makeExtensible (tools: let tools = stdenv.lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
mkExtraBuildCommands = cc: '' mkExtraBuildCommands = cc: ''
rsrc="$out/resource-root" rsrc="$out/resource-root"
mkdir "$rsrc" mkdir "$rsrc"
@ -42,12 +42,12 @@ let
llvm-manpages = lowPrio (tools.llvm.override { llvm-manpages = lowPrio (tools.llvm.override {
enableManpages = true; enableManpages = true;
python = pkgs.python; # don't use python-boot python3 = pkgs.python3; # don't use python-boot
}); });
clang-manpages = lowPrio (tools.clang-unwrapped.override { clang-manpages = lowPrio (tools.clang-unwrapped.override {
enableManpages = true; enableManpages = true;
python = pkgs.python; # don't use python-boot python3 = pkgs.python3; # don't use python-boot
}); });
libclang = tools.clang-unwrapped.lib; libclang = tools.clang-unwrapped.lib;
@ -162,7 +162,7 @@ let
}); });
libraries = stdenv.lib.makeExtensible (libraries: let libraries = stdenv.lib.makeExtensible (libraries: let
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python 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.nix ({} //

4
pkgs/development/compilers/llvm/8/libc++/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version { lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version
, enableShared ? true }: , enableShared ? true }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -25,7 +25,7 @@ stdenv.mkDerivation {
patchShebangs utils/cat_files.py patchShebangs utils/cat_files.py
''; '';
nativeBuildInputs = [ cmake ] nativeBuildInputs = [ cmake ]
++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python; ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3;
buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;

4
pkgs/development/compilers/llvm/8/lldb.nix
View File

@ -9,7 +9,7 @@
, libxml2 , libxml2
, llvm , llvm
, clang-unwrapped , clang-unwrapped
, python , python3
, version , version
, darwin , darwin
}: }:
@ -30,7 +30,7 @@ stdenv.mkDerivation {
cmake/modules/LLDBStandalone.cmake cmake/modules/LLDBStandalone.cmake
''; '';
nativeBuildInputs = [ cmake python which swig ]; nativeBuildInputs = [ cmake python3 which swig ];
buildInputs = [ ncurses zlib libedit libxml2 llvm ] buildInputs = [ ncurses zlib libedit libxml2 llvm ]
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];

6
pkgs/development/compilers/llvm/8/llvm.nix
View File

@ -1,7 +1,7 @@
{ stdenv { stdenv
, fetch , fetch
, cmake , cmake
, python , python3
, libffi , libffi
, libbfd , libbfd
, libpfm , libpfm
@ -46,8 +46,8 @@ in stdenv.mkDerivation ({
outputs = [ "out" "python" ] outputs = [ "out" "python" ]
++ optional enableSharedLibraries "lib"; ++ optional enableSharedLibraries "lib";
nativeBuildInputs = [ cmake python ] nativeBuildInputs = [ cmake python3 ]
++ optionals enableManpages [ python.pkgs.sphinx python.pkgs.recommonmark ]; ++ optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ];
buildInputs = [ libxml2 libffi ] buildInputs = [ libxml2 libffi ]
++ optional enablePFM libpfm; # exegesis ++ optional enablePFM libpfm; # exegesis

6
pkgs/development/compilers/llvm/9/clang/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python { stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3
, fixDarwinDylibNames , fixDarwinDylibNames
, enableManpages ? false , enableManpages ? false
, enablePolly ? false # TODO: get this info from llvm (passthru?) , enablePolly ? false # TODO: get this info from llvm (passthru?)
@ -19,8 +19,8 @@ let
mv clang-tools-extra-* $sourceRoot/tools/extra mv clang-tools-extra-* $sourceRoot/tools/extra
''; '';
nativeBuildInputs = [ cmake python ] nativeBuildInputs = [ cmake python3 ]
++ stdenv.lib.optional enableManpages python.pkgs.sphinx; ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
buildInputs = [ libxml2 llvm ] buildInputs = [ libxml2 llvm ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;

4
pkgs/development/compilers/llvm/9/compiler-rt.nix
View File

@ -1,10 +1,10 @@
{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }: { stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "compiler-rt"; pname = "compiler-rt";
inherit version; inherit version;
src = fetch pname "0xwh79g3zggdabxgnd0bphry75asm1qz7mv3hcqihqwqr6aspgy2"; src = fetch pname "0xwh79g3zggdabxgnd0bphry75asm1qz7mv3hcqihqwqr6aspgy2";
nativeBuildInputs = [ cmake python llvm ]; nativeBuildInputs = [ cmake python3 llvm ];
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
NIX_CFLAGS_COMPILE = [ NIX_CFLAGS_COMPILE = [

10
pkgs/development/compilers/llvm/9/default.nix
View File

@ -1,5 +1,5 @@
{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook { lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook
, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
, buildLlvmTools # tools, but from the previous stage, for cross , buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross
}: }:
@ -16,7 +16,7 @@ let
clang-tools-extra_src = fetch "clang-tools-extra" "01vgzd4k1q93nfs8gyl83mjlc4x0qsgfqw32lacbjzdxg0mdfvxj"; clang-tools-extra_src = fetch "clang-tools-extra" "01vgzd4k1q93nfs8gyl83mjlc4x0qsgfqw32lacbjzdxg0mdfvxj";
tools = stdenv.lib.makeExtensible (tools: let tools = stdenv.lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
mkExtraBuildCommands = cc: '' mkExtraBuildCommands = cc: ''
rsrc="$out/resource-root" rsrc="$out/resource-root"
mkdir "$rsrc" mkdir "$rsrc"
@ -42,12 +42,12 @@ let
llvm-manpages = lowPrio (tools.llvm.override { llvm-manpages = lowPrio (tools.llvm.override {
enableManpages = true; enableManpages = true;
python = pkgs.python; # don't use python-boot python3 = pkgs.python3; # don't use python-boot
}); });
clang-manpages = lowPrio (tools.clang-unwrapped.override { clang-manpages = lowPrio (tools.clang-unwrapped.override {
enableManpages = true; enableManpages = true;
python = pkgs.python; # don't use python-boot python3 = pkgs.python3; # don't use python-boot
}); });
libclang = tools.clang-unwrapped.lib; libclang = tools.clang-unwrapped.lib;
@ -162,7 +162,7 @@ let
}); });
libraries = stdenv.lib.makeExtensible (libraries: let libraries = stdenv.lib.makeExtensible (libraries: let
callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python 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.nix ({} //

4
pkgs/development/compilers/llvm/9/libc++/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version { lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version
, enableShared ? true }: , enableShared ? true }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -21,7 +21,7 @@ stdenv.mkDerivation {
patchShebangs utils/cat_files.py patchShebangs utils/cat_files.py
''; '';
nativeBuildInputs = [ cmake ] nativeBuildInputs = [ cmake ]
++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python; ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3;
buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;

4
pkgs/development/compilers/llvm/9/lldb.nix
View File

@ -9,7 +9,7 @@
, libxml2 , libxml2
, llvm , llvm
, clang-unwrapped , clang-unwrapped
, python , python3
, version , version
, darwin , darwin
, lit , lit
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
patches = [ ./lldb-procfs.patch ]; patches = [ ./lldb-procfs.patch ];
nativeBuildInputs = [ cmake python which swig lit ]; nativeBuildInputs = [ cmake python3 which swig lit ];
buildInputs = [ buildInputs = [
ncurses ncurses
zlib zlib

6
pkgs/development/compilers/llvm/9/llvm.nix
View File

@ -1,7 +1,7 @@
{ stdenv { stdenv
, fetch , fetch
, cmake , cmake
, python , python3
, libffi , libffi
, libbfd , libbfd
, libpfm , libpfm
@ -46,8 +46,8 @@ in stdenv.mkDerivation (rec {
outputs = [ "out" "python" ] outputs = [ "out" "python" ]
++ optional enableSharedLibraries "lib"; ++ optional enableSharedLibraries "lib";
nativeBuildInputs = [ cmake python ] nativeBuildInputs = [ cmake python3 ]
++ optionals enableManpages [ python.pkgs.sphinx python.pkgs.recommonmark ]; ++ optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ];
buildInputs = [ libxml2 libffi ] buildInputs = [ libxml2 libffi ]
++ optional enablePFM libpfm; # exegesis ++ optional enablePFM libpfm; # exegesis