Merge pull request #122759 from dotlambda/mono6

authored by Sandro and committed by GitHub f85bc843 6ad0e5ca

+15 -16
+3 -3
pkgs/applications/science/robotics/mission-planner/default.nix
··· 1 - { lib, stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip, mono6 }: 1 + { lib, stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip, mono }: 2 2 3 3 let 4 4 pname = "mission-planner"; ··· 19 19 sha256 = "1cgpmsmmnbzw1lwsdafp8yklk1rwc61yf12vc1ahcc6bl7q2385x"; 20 20 }; 21 21 22 - nativeBuildInputs = [ makeWrapper mono6 unzip ]; 22 + nativeBuildInputs = [ makeWrapper mono unzip ]; 23 23 sourceRoot = "."; 24 24 25 25 AOT_FILES = [ "MissionPlanner.exe" "MissionPlanner.*.dll" ]; ··· 39 39 install -m 444 -D mpdesktop150.png $out/share/icons/mission-planner.png 40 40 cp -r ${desktopItem}/share/applications $out/share/ 41 41 mv * $out/opt/mission-planner 42 - makeWrapper ${mono6}/bin/mono $out/bin/mission-planner \ 42 + makeWrapper ${mono}/bin/mono $out/bin/mission-planner \ 43 43 --add-flags $out/opt/mission-planner/MissionPlanner.exe 44 44 runHook postInstall 45 45 '';
+2 -2
pkgs/development/tools/omnisharp-roslyn/default.nix
··· 1 1 { lib, stdenv 2 2 , fetchurl 3 - , mono6 3 + , mono 4 4 , msbuild 5 5 , dotnet-sdk 6 6 , makeWrapper ··· 35 35 chmod -R u+w $out/src 36 36 mv $out/src/.msbuild/Current/{bin,Bin} 37 37 38 - makeWrapper ${mono6}/bin/mono $out/bin/omnisharp \ 38 + makeWrapper ${mono}/bin/mono $out/bin/omnisharp \ 39 39 --add-flags "$out/src/OmniSharp.exe" 40 40 ''; 41 41
+3 -4
pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix
··· 7 7 , icu 8 8 , stdenv 9 9 , openssl 10 - , mono6 10 + , mono 11 11 }: 12 12 13 13 let 14 14 # Get as close as possible as the `package.json` required version. 15 15 # This is what drives omnisharp. 16 - mono = mono6; 17 - 18 16 rtDepsSrcsFromJson = builtins.fromJSON (builtins.readFile ./rt-deps-bin-srcs.json); 19 17 20 18 rtDepsBinSrcs = builtins.mapAttrs (k: v: ··· 114 112 declare omnisharp_dir="$PWD/${omnisharp.installPath}" 115 113 unzip_to "${omnisharp.bin-src}" "$omnisharp_dir" 116 114 rm "$omnisharp_dir/bin/mono" 117 - ln -s -T "${mono6}/bin/mono" "$omnisharp_dir/bin/mono" 115 + ln -s -T "${mono}/bin/mono" "$omnisharp_dir/bin/mono" 118 116 chmod a+x "$omnisharp_dir/run" 119 117 touch "$omnisharp_dir/install.Lock" 120 118 ··· 136 134 137 135 meta = with lib; { 138 136 description = "C# for Visual Studio Code (powered by OmniSharp)"; 137 + homepage = "https://github.com/OmniSharp/omnisharp-vscode"; 139 138 license = licenses.mit; 140 139 maintainers = [ maintainers.jraygauthier ]; 141 140 platforms = [ "x86_64-linux" ];
+3 -3
pkgs/tools/graphics/snapdragon-profiler/default.nix
··· 4 4 , makeDesktopItem 5 5 , copyDesktopItems 6 6 , icoutils 7 - , mono6 7 + , mono 8 8 , jre 9 9 , androidenv 10 10 , gtk-sharp-2_0 ··· 38 38 ]; 39 39 40 40 buildInputs = [ 41 - mono6 41 + mono 42 42 gtk-sharp-2_0 43 43 gtk2 44 44 libcxx ··· 52 52 53 53 mv *.so $out/lib 54 54 cp -r * $out/lib/snapdragon-profiler 55 - makeWrapper "${mono6}/bin/mono" $out/bin/snapdragon-profiler \ 55 + makeWrapper "${mono}/bin/mono" $out/bin/snapdragon-profiler \ 56 56 --add-flags "$out/lib/snapdragon-profiler/SnapdragonProfiler.exe" \ 57 57 --suffix PATH : ${lib.makeBinPath [ jre androidenv.androidPkgs_9_0.platform-tools coreutils ]} \ 58 58 --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \
+4 -4
pkgs/top-level/all-packages.nix
··· 10866 10866 10867 10867 fsharp = callPackage ../development/compilers/fsharp { }; 10868 10868 10869 - fsharp41 = callPackage ../development/compilers/fsharp41 { mono = mono6; }; 10869 + fsharp41 = callPackage ../development/compilers/fsharp41 { }; 10870 10870 10871 10871 fstar = callPackage ../development/compilers/fstar { 10872 10872 ocamlPackages = ocaml-ng.ocamlPackages_4_07; ··· 11327 11327 11328 11328 mlton = mlton20180207; 11329 11329 11330 - mono = mono5; 11330 + mono = mono6; 11331 11331 11332 11332 mono4 = lowPrio (callPackage ../development/compilers/mono/4.nix { 11333 11333 inherit (darwin) libobjc; ··· 11346 11346 11347 11347 monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; 11348 11348 11349 - roslyn = callPackage ../development/compilers/roslyn { mono = mono6; }; 11349 + roslyn = callPackage ../development/compilers/roslyn { }; 11350 11350 11351 - msbuild = callPackage ../development/tools/build-managers/msbuild { mono = mono6; }; 11351 + msbuild = callPackage ../development/tools/build-managers/msbuild { }; 11352 11352 11353 11353 mosml = callPackage ../development/compilers/mosml { }; 11354 11354