Skip to content

Commit 7aeae06

Browse files
committed
hnls: bump to 0.5.3.1 to pick up aarch64-linux versions
1 parent 844c97e commit 7aeae06

3 files changed

Lines changed: 45 additions & 23 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
"0.5.3.0"
1+
"0.5.3.1"

modules/kernels/haskell/language-server-hls/hnls.nix

Lines changed: 43 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ let
1919
inherit src;
2020

2121
installPhase = ''
22-
binary=$(find . -executable -type f | head -n 1)
23-
mkdir -p $out/bin
24-
cp "$binary" $out/bin/haskell-notebook-language-server
22+
cp -r ./. $out
2523
'';
2624
};
2725
mkUrl = ghc: system: "https://github.com/codedownio/haskell-notebook-language-server/releases/download/v${version}/haskell-notebook-language-server-${version}-${ghc}-${system}.tar.gz";
@@ -30,75 +28,99 @@ let
3028
# HASHES_START
3129
"ghc92-x86_64-linux" = prebuilt "ghc92-x86_64-linux" (fetchzip {
3230
url = mkUrl "ghc92" "x86_64-linux";
33-
sha256 = "sha256-HhzLHmt5mhxOugV0y+8otHyMqgOB5WKeWdkkaKaUQXY=";
31+
sha256 = "sha256-XXh+ayqM+6ymliTSOfzE6oXENBROl3sbMbIA4qmBoWs=";
3432
});
3533
"ghc94-x86_64-linux" = prebuilt "ghc94-x86_64-linux" (fetchzip {
3634
url = mkUrl "ghc94" "x86_64-linux";
37-
sha256 = "sha256-ZRV8h3+C8jE20IUzSlW5WHoT+SJ/8yyQKWdihFCekl0=";
35+
sha256 = "sha256-00v4AJERRdsBcy/g6N4+lP7zaZhmQIca+yAbvR9sU4Y=";
3836
});
3937
"ghc96-x86_64-linux" = prebuilt "ghc96-x86_64-linux" (fetchzip {
4038
url = mkUrl "ghc96" "x86_64-linux";
41-
sha256 = "sha256-AUePZEEI+O7RPN2TTx0VZ0ao+IDfwY5ZAGh4juMjKzI=";
39+
sha256 = "sha256-vNQ+SUAbV1tMR/LY54b0xgFONl/tJxkKL5vYaxrfQGY=";
4240
});
4341
"ghc98-x86_64-linux" = prebuilt "ghc98-x86_64-linux" (fetchzip {
4442
url = mkUrl "ghc98" "x86_64-linux";
45-
sha256 = "sha256-TE8BzBgKwLfX2tsjDXPuYj0quk/qRQTjb8gL/AGXAHI=";
43+
sha256 = "sha256-j63G/Tw91hsomCsH87JPrLdub146UeglKuM311UPXnw=";
4644
});
4745
"ghc910-x86_64-linux" = prebuilt "ghc910-x86_64-linux" (fetchzip {
4846
url = mkUrl "ghc910" "x86_64-linux";
49-
sha256 = "sha256-FqQsQKiC7B/kxEZmplW0NrEcuE1frERo36WPlb9MgWA=";
47+
sha256 = "sha256-43IRoIwHmlCMy53J/XdBeRadjecXG7jisWzXkL3bFA8=";
5048
});
5149
"ghc912-x86_64-linux" = prebuilt "ghc912-x86_64-linux" (fetchzip {
5250
url = mkUrl "ghc912" "x86_64-linux";
53-
sha256 = "sha256-RFWCniZ1zFrsesuEsTmvSVaIRak6atoLTIlxi6/fb5s=";
51+
sha256 = "sha256-R6vr9m3G8u+I8Gmhd13yZL2ncOjg2qtEn9LkvKafjMo=";
52+
});
53+
"ghc92-aarch64-linux" = prebuilt "ghc92-aarch64-linux" (fetchzip {
54+
url = mkUrl "ghc92" "aarch64-linux";
55+
sha256 = "sha256-qK4BErU8u7MflMIHG79RpfeRmQH2wa8e12MwBUhguis=";
56+
});
57+
"ghc94-aarch64-linux" = prebuilt "ghc94-aarch64-linux" (fetchzip {
58+
url = mkUrl "ghc94" "aarch64-linux";
59+
sha256 = "sha256-Z0Y1j15IoZ2rNrv5ldb4fwnV9kt8ECjzcLgLYLeoq74=";
60+
});
61+
"ghc96-aarch64-linux" = prebuilt "ghc96-aarch64-linux" (fetchzip {
62+
url = mkUrl "ghc96" "aarch64-linux";
63+
sha256 = "sha256-JumFeoV83YU2oNy06srso1w3bY8q32v7sY0en89jVmc=";
64+
});
65+
"ghc98-aarch64-linux" = prebuilt "ghc98-aarch64-linux" (fetchzip {
66+
url = mkUrl "ghc98" "aarch64-linux";
67+
sha256 = "sha256-f0ylzP0j2PbuXogMPwb/6BtbsyW3RAZLbBGqlpZ3tEk=";
68+
});
69+
"ghc910-aarch64-linux" = prebuilt "ghc910-aarch64-linux" (fetchzip {
70+
url = mkUrl "ghc910" "aarch64-linux";
71+
sha256 = "sha256-vRA/JWZ+0lmtuCci48PVmNrj9HR5AiMcGei9D/lMdZA=";
72+
});
73+
"ghc912-aarch64-linux" = prebuilt "ghc912-aarch64-linux" (fetchzip {
74+
url = mkUrl "ghc912" "aarch64-linux";
75+
sha256 = "sha256-ojSBD+qXJmfuPKiP8WW96HxEVY89Nq8AzaO3joCTfLw=";
5476
});
5577
"ghc92-x86_64-darwin" = prebuilt "ghc92-x86_64-darwin" (fetchzip {
5678
url = mkUrl "ghc92" "x86_64-darwin";
57-
sha256 = "sha256-VPHhZXSwfZiOhBX+iUABXp1nupInYERwB5XwKDw66so=";
79+
sha256 = "sha256-uIhrJQ0mVNYDay6L7mRIh/qQsaVn9SK1yjNU5R17dOg=";
5880
});
5981
"ghc94-x86_64-darwin" = prebuilt "ghc94-x86_64-darwin" (fetchzip {
6082
url = mkUrl "ghc94" "x86_64-darwin";
61-
sha256 = "sha256-newFtY/um66lYYdQF353TQnscraYIWekGRbA2QkVNiA=";
83+
sha256 = "sha256-+eDz0Se6+zPGgeFVkJrwk3jUkvVDCrN9I1r1sOG3C8A=";
6284
});
6385
"ghc96-x86_64-darwin" = prebuilt "ghc96-x86_64-darwin" (fetchzip {
6486
url = mkUrl "ghc96" "x86_64-darwin";
65-
sha256 = "sha256-vNWVLoWtgrJd8GCVcw9U8PwcA9xKOWD3xmP9n8dYgn8=";
87+
sha256 = "sha256-9DDMSvrsT98P5EN7zKI5UxQeq6Bc23RUXL9MU4EuyRo=";
6688
});
6789
"ghc98-x86_64-darwin" = prebuilt "ghc98-x86_64-darwin" (fetchzip {
6890
url = mkUrl "ghc98" "x86_64-darwin";
69-
sha256 = "sha256-8HvGp1fq6YVUNlkCxWRcI+XygmkEjWGkWju9javwZnA=";
91+
sha256 = "sha256-XnKq5MyJJxeZghD43SrKxu9i5AwNfh86VBHYhUXk/FU=";
7092
});
7193
"ghc910-x86_64-darwin" = prebuilt "ghc910-x86_64-darwin" (fetchzip {
7294
url = mkUrl "ghc910" "x86_64-darwin";
73-
sha256 = "sha256-qVjydrJtukGF+PpkwoiS1aa1TTRpi5cO33yQYnjMEOs=";
95+
sha256 = "sha256-5cbrN4yPrKu0x5jKamog44DMu12yxlfXo0zLzUnHP1Q=";
7496
});
7597
"ghc912-x86_64-darwin" = prebuilt "ghc912-x86_64-darwin" (fetchzip {
7698
url = mkUrl "ghc912" "x86_64-darwin";
77-
sha256 = "sha256-WLy4puBOPssSj5PJhxHWenvaJJPF+Daqrj6g4XSA154=";
99+
sha256 = "sha256-10fC4BYoeEj3WbPXwfU/g0WNEJqSOV3FMsp4uEEi+9M=";
78100
});
79101
"ghc92-aarch64-darwin" = prebuilt "ghc92-aarch64-darwin" (fetchzip {
80102
url = mkUrl "ghc92" "aarch64-darwin";
81-
sha256 = "sha256-JmSfec2j+bvu2+8mAd+doALsNPq8Aei6l1U5/fNV5XU=";
103+
sha256 = "sha256-NCHLb1aEGl2XwMYUVCctnrBkWH/8Hz8/dK4jk3lWnqA=";
82104
});
83105
"ghc94-aarch64-darwin" = prebuilt "ghc94-aarch64-darwin" (fetchzip {
84106
url = mkUrl "ghc94" "aarch64-darwin";
85-
sha256 = "sha256-R8hOIYUIaDiqQqFleUyAR+Dlw4PuRMmfG7Sshxu8tMs=";
107+
sha256 = "sha256-0VpmZeF4iwfG3I+FyBzo/gj7b25g0+NiRB5I6ZfwKwI=";
86108
});
87109
"ghc96-aarch64-darwin" = prebuilt "ghc96-aarch64-darwin" (fetchzip {
88110
url = mkUrl "ghc96" "aarch64-darwin";
89-
sha256 = "sha256-D+AqJYZ/IzxPGZjYXHl4Gq8mZIoOtQn3gJ6KM/rHEtw=";
111+
sha256 = "sha256-fwYGBzxfLUMA5C2KEno1AqT5FD+WN/WzvpT+lH4fpkY=";
90112
});
91113
"ghc98-aarch64-darwin" = prebuilt "ghc98-aarch64-darwin" (fetchzip {
92114
url = mkUrl "ghc98" "aarch64-darwin";
93-
sha256 = "sha256-zrLY/hqrIXrZeazylFTFO6dj5Lt+T9o++g5R2uuSk4s=";
115+
sha256 = "sha256-F3khVAb9IdkpYISnw3/NI4jUB2E+7Jl/AOR+liN87hs=";
94116
});
95117
"ghc910-aarch64-darwin" = prebuilt "ghc910-aarch64-darwin" (fetchzip {
96118
url = mkUrl "ghc910" "aarch64-darwin";
97-
sha256 = "sha256-Q7+uWdmpg5X0X7dDfMo8Ga32dukDl5kb+vjZ8QT6//E=";
119+
sha256 = "sha256-ERKdhlqBqhBessGq8k8ZdtgBPEXWBE5odPj4wzqehrI=";
98120
});
99121
"ghc912-aarch64-darwin" = prebuilt "ghc912-aarch64-darwin" (fetchzip {
100122
url = mkUrl "ghc912" "aarch64-darwin";
101-
sha256 = "sha256-5YsSOBkbqCuzbfWyUc5OnwmvxzAwOwCr960s0W7eVTc=";
123+
sha256 = "sha256-v4jgQ83hj6AXUC4eTwAzIHZDqie07QLFlcHDCc7Wt7c=";
102124
});
103125
# HASHES_END
104126
};

modules/kernels/haskell/language-server-hls/hnls_update.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ VERSION=$(nix eval --raw --expr 'import ./hnls-version.nix' --impure)
66
echo "Got version: $VERSION"
77

88
NEW_HASHES=$(
9-
for system in x86_64-linux x86_64-darwin aarch64-darwin; do
9+
for system in x86_64-linux aarch64-linux x86_64-darwin aarch64-darwin; do
1010
for ghc in ghc92 ghc94 ghc96 ghc98 ghc910 ghc912; do
1111
URL="https://github.com/codedownio/haskell-notebook-language-server/releases/download/v${VERSION}/haskell-notebook-language-server-${VERSION}-${ghc}-${system}.tar.gz"
1212
HASH=$(nix-prefetch fetchzip --url "$URL" 2>/dev/null)

0 commit comments

Comments
 (0)