06c19c7 · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

on master help sign in

fsharp41: remove

06c19c7Victor Freire5 years ago

nixos/doc/manual/from_md/release-notes/rl-2111.section.xml+6

compare with master

unifiedsplit

@@ -71,6 +71,12 @@

71 <literal>fetchConfigured = false;</literal>.

72 </para>

73 </listitem>

74+ <listitem>

75+ <para>

76+ fsharp41 has been removed in preference to use the latest

77+ dotnet-sdk

78+ </para>

79+ </listitem>

74 </itemizedlist>

80 </itemizedlist>

75 </section>

81 </section>

76 <section xml:id="other-notable-changes">

82 <section xml:id="other-notable-changes">

nixos/doc/manual/release-notes/rl-2111.section.md+2

@@ -31,4 +31,6 @@ In addition to numerous new and upgraded packages, this release has the followin

31* Those making use of `buildBazelPackage` will need to regenerate the fetch

32 hashes (preferred), or set `fetchConfigured = false;`.

34+* fsharp41 has been removed in preference to use the latest dotnet-sdk

35+

34## Other Notable Changes

36## Other Notable Changes

pkgs/development/compilers/fsharp41/default.nixdeleted−126

@@ -1,126 +0,0 @@

1−# Temporaririly avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it

2−

3−{ lib, stdenv, fetchurl, pkg-config, autoconf, automake, which, mono, msbuild, dotnetbuildhelpers, dotnetPackages }:

4−

