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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát
2015-03-17 12:44:58 +01:00
parent 2c1041acc7 c812ded1ea
commit e924f05cc3
215 changed files with 5985 additions and 1555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "ats-${version}";
version = "0.2.11";
version = "0.2.12";
src = fetchurl {
url = "mirror://sourceforge/ats-lang/ats-lang-anairiats-${version}.tgz";
sha256 = "0rqykyx5whichx85jr4l4c9fdan0qsdd4kwd7a81k3l07zbd9fc6";
sha256 = "0l2kj1fzhxwsklwmn5yj2vp9rmw4jg0b18bzwqz72bfi8i39736k";
};
# this is necessary because atxt files usually include some .hats files

38
pkgs/development/compilers/ghc/6.10.4.nix
View File

@@ -5,16 +5,14 @@ stdenv.mkDerivation rec {
name = "ghc-${version}";
homepage = "http://haskell.org/ghc";
src = fetchurl {
url = "${homepage}/dist/${version}/${name}-src.tar.bz2";
url = "${meta.homepage}/dist/${version}/${name}-src.tar.bz2";
sha256 = "d66a8e52572f4ff819fe5c4e34c6dd1e84a7763e25c3fadcc222453c0bd8534d";
};
buildInputs = [ghc libedit perl gmp];
configureFlags=[
configureFlags = [
"--with-gmp-libraries=${gmp}/lib"
"--with-gmp-includes=${gmp}/include"
"--with-gcc=${stdenv.cc}/bin/gcc"
@@ -23,38 +21,8 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-fomit-frame-pointer";
meta = {
inherit homepage;
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
inherit (ghc.meta) license platforms;
};
passthru = {
corePackages = [
[ "Cabal" "1.6.0.3" ]
[ "array" "0.2.0.0" ]
[ "base" "3.0.3.1" ]
[ "base" "4.1.0.0" ]
[ "bytestring" "0.9.1.4" ]
[ "containers" "0.2.0.1" ]
[ "directory" "1.0.0.3" ]
[ "extensible-exceptions" "0.1.1.0" ]
[ "filepath" "1.1.0.2" ]
[ "ghc" "6.10.4" ]
[ "ghc-prim" "0.1.0.0" ]
[ "haddock" "2.4.2" ]
[ "haskell98" "1.0.1.0" ]
[ "hpc" "0.5.0.3" ]
[ "integer" "0.1.0.1" ]
[ "old-locale" "1.0.0.1" ]
[ "old-time" "1.0.0.2" ]
[ "packedstring" "0.1.0.1" ]
[ "pretty" "1.0.1.0" ]
[ "process" "1.0.1.1" ]
[ "random" "1.0.0.1" ]
[ "rts" "1.0" ]
[ "syb" "0.1.0.1" ]
[ "template-haskell" "2.3.0.1" ]
[ "unix" "2.3.2.0" ]
];
};
}

47
pkgs/development/compilers/ghc/6.12.3.nix
View File

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
echo "${buildMK}" > mk/build.mk
'';
configureFlags=[
configureFlags = [
"--with-gcc=${stdenv.cc}/bin/gcc"
];
@@ -36,50 +36,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = [
stdenv.lib.maintainers.marcweber
stdenv.lib.maintainers.andres
];
maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ];
inherit (ghc.meta) license platforms;
};
# TODO: requires a comment as to what it does and why it is needed.
passthru = {
corePackages = [
[ "Cabal" "1.8.0.2" ]
[ "array" "0.3.0.0" ]
[ "base" "3.0.3.2" ]
[ "base" "4.2.0.0" ]
[ "bin-package-db" "0.0.0.0" ]
[ "bytestring" "0.9.1.5" ]
[ "containers" "0.3.0.0" ]
[ "directory" "1.0.1.0" ]
[ "dph-base" "0.4.0" ]
[ "dph-par" "0.4.0" ]
[ "dph-prim-interface" "0.4.0" ]
[ "dph-prim-par" "0.4.0" ]
[ "dph-prim-seq" "0.4.0" ]
[ "dph-seq" "0.4.0" ]
[ "extensible-exceptions" "0.1.1.1" ]
[ "ffi" "1.0" ]
[ "filepath" "1.1.0.3" ]
[ "ghc" "6.12.1" ]
[ "ghc-binary" "0.5.0.2" ]
[ "ghc-prim" "0.2.0.0" ]
[ "haskell98" "1.0.1.1" ]
[ "hpc" "0.5.0.4" ]
[ "integer-gmp" "0.2.0.0" ]
[ "old-locale" "1.0.0.2" ]
[ "old-time" "1.0.0.3" ]
[ "pretty" "1.0.1.1" ]
[ "process" "1.0.1.2" ]
[ "random" "1.0.0.2" ]
[ "rts" "1.0" ]
[ "syb" "0.1.0.2" ]
[ "template-haskell" "2.4.0.0" ]
[ "time" "1.1.4" ]
[ "unix" "2.4.0.0" ]
[ "utf8-string" "0.3.4" ]
];
};
}

