Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2a88c3c30291
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bc18cc72dd6a
Choose a head ref
  • 10 commits
  • 48 files changed
  • 2 contributors

Commits on Jan 13, 2020

  1. darwin.xnu: python2 -> python3

    @LnL7
    LnL7 committed Jan 13, 2020
    Copy the full SHA
    c7d457c View commit details

  2. libxml2: python2 -> python3

    @LnL7
    LnL7 committed Jan 13, 2020
    Copy the full SHA
    96a0cad View commit details

  3. ninja: python2 -> python3

    @LnL7
    LnL7 committed Jan 13, 2020
    Copy the full SHA
    587c66c View commit details

  4. darwin.CF: python2 -> python3

    @LnL7
    LnL7 committed Jan 13, 2020
    Copy the full SHA
    453e009 View commit details

  5. llvmPackages: python2 -> python3

    @LnL7
    LnL7 committed Jan 13, 2020
    Copy the full SHA
    d0a90de View commit details

  6. darwin.apple_sdk: python2 -> python3

    @LnL7
    LnL7 committed Jan 13, 2020
    Copy the full SHA
    73db5d8 View commit details

  7. stdenv: bootstrap darwin with python3 

    - Replaced python override from the final stdenv, instead we
  propagate our bootstrap python to stage4 and override both
  CF and xnu to use it.

- Removed CF argument from python interpreters, this is redundant
  since it's not overidden anymore.

- Inherit CF from stage4, making it the same as the stdenv.
    @LnL7
    LnL7 committed Jan 13, 2020
    1
    Copy the full SHA
    6328518 View commit details

  8. darwin.libtapi: python2 -> python3

    @LnL7
    LnL7 committed Jan 13, 2020
    Copy the full SHA
    da6bc4b View commit details

  9. darwin.iproute2mac: explicitly use python2

    @LnL7
    LnL7 committed Jan 13, 2020
    Copy the full SHA
    c05efed View commit details

Commits on Jan 15, 2020

  1. Merge pull request #77610 from LnL7/darwin-stdenv-python3 

    darwin-stdenv: bootstrap with python3
    @FRidh
    FRidh authored Jan 15, 2020
    Copy the full SHA
    bc18cc7 View commit details
Showing with 181 additions and 253 deletions.
  1. +3 −3 pkgs/development/compilers/llvm/4/clang/default.nix
  2. +5 −5 pkgs/development/compilers/llvm/4/default.nix
  3. +2 −2 pkgs/development/compilers/llvm/4/libc++/default.nix
  4. +2 −2 pkgs/development/compilers/llvm/4/lldb.nix
  5. +3 −3 pkgs/development/compilers/llvm/4/llvm.nix
  6. +3 −3 pkgs/development/compilers/llvm/5/clang/default.nix
  7. +2 −2 pkgs/development/compilers/llvm/5/compiler-rt.nix
  8. +5 −5 pkgs/development/compilers/llvm/5/default.nix
  9. +2 −2 pkgs/development/compilers/llvm/5/libc++/default.nix
  10. +2 −2 pkgs/development/compilers/llvm/5/lldb.nix
  11. +3 −3 pkgs/development/compilers/llvm/5/llvm.nix
  12. +3 −3 pkgs/development/compilers/llvm/6/clang/default.nix
  13. +2 −2 pkgs/development/compilers/llvm/6/compiler-rt.nix
  14. +5 −5 pkgs/development/compilers/llvm/6/default.nix
  15. +2 −2 pkgs/development/compilers/llvm/6/libc++/default.nix
  16. +2 −2 pkgs/development/compilers/llvm/6/lldb.nix
  17. +3 −3 pkgs/development/compilers/llvm/6/llvm.nix
  18. +3 −3 pkgs/development/compilers/llvm/7/clang/default.nix
  19. +2 −2 pkgs/development/compilers/llvm/7/compiler-rt.nix
  20. +5 −5 pkgs/development/compilers/llvm/7/default.nix
  21. +2 −2 pkgs/development/compilers/llvm/7/libc++/default.nix
  22. +2 −2 pkgs/development/compilers/llvm/7/lldb.nix
  23. +3 −3 pkgs/development/compilers/llvm/7/llvm.nix
  24. +3 −3 pkgs/development/compilers/llvm/8/clang/default.nix
  25. +2 −2 pkgs/development/compilers/llvm/8/compiler-rt.nix
  26. +5 −5 pkgs/development/compilers/llvm/8/default.nix
  27. +2 −2 pkgs/development/compilers/llvm/8/libc++/default.nix
  28. +2 −2 pkgs/development/compilers/llvm/8/lldb.nix
  29. +3 −3 pkgs/development/compilers/llvm/8/llvm.nix
  30. +3 −3 pkgs/development/compilers/llvm/9/clang/default.nix
  31. +2 −2 pkgs/development/compilers/llvm/9/compiler-rt.nix
  32. +5 −5 pkgs/development/compilers/llvm/9/default.nix
  33. +2 −2 pkgs/development/compilers/llvm/9/libc++/default.nix
  34. +2 −2 pkgs/development/compilers/llvm/9/lldb.nix
  35. +3 −3 pkgs/development/compilers/llvm/9/llvm.nix
  36. +0 −103 pkgs/development/interpreters/python/cpython/2.7/boot.nix
  37. +2 −2 pkgs/development/interpreters/python/cpython/2.7/default.nix
  38. +3 −3 pkgs/development/interpreters/python/cpython/default.nix
  39. +7 −6 pkgs/development/interpreters/python/default.nix
  40. +3 −3 pkgs/development/tools/build-managers/ninja/default.nix
  41. +2 −2 pkgs/os-specific/darwin/apple-sdk/default.nix
  42. +4 −2 pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix
  43. +41 −0 pkgs/os-specific/darwin/apple-source-releases/xnu/python3.patch
  44. +3 −3 pkgs/os-specific/darwin/iproute2mac/default.nix
  45. +2 −2 pkgs/os-specific/darwin/libtapi/default.nix
  46. +3 −3 pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix
  47. +10 −23 pkgs/stdenv/darwin/default.nix
  48. +1 −1 pkgs/top-level/all-packages.nix
