From b2c3907f9b8f46b90d51cd5dd0faa49e9cd4a735 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 25 Nov 2024 01:16:22 +0100 Subject: [PATCH 1/2] vscodium: fix update script to work with longer hashes The previous VSCodium update introduced longer hashes. This broke the update script, since the hash length is hardcoded. To fix this, make the hash length a bit more flexible and in exchange, make sure the characters are hexadecimal. --- pkgs/applications/editors/vscode/update-vscodium.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vscode/update-vscodium.sh b/pkgs/applications/editors/vscode/update-vscodium.sh index c7d9c1068b14..d5f2c4bf641b 100755 --- a/pkgs/applications/editors/vscode/update-vscodium.sh +++ b/pkgs/applications/editors/vscode/update-vscodium.sh @@ -21,7 +21,7 @@ update_vscodium () { ARCHIVE_FMT=$4 VSCODIUM_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-${ARCH}-${VSCODIUM_VER}.${ARCHIVE_FMT}" VSCODIUM_SHA256=$(nix-prefetch-url ${VSCODIUM_URL}) - sed -i "s/${ARCH_LONG} = \".\{52\}\"/${ARCH_LONG} = \"${VSCODIUM_SHA256}\"/" "$ROOT/vscodium.nix" + sed -i "s/${ARCH_LONG} = \"[0-9a-fA-F]\{40,64\}\"/${ARCH_LONG} = \"${VSCODIUM_SHA256}\"/" "$ROOT/vscodium.nix" } # VSCodium From aac60d6a8742e87fa82c28946b8201b99015d935 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 25 Nov 2024 01:36:47 +0100 Subject: [PATCH 2/2] vscodium: 1.95.2 -> 1.95.3 https://github.com/VSCodium/vscodium/releases/tag/1.95.3.24320 https://github.com/VSCodium/vscodium/releases/tag/1.95.3.24321 --- pkgs/applications/editors/vscode/vscodium.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index b112f1fe663b..167df0c85482 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.hostPlatform.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "c3c97f536692f7d658ddd77dc809693d4cb48b720c9ab97d3931bec028633639"; - x86_64-darwin = "0fa21f9e0562b61e755d458596bb6ed41d55efb3a9376ec07eea02641eaef631"; - aarch64-linux = "0bf48851a51ee7c506d73b8633bd02c1da986b5973683eadfeac804cd73e5d2a"; - aarch64-darwin = "b54453610b92c17032d4ecc71717a1a7b3c9643091e91e58c34576e5a6a78b3c"; - armv7l-linux = "211b93a60bda18f62cee5ec279f6179af9b94d827535cd89f6c1c832a3ae6dfa"; + x86_64-linux = "0948jbnhjra09bvf9acrl6b2dp1xar5ajahmzy0cwf6dbidfms5y"; + x86_64-darwin = "1a8ga66526lfy2xrgshhizmidp8aaiwvpr38rvhsx0hqb4vmm0hy"; + aarch64-linux = "08la7kbb6myf9iz23p60vd00mrmhnizw8dgh54gb0msh8wbasidq"; + aarch64-darwin = "01z1dx77briqzhfx45c2f2np78r11b5xm92smi9idivbsia800i3"; + armv7l-linux = "0h3f9sy7d4ylk0ay63adhnz9s7jlpwlf3x831v8pygzm2r7k9zgc"; }.${system} or throwSystem; sourceRoot = lib.optionalString (!stdenv.hostPlatform.isDarwin) "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.95.2.24313"; + version = "1.95.3.24321"; pname = "vscodium"; executableName = "codium";