omnisharp-roslyn: 1.37.15 -> 1.38.0
This commit is contained in:
parent
948603bb97
commit
7ab67fdaeb
|
@ -1,5 +1,5 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=../../../../.. -i bash -p msbuild dotnet-sdk_3 jq xmlstarlet curl
|
||||
#!nix-shell -I nixpkgs=../../../../.. -i bash -p dotnet-sdk_6 jq xmlstarlet curl
|
||||
set -euo pipefail
|
||||
|
||||
cat << EOL
|
||||
|
@ -18,7 +18,7 @@ mapfile -t repos < <(
|
|||
done
|
||||
)
|
||||
|
||||
msbuild -t:restore -p:Configuration=Release -p:RestorePackagesPath="$tmpdir" \
|
||||
dotnet msbuild -t:restore -p:Configuration=Release -p:RestorePackagesPath="$tmpdir" \
|
||||
-p:RestoreNoCache=true -p:RestoreForce=true \
|
||||
src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj >&2
|
||||
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, mono6
|
||||
, msbuild
|
||||
, dotnetCorePackages
|
||||
, makeWrapper
|
||||
, unzip
|
||||
|
@ -11,7 +9,7 @@
|
|||
|
||||
let
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_5_0;
|
||||
dotnet-sdk = dotnetCorePackages.sdk_6_0;
|
||||
|
||||
deps = map (package: stdenv.mkDerivation (with package; {
|
||||
inherit pname version src;
|
||||
|
@ -67,21 +65,21 @@ let
|
|||
in stdenv.mkDerivation rec {
|
||||
|
||||
pname = "omnisharp-roslyn";
|
||||
version = "1.37.15";
|
||||
version = "1.38.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OmniSharp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "070wqs667si3f78fy6w4rrfm8qncnabg0yckjhll0yv1pzbj9q42";
|
||||
sha256 = "00V+7Z1IoCSuSM0RClM81IslzCzC/FNYxHIKtnI9QDg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper msbuild ];
|
||||
nativeBuildInputs = [ makeWrapper dotnet-sdk ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
HOME=$(pwd)/fake-home msbuild -r \
|
||||
HOME=$(pwd)/fake-home dotnet msbuild -r \
|
||||
-p:Configuration=Release \
|
||||
-p:RestoreConfigFile=${nuget-config} \
|
||||
src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj
|
||||
|
@ -91,18 +89,10 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp -r bin/Release/OmniSharp.Stdio.Driver/net472 $out/src
|
||||
cp bin/Release/OmniSharp.Host/net472/SQLitePCLRaw* $out/src
|
||||
mkdir $out/src/.msbuild
|
||||
ln -s ${msbuild}/lib/mono/xbuild/* $out/src/.msbuild/
|
||||
rm $out/src/.msbuild/Current
|
||||
mkdir $out/src/.msbuild/Current
|
||||
ln -s ${msbuild}/lib/mono/xbuild/Current/* $out/src/.msbuild/Current/
|
||||
ln -s ${msbuild}/lib/mono/msbuild/Current/bin $out/src/.msbuild/Current/Bin
|
||||
|
||||
makeWrapper ${mono6}/bin/mono $out/bin/omnisharp \
|
||||
--suffix PATH : ${dotnet-sdk}/bin \
|
||||
--add-flags "$out/src/OmniSharp.exe"
|
||||
cp -r bin/Release/OmniSharp.Stdio.Driver/net6.0 $out/src
|
||||
makeWrapper $out/src/OmniSharp $out/bin/omnisharp \
|
||||
--prefix DOTNET_ROOT : ${dotnet-sdk} \
|
||||
--suffix PATH : ${dotnet-sdk}/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
1002
pkgs/development/tools/omnisharp-roslyn/deps.nix
generated
1002
pkgs/development/tools/omnisharp-roslyn/deps.nix
generated
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue