Unverified Commit 1f244bd9 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #183385 from GGG-KILLER/update/ms-dotnettools.csharp-1.25.0

parents bf7e9939 96b6d213

pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix

+67 −88
Original line number Diff line number Diff line 
{ lib

, fetchurl

, vscode-utils

, unzip

, patchelf

, makeWrapper

, icu

, stdenv

, openssl

, mono

}:



let

  # Get as close as possible as the `package.json` required version.

  # This is what drives omnisharp.

  rtDepsSrcsFromJson = lib.importJSON ./rt-deps-bin-srcs.json;

  inherit (stdenv.hostPlatform) system;



  version = "1.25.0";





  rtDepsBinSrcs = builtins.mapAttrs (k: v:

  vsixInfo =

    let

        # E.g: "OmniSharp-x86_64-linux"

        kSplit = builtins.split "(__)" k;

        name = builtins.elemAt kSplit 0;

        system = builtins.elemAt kSplit 2;

      linuxDebuggerBins = [

        ".debugger/vsdbg-ui"

        ".debugger/vsdbg"

      ];

      darwinX86DebuggerBins = [

        ".debugger/x86_64/vsdbg-ui"

        ".debugger/x86_64/vsdbg"

      ];

      darwinAarch64DebuggerBins = [

        ".debugger/arm64/vsdbg-ui"

        ".debugger/arm64/vsdbg"

      ];

      omniSharpBins = [

        ".omnisharp/1.39.0-net6.0/OmniSharp"

      ];

      razorBins = [

        ".razor/createdump"

        ".razor/rzls"

      ];

    in

      {

        inherit name system;

        installPath = v.installPath;

        binaries = v.binaries;

        bin-src = fetchurl {

          urls = v.urls;

          inherit (v) sha256;

        x86_64-linux = {

          url = "https://github.com/OmniSharp/omnisharp-vscode/releases/download/v${version}/csharp-${version}-linux-x64.vsix";

          sha256 = "1cqqjg8q6v56b19aabs9w1kxly457mpm0akbn5mis9nd1mrdmydl";

          binaries = linuxDebuggerBins ++ omniSharpBins ++ razorBins;

        };

      }

    )

    rtDepsSrcsFromJson;



  rtDepBinSrcByName = bSrcName:

    rtDepsBinSrcs."${bSrcName}__${stdenv.targetPlatform.system}";



  omnisharp = rtDepBinSrcByName "OmniSharp";

  vsdbgs = [

    (rtDepBinSrcByName "Debugger")

  ] ++ lib.optionals (stdenv.isDarwin) [

  # Include the aarch64-darwin debugger binaries on x86_64-darwin.  Even though OmniSharp will be

  # running under Rosetta 2, debugging will fail to start if both sets of binaries are not present.

    (rtDepsBinSrcs."Debugger__aarch64-darwin")

  ];

  razor = rtDepBinSrcByName "Razor";

        aarch64-linux = {

          url = "https://github.com/OmniSharp/omnisharp-vscode/releases/download/v${version}/csharp-${version}-linux-arm64.vsix";

          sha256 = "0nsjgrb7y4w71w1gnrf50ifwbmjidi4vrw2fyfmch7lgjl8ilnhd";

          binaries = linuxDebuggerBins ++ omniSharpBins; # Linux aarch64 version has no Razor Language Server

        };

        x86_64-darwin = {

          url = "https://github.com/OmniSharp/omnisharp-vscode/releases/download/v${version}/csharp-${version}-darwin-x64.vsix";

          sha256 = "01qn398vmjfi9imzlmzm0qi7y2h214wx6a8la088lfkhyj3gfjh8";

          binaries = darwinX86DebuggerBins ++ omniSharpBins ++ razorBins;

        };

        aarch64-darwin = {

          url = "https://github.com/OmniSharp/omnisharp-vscode/releases/download/v${version}/csharp-${version}-darwin-arm64.vsix";

          sha256 = "020j451innh7jzarbv1ij57rfmqnlngdxaw6wdgp8sjkgbylr634";

          binaries = darwinAarch64DebuggerBins ++ darwinX86DebuggerBins ++ omniSharpBins ++ razorBins;

        };

      }.${system} or (throw "Unsupported system: ${system}");

in



