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-13 11:13:56 +01:00
parent 453e009947
commit d0a90de910
35 changed files with 100 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/llvm/6/clang/default.nix
+3 -3
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
, enableManpages ? false
}:
@@ -19,8 +19,8 @@ let
mv clang-tools-extra-* $sourceRoot/tools/extra
'';
nativeBuildInputs = [ cmake python ]
++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
nativeBuildInputs = [ cmake python3 ]
++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
buildInputs = [ libxml2 llvm ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
pkgs/development/compilers/llvm/6/compiler-rt.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
with stdenv.lib;
stdenv.mkDerivation {
pname = "compiler-rt";
inherit version;
src = fetch "compiler-rt" "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl";
nativeBuildInputs = [ cmake python llvm ];
nativeBuildInputs = [ cmake python3 llvm ];
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
configureFlags = [
pkgs/development/compilers/llvm/6/default.nix
+5 -5
View File
@@ -1,5 +1,5 @@
{ 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
, targetLlvmLibraries # libraries, but from the next stage, for cross
}:
@@ -16,7 +16,7 @@ let
clang-tools-extra_src = fetch "clang-tools-extra" "1w8ml7fyn4vyxmy59n2qm4r1k1kgwgwkaldp6m45fdv4g0kkfbhd";
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: ''
rsrc="$out/resource-root"
mkdir "$rsrc"
@@ -36,12 +36,12 @@ let
llvm-manpages = lowPrio (tools.llvm.override {
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 {
enableManpages = true;
python = pkgs.python; # don't use python-boot
python3 = pkgs.python3; # don't use python-boot
});
libclang = tools.clang-unwrapped.lib;
@@ -74,7 +74,7 @@ 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 {
compiler-rt = callPackage ./compiler-rt.nix {};
pkgs/development/compilers/llvm/6/libc++/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
{ lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version }:
stdenv.mkDerivation {
pname = "libc++";
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
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;
pkgs/development/compilers/llvm/6/lldb.nix
+2 -2
View File
@@ -9,7 +9,7 @@
, libxml2
, llvm
, clang-unwrapped
, python
, python3
, version
, darwin
}:
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
cmake/modules/LLDBStandalone.cmake
'';
nativeBuildInputs = [ cmake python which swig ];
nativeBuildInputs = [ cmake python3 which swig ];
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 ];
pkgs/development/compilers/llvm/6/llvm.nix
+3 -3
View File
@@ -1,7 +1,7 @@
{ stdenv
, fetch
, cmake
, python
, python3
, libffi
, libbfd
, libxml2
@@ -40,8 +40,8 @@ stdenv.mkDerivation ({
outputs = [ "out" "python" ]
++ optional enableSharedLibraries "lib";
nativeBuildInputs = [ cmake python ]
++ optional enableManpages python.pkgs.sphinx;
nativeBuildInputs = [ cmake python3 ]
++ optional enableManpages python3.pkgs.sphinx;
buildInputs = [ libxml2 libffi ];