From d099e7558e8d93f4ff5bf3ee01820779a9e6bc79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 12 May 2021 21:32:40 +0200 Subject: [PATCH] mono: 5 -> 6 --- .../science/robotics/mission-planner/default.nix | 6 +++--- pkgs/development/tools/omnisharp-roslyn/default.nix | 4 ++-- .../vscode-extensions/ms-dotnettools-csharp/default.nix | 6 ++---- pkgs/tools/graphics/snapdragon-profiler/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 8 ++++---- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/science/robotics/mission-planner/default.nix b/pkgs/applications/science/robotics/mission-planner/default.nix index a299a66704d..3dbb1a4bf5a 100644 --- a/pkgs/applications/science/robotics/mission-planner/default.nix +++ b/pkgs/applications/science/robotics/mission-planner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip, mono6 }: +{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip, mono }: let pname = "mission-planner"; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { sha256 = "1cgpmsmmnbzw1lwsdafp8yklk1rwc61yf12vc1ahcc6bl7q2385x"; }; - nativeBuildInputs = [ makeWrapper mono6 unzip ]; + nativeBuildInputs = [ makeWrapper mono unzip ]; sourceRoot = "."; AOT_FILES = [ "MissionPlanner.exe" "MissionPlanner.*.dll" ]; @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { install -m 444 -D mpdesktop150.png $out/share/icons/mission-planner.png cp -r ${desktopItem}/share/applications $out/share/ mv * $out/opt/mission-planner - makeWrapper ${mono6}/bin/mono $out/bin/mission-planner \ + makeWrapper ${mono}/bin/mono $out/bin/mission-planner \ --add-flags $out/opt/mission-planner/MissionPlanner.exe runHook postInstall ''; diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index 51f731c9431..e0710079b62 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, mono6 +, mono , msbuild , dotnet-sdk , makeWrapper @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { chmod -R u+w $out/src mv $out/src/.msbuild/Current/{bin,Bin} - makeWrapper ${mono6}/bin/mono $out/bin/omnisharp \ + makeWrapper ${mono}/bin/mono $out/bin/omnisharp \ --add-flags "$out/src/OmniSharp.exe" ''; diff --git a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix index a7b0e17ecbf..77372411b88 100644 --- a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix +++ b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix @@ -7,14 +7,12 @@ , icu , stdenv , openssl -, mono6 +, mono }: let # Get as close as possible as the `package.json` required version. # This is what drives omnisharp. - mono = mono6; - rtDepsSrcsFromJson = builtins.fromJSON (builtins.readFile ./rt-deps-bin-srcs.json); rtDepsBinSrcs = builtins.mapAttrs (k: v: @@ -114,7 +112,7 @@ vscode-utils.buildVscodeMarketplaceExtension { declare omnisharp_dir="$PWD/${omnisharp.installPath}" unzip_to "${omnisharp.bin-src}" "$omnisharp_dir" rm "$omnisharp_dir/bin/mono" - ln -s -T "${mono6}/bin/mono" "$omnisharp_dir/bin/mono" + ln -s -T "${mono}/bin/mono" "$omnisharp_dir/bin/mono" chmod a+x "$omnisharp_dir/run" touch "$omnisharp_dir/install.Lock" diff --git a/pkgs/tools/graphics/snapdragon-profiler/default.nix b/pkgs/tools/graphics/snapdragon-profiler/default.nix index 96fada91093..02a96184812 100644 --- a/pkgs/tools/graphics/snapdragon-profiler/default.nix +++ b/pkgs/tools/graphics/snapdragon-profiler/default.nix @@ -4,7 +4,7 @@ , makeDesktopItem , copyDesktopItems , icoutils -, mono6 +, mono , jre , androidenv , gtk-sharp-2_0 @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - mono6 + mono gtk-sharp-2_0 gtk2 libcxx @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { mv *.so $out/lib cp -r * $out/lib/snapdragon-profiler - makeWrapper "${mono6}/bin/mono" $out/bin/snapdragon-profiler \ + makeWrapper "${mono}/bin/mono" $out/bin/snapdragon-profiler \ --add-flags "$out/lib/snapdragon-profiler/SnapdragonProfiler.exe" \ --suffix PATH : ${lib.makeBinPath [ jre androidenv.androidPkgs_9_0.platform-tools coreutils ]} \ --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67d5cd2f475..3307d677780 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10820,7 +10820,7 @@ in fsharp = callPackage ../development/compilers/fsharp { }; - fsharp41 = callPackage ../development/compilers/fsharp41 { mono = mono6; }; + fsharp41 = callPackage ../development/compilers/fsharp41 { }; fstar = callPackage ../development/compilers/fstar { ocamlPackages = ocaml-ng.ocamlPackages_4_07; @@ -11273,7 +11273,7 @@ in mlton = mlton20180207; - mono = mono5; + mono = mono6; mono4 = lowPrio (callPackage ../development/compilers/mono/4.nix { inherit (darwin) libobjc; @@ -11292,9 +11292,9 @@ in monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; - roslyn = callPackage ../development/compilers/roslyn { mono = mono6; }; + roslyn = callPackage ../development/compilers/roslyn { }; - msbuild = callPackage ../development/tools/build-managers/msbuild { mono = mono6; }; + msbuild = callPackage ../development/tools/build-managers/msbuild { }; mosml = callPackage ../development/compilers/mosml { };