vscode-utils.buildVscodeMarketplaceExtension {

vscode-utils.buildVscodeMarketplaceExtension rec {

  mktplcRef = {

    name = "csharp";

    publisher = "ms-dotnettools";

    version = "1.23.16";

    sha256 = "sha256-fM4vcSMi2tEjIox9Twh2sRiFhXgAeRwAM9to3vtcSqI=";

    inherit version;

  };



  vsix = fetchurl {

    name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";

    inherit (vsixInfo) url sha256;

  };



  nativeBuildInputs = [

    unzip

    patchelf

    makeWrapper

  ];



  postPatch = ''
@@ -78,23 +89,11 @@ vscode-utils.buildVscodeMarketplaceExtension { 
      -E -e 's/(this\._pipePath=[a-zA-Z0-9_]+\.join\()([a-zA-Z0-9_]+\.getExtensionPath\(\)[^,]*,)/\1require("os").tmpdir(), "'"$ext_unique_id"'"\+/g' \

      "$PWD/dist/extension.js"



    unzip_to() {

      declare src_zip="''${1?}"

      declare target_dir="''${2?}"

      mkdir -p "$target_dir"

      if unzip "$src_zip" -d "$target_dir"; then

        true

      elif [[ "1" -eq "$?" ]]; then

        1>&2 echo "WARNING: unzip('$?' -> skipped files)."

      else

        1>&2 echo "ERROR: unzip('$?')."

      fi

    }



    patchelf_add_icu_as_needed() {

      declare elf="''${1?}"

      declare icu_major_v="${

        with builtins; head (splitVersion (parseDrvName icu.name).version)}"

      lib.head (lib.splitVersion (lib.getVersion icu.name))

    }"



      for icu_lib in icui18n icuuc icudata; do

        patchelf --add-needed "lib''${icu_lib}.so.$icu_major_v" "$elf"
@@ -111,42 +110,22 @@ vscode-utils.buildVscodeMarketplaceExtension { 
        "$elf"

    }



    declare omnisharp_dir="$PWD/${omnisharp.installPath}"

    unzip_to "${omnisharp.bin-src}" "$omnisharp_dir"

    rm "$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"



  '' + builtins.concatStringsSep "\n" (map (vsdbg: ''

    declare vsdbg_dir="$PWD/${vsdbg.installPath}"

    unzip_to "${vsdbg.bin-src}" "$vsdbg_dir"

    chmod a+x "$vsdbg_dir/vsdbg-ui"

    chmod a+x "$vsdbg_dir/vsdbg"

    touch "$vsdbg_dir/install.complete"

    touch "$vsdbg_dir/install.Lock"



  '') vsdbgs) + ''

    declare razor_dir="$PWD/${razor.installPath}"

    unzip_to "${razor.bin-src}" "$razor_dir"

    chmod a+x "$razor_dir/rzls"

    touch "$razor_dir/install.Lock"



  '' + lib.optionalString stdenv.isLinux ''

    patchelf_common "$vsdbg_dir/vsdbg"

    patchelf_common "$vsdbg_dir/vsdbg-ui"

    patchelf_common "$razor_dir/rzls"



  '' + lib.optionalString stdenv.isDarwin ''

    substituteInPlace $omnisharp_dir/etc/config \

      --replace "libmono-native-compat.dylib" "libmono-native.dylib"

  '';

  '' + (lib.concatStringsSep "\n" (map

    (bin: ''

      chmod +x "${bin}"

    '')

    vsixInfo.binaries))

  + lib.optionalString stdenv.isLinux (lib.concatStringsSep "\n" (map

    (bin: ''

      patchelf_common "${bin}"

    '')

    vsixInfo.binaries));



  meta = with lib; {

    description = "C# for Visual Studio Code (powered by OmniSharp)";

    homepage = "https://github.com/OmniSharp/omnisharp-vscode";

    license = licenses.mit;

    maintainers = [ maintainers.jraygauthier ];

    platforms = [ "x86_64-linux" "x86_64-darwin" ];

    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];

  };

}

pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json

