Merge pull request #114848 from sternenseemann/remove-ocaml-3
pkgs/development/compilers/ocaml: remove 3.* expressions
This commit is contained in:
Sandro
GitHub
commit
e495e2fa72
@ -1,21 +0,0 @@
|
||||
{ stdenv, fetchurl, xlibsWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml";
|
||||
version = "3.08.0";
|
||||
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = "http://tarballs.nixos.org/${pname}-${version}.tar.gz";
|
||||
sha256 = "135g5waj7djzrj0dbc8z1llasfs2iv5asq41jifhldxb4l2b97mx";
|
||||
};
|
||||
configureScript = ./configure-3.08.0;
|
||||
dontAddPrefix = "True";
|
||||
configureFlags = ["-no-tk" "-x11lib" xlibsWrapper];
|
||||
buildFlags = ["world" "bootstrap" "opt"];
|
||||
checkTarget = ["opt.opt"];
|
||||
|
||||
meta = {
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,34 +0,0 @@
|
||||
{ stdenv, fetchurl, xlibsWrapper, ncurses }:
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
|
||||
pname = "ocaml";
|
||||
version = "3.10.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://caml.inria.fr/pub/distrib/ocaml-3.10/${pname}-${version}.tar.bz2";
|
||||
sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d";
|
||||
};
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
configureFlags = ["-no-tk" "-x11lib" xlibsWrapper];
|
||||
buildFlags = [ "world" "bootstrap" "world.opt" ];
|
||||
buildInputs = [xlibsWrapper ncurses];
|
||||
installTargets = "install installopt";
|
||||
patchPhase = ''
|
||||
CAT=$(type -tp cat)
|
||||
sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
|
||||
'';
|
||||
postBuild = ''
|
||||
mkdir -p $out/include
|
||||
ln -sv $out/lib/ocaml/caml $out/include/caml
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://caml.inria.fr/ocaml";
|
||||
license = with lib.licenses; [ qpl lgpl2 ];
|
||||
description = "Most popular variant of the Caml language";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
})
|
||||
@ -1,75 +0,0 @@
|
||||
{ stdenv, fetchurl, ncurses, xlibsWrapper }:
|
||||
|
||||
let
|
||||
useX11 = stdenv.isi686 || stdenv.isx86_64;
|
||||
useNativeCompilers = stdenv.isi686 || stdenv.isx86_64 || stdenv.isMips;
|
||||
inherit (lib) optionals optionalString;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "ocaml";
|
||||
version = "3.11.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://caml.inria.fr/pub/distrib/ocaml-3.11/${pname}-${version}.tar.bz2";
|
||||
sha256 = "86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143";
|
||||
};
|
||||
|
||||
# Needed to avoid a SIGBUS on the final executable on mips
|
||||
NIX_CFLAGS_COMPILE = if stdenv.isMips then "-fPIC" else "";
|
||||
|
||||
patches = optionals stdenv.isDarwin [ ./gnused-on-osx-fix.patch ] ++
|
||||
[ (fetchurl {
|
||||
name = "0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch";
|
||||
url = "http://caml.inria.fr/mantis/file_download.php?file_id=418&type=bug";
|
||||
sha256 = "612a9ac108bbfce2238aa5634123da162f0315dedb219958be705e0d92dcdd8e";
|
||||
})
|
||||
];
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
|
||||
buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
|
||||
buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];
|
||||
installTargets = "install" + optionalString useNativeCompilers " installopt";
|
||||
prePatch = ''
|
||||
CAT=$(type -tp cat)
|
||||
sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
|
||||
patch -p0 < ${./mips64.patch}
|
||||
'';
|
||||
postBuild = ''
|
||||
mkdir -p $out/include
|
||||
ln -sv $out/lib/ocaml/caml $out/include/caml
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://caml.inria.fr/ocaml";
|
||||
license = with licenses; [
|
||||
qpl /* compiler */
|
||||
lgpl2 /* library */
|
||||
];
|
||||
description = "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 = with platforms; linux ++ darwin;
|
||||
};
|
||||
|
||||
}
|
||||
@ -1,32 +0,0 @@
|
||||
diff -Nuar ocaml-3.12.1/configure ocaml-3.12.1-fix-configure/configure
|
||||
--- ocaml-3.12.1/configure 2011-07-04 23:15:01.000000000 +0200
|
||||
+++ ocaml-3.12.1-fix-configure/configure 2012-06-06 22:20:40.000000000 +0200
|
||||
@@ -259,7 +259,7 @@
|
||||
bytecccompopts="-fno-defer-pop $gcc_warnings -DSHRINKED_GNUC"
|
||||
mathlib="";;
|
||||
*,*-*-darwin*)
|
||||
- bytecccompopts="-fno-defer-pop -no-cpp-precomp $gcc_warnings"
|
||||
+ bytecccompopts="-fno-defer-pop $gcc_warnings"
|
||||
mathlib=""
|
||||
# Tell gcc that we can use 32-bit code addresses for threaded code
|
||||
# unless we are compiled for a shared library (-fPIC option)
|
||||
@@ -739,7 +739,7 @@
|
||||
*,*,rhapsody,*) nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs"
|
||||
if $arch64; then partialld="ld -r -arch ppc64"; fi;;
|
||||
*,gcc*,cygwin,*) nativecccompopts="$gcc_warnings -U_WIN32";;
|
||||
- amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";;
|
||||
+ amd64,gcc*,macosx,*) partialld="ld -r";;
|
||||
amd64,gcc*,solaris,*) partialld="ld -r -m elf_x86_64";;
|
||||
*,gcc*,*,*) nativecccompopts="$gcc_warnings";;
|
||||
esac
|
||||
@@ -752,8 +752,8 @@
|
||||
asppprofflags='-pg -DPROFILING';;
|
||||
alpha,*,*) as='as'
|
||||
aspp='gcc -c';;
|
||||
- amd64,*,macosx) as='as -arch x86_64'
|
||||
- aspp='gcc -arch x86_64 -c';;
|
||||
+ amd64,*,macosx) as='as'
|
||||
+ aspp='gcc -c';;
|
||||
amd64,*,solaris) as='as --64'
|
||||
aspp='gcc -m64 -c';;
|
||||
amd64,*,*) as='as'
|
||||
@ -1,69 +0,0 @@
|
||||
{ stdenv, fetchurl, ncurses, xlibsWrapper }:
|
||||
|
||||
let
|
||||
useX11 = !stdenv.isAarch32 && !stdenv.isMips;
|
||||
useNativeCompilers = !stdenv.isMips;
|
||||
inherit (lib) optionals optionalString;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "ocaml";
|
||||
version = "3.12.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://caml.inria.fr/pub/distrib/ocaml-3.12/${pname}-${version}.tar.bz2";
|
||||
sha256 = "13cmhkh7s6srnlvhg3s9qzh3a5dbk2m9qr35jzq922sylwymdkzd";
|
||||
};
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
|
||||
buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
|
||||
buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];
|
||||
installTargets = "install" + optionalString useNativeCompilers " installopt";
|
||||
patches = optionals stdenv.isDarwin [ ./3.12.1-darwin-fix-configure.patch ];
|
||||
preConfigure = ''
|
||||
CAT=$(type -tp cat)
|
||||
sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
|
||||
'';
|
||||
postBuild = ''
|
||||
mkdir -p $out/include
|
||||
ln -sv $out/lib/ocaml/caml $out/include/caml
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
nativeCompilers = useNativeCompilers;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://caml.inria.fr/ocaml";
|
||||
branch = "3.12";
|
||||
license = with licenses; [
|
||||
qpl /* compiler */
|
||||
lgpl2 /* library */
|
||||
];
|
||||
description = "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 = with platforms; linux;
|
||||
};
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user