nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-02 15:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

llvm: Bump to 3.1

Browse Source
This commit is contained in:
Shea Levy 2012-10-07 23:25:11 -04:00
parent c6c7019091
commit 5a6fd3d510
3 changed files with 6 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/development/compilers/llvm/3.1.nix
View File

@ -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;
};
}

12
pkgs/development/compilers/llvm/default.nix
View File

@ -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;
};
}

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

@ -2402,7 +2402,6 @@ let
jikes = callPackage ../development/compilers/jikes { };
julia = callPackage ../development/compilers/julia {
llvm = llvm_3_1;
pcre = pcre_8_30;
liblapack = liblapack.override {shared = true;};
fftw = fftw.override {pthreads = true;};
@ -2416,7 +2415,6 @@ let
};
llvm = callPackage ../development/compilers/llvm { };
llvm_3_1 = callPackage ../development/compilers/llvm/3.1.nix { };
mitscheme = callPackage ../development/compilers/mit-scheme { };