5−stdenv.mkDerivation rec {

6− pname = "fsharp";

7− version = "4.1.34";

8−

9− src = fetchurl {

10− url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz";

11− sha256 = "0cv6p5pin962vhbpsji40nkckkag5c96kq5qihvg60pc1z821p0i";

12− };

13−

14− nativeBuildInputs = [ pkg-config ];

15− buildInputs = [

16− autoconf

17− automake

18− which

19− mono

20− msbuild

21− dotnetbuildhelpers

22− dotnetPackages.FsCheck262

23− dotnetPackages.FSharpCompilerTools

24− dotnetPackages.FSharpCore302

25− dotnetPackages.FSharpCore3125

26− dotnetPackages.FSharpCore4001

27− dotnetPackages.FSharpCore4117

28− dotnetPackages.FSharpData225

29− dotnetPackages.FsLexYacc706

30− dotnetPackages.MicrosoftDiaSymReader

31− dotnetPackages.MicrosoftDiaSymReaderPortablePdb

32− dotnetPackages.NUnit350

33− dotnetPackages.SystemCollectionsImmutable131

34− dotnetPackages.SystemReflectionMetadata

35− dotnetPackages.SystemValueTuple

36− ];

37−

38− # https://github.com/mono/mono/tree/fe0f311a848068ab2d17a9b9dd15326e5712d520/packaging/MacSDK/patches

39− # https://github.com/mono/mono/issues/7805

40− patches = [

41− ./fsharp-IsPathRooted-type-inference.patch

42− ./fsharp-string-switchName.patch

43− ./fsharp-path-overloads.patch

44− ./fsharp-GetFileNameWithoutExtension-type-inference.patch

45− ];

46−

47− configurePhase = ''

48− substituteInPlace ./autogen.sh --replace "/usr/bin/env sh" "${stdenv.shell}"

49− ./autogen.sh --prefix $out

50− '';

51−

52− preBuild = ''

53− substituteInPlace Makefile --replace "MONO_ENV_OPTIONS=\$(monoopts) mono .nuget/NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget/NuGet.Config" "true"

54− substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "<FSharpCoreOptSigFiles Include=\"\$(FSharpCoreLkgPath)\\FSharp.Core.dll\" />" ""

55− substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "<FSharpCoreOptSigFiles Include=\"\$(FSharpCoreLkgPath)\\FSharp.Core.optdata\" />" ""

56− substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "<FSharpCoreOptSigFiles Include=\"\$(FSharpCoreLkgPath)\\FSharp.Core.sigdata\" />" ""

57− substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "<FSharpCoreOptSigFiles Include=\"\$(FSharpCoreLkgPath)\\FSharp.Core.xml\" />" ""

58−

59− rm -rf packages

60− mkdir packages

61−

62− ln -s ${dotnetPackages.FsCheck262}/lib/dotnet/FsCheck packages/FsCheck.2.6.2

63− ln -s ${dotnetPackages.FSharpCompilerTools}/lib/dotnet/FSharp.Compiler.Tools packages/FSharp.Compiler.Tools.4.1.27

64− ln -s ${dotnetPackages.FSharpCore302}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.3.0.2

65− ln -s ${dotnetPackages.FSharpCore3125}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.3.1.2.5

66− ln -s ${dotnetPackages.FSharpCore4001}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.4.0.0.1

67− ln -s ${dotnetPackages.FSharpCore4117}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.4.1.17

68− ln -s ${dotnetPackages.FSharpData225}/lib/dotnet/FSharp.Data/ packages/FSharp.Data.2.2.5

69− ln -s ${dotnetPackages.FsLexYacc706}/lib/dotnet/FsLexYacc/ packages/FsLexYacc.7.0.6

70− ln -s ${dotnetPackages.MicrosoftDiaSymReader}/lib/dotnet/Microsoft.DiaSymReader/ packages/Microsoft.DiaSymReader.1.1.0

71− ln -s ${dotnetPackages.MicrosoftDiaSymReaderPortablePdb}/lib/dotnet/Microsoft.DiaSymReader.PortablePdb/ packages/Microsoft.DiaSymReader.PortablePdb.1.2.0

72− ln -s ${dotnetPackages.NUnit350}/lib/dotnet/NUnit/ packages/NUnit.3.5.0

73− ln -s ${dotnetPackages.SystemCollectionsImmutable131}/lib/dotnet/System.Collections.Immutable/ packages/System.Collections.Immutable.1.3.1

74− ln -s ${dotnetPackages.SystemReflectionMetadata}/lib/dotnet/System.Reflection.Metadata/ packages/System.Reflection.Metadata.1.4.2

75− ln -s ${dotnetPackages.SystemValueTuple}/lib/dotnet/System.ValueTuple/ packages/System.ValueTuple.4.3.1

76− '';

77−

78− # Signing /home/jdanek/nix/nixpkgs/build/fss/fsharp-4.1.34/again/fsharp-4.1.34/Release/fsharp30/net40/bin/FSharp.Core.dll with Mono key

79− # ERROR: Unknown error during processing: System.UnauthorizedAccessException: Access to the path

80− # "Release/fsharp30/net40/bin/FSharp.Core.dll" is denied.

81− preInstall = ''

82− find Release/ -name FSharp.Core.dll -exec chmod u+w {} \;

83− '';

84−

85− # Set up some symlinks for backwards compatibility.

86− postInstall = ''

87− ln -s $out/bin/fsharpc $out/bin/fsc

88− ln -s $out/bin/fsharpi $out/bin/fsi

89− for dll in "$out/lib/mono/fsharp"/FSharp*.dll

90− do

91− create-pkg-config-for-dll.sh "$out/lib/pkgconfig" "$dll"

92− done

93− '';

94−

95− doInstallCheck = true;

96− installCheckPhase = ''

97− echo 'printf "int = %i" (6 * 7);;' > script.fsx

98− $out/bin/fsi --exec script.fsx | grep "int = 42"

99− $out/bin/fsharpi --exec script.fsx | grep "int = 42"

100− $out/bin/fsharpiAnyCpu --exec script.fsx | grep "int = 42"

101−

102− cat > answer.fs <<EOF

103−open System

104−

105−[<EntryPoint>]

106−let main argv =

107− printfn "int = %i" (6 * 7)

108− 0

109−EOF

110−

111− $out/bin/fsc answer.fs

112− ${mono}/bin/mono answer.exe | grep "int = 42"

113− '';

114−

115− # To fix this error when running:

116− # The file "/nix/store/path/whatever.exe" is an not a valid CIL image

117− dontStrip = true;

118−

119− meta = {

120− description = "A functional CLI language";

121− homepage = "https://fsharp.org/";

122− license = lib.licenses.asl20;

123− maintainers = with lib.maintainers; [ thoughtpolice raskin ];

124− platforms = with lib.platforms; unix;

125− };

126−}

pkgs/development/compilers/fsharp41/fsharp-GetFileNameWithoutExtension-type-inference.patchdeleted−13

@@ -1,13 +0,0 @@

1−diff --git a/src/scripts/fssrgen.fsx b/src/scripts/fssrgen.fsx

2−index 0bee9b79e..e6ceda11e 100644

3−--- a/src/scripts/fssrgen.fsx

4−+++ b/src/scripts/fssrgen.fsx

5−@@ -329,7 +329,7 @@ let StringBoilerPlate filename =

6− // END BOILERPLATE

7− "

8−

9−-let RunMain(filename, outFilename, outXmlFilenameOpt, projectNameOpt) =

10−+let RunMain(filename:string, outFilename, outXmlFilenameOpt, projectNameOpt) =

11− try

12− let justfilename = System.IO.Path.GetFileNameWithoutExtension(filename)

13− if justfilename |> Seq.exists (fun c -> not(System.Char.IsLetterOrDigit(c))) then

