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

llvm-packages: cleanup

Browse Source
This commit is contained in:
Daiderd Jordan 2018-01-31 19:13:57 +01:00
parent 19d8850164
commit db7e0aeb42
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/zig/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, llvmPackages_5, llvm_5 }: { stdenv, fetchFromGitHub, cmake, llvmPackages }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.1.1"; version = "0.1.1";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "01yqjyi25f99bfmxxwyh45k7j84z0zg7n9jl8gg0draf96mzdh06"; sha256 = "01yqjyi25f99bfmxxwyh45k7j84z0zg7n9jl8gg0draf96mzdh06";
}; };
buildInputs = [ cmake llvmPackages_5.clang-unwrapped llvm_5 ]; buildInputs = [ cmake llvmPackages.clang-unwrapped llvmPackages.llvm ];
cmakeFlags = [ cmakeFlags = [
"-DZIG_LIBC_INCLUDE_DIR=${stdenv.cc.libc_dev}/include" "-DZIG_LIBC_INCLUDE_DIR=${stdenv.cc.libc_dev}/include"

2
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -258,7 +258,7 @@ self: super: builtins.intersectAttrs super {
} }
); );
llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm_5; }; llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm; };
# Needs help finding LLVM. # Needs help finding LLVM.
spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm; spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm;

4
pkgs/os-specific/linux/bcc/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, llvmPackages_5, kernel { stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, llvmPackages, kernel
, flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf, libelf }: , flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf, libelf }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
llvmPackages_5.llvm llvmPackages_5.clang-unwrapped kernel llvmPackages.llvm llvmPackages.clang-unwrapped kernel
elfutils python pythonPackages.netaddr luajit netperf iperf elfutils python pythonPackages.netaddr luajit netperf iperf
]; ];

4
pkgs/top-level/all-packages.nix
View File

@ -5611,9 +5611,7 @@ with pkgs;
''; '';
}); });
crystal = callPackage ../development/compilers/crystal { crystal = callPackage ../development/compilers/crystal { };
llvm = llvm_5;
};
devpi-client = callPackage ../development/tools/devpi-client {}; devpi-client = callPackage ../development/tools/devpi-client {};

2
pkgs/top-level/python-packages.nix
View File

@ -9935,7 +9935,7 @@ in {
locustio = callPackage ../development/python-modules/locustio { }; locustio = callPackage ../development/python-modules/locustio { };
llvmlite = callPackage ../development/python-modules/llvmlite {llvm=pkgs.llvm_5;}; llvmlite = callPackage ../development/python-modules/llvmlite { llvm = pkgs.llvm; };
lockfile = buildPythonPackage rec { lockfile = buildPythonPackage rec {
pname = "lockfile"; pname = "lockfile";