diff options
author | Shea Levy <shea@shealevy.com> | 2012-10-07 23:25:11 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2012-10-07 23:25:11 -0400 |
commit | 5a6fd3d51042a16ae4042bafcdce976c9b26eae3 (patch) | |
tree | 7d0e4f3c85df9156fe8f69f1787912d8234ce58c /pkgs/development/compilers | |
parent | c6c701909123bb3ee593a96b5a18ee39d8aa30e8 (diff) | |
download | nixlib-5a6fd3d51042a16ae4042bafcdce976c9b26eae3.tar nixlib-5a6fd3d51042a16ae4042bafcdce976c9b26eae3.tar.gz nixlib-5a6fd3d51042a16ae4042bafcdce976c9b26eae3.tar.bz2 nixlib-5a6fd3d51042a16ae4042bafcdce976c9b26eae3.tar.lz nixlib-5a6fd3d51042a16ae4042bafcdce976c9b26eae3.tar.xz nixlib-5a6fd3d51042a16ae4042bafcdce976c9b26eae3.tar.zst nixlib-5a6fd3d51042a16ae4042bafcdce976c9b26eae3.zip |
llvm: Bump to 3.1
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/llvm/3.1.nix | 27 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/default.nix | 12 |
2 files changed, 6 insertions, 33 deletions
diff --git a/pkgs/development/compilers/llvm/3.1.nix b/pkgs/development/compilers/llvm/3.1.nix deleted file mode 100644 index 204c080b871a..000000000000 --- a/pkgs/development/compilers/llvm/3.1.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, perl, groff, cmake, python }: - -let version = "3.1"; in - -stdenv.mkDerivation { - name = "llvm-${version}"; - - src = fetchurl { - url = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz"; - sha256 = "1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab"; - }; - - buildInputs = [ perl groff cmake python ]; - - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - - enableParallelBuilding = true; - - meta = { - homepage = http://llvm.org/; - description = "Collection of modular and reusable compiler and toolchain technologies"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric shlevy raskin]; - platforms = with stdenv.lib.platforms; all; - }; -} - diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 0fb1cf82cc27..204c080b871a 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, perl, groff, cmake }: +{ stdenv, fetchurl, perl, groff, cmake, python }: -let version = "3.0"; in +let version = "3.1"; in stdenv.mkDerivation { name = "llvm-${version}"; src = fetchurl { - url = "http://llvm.org/releases/${version}/llvm-${version}.tar.gz"; - sha256 = "0xq4gi7lflv8ilfckslhfvnja5693xjii1yvzz39kklr6hfv37ji"; + url = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz"; + sha256 = "1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab"; }; - buildInputs = [ perl groff cmake ]; + buildInputs = [ perl groff cmake python ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation { homepage = http://llvm.org/; description = "Collection of modular and reusable compiler and toolchain technologies"; license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric shlevy]; + maintainers = with stdenv.lib.maintainers; [viric shlevy raskin]; platforms = with stdenv.lib.platforms; all; }; } |