git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #107052 from drewrisinger/dr-pr-vscode-arm

vscode, vscodium: 1.51.1 -> 1.52.1 & add aarch64-linux, armv7l-linux builds

commit14c2379fa7952c6cb18b57e697aa2bc023f4208d authorGraham Christensen <graham@grahamc.com> dateMon 28 Dec 2020, 16:55 (6 years ago) parentefc50369485b86
4 files changed+37−11
pkgs/applications/editors/vscode/update-vscode.sh+8 pkgs/applications/editors/vscode/update-vscodium.sh+14−6 pkgs/applications/editors/vscode/vscode.nix+5−1 pkgs/applications/editors/vscode/vscodium.nix+10−4
pkgs/applications/editors/vscode/update-vscode.sh+8
@@ -27,3 +27,11 @@ sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODE_LINUX_SHA256}\"/"
2727VSCODE_DARWIN_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/darwin/stable"
2828VSCODE_DARWIN_SHA256=$(nix-prefetch-url ${VSCODE_DARWIN_URL})
2929sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODE_DARWIN_SHA256}\"/" "$ROOT/vscode.nix"
30+
31+VSCODE_LINUX_AARCH64_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/linux-arm64/stable"
32+VSCODE_LINUX_AARCH64_SHA256=$(nix-prefetch-url ${VSCODE_LINUX_AARCH64_URL})
33+sed -i "s/aarch64-linux = \".\{52\}\"/aarch64-linux = \"${VSCODE_LINUX_AARCH64_SHA256}\"/" "$ROOT/vscode.nix"
34+
35+VSCODE_LINUX_ARMV7L_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/linux-armhf/stable"
36+VSCODE_LINUX_ARMV7L_SHA256=$(nix-prefetch-url ${VSCODE_LINUX_ARMV7L_URL})
37+sed -i "s/armv7l-linux = \".\{52\}\"/armv7l-linux = \"${VSCODE_LINUX_ARMV7L_SHA256}\"/" "$ROOT/vscode.nix"
pkgs/applications/editors/vscode/update-vscodium.sh+14−6
@@ -19,10 +19,18 @@ fi
1919VSCODIUM_VER=$(curl -Ls -w %{url_effective} -o /dev/null https://github.com/VSCodium/vscodium/releases/latest | awk -F'/' '{print $NF}')
2020sed -i "s/version = \".*\"/version = \"${VSCODIUM_VER}\"/" "$ROOT/vscodium.nix"
2121
22−VSCODIUM_LINUX_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-x64-${VSCODIUM_VER}.tar.gz"
23−VSCODIUM_LINUX_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_URL})
24−sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODIUM_LINUX_SHA256}\"/" "$ROOT/vscodium.nix"
22+VSCODIUM_LINUX_X64_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-x64-${VSCODIUM_VER}.tar.gz"
23+VSCODIUM_LINUX_X64_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_X64_URL})
24+sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODIUM_LINUX_X64_SHA256}\"/" "$ROOT/vscodium.nix"
2525
26−VSCODIUM_DARWIN_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-darwin-x64-${VSCODIUM_VER}.zip"
27−VSCODIUM_DARWIN_SHA256=$(nix-prefetch-url ${VSCODIUM_DARWIN_URL})
28−sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODIUM_DARWIN_SHA256}\"/" "$ROOT/vscodium.nix"
26+VSCODIUM_DARWIN_X64_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-darwin-x64-${VSCODIUM_VER}.zip"
27+VSCODIUM_DARWIN_X64_SHA256=$(nix-prefetch-url ${VSCODIUM_DARWIN_X64_URL})
28+sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODIUM_DARWIN_X64_SHA256}\"/" "$ROOT/vscodium.nix"
29+
30+VSCODIUM_LINUX_AARCH64_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-arm64-${VSCODIUM_VER}.tar.gz"
31+VSCODIUM_LINUX_AARCH64_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_AARCH64_URL})
32+sed -i "s/aarch64-linux = \".\{52\}\"/aarch64-linux = \"${VSCODIUM_LINUX_AARCH64_SHA256}\"/" "$ROOT/vscodium.nix"
33+
34+VSCODIUM_LINUX_ARMV7L_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-armhf-${VSCODIUM_VER}.tar.gz"
35+VSCODIUM_LINUX_ARMV7L_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_ARMV7L_URL})
36+sed -i "s/armv7l-linux = \".\{52\}\"/armv7l-linux = \"${VSCODIUM_LINUX_ARMV7L_SHA256}\"/" "$ROOT/vscodium.nix"
pkgs/applications/editors/vscode/vscode.nix+5−1
@@ -6,6 +6,8 @@ let
66 plat = {
77 x86_64-linux = "linux-x64";
88 x86_64-darwin = "darwin";
9+ aarch64-linux = "linux-arm64";
10+ armv7l-linux = "linux-armhf";
911 }.${system};
1012
1113 archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
@@ -13,6 +15,8 @@ let
1315 sha256 = {
1416 x86_64-linux = "1kbjbqb03yapz7067q589gaa7d6cqaipj7hmp1l3nh0bmggzsc4c";
1517 x86_64-darwin = "1qgadm52c5lzkvgvqrz0n8brm4qbjg8hf1dk6a2ynqhqjxcwbj4r";
18+ aarch64-linux = "0i3yl9rx9h7qkl3k9qk6gg35nhz737qzzbvzvdwkqjaacsbpfgf8";
19+ armv7l-linux = "19iz2bxcq6y8sklr6zcnbp47kki9l00x3nvr213lkk3kj08l0afv";
1620 }.${system};
1721in
1822 callPackage ./generic.nix rec {
@@ -52,6 +56,6 @@ in
5256 downloadPage = "https://code.visualstudio.com/Updates";
5357 license = licenses.unfree;
5458 maintainers = with maintainers; [ eadwu synthetica ];
55− platforms = [ "x86_64-linux" "x86_64-darwin" ];
59+ platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "armv7l-linux" ];
5660 };
5761 }
pkgs/applications/editors/vscode/vscodium.nix+10−4
@@ -6,18 +6,24 @@ let
66 plat = {
77 x86_64-linux = "linux-x64";
88 x86_64-darwin = "darwin";
9+ aarch64-linux = "linux-arm64";
10+ armv7l-linux = "linux-armhf";
911 }.${system};
1012
1113 archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
1214
1315 sha256 = {
14− x86_64-linux = "0hn4pqmabz3qf3bbqnn1fz7fcgzdkp2lwr2yzgmx8hhh3cff8bnb";
15− x86_64-darwin = "1x3wx0d99ihyya0n89qclc3jlhh0m72hs8hj7l0h3z6zmh6q2vzv";
16+ x86_64-linux = "1ckg279vvg8h1n8ippa9vlyw4vk3frinb6fvvi47zggs31168m7b";
17+ x86_64-darwin = "168g34v2b8r1pdbnqrs0c0k9aa60n5rspixziywnq7m61i23nlgd";
18+ aarch64-linux = "1cd4sg6k7sqmj3yzmprq1rz928bvc3zrch8agfd8zfap1d6nfaal";
19+ armv7l-linux = "0f8z4lws027dyqhcrkzm9rvifwid5m0icprg0xk01l7y18n3q923";
1620 }.${system};
1721
1822 sourceRoot = {
1923 x86_64-linux = ".";
2024 x86_64-darwin = "";
25+ aarch64-linux = ".";
26+ armv7l-linux = ".";
2127 }.${system};
2228in
2329 callPackage ./generic.nix rec {
@@ -27,7 +33,7 @@ in
2733
2834 # Please backport all compatible updates to the stable release.
2935 # This is important for the extension ecosystem.
30− version = "1.51.1";
36+ version = "1.52.1";
3137 pname = "vscodium";
3238
3339 executableName = "codium";
@@ -55,6 +61,6 @@ in
5561 downloadPage = "https://github.com/VSCodium/vscodium/releases";
5662 license = licenses.mit;
5763 maintainers = with maintainers; [ synthetica turion ];
58− platforms = [ "x86_64-linux" "x86_64-darwin" ];
64+ platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "armv7l-linux" ];
5965 };
6066 }