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

Merge remote-tracking branch 'origin/staging' into gcc-4.9

Browse Source 
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/libraries/wayland/default.nix
	pkgs/development/tools/build-managers/cmake/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Eelco Dolstra
2015-06-01 20:08:43 +02:00
parent 592d4af9cf 3aee39bb83
commit 553abf71ba
1274 changed files with 28934 additions and 14858 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/llvm/3.4/clang.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }:
{ stdenv, fetch, cmake, libxml2, libedit, llvm, zlib, version, clang-tools-extra_src }:
stdenv.mkDerivation {
name = "clang-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
patches = [ ./clang-separate-build.patch ./clang-purity.patch ];
buildInputs = [ cmake libedit libxml2 ];
buildInputs = [ cmake libedit libxml2 zlib ];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"

2
pkgs/development/compilers/llvm/3.5/clang.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }:
let
gcc = if stdenv.cc.cc.isGNU or false then stdenv.cc.cc else stdenv.cc.cc.gcc;
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in stdenv.mkDerivation {
name = "clang-${version}";

4
pkgs/development/compilers/llvm/3.6/clang/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }:
let
gcc = if stdenv.cc.cc.isGNU or false then stdenv.cc.cc else stdenv.cc.cc.gcc;
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in stdenv.mkDerivation {
name = "clang-${version}";
unpackPhase = ''
unpackFile ${fetch "cfe" "0b8825mvdhfk5r9gwcwp1j2dl9kw5glgyk7pybq2dzhrh4vnj3my"}
unpackFile ${fetch "cfe" "1myssbxlyln0nggfz04nfrbzdckljksmaxp82nq7hrmqjc62vybl"}
mv cfe-${version}.src clang
sourceRoot=$PWD/clang
unpackFile ${clang-tools-extra_src}

6
pkgs/development/compilers/llvm/3.6/default.nix
View File

@@ -2,7 +2,7 @@
let
callPackage = newScope (self // { inherit isl version fetch; });
version = "3.6.0";
version = "3.6.1";
fetch = fetch_v version;
fetch_v = ver: name: sha256: fetchurl {
@@ -10,8 +10,8 @@ let
inherit sha256;
};
compiler-rt_src = fetch "compiler-rt" "04bbn946jninynkrjyp337xqs8ihn4fkz5xgvmywxkddwmwznjbz";
clang-tools-extra_src = fetch "clang-tools-extra" "04n83gsmy2ghvn7vp9hamsgn332rx2g7sa4paskr0d4ihax4ka9s";
compiler-rt_src = fetch "compiler-rt" "17v4gf4y5krgkrd12r95hfxbw5q4c4jlf3513kqlfq5yfw663gzw";
clang-tools-extra_src = fetch "clang-tools-extra" "1dljzdk2jmrwyh8z92rljxl9wzdggp74i9f6g8aajl6mf3c71vpl";
self = {
llvm = callPackage ./llvm.nix {

2
pkgs/development/compilers/llvm/3.6/libc++/default.nix
View File

@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
name = "libc++-${version}";
src = fetch "libcxx" "1dzvhyrzj54v823biadag5lwxfz37gm8a65aq72pjsh8n211x719";
src = fetch "libcxx" "1yf0ns4cvvirp1ml5a8h29lysnw5c23715b09x68v5zkxhxnap2s";
# instead of allowing libc++ to link with /usr/lib/libc++abi.dylib,
# force it to link with our copy

2
pkgs/development/compilers/llvm/3.6/libc++abi.nix
View File

@@ -3,7 +3,7 @@
stdenv.mkDerivation {
name = "libc++abi-${version}";
src = fetch "libcxxabi" "1xclv63l7cmrxkl129w6j9fsxgdm8jjlcm8gswl2y9qmh3dwz2zp";
src = fetch "libcxxabi" "0pgimy1b5vj4favzdz2830n917fyz65hm3khdgkbgnfs43s8g0xw";
buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) libunwind;

2
pkgs/development/compilers/llvm/3.6/lldb.nix
View File

@@ -15,7 +15,7 @@
stdenv.mkDerivation {
name = "lldb-${version}";
src = fetch "lldb" "1cphxbc8c0yqs2rxn94vcn8his465m97rnynklpzm8sf5kad26ib";
src = fetch "lldb" "1fmaz7zcc1f54ns4x8rx9nvhh4pyrhbz103bl02sv1cfwxj5ryyf";
patchPhase = ''
sed -i 's|/usr/bin/env||' \

2
pkgs/development/compilers/llvm/3.6/llvm.nix
View File

@@ -15,7 +15,7 @@
}:
let
src = fetch "llvm" "1kmr5vlnz1419nnvyc7lsrcfx09n65ravjbmzxrqz7ml07jnk6mk";
src = fetch "llvm" "0ypwcqrld91jn0zz4mkdksl2mbb0ds9lh5gf0xkbb81sj4awc01g";
in stdenv.mkDerivation rec {
name = "llvm-${version}";