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

Merge pull request #10900 from krgn/update-fsharp

Browse Source 
update fsharp to 4.0.0.4
This commit is contained in:
Pascal Wittmann 2015-11-11 11:00:22 +01:00
commit 80be767b92
2 changed files with 52 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,15 +4,17 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "fsharp-${version}"; name = "fsharp-${version}";
version = "3.1.2.5"; version = "4.0.0.4";
src = fetchurl { src = fetchurl {
url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz"; url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz";
sha256 = "1j6lnzvhj8fj1csb9am9xcrmmph6v3jyangkq8n1yp3dr6yxqzh1"; sha256 = "1m9pwr4xjl3ikaf3pzsa4pb3pr533xa0v34y2cy4pjcc6j0f71av";
}; };
buildInputs = [ mono pkgconfig dotnetbuildhelpers autoconf automake which ]; buildInputs = [ mono pkgconfig dotnetbuildhelpers autoconf automake which ];
configurePhase = '' configurePhase = ''
sed -i '988d' src/FSharpSource.targets
substituteInPlace ./autogen.sh --replace "/usr/bin/env sh" "/bin/sh" substituteInPlace ./autogen.sh --replace "/usr/bin/env sh" "/bin/sh"
./autogen.sh --prefix $out ./autogen.sh --prefix $out
''; '';

94
pkgs/top-level/dotnet-packages.nix
View File

@ -452,60 +452,62 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
}; };
}; };
MonoDevelopFSharpBinding = buildDotnetPackage rec { # MonoDevelopFSharpBinding = buildDotnetPackage rec {
baseName = "MonoDevelop.FSharpBinding"; # baseName = "MonoDevelop.FSharpBinding";
version = "git-a09c8185eb"; # version = "git-a09c8185eb";
src = fetchFromGitHub { # broken = true;
owner = "fsharp";
repo = "fsharpbinding";
rev = "a09c8185ebf23fe2f7d22b14b4af2e3268d4f011";
sha256 = "1zp5gig42s1h681kch0rw5ykbbj0mcsmdvpyz1319wy9s7n2ng91";
};
buildInputs = [ # src = fetchFromGitHub {
fsharp # owner = "fsharp";
monodevelop # repo = "fsharpbinding";
pkgs.gtk-sharp # rev = "a09c8185ebf23fe2f7d22b14b4af2e3268d4f011";
pkgs.gnome-sharp # sha256 = "1zp5gig42s1h681kch0rw5ykbbj0mcsmdvpyz1319wy9s7n2ng91";
dotnetPackages.ExtCore # };
dotnetPackages.FSharpCompilerService
dotnetPackages.FSharpCompilerCodeDom
dotnetPackages.FSharpAutoComplete
dotnetPackages.Fantomas
];
patches = [ # buildInputs = [
../development/dotnet-modules/patches/monodevelop-fsharpbinding.references.patch # fsharp
../development/dotnet-modules/patches/monodevelop-fsharpbinding.addin-xml.patch # monodevelop
]; # pkgs.gtk-sharp
# pkgs.gnome-sharp
# dotnetPackages.ExtCore
# dotnetPackages.FSharpCompilerService
# dotnetPackages.FSharpCompilerCodeDom
# dotnetPackages.FSharpAutoComplete
# dotnetPackages.Fantomas
# ];
preConfigure = '' # patches = [
substituteInPlace monodevelop/configure.fsx --replace /usr/lib/monodevelop ${monodevelop}/lib/monodevelop # ../development/dotnet-modules/patches/monodevelop-fsharpbinding.references.patch
substituteInPlace monodevelop/configure.fsx --replace bin/MonoDevelop.exe ../../bin/monodevelop # ../development/dotnet-modules/patches/monodevelop-fsharpbinding.addin-xml.patch
(cd monodevelop; fsharpi ./configure.fsx) # ];
'';
# This will not work as monodevelop probably looks in absolute nix store path rather than path # preConfigure = ''
# relative to its executable. Need to ln -s /run/current-system/sw/lib/dotnet/MonoDevelop.FSharpBinding # substituteInPlace monodevelop/configure.fsx --replace /usr/lib/monodevelop ${monodevelop}/lib/monodevelop
# ~/.local/share/MonoDevelop-5.0/LocalInstall/Addins/ to install until we have a better way # substituteInPlace monodevelop/configure.fsx --replace bin/MonoDevelop.exe ../../bin/monodevelop
# (cd monodevelop; fsharpi ./configure.fsx)
# '';
# postInstall = '' # # This will not work as monodevelop probably looks in absolute nix store path rather than path
# mkdir -p "$out/lib/monodevelop/AddIns" # # relative to its executable. Need to ln -s /run/current-system/sw/lib/dotnet/MonoDevelop.FSharpBinding
# ln -sv "$out/lib/dotnet/${baseName}" "$out/lib/monodevelop/AddIns" # # ~/.local/share/MonoDevelop-5.0/LocalInstall/Addins/ to install until we have a better way
# '';
xBuildFiles = [ "monodevelop/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.mac-linux.fsproj" ]; # # postInstall = ''
outputFiles = [ "monodevelop/bin/mac-linux/Release/*" ]; # # mkdir -p "$out/lib/monodevelop/AddIns"
# # ln -sv "$out/lib/dotnet/${baseName}" "$out/lib/monodevelop/AddIns"
# # '';
meta = { # xBuildFiles = [ "monodevelop/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.mac-linux.fsproj" ];
description = "F# addin for MonoDevelop 5.9"; # outputFiles = [ "monodevelop/bin/mac-linux/Release/*" ];
homepage = "https://github.com/fsharp/fsharpbinding/tree/5.9";
license = stdenv.lib.licenses.asl20; # meta = {
maintainers = with stdenv.lib.maintainers; [ obadz ]; # description = "F# addin for MonoDevelop 5.9";
platforms = with stdenv.lib.platforms; linux; # homepage = "https://github.com/fsharp/fsharpbinding/tree/5.9";
}; # license = stdenv.lib.licenses.asl20;
}; # maintainers = with stdenv.lib.maintainers; [ obadz ];
# platforms = with stdenv.lib.platforms; linux;
# };
# };
NDeskOptions = stdenv.mkDerivation rec { NDeskOptions = stdenv.mkDerivation rec {
baseName = "NDesk.Options"; baseName = "NDesk.Options";