From 831105a4b63d6d9ff860662f1c4bb2ef87c56950 Mon Sep 17 00:00:00 2001
From: Grant DeFayette <grant@cavebatsofware.com>
Date: Thu, 16 Apr 2026 15:23:19 -0400
Subject: [PATCH] vscodium: vscodium.vscodeVersion should be set to
 latestUpstream

Resolves https://github.com/NixOS/nixpkgs/issues/505096

(cherry picked from commit 6c381c34c8d90a9dd54879be9a864829c9d82833)
---
 pkgs/applications/editors/vscode/update-vscodium.sh | 4 ++++
 pkgs/applications/editors/vscode/vscodium.nix       | 1 +
 2 files changed, 5 insertions(+)

diff --git a/pkgs/applications/editors/vscode/update-vscodium.sh b/pkgs/applications/editors/vscode/update-vscodium.sh
index 1f35a851613a..a1207e3f9815 100755
--- a/pkgs/applications/editors/vscode/update-vscodium.sh
+++ b/pkgs/applications/editors/vscode/update-vscodium.sh
@@ -5,9 +5,11 @@ set -eou pipefail
 
 latestVersion=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/VSCodium/vscodium/releases/latest | jq -r ".tag_name")
 currentVersion=$(nix-instantiate --eval -E "with import ./. {}; vscodium.version or (lib.getVersion vscodium)" | tr -d '"')
+latestUpstream=$(curl -sL https://raw.githubusercontent.com/VSCodium/vscodium/refs/tags/$latestVersion/upstream/stable.json | jq -r ".tag")
 
 echo "latest  version: $latestVersion"
 echo "current version: $currentVersion"
+echo "latest upstream version: $latestUpstream"
 
 if [[ "$latestVersion" == "$currentVersion" ]]; then
     echo "package is up-to-date"
@@ -25,3 +27,5 @@ for i in \
     hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri $(nix-prefetch-url "https://github.com/VSCodium/vscodium/releases/download/$latestVersion/VSCodium-$2-$latestVersion.$3"))
     update-source-version vscodium $latestVersion $hash --system=$1 --ignore-same-version
 done
+
+update-source-version vscodium $latestUpstream --version-key=vscodeVersion --ignore-same-version --ignore-same-hash
diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index 45a88e87ae6e..0a1f4c0ab2b5 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -44,6 +44,7 @@ buildVscode rec {
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
   version = "1.116.02821";
+  vscodeVersion = "1.116.0";
   pname = "vscodium";
 
   executableName = "codium";