6 changes: 3 additions & 3 deletions pkgs/development/compilers/llvm/4/clang/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
, 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;
10 changes: 5 additions & 5 deletions pkgs/development/compilers/llvm/4/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
}:
@@ -17,7 +17,7 @@ let
clang-tools-extra_src = fetch "clang-tools-extra" "1dhmp7ccfpr42bmvk3kp37ngjpf3a9m5d4kkpsn7d00hzi7fdl9m";

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 {

llvm = callPackage ./llvm.nix {
@@ -29,12 +29,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;
@@ -57,7 +57,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 {

stdenv = overrideCC stdenv buildLlvmTools.clang;
4 changes: 2 additions & 2 deletions pkgs/development/compilers/llvm/4/libc++/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
{ lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version }:

stdenv.mkDerivation {
pname = "libc++";
@@ -31,7 +31,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;

4 changes: 2 additions & 2 deletions pkgs/development/compilers/llvm/4/lldb.nix
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
, libxml2
, llvm
, clang-unwrapped
, python
, python3
, version
, darwin
}:
@@ -31,7 +31,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 ];

6 changes: 3 additions & 3 deletions pkgs/development/compilers/llvm/4/llvm.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
, fetch
, fetchpatch
, cmake
, python
, python3
, libffi
, libbfd
, libxml2
@@ -40,8 +40,8 @@ stdenv.mkDerivation ({
outputs = [ "out" ]
++ stdenv.lib.optional enableSharedLibraries "lib";

nativeBuildInputs = [ cmake python ]
++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
nativeBuildInputs = [ cmake python3 ]
++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;

buildInputs = [ libxml2 libffi ];

6 changes: 3 additions & 3 deletions pkgs/development/compilers/llvm/5/clang/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
4 changes: 2 additions & 2 deletions pkgs/development/compilers/llvm/5/compiler-rt.nix
View file
Original file line number Diff line number Diff line change
@@ -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" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy";

nativeBuildInputs = [ cmake python llvm ];
nativeBuildInputs = [ cmake python3 llvm ];
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;

configureFlags = [
10 changes: 5 additions & 5 deletions pkgs/development/compilers/llvm/5/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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" "018b3fiwah8f8br5i26qmzh6sjvzchpn358sn8v079m49f2jldm3";

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 {};
4 changes: 2 additions & 2 deletions pkgs/development/compilers/llvm/5/libc++/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;

4 changes: 2 additions & 2 deletions pkgs/development/compilers/llvm/5/lldb.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];

6 changes: 3 additions & 3 deletions pkgs/development/compilers/llvm/5/llvm.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
, fetch
, fetchpatch
, cmake
, python
, python3
, libffi
, libbfd
, libxml2
@@ -37,8 +37,8 @@ stdenv.mkDerivation ({
outputs = [ "out" "python" ]
++ stdenv.lib.optional enableSharedLibraries "lib";

nativeBuildInputs = [ cmake python ]
++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
nativeBuildInputs = [ cmake python3 ]
++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;

buildInputs = [ libxml2 libffi ];

6 changes: 3 additions & 3 deletions pkgs/development/compilers/llvm/6/clang/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
4 changes: 2 additions & 2 deletions pkgs/development/compilers/llvm/6/compiler-rt.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = [
10 changes: 5 additions & 5 deletions pkgs/development/compilers/llvm/6/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 {};
4 changes: 2 additions & 2 deletions pkgs/development/compilers/llvm/6/libc++/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;

4 changes: 2 additions & 2 deletions pkgs/development/compilers/llvm/6/lldb.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];

6 changes: 3 additions & 3 deletions pkgs/development/compilers/llvm/6/llvm.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];

6 changes: 3 additions & 3 deletions pkgs/development/compilers/llvm/7/clang/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
, enablePolly ? false # TODO: get this info from llvm (passthru?)
@@ -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;
4 changes: 2 additions & 2 deletions pkgs/development/compilers/llvm/7/compiler-rt.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
stdenv.mkDerivation {
pname = "compiler-rt";
inherit version;
src = fetch "compiler-rt" "1n48p8gjarihkws0i2bay5w9bdwyxyxxbpwyng7ba58jb30dlyq5";

nativeBuildInputs = [ cmake python llvm ];
nativeBuildInputs = [ cmake python3 llvm ];
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;

NIX_CFLAGS_COMPILE = [
Loading