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

Merge branch 'fsharp' of git://github.com/thoughtpolice/nixpkgs 

fsharp: 3.0 -> 3.1, and attempt to fix build
This commit is contained in:
Shea Levy 2014-03-22 05:08:53 -04:00
parent ceb7673bf0 2560f2e78b
commit dbee90b242
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/compilers/fsharp/default.nix
View File

@ -2,16 +2,19 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "fsharp-${version}"; name = "fsharp-${version}";
version = "3.0"; version = "3.1";
src = fetchgit { src = fetchgit {
url = "https://github.com/fsharp/fsharp"; url = "https://github.com/fsharp/fsharp";
rev = "refs/heads/fsharp_30"; rev = "refs/heads/fsharp_31";
sha256 = "59639c76ff401c9ddb1af7a2f5a53a5aef4ec0d62317aeb33429f3eb009f771f"; sha256 = "0d41ae31c57ec9ac8a4ea149b615ae085f3774b8877d8e53ddbf68856c32eda0";
}; };
buildInputs = [ mono pkgconfig autoconf automake which ]; buildInputs = [ mono pkgconfig autoconf automake which ];
configurePhase = "./autogen.sh --prefix $out"; configurePhase = ''
substituteInPlace ./autogen.sh "/usr/bin/env sh" "/bin/sh"
./autogen.sh --prefix $out
'';
# Make sure the executables use the right mono binary, # Make sure the executables use the right mono binary,
# and set up some symlinks for backwards compatibility. # and set up some symlinks for backwards compatibility.