pkgs/development/compilers/fsharp41/fsharp-IsPathRooted-type-inference.patchdeleted−21

@@ -1,21 +0,0 @@

1−commit c37fce5b3019c7a150203fc3a484885591b194de

2−Author: Alexis Christoforides <alexis@thenull.net>

3−Date: Sun Dec 2 00:10:24 2018 -0500

4−

5− Help Path.IsPathRooted method overload selection.

6−

7− .NET Core, and Mono after merging https://github.com/mono/mono/pull/11342, introduce ambiguity with a new overload.

8−

9−diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx

10−index cc797e305..699c7bb93 100644

11−--- a/src/scripts/scriptlib.fsx

12−+++ b/src/scripts/scriptlib.fsx

13−@@ -92,7 +92,7 @@ module Scripting =

14−

15− module Process =

16−

17−- let processExePath baseDir exe =

18−+ let processExePath baseDir (exe:string) =

19− if Path.IsPathRooted(exe) then exe

20− else

21− match Path.GetDirectoryName(exe) with

pkgs/development/compilers/fsharp41/fsharp-path-overloads.patchdeleted−22

@@ -1,22 +0,0 @@

1−diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx

2−index cc797e305..ae8a6d3cc 100644

3−--- a/src/scripts/scriptlib.fsx

4−+++ b/src/scripts/scriptlib.fsx

5−@@ -59,12 +59,12 @@ module Scripting =

6−

7− let (++) a b = Path.Combine(a,b)

8−

9−- let getBasename a = Path.GetFileNameWithoutExtension a

10−- let getFullPath a = Path.GetFullPath a

11−- let getFilename a = Path.GetFileName a

12−- let getDirectoryName a = Path.GetDirectoryName a

13−+ let getBasename (path: string) = Path.GetFileNameWithoutExtension path

14−+ let getFullPath (path: string) = Path.GetFullPath path

15−+ let getFilename (path: string) = Path.GetFileName path

16−+ let getDirectoryName (path: string) = Path.GetDirectoryName path

17−

18−- let copyFile source dir =

19−+ let copyFile (source: string) dir =

20− let dest =

21− if not (Directory.Exists dir) then Directory.CreateDirectory dir |>ignore

22− let result = Path.Combine(dir, Path.GetFileName source)

pkgs/development/compilers/fsharp41/fsharp-string-switchName.patchdeleted−13

@@ -1,13 +0,0 @@

1−diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx

2−index cc797e305..5a7be7d2b 100644

3−--- a/src/scripts/scriptlib.fsx

4−+++ b/src/scripts/scriptlib.fsx

5−@@ -36,7 +36,7 @@ module Scripting =

6− #if INTERACTIVE

7− let argv = Microsoft.FSharp.Compiler.Interactive.Settings.fsi.CommandLineArgs |> Seq.skip 1 |> Seq.toArray

8−

9−- let getCmdLineArgOptional switchName =

10−+ let getCmdLineArgOptional (switchName: string) =

11− argv |> Array.filter(fun t -> t.StartsWith(switchName)) |> Array.map(fun t -> t.Remove(0, switchName.Length).Trim()) |> Array.tryHead

12−

13− let getCmdLineArg switchName defaultValue =

pkgs/top-level/aliases.nix+1

@@ -237,6 +237,7 @@ mapAliases ({

237 '';

238 font-droid = throw "font-droid has been deprecated by noto-fonts"; # 2019-04-12

239 foomatic_filters = foomatic-filters; # 2016-08

240+ fsharp41 = throw "fsharp41 has been removed, please use dotnet-sdk_5 or later";

240 fuse_exfat = exfat; # 2015-09-11

241 fuse_exfat = exfat; # 2015-09-11

241 fuseki = apache-jena-fuseki; # added 2018-04-25

242 fuseki = apache-jena-fuseki; # added 2018-04-25

242 fusesmb = throw "fusesmb is abandoned by upstream"; # added 2019-10-15

243 fusesmb = throw "fusesmb is abandoned by upstream"; # added 2019-10-15

pkgs/top-level/all-packages.nix−2

@@ -11103,8 +11103,6 @@ in

11103

11104 fsharp = callPackage ../development/compilers/fsharp { };

11105

11106− fsharp41 = callPackage ../development/compilers/fsharp41 { };

11107−

11108 fstar = callPackage ../development/compilers/fstar {

11106 fstar = callPackage ../development/compilers/fstar {

11109 ocamlPackages = ocaml-ng.ocamlPackages_4_07;

11107 ocamlPackages = ocaml-ng.ocamlPackages_4_07;

11110 };

11108 };