6
pkgs/development/compilers/ghc/7.10.1.nix
View File

@@ -16,12 +16,12 @@ let
in
stdenv.mkDerivation rec {
version = "7.10.0.20150123";
version = "7.10.0.20150315";
name = "ghc-${version}";
src = fetchurl {
url = "https://downloads.haskell.org/~ghc/7.10.1-rc2/${name}-src.tar.xz";
sha256 = "0in5zsr2z545yln55c7mwi07x3za0874yxbpsj5xsb4vn3wrcrbn";
url = "https://downloads.haskell.org/~ghc/7.10.1-rc3/${name}-src.tar.bz2";
sha256 = "0drj8llsf17iqlr04dp0xd5ypfsv5cgcm7ncvh675sas2rw5qhjx";
};
buildInputs = [ ghc perl ];

4
pkgs/development/compilers/rustc/makeRustcDerivation.nix
View File

@@ -61,7 +61,7 @@ let version = if isRelease then
meta = with stdenv.lib; {
homepage = http://www.rust-lang.org/;
description = "A safe, concurrent, practical language";
maintainers = with maintainers; [ madjar cstrahan wizeman ];
maintainers = with maintainers; [ madjar cstrahan wizeman globin ];
license = map (builtins.getAttr "shortName") [ licenses.mit licenses.asl20 ];
platforms = platforms.linux;
};
@@ -132,7 +132,7 @@ stdenv.mkDerivation {
buildInputs = [ which file perl curl python27 makeWrapper git valgrind procps ];
enableParallelBuilding = false; # disabled due to rust-lang/rust#16305
enableParallelBuilding = true;
preCheck = "export TZDIR=${tzdata}/share/zoneinfo";

11
pkgs/development/compilers/rustc/patches/alpha2.patch
View File

@@ -42,3 +42,14 @@ index ef849bb..e090b99 100644
}
}
diff --git a/src/test/run-pass/issue-20797.rs b/src/test/run-pass/issue-20797.rs
index 049e08d..30b9d2a 100644
--- a/src/test/run-pass/issue-20797.rs
+++ b/src/test/run-pass/issue-20797.rs
@@ -90,5 +90,5 @@ impl<S: Strategy> Iterator for Subpaths<S> {
}
fn main() {
- let mut walker: Subpaths<Recursive> = Subpaths::walk(&Path::new("/home")).unwrap();
+ let mut walker: Subpaths<Recursive> = Subpaths::walk(&Path::new("/tmp")).unwrap();
}

21
pkgs/development/compilers/rustc/patches/head.patch
View File

@@ -15,11 +15,11 @@ index ca59b1c..65ee7bf 100755
# do not fail if one of the above fails, as all we need is a working rustc!
exit 0
diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs
index 6bf7453..319f9af 100644
index ed44bf8..2b84627 100644
--- a/src/librustc_back/archive.rs
+++ b/src/librustc_back/archive.rs
@@ -54,7 +54,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option<String>,
paths: &[&Path]) -> ProcessOutput {
@@ -57,7 +57,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option<String>,
paths: &[&Path]) -> Output {
let ar = match *maybe_ar_prog {
Some(ref ar) => &ar[..],
- None => "ar"
@@ -28,10 +28,10 @@ index 6bf7453..319f9af 100644
let mut cmd = Command::new(ar);
diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs
index ea5001a..911445c 100644
index 3087a8e..578448f 100644
--- a/src/librustc_trans/back/link.rs
+++ b/src/librustc_trans/back/link.rs
@@ -350,8 +350,8 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri
@@ -352,8 +352,8 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri
pub fn get_cc_prog(sess: &Session) -> String {
match sess.opts.cg.linker {
@@ -42,3 +42,14 @@ index ea5001a..911445c 100644
}
}
diff --git a/src/test/run-pass/issue-20797.rs b/src/test/run-pass/issue-20797.rs
index 049e08d..30b9d2a 100644
--- a/src/test/run-pass/issue-20797.rs
+++ b/src/test/run-pass/issue-20797.rs
@@ -90,5 +90,5 @@ impl<S: Strategy> Iterator for Subpaths<S> {
}
fn main() {
- let mut walker: Subpaths<Recursive> = Subpaths::walk(&Path::new("/home")).unwrap();
+ let mut walker: Subpaths<Recursive> = Subpaths::walk(&Path::new("/tmp")).unwrap();
}