Skip to content

LLVM: Move aliases to aliases.nix and switch to llvmPackages_latest #118076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
primeos wants to merge 2 commits into from
Closed

LLVM: Move aliases to aliases.nix and switch to llvmPackages_latest #118076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fde6a0
LLVM: Move aliases to aliases.nix and switch to llvmPackages_latest
primeos Mar 30, 2021
db81ab3
Update pkgs/top-level/all-packages.nix (style change)
primeos Mar 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/discord/base.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ pname, version, src, binaryName, desktopName
, autoPatchelfHook, fetchurl, makeDesktopItem, lib, stdenv, wrapGAppsHook
, alsaLib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig
, freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid
, freetype, gdk-pixbuf, glib, gtk3, llvmPackages, libdrm, libnotify, libpulseaudio, libuuid
, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb
, mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu
Expand Down Expand Up @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
dontWrapGApps = true;

libPath = lib.makeLibraryPath [
libcxx systemd libpulseaudio
llvmPackages.libcxx systemd libpulseaudio
stdenv.cc.cc alsaLib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype
gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid
libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
Expand Down
6 changes: 3 additions & 3 deletions pkgs/applications/networking/remote/citrix-workspace/generic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
, file, atk, alsaLib, cairo, fontconfig, gdk-pixbuf, glib, gnome3, gtk2-x11, gtk3
, heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2
, gnome2, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2
, libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin
, libjpeg, libredirect, tzdata, cacert, systemd, llvmPackages, e2fsprogs, symlinkJoin
, libpulseaudio, pcsclite

, homepage, version, prefix, hash
Expand Down Expand Up @@ -77,8 +77,8 @@ stdenv.mkDerivation rec {
gtk_engines
heimdal
krb5
libcxx
libcxxabi
llvmPackages.libcxx
llvmPackages.libcxxabi
libjpeg
libpng12
libsoup
Expand Down
6 changes: 6 additions & 0 deletions pkgs/top-level/aliases.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,5 +988,11 @@ mapAliases ({
inherit (libsForQt5)
sddm
;
inherit (llvmPackages_latest)
lld
lldb
libcxx
libcxxabi
;

})
30 changes: 19 additions & 11 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1362,7 +1362,9 @@ in

gitless = callPackage ../applications/version-management/gitless { python = python3; };

gitter = callPackage ../applications/networking/instant-messengers/gitter { };
gitter = callPackage ../applications/networking/instant-messengers/gitter {
inherit (pkgs.llvmPackages) libcxx;
};

gjs = callPackage ../development/libraries/gjs { };

Expand Down Expand Up @@ -2536,7 +2538,9 @@ in

grim = callPackage ../tools/graphics/grim { };

gringo = callPackage ../tools/misc/gringo { };
gringo = callPackage ../tools/misc/gringo {
inherit (pkgs.llvmPackages) libcxx;
Copy link
Member

@SuperSandro2000 SuperSandro2000 Mar 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could also be done for discord.

Copy link
Member Author

@primeos primeos Mar 30, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I considered that but I'm not sure if it's worth it as discord/base.nix is called indirectly through discord/default.nix (and that way it's implemented might make this a bit tricky but it should be doable if necessary).

};

grobi = callPackage ../tools/X11/grobi { };

Expand Down Expand Up @@ -9260,7 +9264,9 @@ in

uptimed = callPackage ../tools/system/uptimed { };

upwork = callPackage ../applications/misc/upwork { };
upwork = callPackage ../applications/misc/upwork {
inherit (llvmPackages) libcxx;
};

urjtag = callPackage ../tools/misc/urjtag { };

Expand Down Expand Up @@ -9887,10 +9893,11 @@ in

chez-matchable = callPackage ../development/chez-modules/chez-matchable { };

# TODO: Move to pkgs/top-level/aliases.nix and switch to llvmPackages_latest:
clang = llvmPackages.clang;
clang-manpages = llvmPackages.clang-manpages;

clang-sierraHack = clang.override {
clang-sierraHack = llvmPackages.clang.override {
name = "clang-wrapper-with-reexport-hack";
bintools = darwin.binutils.override {
useMacosReexportHack = true;
Expand Down Expand Up @@ -10767,7 +10774,6 @@ in
Cocoa AudioToolbox OpenGL Foundation ForceFeedback;
};

lld = llvmPackages.lld;
lld_5 = llvmPackages_5.lld;
lld_6 = llvmPackages_6.lld;
lld_7 = llvmPackages_7.lld;
Expand All @@ -10776,7 +10782,6 @@ in
lld_10 = llvmPackages_10.lld;
lld_11 = llvmPackages_11.lld;

lldb = llvmPackages_latest.lldb;
lldb_5 = llvmPackages_5.lldb;
lldb_6 = llvmPackages_6.lldb;
lldb_7 = llvmPackages_7.lldb;
Expand All @@ -10785,6 +10790,7 @@ in
lldb_10 = llvmPackages_10.lldb;
lldb_11 = llvmPackages_11.lldb;

# TODO: Move to pkgs/top-level/aliases.nix and switch to llvmPackages_latest:
llvm = llvmPackages.llvm;
llvm-manpages = llvmPackages.llvm-manpages;

Expand Down Expand Up @@ -11815,7 +11821,9 @@ in
dust = callPackage ../development/interpreters/pixie/dust.nix { };

buildRubyGem = callPackage ../development/ruby-modules/gem { };
defaultGemConfig = callPackage ../development/ruby-modules/gem-config { };
defaultGemConfig = callPackage ../development/ruby-modules/gem-config {
inherit (llvmPackages) libcxx;
};
bundix = callPackage ../development/ruby-modules/bundix { };
bundler = callPackage ../development/ruby-modules/bundler { };
bundlerEnv = callPackage ../development/ruby-modules/bundler-env { };
Expand Down Expand Up @@ -12124,6 +12132,7 @@ in
runJdk = jdk11_headless;
stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
bazel_self = bazel_3;
inherit (llvmPackages) libcxx;
};

bazel_4 = callPackage ../development/tools/build-managers/bazel/bazel_4 {
Expand All @@ -12134,6 +12143,7 @@ in
runJdk = jdk11_headless;
stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
bazel_self = bazel_4;
inherit (llvmPackages) libcxx;
};

bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { };
Expand Down Expand Up @@ -12393,9 +12403,6 @@ in
inherit (llvmPackages_11) llvm clang-unwrapped;
};

libcxx = llvmPackages.libcxx;
libcxxabi = llvmPackages.libcxxabi;

librarian-puppet-go = callPackage ../development/tools/librarian-puppet-go { };

libgcc = callPackage ../development/libraries/gcc/libgcc {
Expand Down Expand Up @@ -16773,9 +16780,9 @@ in

# XXX: mariadb doesn't built on fbsd as of nov 2015
libmysqlclient = if (!stdenv.isFreeBSD) then libmysqlclient else null;

inherit (pkgs.darwin) libobjc;
inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL;
inherit (pkgs.llvmPackages) libcxx;
};

qmake48Hook = makeSetupHook
Expand Down Expand Up @@ -17999,6 +18006,7 @@ in
inherit (darwin.apple_sdk.frameworks) Cocoa Foundation;
inherit (darwin) libobjc;
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
inherit (llvmPackages) libcxx;
};

rWrapper = callPackage ../development/r-modules/wrapper.nix {
Expand Down
1 change: 1 addition & 0 deletions pkgs/top-level/darwin-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ in

maloader = callPackage ../os-specific/darwin/maloader {
inherit (darwin) opencflite;
inherit (pkgs.llvmPackages) libcxx;
};

insert_dylib = callPackage ../os-specific/darwin/insert_dylib { };
Expand Down
4 changes: 3 additions & 1 deletion pkgs/top-level/ocaml-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,9 @@ let

easy-format = callPackage ../development/ocaml-modules/easy-format { };

eigen = callPackage ../development/ocaml-modules/eigen { };
eigen = callPackage ../development/ocaml-modules/eigen {
inherit (pkgs.llvmPackages) libcxx;
};

either = callPackage ../development/ocaml-modules/either { };

Expand Down
21 changes: 16 additions & 5 deletions pkgs/top-level/python-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1708,7 +1708,9 @@ in {

datashape = callPackage ../development/python-modules/datashape { };

datatable = callPackage ../development/python-modules/datatable { };
datatable = callPackage ../development/python-modules/datatable {
inherit (pkgs.llvmPackages) libcxx;
};

dateparser = if isPy27 then
callPackage ../development/python-modules/dateparser/0.x.nix { }
Expand Down Expand Up @@ -3681,7 +3683,9 @@ in {
kivy-garden = callPackage ../development/python-modules/kivy-garden { };

kiwisolver = if isPy3k then
callPackage ../development/python-modules/kiwisolver { }
callPackage ../development/python-modules/kiwisolver {
inherit (llvmPackages) libcxx;
}
else
callPackage ../development/python-modules/kiwisolver/1_1.nix { };

Expand Down Expand Up @@ -4700,7 +4704,9 @@ in {

num2words = callPackage ../development/python-modules/num2words { };

numba = callPackage ../development/python-modules/numba { };
numba = callPackage ../development/python-modules/numba {
inherit (pkgs.llvmPackages) libcxx;
};

numcodecs = callPackage ../development/python-modules/numcodecs { };

Expand Down Expand Up @@ -4886,7 +4892,9 @@ in {
pamqp = callPackage ../development/python-modules/pamqp { };

pandas = if isPy3k then
callPackage ../development/python-modules/pandas { }
callPackage ../development/python-modules/pandas {
inherit (pkgs.llvmPackages) libcxx;
}
else
callPackage ../development/python-modules/pandas/2.nix { };

Expand Down Expand Up @@ -5356,6 +5364,7 @@ in {
# If a protobuf upgrade causes many Python packages to fail, please pin it here to the previous version.
doCheck = !isPy3k;
inherit (pkgs) protobuf;
inherit (pkgs.llvmPackages) libcxx;
};

protobuf3-to-dict = callPackage ../development/python-modules/protobuf3-to-dict { };
Expand Down Expand Up @@ -5434,7 +5443,9 @@ in {

py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { });

py3exiv2 = callPackage ../development/python-modules/py3exiv2 { };
py3exiv2 = callPackage ../development/python-modules/py3exiv2 {
inherit (pkgs.llvmPackages) libcxx;
};

py3status = callPackage ../development/python-modules/py3status { };

Expand Down