Merge branch 'fsharp' of git://github.com/thoughtpolice/nixpkgs
fsharp: Upgrade to fsharp-3.0 [ Shea: I'm merging thoughtpolice's commits without further testing beyond code inspection, as I believe their work has proven itself ]
This commit is contained in:
commit
2d97dd3fb7
@ -1,18 +1,27 @@
|
|||||||
{ stdenv, fetchurl, mono, unzip, pkgconfig
|
{ stdenv, fetchgit, mono, pkgconfig, autoconf, automake, which }:
|
||||||
} :
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "fsharp";
|
|
||||||
date = "2011-08-10";
|
|
||||||
name = "${pname}-${date}";
|
|
||||||
|
|
||||||
src = fetchurl {
|
stdenv.mkDerivation rec {
|
||||||
url = "http://download.mono-project.com/sources/fsharp/fsharp-cc126f2.zip";
|
name = "fsharp-${version}";
|
||||||
sha256 = "03j2ypnfddl2zpvg8ivhafjy8dlz49b38rdy89l8c3irxdsb7k6i";
|
version = "3.0";
|
||||||
|
|
||||||
|
src = fetchgit {
|
||||||
|
url = "https://github.com/fsharp/fsharp";
|
||||||
|
rev = "refs/heads/fsharp_30";
|
||||||
|
sha256 = "59639c76ff401c9ddb1af7a2f5a53a5aef4ec0d62317aeb33429f3eb009f771f";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [mono unzip pkgconfig];
|
buildInputs = [ mono pkgconfig autoconf automake which ];
|
||||||
|
configurePhase = "./autogen.sh --prefix $out";
|
||||||
|
|
||||||
sourceRoot = "fsharp";
|
# Make sure the executables use the right mono binary,
|
||||||
|
# and set up some symlinks for backwards compatibility.
|
||||||
|
postInstall = ''
|
||||||
|
substituteInPlace $out/bin/fsharpc --replace " mono " " ${mono}/bin/mono "
|
||||||
|
substituteInPlace $out/bin/fsharpi --replace " mono " " ${mono}/bin/mono "
|
||||||
|
substituteInPlace $out/bin/fsharpiAnyCpu --replace " mono " " ${mono}/bin/mono "
|
||||||
|
ln -s $out/bin/fsharpc $out/bin/fsc
|
||||||
|
ln -s $out/bin/fsharpi $out/bin/fsi
|
||||||
|
'';
|
||||||
|
|
||||||
# To fix this error when running:
|
# To fix this error when running:
|
||||||
# The file "/nix/store/path/whatever.exe" is an not a valid CIL image
|
# The file "/nix/store/path/whatever.exe" is an not a valid CIL image
|
||||||
@ -20,9 +29,9 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "A functional CLI language";
|
description = "A functional CLI language";
|
||||||
homepage = "http://tryfsharp.org/";
|
homepage = "http://fsharp.org/";
|
||||||
license = stdenv.lib.licenses.asl20;
|
license = stdenv.lib.licenses.asl20;
|
||||||
maintainers = [ stdenv.lib.maintainers.raskin ];
|
maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ];
|
||||||
platforms = with stdenv.lib.platforms; linux;
|
platforms = with stdenv.lib.platforms; linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user