git.iko.soy/typeable/nixpkgs
on master help sign in
python-language-server: cleanup deps, add missing phase hooks

also improve script a little bit

commitd68e0569a0b5be705f11922f6144b334e3905c13 authorFelix Rath <felixm.rath@gmail.com> dateMon 3 May 2021, 19:17 (6 years ago) parentd3b00c9
4 files changed+12−100
pkgs/development/dotnet-modules/python-language-server/create_deps.sh+4−2 pkgs/development/dotnet-modules/python-language-server/default.nix+8 pkgs/development/dotnet-modules/python-language-server/deps.nix−84 pkgs/development/dotnet-modules/python-language-server/manual_deps.txt−14
pkgs/development/dotnet-modules/python-language-server/create_deps.sh+4−2
@@ -4,6 +4,8 @@
44# Run this script to generate deps.nix
55# ./create_deps.sh /path/to/microsoft/python/language/server/source/checkout
66
7+set -euo pipefail
8+
79SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
810
911if [ -d "$1" ]; then
@@ -14,13 +16,13 @@ else
1416fi
1517
1618# Generate lockfiles in source checkout
17−cd $CHECKOUT_PATH/src
19+cd "$CHECKOUT_PATH/src"
1820dotnet nuget locals all --clear
1921dotnet restore -v normal --no-cache PLS.sln --use-lock-file -r linux-x64
2022
2123# Use the lockfiles to make a file with two columns: name and version number
2224# for all possible package dependencies
23−cd $SCRIPTDIR
25+cd "$SCRIPTDIR"
2426echo "" > all_versions.txt
2527for lockfile in $(find "$CHECKOUT_PATH" -name packages.lock.json); do
2628 echo "Processing lockfile $lockfile"
pkgs/development/dotnet-modules/python-language-server/default.nix+8
@@ -62,6 +62,8 @@ stdenv.mkDerivation {
6262 ];
6363
6464 buildPhase = ''
65+ runHook preBuild
66+
6567 mkdir home
6668 export HOME=$(mktemp -d)
6769 export DOTNET_CLI_TELEMETRY_OPTOUT=1
@@ -75,14 +77,20 @@ stdenv.mkDerivation {
7577 pushd src/LanguageServer/Impl
7678 dotnet publish --no-restore -c Release -r linux-x64
7779 popd
80+
81+ runHook postBuild
7882 '';
7983
8084 installPhase = ''
85+ runHook preInstall
86+
8187 mkdir -p $out
8288 cp -r output/bin/Release/linux-x64/publish $out/lib
8389
8490 mkdir $out/bin
8591 makeWrapper $out/lib/Microsoft.Python.LanguageServer $out/bin/python-language-server
92+
93+ runHook postInstall
8694 '';
8795
8896 postFixup = ''
pkgs/development/dotnet-modules/python-language-server/deps.nix−84
@@ -46,36 +46,6 @@ in [
4646 sha256 = "190d755l60j3l5m1661wj19gj9w6ngza56q3vkijkkmbbabdmqln";
4747 })
4848
49− (fetchNuGet {
50− name = "Microsoft.AspNetCore.App.Ref";
51− version = "3.0.1";
52− sha256 = "0k2ry757qhm99xwm0wh4zalxn9nmxhfswd184z1fjr42szr511fb";
53− })
54−
55− (fetchNuGet {
56− name = "Microsoft.AspNetCore.App.Runtime.linux-x64";
57− version = "3.0.2";
58− sha256 = "0d4r744n3bk4v7ddfjpy5ils150h0693bil3c7v27n84037hqndj";
59− })
60−
61− (fetchNuGet {
62− name = "Microsoft.AspNetCore.App.Runtime.linux-x64";
63− version = "3.0.3";
64− sha256 = "1jcqy8i9fzb1pmkazi80yqr09zi5nk30n57i46ggr5ky45jngfq9";
65− })
66−
67− (fetchNuGet {
68− name = "Microsoft.AspNetCore.App.Runtime.linux-x64";
69− version = "3.1.2";
70− sha256 = "19wfh9yg4n2khbl7pvf6ngx95m5p8lw4l9y935pv7nh4xgwk02p9";
71− })
72−
73− (fetchNuGet {
74− name = "Microsoft.AspNetCore.App.Runtime.linux-x64";
75− version = "3.1.3";
76− sha256 = "0kvnzb9xjii48kg30ac63qdf0fn1y8j3nblbrfaqv2aiy6kp0iwn";
77− })
78−
7949 (fetchNuGet {
8050 name = "Microsoft.AspNetCore.App.Runtime.linux-x64";
8151 version = "3.1.8";
@@ -106,60 +76,6 @@ in [
10676 sha256 = "1v2lr0vbssqayzgxvdwb54jmvz7mvlih4l9h7i71gm3c62nlbq8y";
10777 })
10878
109− (fetchNuGet {
110− name = "Microsoft.NetCore.App.Host.linux-x64";
111− version = "3.0.2";
112− sha256 = "0y14y2x3wbi44i23ndmf4323cii8wrqw9s289gcab3s393l71sf5";
113− })
114−
115− (fetchNuGet {
116− name = "Microsoft.NetCore.App.Host.linux-x64";
117− version = "3.0.3";
118− sha256 = "19igfvwsjzwkh90gqzabl6pdkyygslj2iwpsxg680phffzr411w4";
119− })
120−
121− (fetchNuGet {
122− name = "Microsoft.NetCore.App.Host.linux-x64";
123− version = "3.1.3";
124− sha256 = "013ibnhsimgqj5l2dqma035xvsvrb47bn65z6xbxgg88383hpgvw";
125− })
126−
127− (fetchNuGet {
128− name = "Microsoft.NetCore.App.Ref";
129− version = "3.0.0";
130− sha256 = "1qi382157ln7yngazvr3nskpjkab4x8sqx11l13xyg56vyyjyyiw";
131− })
132−
133− (fetchNuGet {
134− name = "Microsoft.NetCore.App.Ref";
135− version = "3.1.0";
136− sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y";
137− })
138−
139− (fetchNuGet {
140− name = "Microsoft.NetCore.App.Runtime.linux-x64";
141− version = "3.0.2";
142− sha256 = "1h6d0nl495k0bh4my43l578l7m8qwah7ll42aax7jrib2py354f1";
143− })
144−
145− (fetchNuGet {
146− name = "Microsoft.NetCore.App.Runtime.linux-x64";
147− version = "3.0.3";
148− sha256 = "1ykgfnphbkyck0gqbbh5n96w59z2bq47g896ygal1j4nblj3s44v";
149− })
150−
151− (fetchNuGet {
152− name = "Microsoft.NetCore.App.Runtime.linux-x64";
153− version = "3.1.2";
154− sha256 = "0a332ia5pabnz7mdfc99a5hlc7drnwzlc7cj9b5c3an6dq636p66";
155− })
156−
157− (fetchNuGet {
158− name = "Microsoft.NetCore.App.Runtime.linux-x64";
159− version = "3.1.3";
160− sha256 = "1ynhzsr8a0hfby2wjhzkdiimj18izgfzp7m2yp3pby2iwb4v3xy9";
161− })
162−
16379 (fetchNuGet {
16480 name = "Microsoft.NetCore.App.Runtime.linux-x64";
16581 version = "3.1.8";
pkgs/development/dotnet-modules/python-language-server/manual_deps.txt−14
@@ -1,16 +1,2 @@
11Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.8
2−Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.3
3−Microsoft.AspNetCore.App.Ref 3.0.1
4−Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.2
5−Microsoft.AspNetCore.App.Runtime.linux-x64 3.0.3
6−Microsoft.AspNetCore.App.Runtime.linux-x64 3.0.2
7−Microsoft.NetCore.App.Ref 3.1.0
8−Microsoft.NetCore.App.Ref 3.0.0
92Microsoft.NetCore.App.Runtime.linux-x64 3.1.8
10−Microsoft.NetCore.App.Runtime.linux-x64 3.1.3
11−Microsoft.NetCore.App.Runtime.linux-x64 3.1.2
12−Microsoft.NetCore.App.Runtime.linux-x64 3.0.2
13−Microsoft.NetCore.App.Runtime.linux-x64 3.0.3
14−Microsoft.NetCore.App.Host.linux-x64 3.1.3
15−Microsoft.NetCore.App.Host.linux-x64 3.0.2
16−Microsoft.NetCore.App.Host.linux-x64 3.0.3