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

merge trunk

Browse Source 
A few conflicts due to renames

svn path=/nixpkgs/branches/stdenv-updates/; revision=30947
This commit is contained in:
Yury G. Kudryashov
2011-12-16 22:57:21 +00:00
parent b077940b3b 1e74801dc4
commit a670a7aca1
115 changed files with 201 additions and 2605 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/ghc/head.nix
+9 -9
View File
@@ -1,19 +1,17 @@
{stdenv, fetchurl, ghc, perl, gmp, ncurses}:
{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
stdenv.mkDerivation rec {
version = "7.3.20110910";
version = "7.3.20111212";
name = "ghc-${version}";
# TODO: Does this have to be here, or can it go to meta?
homepage = "http://haskell.org/ghc";
src = fetchurl {
url = "${homepage}/dist/current/dist/${name}-src.tar.bz2";
sha256 = "1y8ixh6vcbqxqddc872kjfzxj94q4dhyaprdv7kv2yzwgp49qza5";
url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";
sha256 = "1i8zw3qaihzbgygdlip9d5g5321wv1yhashf8nrinwgy5649rsyf";
};
buildInputs = [ghc perl gmp ncurses];
buildInputs = [ghc perl gmp ncurses] ++
(if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
@@ -22,6 +20,7 @@ stdenv.mkDerivation rec {
preConfigure = ''
echo "${buildMK}" > mk/build.mk
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'';
configureFlags=[
@@ -33,11 +32,12 @@ stdenv.mkDerivation rec {
stripDebugFlags=["-S" "--keep-file-symbols"];
meta = {
inherit homepage;
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = [
stdenv.lib.maintainers.marcweber
stdenv.lib.maintainers.andres
stdenv.lib.maintainers.simons
];
platforms = ghc.meta.platforms;
};
pkgs/development/compilers/ocaml/3.12.0.nix
-59
View File
@@ -1,59 +0,0 @@
{ stdenv, fetchurl, ncurses, x11 }:
let
useX11 = stdenv.system != "armv5tel-linux";
useNativeCompilers = stdenv.system != "armv5tel-linux";
inherit (stdenv.lib) optionals optionalString;
in
stdenv.mkDerivation rec {
name = "ocaml-3.12.0";
src = fetchurl {
url = "http://caml.inria.fr/pub/distrib/ocaml-3.12/${name}.tar.bz2";
sha256 = "0fzczy1s38ihlvghngn4l4n7gnyywnwd7c172276bjcy41b1g08p";
};
prefixKey = "-prefix ";
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ];
buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
buildInputs = [ncurses] ++ optionals useX11 [ x11 ];
installTargets = "install" + optionalString useNativeCompilers " installopt";
patchPhase = ''
CAT=$(type -tp cat)
sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
'';
postBuild = ''
ensureDir $out/include
ln -sv $out/lib/ocaml/caml $out/include/caml
'';
meta = {
homepage = http://caml.inria.fr/ocaml;
licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
description = "Objective Caml, the most popular variant of the Caml language";
longDescription =
'' Objective Caml is the most popular variant of the Caml language.
From a language standpoint, it extends the core Caml language with a
fully-fledged object-oriented layer, as well as a powerful module
system, all connected by a sound, polymorphic type system featuring
type inference.
The Objective Caml system is an industrial-strength implementation
of this language, featuring a high-performance native-code compiler
(ocamlopt) for 9 processor architectures (IA32, PowerPC, AMD64,
Alpha, Sparc, Mips, IA64, HPPA, StrongArm), as well as a bytecode
compiler (ocamlc) and an interactive read-eval-print loop (ocaml)
for quick development and portability. The Objective Caml
distribution includes a comprehensive standard library, a replay
debugger (ocamldebug), lexer (ocamllex) and parser (ocamlyacc)
generators, a pre-processor pretty-printer (camlp4) and a
documentation generator (ocamldoc).
'';
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
};
}
pkgs/development/compilers/ocaml/3.12.1.nix
+59
View File
@@ -0,0 +1,59 @@
{ stdenv, fetchurl, ncurses, x11 }:
let
useX11 = stdenv.system != "armv5tel-linux";
useNativeCompilers = stdenv.system != "armv5tel-linux";
inherit (stdenv.lib) optionals optionalString;
in
stdenv.mkDerivation rec {
name = "ocaml-3.12.1";
src = fetchurl {
url = "http://caml.inria.fr/pub/distrib/ocaml-3.12/${name}.tar.bz2";
sha256 = "13cmhkh7s6srnlvhg3s9qzh3a5dbk2m9qr35jzq922sylwymdkzd";
};
prefixKey = "-prefix ";
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ];
buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
buildInputs = [ncurses] ++ optionals useX11 [ x11 ];
installTargets = "install" + optionalString useNativeCompilers " installopt";
patchPhase = ''
CAT=$(type -tp cat)
sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
'';
postBuild = ''
ensureDir $out/include
ln -sv $out/lib/ocaml/caml $out/include/caml
'';
meta = {
homepage = http://caml.inria.fr/ocaml;
licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
description = "OCaml, the most popular variant of the Caml language";
longDescription =
''
OCaml is the most popular variant of the Caml language. From a
language standpoint, it extends the core Caml language with a
fully-fledged object-oriented layer, as well as a powerful module
system, all connected by a sound, polymorphic type system featuring
type inference.
The OCaml system is an industrial-strength implementation of this
language, featuring a high-performance native-code compiler (ocamlopt)
for 9 processor architectures (IA32, PowerPC, AMD64, Alpha, Sparc,
Mips, IA64, HPPA, StrongArm), as well as a bytecode compiler (ocamlc)
and an interactive read-eval-print loop (ocaml) for quick development
and portability. The OCaml distribution includes a comprehensive
standard library, a replay debugger (ocamldebug), lexer (ocamllex) and
parser (ocamlyacc) generators, a pre-processor pretty-printer (camlp4)
and a documentation generator (ocamldoc).
'';
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
};
}