deleted100644 → 0
+0 −94
Original line number Diff line number Diff line 
{

  "OmniSharp__x86_64-darwin": {

    "installPath": ".omnisharp/1.37.16",

    "binaries": [

      "./mono.osx",

      "./run"

    ],

    "urls": [

      "https://download.visualstudio.microsoft.com/download/pr/03c32aa6-7c7a-4936-82a0-fd8f816d112f/0ea1ea1eae48552a1992ed6df782353a/omnisharp-osx-1.37.16.zip",

      "https://roslynomnisharp.blob.core.windows.net/releases/1.37.16/omnisharp-osx-1.37.16.zip"

    ],

    "sha256": "0hhgfx7zs1rljhn3n9c7lci7j15yp2448z3f1d3c47a95l1hmlip"

  },

  "OmniSharp__x86_64-linux": {

    "installPath": ".omnisharp/1.37.16",

    "binaries": [

      "./mono.linux-x86_64",

      "./run"

    ],

    "urls": [

      "https://download.visualstudio.microsoft.com/download/pr/03c32aa6-7c7a-4936-82a0-fd8f816d112f/9ae3ed99fc0c41c7139751dde6f2bc78/omnisharp-linux-x64-1.37.16.zip",

      "https://roslynomnisharp.blob.core.windows.net/releases/1.37.16/omnisharp-linux-x64-1.37.16.zip"

    ],

    "sha256": "0a2basc6dw42fnjv9zz93ff0bsw2i3446gvcjx5mn5d8dasi483i"

  },

  "Debugger__x86_64-darwin": {

    "installPath": ".debugger/x86_64",

    "binaries": [

      "./vsdbg-ui",

      "./vsdbg"

    ],

    "urls": [

      "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/c1122f7141735472d9583c1124024c55/coreclr-debug-osx-x64.zip",

      "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-osx-x64.zip"

    ],

    "sha256": "08z3k0h25gdsbmlxwayd94672hp2z7zmwdmd0nyr9j82izj3ci2m"

  },

  "Debugger__aarch64-darwin": {

    "installPath": ".debugger/arm64",

    "binaries": [

      "./vsdbg-ui",

      "./vsdbg"

    ],

    "urls": [

      "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/96a88189c7904a517f3bb59b2dba8bd1/coreclr-debug-osx-arm64.zip",

      "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-osx-arm64.zip"

    ],

    "sha256": "113kz02ihvb4y5fj01wamqz2jsql2q7n7f55s9kzs9dsrmq5ffa0"

  },

  "Debugger__aarch64-linux": {

    "installPath": ".debugger",

    "binaries": [

      "./vsdbg-ui",

      "./vsdbg"

    ],

    "urls": [

      "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/7a723bfbda6d196c52084226b6835b36/coreclr-debug-linux-arm64.zip",

      "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-linux-arm64.zip"

    ],

    "sha256": "1d4a5q3f7qfk3jq2i4f6g50i9i4z8z7g8ss083y9n5c1yj3629kw"

  },

  "Debugger__x86_64-linux": {

    "installPath": ".debugger",

    "binaries": [

      "./vsdbg-ui",

      "./vsdbg"

    ],

    "urls": [

      "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/dd019b4c839f458596e26bfcfe6a3e7f/coreclr-debug-linux-x64.zip",

      "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-linux-x64.zip"

    ],

    "sha256": "0c5y0035sa07bl3m3iiqccqd92xjwpcfjrqhmi5xligk40q2i2gk"

  },

  "Razor__x86_64-linux": {

    "installPath": ".razor",

    "binaries": [

      "./rzls"

    ],

    "urls": [

      "https://download.visualstudio.microsoft.com/download/pr/b8678010-2cd7-4201-a5e7-ba57920607d5/b846e9c7d7afdba54a72fae1dcb6c42c/razorlanguageserver-linux-x64-6.0.0-preview.5.21358.6.zip"

    ],

    "sha256": "0gb36nlb7fgcv03a0awna1qyrsky6ys5gkpsmvxc5j35f1yq337b"

  },

  "Razor__x86_64-darwin": {

    "installPath": ".razor",

    "binaries": [

      "./rzls"

    ],

    "urls": [

      "https://download.visualstudio.microsoft.com/download/pr/b8678010-2cd7-4201-a5e7-ba57920607d5/ad846449769eb2ae810d0236823a6aaa/razorlanguageserver-osx-x64-6.0.0-preview.5.21358.6.zip"

    ],

    "sha256": "0iqinpwwlqwajdq4i1qbb9hfpfmgy17av95bpw02ad2f9fnyh572"

  }

}

pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/update-bin-srcs

deleted100755 → 0
+0 −21
Original line number Diff line number Diff line 
#!/usr/bin/env nix-shell

#!nix-shell -I nixpkgs=../../../.. -i bash -p curl jq unzip

set -euf -o pipefail



declare scriptDir

scriptDir=$(cd "$(dirname "$0")"; pwd)

1>&2 echo "scriptDir='$scriptDir'"



. "$scriptDir/../_maintainers/update-bin-srcs-lib.sh"



declare extPublisher="ms-dotnettools"

declare extName="csharp"

declare defaultExtVersion="1.23.16"

declare extVersion="${1:-$defaultExtVersion}"



formatExtRuntimeDeps \

  "$extPublisher" "$extName" "$extVersion" \

  | computeAndAttachExtRtDepsChecksums \

  | jqStreamToJson \

  | tee "$scriptDir/rt-deps-bin-srcs.json" \

  | jq '.'