From 429c536ddded5d9022df2c67ec803f244969d106 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 8 Mar 2014 09:00:57 -0600 Subject: [PATCH 1/2] fsharp: update to 3.0 Also, add myself to the maintainer list. Signed-off-by: Austin Seipp --- pkgs/development/compilers/fsharp/default.nix | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index bb9c6d75d44..a2f8f4e4ff4 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchurl, mono, unzip, pkgconfig - } : -stdenv.mkDerivation rec { - pname = "fsharp"; - date = "2011-08-10"; - name = "${pname}-${date}"; +{ stdenv, fetchgit, mono, pkgconfig, autoconf, automake, which }: - src = fetchurl { - url = "http://download.mono-project.com/sources/fsharp/fsharp-cc126f2.zip"; - sha256 = "03j2ypnfddl2zpvg8ivhafjy8dlz49b38rdy89l8c3irxdsb7k6i"; +stdenv.mkDerivation rec { + name = "fsharp-${version}"; + version = "3.0"; + + src = fetchgit { + url = "https://github.com/fsharp/fsharp"; + rev = "refs/heads/fsharp_30"; + sha256 = "59639c76ff401c9ddb1af7a2f5a53a5aef4ec0d62317aeb33429f3eb009f771f"; }; - buildInputs = [mono unzip pkgconfig]; - - sourceRoot = "fsharp"; + buildInputs = [ mono pkgconfig autoconf automake which ]; + configurePhase = "./autogen.sh --prefix $out"; # To fix this error when running: # The file "/nix/store/path/whatever.exe" is an not a valid CIL image @@ -20,9 +19,9 @@ stdenv.mkDerivation rec { meta = { description = "A functional CLI language"; - homepage = "http://tryfsharp.org/"; + homepage = "http://fsharp.org/"; license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.raskin ]; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ]; platforms = with stdenv.lib.platforms; linux; }; } From f277d6f4a060ea98d85ffa55d5dea28b01b887d5 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 8 Mar 2014 15:45:52 -0600 Subject: [PATCH 2/2] fsharp: specify exact mono path, install fsi/fsc binaries fsc/fsi are just symlinks for backwards compatibility. Signed-off-by: Austin Seipp --- pkgs/development/compilers/fsharp/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index a2f8f4e4ff4..37516fabaab 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -13,6 +13,16 @@ stdenv.mkDerivation rec { buildInputs = [ mono pkgconfig autoconf automake which ]; configurePhase = "./autogen.sh --prefix $out"; + # 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: # The file "/nix/store/path/whatever.exe" is an not a valid CIL image dontStrip = true;