Jan Malakhovski 7079e744d4 Merge branch 'master' into staging ... Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix		2018-03-10 20:38:13 +00:00
..
clang	llvmPackages_{4,5}: musl compat	2018-02-19 11:19:32 -06:00
libc++	llvmPackages_{4,5}: musl compat	2018-02-19 11:19:32 -06:00
cmdline-help.patch	llvm_4: fix cosmetic issue in help output	2018-02-26 08:30:20 -06:00
default.nix	Merge #33948: {llvm,clang}-{4,5}: better man-pages	2018-01-21 11:35:10 +01:00
dynamiclibrary-musl.patch	llvmPackages_{4,5}: musl compat	2018-02-19 11:19:32 -06:00
libc++abi.nix	llvmPackages_{4,5}: musl compat	2018-02-19 11:19:32 -06:00
lld.nix	llvmPackages_4: 4.0.0 -> 4.0.1	2017-06-27 09:05:37 -05:00
lldb-libedit.patch	lldb-4: Patch to fix libedit usage on Linux	2017-05-27 14:10:01 -05:00
lldb.nix	lldb_4: fix w/gcc7	2018-03-07 17:38:15 -06:00
llvm-outputs.patch
llvm.nix	llvm_4: fix cosmetic issue in help output	2018-02-26 08:30:20 -06:00
openmp.nix	llvmPackages_4: 4.0.0 -> 4.0.1	2017-06-27 09:05:37 -05:00