diff --git a/pkgs/applications/editors/jetbrains/readme.md b/pkgs/applications/editors/jetbrains/readme.md index 0ed0a67d4fd5..c890021090e9 100644 --- a/pkgs/applications/editors/jetbrains/readme.md +++ b/pkgs/applications/editors/jetbrains/readme.md @@ -78,7 +78,5 @@ Any comments or other manual changes between these markers will be removed when - on `aarch64-linux`: - from source build - see if build (binary or source) works without expat - - on `x86_64-darwin`: - - from source build - on `aarch64-darwin`: - from source build diff --git a/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/config.py b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/config.py index 0449427e945f..d2c202c13fcf 100644 --- a/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/config.py +++ b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/config.py @@ -3,7 +3,7 @@ import os import dataclasses from pathlib import Path -SUPPORTED_SYSTEMS = ["x86_64-linux", "aarch64-linux", "x86_64-darwin", "aarch64-darwin"] +SUPPORTED_SYSTEMS = ["x86_64-linux", "aarch64-linux", "aarch64-darwin"] def find_nixpkgs(current_path: Path) -> Path: diff --git a/pkgs/applications/editors/vscode/update-vscodium.sh b/pkgs/applications/editors/vscode/update-vscodium.sh index 6420ff0ee1f2..08c776dd9a46 100755 --- a/pkgs/applications/editors/vscode/update-vscodium.sh +++ b/pkgs/applications/editors/vscode/update-vscodium.sh @@ -21,8 +21,7 @@ for i in \ "aarch64-linux linux-arm64 tar.gz" \ "armv7l-linux linux-armhf tar.gz" \ "loongarch64-linux linux-loong64 tar.gz" \ - "aarch64-darwin darwin-arm64 zip" \ - "x86_64-darwin darwin-x64 zip"; do + "aarch64-darwin darwin-arm64 zip"; do set -- $i 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 diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 33f308b23834..02777cbbdca1 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -3,7 +3,6 @@ "version": "150.0.7871.124", "chromedriver": { "version": "150.0.7871.125", - "hash_darwin": "sha256-HJTBS6eRmAsxrn7WW4hCxMCXdzn+1PYz1W0uZHJ38yk=", "hash_darwin_aarch64": "sha256-VCgkc6MeMPbt0F2ZVTJNn9yJbSYNhy1zr8KzPVaVi0I=" }, "deps": { diff --git a/pkgs/applications/networking/browsers/chromium/update.mjs b/pkgs/applications/networking/browsers/chromium/update.mjs index 9aab0753db78..c3652f161d5e 100755 --- a/pkgs/applications/networking/browsers/chromium/update.mjs +++ b/pkgs/applications/networking/browsers/chromium/update.mjs @@ -170,7 +170,6 @@ async function fetch_chromedriver_binaries(version) { const url = (platform) => `https://storage.googleapis.com/chrome-for-testing-public/${version}/${platform}/chromedriver-${platform}.zip` return { version, - hash_darwin: await prefetch(url('mac-x64')), hash_darwin_aarch64: await prefetch(url('mac-arm64')), } } diff --git a/pkgs/applications/office/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/default.nix index a2fdd448cdec..eb613364c8f3 100644 --- a/pkgs/applications/office/libreoffice/darwin/default.nix +++ b/pkgs/applications/office/libreoffice/darwin/default.nix @@ -12,22 +12,15 @@ let version = "26.2.4"; dist = { - aarch64-darwin = rec { - arch = "aarch64"; - archSuffix = arch; - url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg"; - sha256 = "64e0ad05564554eeee639d49b08b20908a38d4722ec95f1620d05c99bcbe9fb1"; - }; + url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/aarch64/LibreOffice_${version}_MacOS_aarch64.dmg"; + sha256 = "64e0ad05564554eeee639d49b08b20908a38d4722ec95f1620d05c99bcbe9fb1"; }; in stdenvNoCC.mkDerivation { inherit version; pname = "libreoffice"; src = fetchurl { - inherit - (dist.${stdenvNoCC.hostPlatform.system} - or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}") - ) + inherit (dist) url sha256 ; @@ -52,16 +45,13 @@ stdenvNoCC.mkDerivation { let defaultNixFile = toString ./default.nix; updateNix = toString ./update.nix; - aarch64Url = dist."aarch64-darwin".url; - x86_64Url = dist."x86_64-darwin".url; in writeScript "update-libreoffice.sh" '' #!/usr/bin/env nix-shell - #!nix-shell -i bash --argstr aarch64Url ${aarch64Url} --argstr x86_64Url ${x86_64Url} --argstr version ${version} ${updateNix} + #!nix-shell -i bash --argstr url ${dist.url} --argstr version ${version} ${updateNix} set -eou pipefail - update-source-version libreoffice-bin $newVersion $newAarch64Sha256 --file=${defaultNixFile} --system=aarch64-darwin --ignore-same-version - update-source-version libreoffice-bin $newVersion $newX86_64Sha256 --file=${defaultNixFile} --system=x86_64-darwin --ignore-same-version + update-source-version libreoffice-bin $newVersion $newSha256 --file=${defaultNixFile} --ignore-same-version ''; meta = { diff --git a/pkgs/applications/office/libreoffice/darwin/update.nix b/pkgs/applications/office/libreoffice/darwin/update.nix index f3c5c758b428..17f4c69cf85e 100644 --- a/pkgs/applications/office/libreoffice/darwin/update.nix +++ b/pkgs/applications/office/libreoffice/darwin/update.nix @@ -1,7 +1,6 @@ # Impure functions, for passthru.updateScript runtime only { - aarch64Url, - x86_64Url, + url, version, pkgs ? import ../../../../../default.nix { }, }: @@ -14,6 +13,5 @@ in pkgs.mkShell rec { buildInputs = [ pkgs.common-updater-scripts ]; newVersion = getLatestStableVersion; - newAarch64Sha256 = getSha256 aarch64Url version newVersion; - newX86_64Sha256 = getSha256 x86_64Url version newVersion; + newSha256 = getSha256 url version newVersion; } diff --git a/pkgs/by-name/ac/acli/update.py b/pkgs/by-name/ac/acli/update.py index 4afb0b902f6d..0bec673b26b0 100755 --- a/pkgs/by-name/ac/acli/update.py +++ b/pkgs/by-name/ac/acli/update.py @@ -10,7 +10,7 @@ from urllib.request import urlopen, Request def get_arch_os_key(url) -> str: if "darwin_amd64" in url: - return "x86_64-darwin" + return None elif "darwin_arm64" in url: return "aarch64-darwin" elif "linux_amd64" in url: @@ -57,9 +57,8 @@ def parse_and_check(content): ) for url, hex_sha in matches: - key = get_arch_os_key(url) - - data["sources"][key] = {"url": url, "sha256": hex_sha} + if key := get_arch_os_key(url): + data["sources"][key] = {"url": url, "sha256": hex_sha} data["sources"] = dict(sorted(data["sources"].items())) diff --git a/pkgs/by-name/am/amp-cli/update.sh b/pkgs/by-name/am/amp-cli/update.sh index 86b348d857a2..d795637ef432 100755 --- a/pkgs/by-name/am/amp-cli/update.sh +++ b/pkgs/by-name/am/amp-cli/update.sh @@ -10,7 +10,6 @@ cd "$(dirname "${BASH_SOURCE[0]}")/../../../.." for system in \ x86_64-linux \ aarch64-linux \ - x86_64-darwin \ aarch64-darwin do update-source-version amp-cli "$version" \ diff --git a/pkgs/by-name/an/antigravity-cli/update.sh b/pkgs/by-name/an/antigravity-cli/update.sh index 835800502981..61ca43ac4483 100755 --- a/pkgs/by-name/an/antigravity-cli/update.sh +++ b/pkgs/by-name/an/antigravity-cli/update.sh @@ -25,7 +25,6 @@ update-source-version --version-key=version antigravity-cli $latestVersion || tr for system in \ x86_64-linux \ aarch64-linux \ - x86_64-darwin \ aarch64-darwin; do hash=$(nix store prefetch-file --json --hash-type sha256 \ $(nix-instantiate --eval --raw -E "with import ./. {}; antigravity-cli.src.url" --system "$system") | jq -r '.hash') diff --git a/pkgs/by-name/an/antigravity/update.js b/pkgs/by-name/an/antigravity/update.js index 45bf250a2fd5..38eb4cf7a444 100755 --- a/pkgs/by-name/an/antigravity/update.js +++ b/pkgs/by-name/an/antigravity/update.js @@ -13,12 +13,12 @@ import * as path from "node:path"; * @property {string} sha256hash SHA256 hash of the download file, example: "8eb01462dc4f26aba45be4992bda0b145d1ec210c63a6272578af27e59f23bef" * @property {string} url Download URL, example: "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.2-6251250307170304/linux-arm/Antigravity.tar.gz", "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.2-6251250307170304/darwin-x64/Antigravity.zip" */ -/** @typedef {"x86_64-linux" | "aarch64-linux" | "x86_64-darwin" | "aarch64-darwin"} Platform */ +/** @typedef {"x86_64-linux" | "aarch64-linux" | "aarch64-darwin"} Platform */ /** @typedef {{ version: string; vscodeVersion: string; sources: Record }} Information */ let version = ""; let vscodeVersion = ""; -async function getLatestInformation(/** @type {"linux-x64" | "linux-arm64" | "darwin-arm64" | "darwin"} */ targetSystem) { +async function getLatestInformation(/** @type {"linux-x64" | "linux-arm64" | "darwin-arm64"} */ targetSystem) { /** @type {UpdateInfo} */ const latestInfo = await (await fetch(`https://antigravity-auto-updater-974169037036.us-central1.run.app/api/update/${targetSystem}/stable/latest`)).json(); const newVersion = /\/antigravity\/stable\/([\d.]+)-[\d]+/.exec(latestInfo.url)?.[1] ?? ""; // Current API lack version field now, we need to parse it from the URL temporarily. @@ -35,7 +35,6 @@ async function getLatestInformation(/** @type {"linux-x64" | "linux-arm64" | "da const sources = { "x86_64-linux": await getLatestInformation("linux-x64"), "aarch64-linux": await getLatestInformation("linux-arm64"), - "x86_64-darwin": await getLatestInformation("darwin"), "aarch64-darwin": await getLatestInformation("darwin-arm64"), }; /** @type {Information} */ diff --git a/pkgs/by-name/bo/boundary/update.sh b/pkgs/by-name/bo/boundary/update.sh index 660f44964a95..a163881d604c 100644 --- a/pkgs/by-name/bo/boundary/update.sh +++ b/pkgs/by-name/bo/boundary/update.sh @@ -26,13 +26,11 @@ replace_sha() { BOUNDARY_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/hashicorp/boundary/releases/latest | awk -F'/' '{print $NF}' | sed 's/v//') BOUNDARY_LINUX_X64_SHA256=$(calc_hash "$BOUNDARY_VER" "linux_amd64") -BOUNDARY_DARWIN_X64_SHA256=$(calc_hash "$BOUNDARY_VER" "darwin_amd64") BOUNDARY_LINUX_AARCH64_SHA256=$(calc_hash "$BOUNDARY_VER" "linux_arm64") BOUNDARY_DARWIN_AARCH64_SHA256=$(calc_hash "$BOUNDARY_VER" "darwin_arm64") sed -i "s/version = \".*\"/version = \"$BOUNDARY_VER\"/" "$NIX_DRV" replace_sha "x86_64-linux" "$BOUNDARY_LINUX_X64_SHA256" -replace_sha "x86_64-darwin" "$BOUNDARY_DARWIN_X64_SHA256" replace_sha "aarch64-linux" "$BOUNDARY_LINUX_AARCH64_SHA256" replace_sha "aarch64-darwin" "$BOUNDARY_DARWIN_AARCH64_SHA256" diff --git a/pkgs/by-name/bo/box-cli/update.sh b/pkgs/by-name/bo/box-cli/update.sh index 3656eb168b46..093689c68b3f 100755 --- a/pkgs/by-name/bo/box-cli/update.sh +++ b/pkgs/by-name/bo/box-cli/update.sh @@ -32,7 +32,6 @@ echo "Updating box-cli from $old_version to $version" declare -A platforms=( [x86_64-linux]="box-linux-x64" [aarch64-linux]="box-linux-arm64" - [x86_64-darwin]="box-darwin-x64" [aarch64-darwin]="box-darwin-arm64" ) diff --git a/pkgs/by-name/br/brave/update.sh b/pkgs/by-name/br/brave/update.sh index f806154aa9dc..ccb7c9b826b0 100755 --- a/pkgs/by-name/br/brave/update.sh +++ b/pkgs/by-name/br/brave/update.sh @@ -8,7 +8,6 @@ latestVersion="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://ap hashAarch64="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-browser_${latestVersion}_arm64.deb")")" hashAmd64="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-browser_${latestVersion}_amd64.deb")")" hashAarch64Darwin="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-v${latestVersion}-darwin-arm64.zip")")" -hashAmd64Darwin="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-v${latestVersion}-darwin-x64.zip")")" cat > $SCRIPT_DIR/package.nix << EOF # Expression generated by update.sh; do not edit it by hand! @@ -31,10 +30,6 @@ let url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-v\${version}-darwin-arm64.zip"; hash = "${hashAarch64Darwin}"; }; - x86_64-darwin = { - url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-v\${version}-darwin-x64.zip"; - hash = "${hashAmd64Darwin}"; - }; }; archive = diff --git a/pkgs/by-name/br/brioche/update-librusty.sh b/pkgs/by-name/br/brioche/update-librusty.sh index 0ba452c803f5..575755a3c110 100755 --- a/pkgs/by-name/br/brioche/update-librusty.sh +++ b/pkgs/by-name/br/brioche/update-librusty.sh @@ -36,7 +36,6 @@ fetchLibrustyV8 { # NOTE; Follows supported platforms of package (see meta.platforms attribute)! x86_64-linux = "$(nix-prefetch-url --type sha256 https://github.com/denoland/rusty_v8/releases/download/v"$NEW_VERSION"/librusty_v8_release_x86_64-unknown-linux-gnu.a.gz)"; aarch64-linux = "$(nix-prefetch-url --type sha256 https://github.com/denoland/rusty_v8/releases/download/v"$NEW_VERSION"/librusty_v8_release_aarch64-unknown-linux-gnu.a.gz)"; - x86_64-darwin = "$(nix-prefetch-url --type sha256 https://github.com/denoland/rusty_v8/releases/download/v"$NEW_VERSION"/librusty_v8_release_x86_64-apple-darwin.a.gz)"; aarch64-darwin = "$(nix-prefetch-url --type sha256 https://github.com/denoland/rusty_v8/releases/download/v"$NEW_VERSION"/librusty_v8_release_aarch64-apple-darwin.a.gz)"; }; } diff --git a/pkgs/by-name/bu/buck2/update.nu b/pkgs/by-name/bu/buck2/update.nu index dd43e7b834b6..57188e797bee 100755 --- a/pkgs/by-name/bu/buck2/update.nu +++ b/pkgs/by-name/bu/buck2/update.nu @@ -5,7 +5,6 @@ const ARCHES = [ { name: "x86_64-linux", target: "x86_64-unknown-linux-gnu" }, - { name: "x86_64-darwin", target: "x86_64-apple-darwin" }, { name: "aarch64-linux", target: "aarch64-unknown-linux-gnu" }, { name: "aarch64-darwin", target: "aarch64-apple-darwin" }, ]; diff --git a/pkgs/by-name/cl/clouddrive2/update.sh b/pkgs/by-name/cl/clouddrive2/update.sh index 200bb47700fe..1e121ba98260 100755 --- a/pkgs/by-name/cl/clouddrive2/update.sh +++ b/pkgs/by-name/cl/clouddrive2/update.sh @@ -15,7 +15,6 @@ fi for i in \ "x86_64-linux linux-x86_64" \ "aarch64-linux linux-aarch64" \ - "x86_64-darwin macos-x86_64" \ "aarch64-darwin macos-aarch64"; do set -- $i prefetch=$(nix-prefetch-url "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v$latestVersion/clouddrive-2-$2-$latestVersion.tgz") diff --git a/pkgs/by-name/co/code-cursor/update.sh b/pkgs/by-name/co/code-cursor/update.sh index d0d7308c81e1..da907c7aa003 100755 --- a/pkgs/by-name/co/code-cursor/update.sh +++ b/pkgs/by-name/co/code-cursor/update.sh @@ -17,7 +17,6 @@ VSCODE="" for pair in \ x86_64-linux:linux-x64 \ aarch64-linux:linux-arm64 \ - x86_64-darwin:darwin-x64 \ aarch64-darwin:darwin-arm64 do IFS=: read -r sys platform <<< "$pair" diff --git a/pkgs/by-name/co/codeium/update.sh b/pkgs/by-name/co/codeium/update.sh index 268886b576a0..1c3bfabb32dd 100755 --- a/pkgs/by-name/co/codeium/update.sh +++ b/pkgs/by-name/co/codeium/update.sh @@ -24,12 +24,10 @@ CODEIUM_VER=$(curl -s "https://api.github.com/repos/Exafunction/codeium/releases CODEIUM_LINUX_X64_HASH=$(fetch_arch "$CODEIUM_VER" "linux_x64") CODEIUM_LINUX_AARCH64_HASH=$(fetch_arch "$CODEIUM_VER" "linux_arm") -CODEIUM_DARWIN_X64_HASH=$(fetch_arch "$CODEIUM_VER" "macos_x64") CODEIUM_DARWIN_AARCH64_HASH=$(fetch_arch "$CODEIUM_VER" "macos_arm") sed -i "s/version = \".*\"/version = \"$CODEIUM_VER\"/" "$NIX_DRV" replace_hash "x86_64-linux" "$CODEIUM_LINUX_X64_HASH" replace_hash "aarch64-linux" "$CODEIUM_LINUX_AARCH64_HASH" -replace_hash "x86_64-darwin" "$CODEIUM_DARWIN_X64_HASH" replace_hash "aarch64-darwin" "$CODEIUM_DARWIN_AARCH64_HASH" diff --git a/pkgs/by-name/co/coder/update.sh b/pkgs/by-name/co/coder/update.sh index 7f5e29d10b00..65a4dd6fcc84 100755 --- a/pkgs/by-name/co/coder/update.sh +++ b/pkgs/by-name/co/coder/update.sh @@ -13,7 +13,6 @@ LATEST_MAINLINE_VERSION=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --fail # Define the platforms declare -A ARCHS=(["x86_64-linux"]="linux_amd64.tar.gz" ["aarch64-linux"]="linux_arm64.tar.gz" - ["x86_64-darwin"]="darwin_amd64.zip" ["aarch64-darwin"]="darwin_arm64.zip") update_version_and_hashes() { diff --git a/pkgs/by-name/co/codex-acp/update.sh b/pkgs/by-name/co/codex-acp/update.sh index 2a8328e7bcf5..aa434ded6b25 100755 --- a/pkgs/by-name/co/codex-acp/update.sh +++ b/pkgs/by-name/co/codex-acp/update.sh @@ -141,7 +141,6 @@ fetchurl { { x86_64-linux = "${V8_HASH_X86_64_LINUX}"; aarch64-linux = "${V8_HASH_AARCH64_LINUX}"; - x86_64-darwin = "${V8_HASH_X86_64_DARWIN}"; aarch64-darwin = "${V8_HASH_AARCH64_DARWIN}"; } .\${stdenv.hostPlatform.system} @@ -198,9 +197,8 @@ export CODEX_HASH V8_HASH_X86_64_LINUX="$(prefetch_sri "https://github.com/denoland/rusty_v8/releases/download/v${V8_VERSION}/librusty_v8_release_x86_64-unknown-linux-gnu.a.gz")" V8_HASH_AARCH64_LINUX="$(prefetch_sri "https://github.com/denoland/rusty_v8/releases/download/v${V8_VERSION}/librusty_v8_release_aarch64-unknown-linux-gnu.a.gz")" -V8_HASH_X86_64_DARWIN="$(prefetch_sri "https://github.com/denoland/rusty_v8/releases/download/v${V8_VERSION}/librusty_v8_release_x86_64-apple-darwin.a.gz")" V8_HASH_AARCH64_DARWIN="$(prefetch_sri "https://github.com/denoland/rusty_v8/releases/download/v${V8_VERSION}/librusty_v8_release_aarch64-apple-darwin.a.gz")" -export V8_VERSION V8_HASH_X86_64_LINUX V8_HASH_AARCH64_LINUX V8_HASH_X86_64_DARWIN V8_HASH_AARCH64_DARWIN +export V8_VERSION V8_HASH_X86_64_LINUX V8_HASH_AARCH64_LINUX V8_HASH_AARCH64_DARWIN update-source-version "$ATTR_PATH" "$latest_version" "$src_hash" --ignore-same-version update_codex_pins diff --git a/pkgs/by-name/co/confluent-cli/update.sh b/pkgs/by-name/co/confluent-cli/update.sh index e237957438f0..402304aa903e 100755 --- a/pkgs/by-name/co/confluent-cli/update.sh +++ b/pkgs/by-name/co/confluent-cli/update.sh @@ -23,7 +23,6 @@ fi for i in \ "x86_64-linux linux_amd64" \ "aarch64-linux linux_arm64" \ - "x86_64-darwin darwin_amd64" \ "aarch64-darwin darwin_arm64"; do set -- $i hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/$latestVersion/confluent_${latestVersion}_$2.tar.gz")) diff --git a/pkgs/by-name/cu/cursor-cli/update.sh b/pkgs/by-name/cu/cursor-cli/update.sh index 82484933310f..26b370557183 100755 --- a/pkgs/by-name/cu/cursor-cli/update.sh +++ b/pkgs/by-name/cu/cursor-cli/update.sh @@ -22,7 +22,7 @@ if [[ "$latestVersion" == "$currentVersion" ]]; then exit 0 fi -declare -A platforms=( [x86_64-linux]="linux/x64" [aarch64-linux]="linux/arm64" [x86_64-darwin]="darwin/x64" [aarch64-darwin]="darwin/arm64" ) +declare -A platforms=( [x86_64-linux]="linux/x64" [aarch64-linux]="linux/arm64" [aarch64-darwin]="darwin/arm64" ) for platform in "${!platforms[@]}"; do url="https://downloads.cursor.com/lab/$release/${platforms[$platform]}/agent-cli-package.tar.gz" diff --git a/pkgs/by-name/db/dbeaver-bin/update.sh b/pkgs/by-name/db/dbeaver-bin/update.sh index 8ab7bd75fcef..8a1e992dcef1 100755 --- a/pkgs/by-name/db/dbeaver-bin/update.sh +++ b/pkgs/by-name/db/dbeaver-bin/update.sh @@ -18,7 +18,6 @@ fi for i in \ "x86_64-linux linux-x86_64.tar.gz" \ "aarch64-linux linux-aarch64.tar.gz" \ - "x86_64-darwin macos-x86_64.dmg" \ "aarch64-darwin macos-aarch64.dmg" do # shellcheck disable=SC2086 # $i is intentionally splitted to $1 and $2 diff --git a/pkgs/by-name/db/dbgate/update.sh b/pkgs/by-name/db/dbgate/update.sh index 1e893aaa7706..d37000bac6a1 100755 --- a/pkgs/by-name/db/dbgate/update.sh +++ b/pkgs/by-name/db/dbgate/update.sh @@ -15,7 +15,6 @@ fi for system in \ x86_64-linux \ aarch64-linux \ - x86_64-darwin \ aarch64-darwin; do hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; dbgate.src.url" --system "$system" | tr -d '"'))) update-source-version dbgate $latestVersion $hash --system=$system --ignore-same-version diff --git a/pkgs/by-name/fe/fermyon-spin/update.py b/pkgs/by-name/fe/fermyon-spin/update.py index 2a2129a5926e..7fbff7d295f2 100755 --- a/pkgs/by-name/fe/fermyon-spin/update.py +++ b/pkgs/by-name/fe/fermyon-spin/update.py @@ -7,7 +7,6 @@ from os.path import join, dirname # We set oldHash and newHash fields in the inner dict later. systems = { "x86_64-linux": {"os": "linux", "arch": "amd64"}, - "x86_64-darwin": {"os": "macos", "arch": "amd64"}, "aarch64-linux": {"os": "linux", "arch": "aarch64"}, "aarch64-darwin": {"os": "macos", "arch": "aarch64"}, } diff --git a/pkgs/by-name/fl/floorp-bin-unwrapped/update.sh b/pkgs/by-name/fl/floorp-bin-unwrapped/update.sh index 3d0b87d688f2..f912437dd84b 100755 --- a/pkgs/by-name/fl/floorp-bin-unwrapped/update.sh +++ b/pkgs/by-name/fl/floorp-bin-unwrapped/update.sh @@ -34,10 +34,9 @@ jq ' elif .url | contains("linux-x86_64") then {key: "x86_64-linux", value: .} elif .url | contains("macOS-universal") then - [{key: "aarch64-darwin", value: .}, {key: "x86_64-darwin", value: .}] + {key: "aarch64-darwin", value: .} else null end ) - | flatten | from_entries ) } diff --git a/pkgs/by-name/gi/gitkraken/update.sh b/pkgs/by-name/gi/gitkraken/update.sh index 8c75dc1a4977..3330868113c0 100755 --- a/pkgs/by-name/gi/gitkraken/update.sh +++ b/pkgs/by-name/gi/gitkraken/update.sh @@ -14,7 +14,6 @@ version=$(curl -fsSL https://api.gitkraken.dev/releases/production/linux/x64/REL # Hardcoded URLs to compute hashes declare -A tarballs=( ["x86_64-linux"]="https://api.gitkraken.dev/releases/production/linux/x64/${version}/gitkraken-amd64.tar.gz" - ["x86_64-darwin"]="https://api.gitkraken.dev/releases/production/darwin/x64/${version}/GitKraken-v${version}.zip" ["aarch64-darwin"]="https://api.gitkraken.dev/releases/production/darwin/arm64/${version}/GitKraken-v${version}.zip" ) diff --git a/pkgs/by-name/go/google-cloud-sdk/update.sh b/pkgs/by-name/go/google-cloud-sdk/update.sh index e8f3caf832f8..aea218cc1f87 100755 --- a/pkgs/by-name/go/google-cloud-sdk/update.sh +++ b/pkgs/by-name/go/google-cloud-sdk/update.sh @@ -30,9 +30,6 @@ EOF echo -n " x86_64-linux =" genMainSrc "linux" "x86_64" - echo -n " x86_64-darwin =" - genMainSrc "darwin" "x86_64" - echo -n " aarch64-linux =" genMainSrc "linux" "arm" diff --git a/pkgs/by-name/gr/grok-build/update.sh b/pkgs/by-name/gr/grok-build/update.sh index 371f2853e8ad..5d7553dc2603 100755 --- a/pkgs/by-name/gr/grok-build/update.sh +++ b/pkgs/by-name/gr/grok-build/update.sh @@ -16,7 +16,7 @@ fi update-source-version grok-build "${version}" || true -for system in "aarch64-darwin macos-aarch64" "aarch64-linux linux-aarch64" "x86_64-darwin macos-x86_64" "x86_64-linux linux-x86_64"; do +for system in "aarch64-darwin macos-aarch64" "aarch64-linux linux-aarch64" "x86_64-linux linux-x86_64"; do # shellcheck disable=SC2086 set -- ${system} diff --git a/pkgs/by-name/ho/hoppscotch/update.sh b/pkgs/by-name/ho/hoppscotch/update.sh index dd18d1942cad..ce3a73ceb62c 100755 --- a/pkgs/by-name/ho/hoppscotch/update.sh +++ b/pkgs/by-name/ho/hoppscotch/update.sh @@ -17,7 +17,6 @@ update-source-version hoppscotch $latestVersion || true for system in \ x86_64-linux \ - x86_64-darwin \ aarch64-darwin; do hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import $BASEDIR {}; hoppscotch.src.url" --system "$system" | tr -d '"'))) (cd $BASEDIR && update-source-version hoppscotch $latestVersion $hash --system=$system --ignore-same-version) diff --git a/pkgs/by-name/ib/ibmcloud-cli/package.nix b/pkgs/by-name/ib/ibmcloud-cli/package.nix index d4048cfd7ef4..ae09b5cb8e96 100644 --- a/pkgs/by-name/ib/ibmcloud-cli/package.nix +++ b/pkgs/by-name/ib/ibmcloud-cli/package.nix @@ -21,13 +21,7 @@ let "s390x" else throw "Unsupported arch: ${stdenv.hostPlatform.system}"; - platform = - if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then - "macos_arm64" - else if stdenv.hostPlatform.isDarwin then - "macos" - else - "linux_${arch}"; + platform = if stdenv.hostPlatform.isDarwin then "macos_arm64" else "linux_${arch}"; in stdenv.mkDerivation (finalAttrs: { pname = "ibmcloud-cli"; diff --git a/pkgs/by-name/ib/ibmcloud-cli/update.sh b/pkgs/by-name/ib/ibmcloud-cli/update.sh index 26f1525a3202..2d340e8d12ee 100755 --- a/pkgs/by-name/ib/ibmcloud-cli/update.sh +++ b/pkgs/by-name/ib/ibmcloud-cli/update.sh @@ -19,7 +19,6 @@ for system in \ i686-linux \ powerpc64le-linux \ s390x-linux \ - x86_64-darwin \ aarch64-darwin; do tmp=$(mktemp -d) curl -fsSL -o $tmp/ibmcloud-cli $(nix-instantiate --eval -E "with import ./. {}; ibmcloud-cli.src.url" --system "$system" | tr -d '"') diff --git a/pkgs/by-name/ki/kiro-cli/package.nix b/pkgs/by-name/ki/kiro-cli/package.nix index bdb2b27bd3c6..295cfe09be35 100644 --- a/pkgs/by-name/ki/kiro-cli/package.nix +++ b/pkgs/by-name/ki/kiro-cli/package.nix @@ -17,12 +17,6 @@ stdenv.mkDerivation (finalAttrs: { version = "2.10.0"; src = - let - darwinDmg = fetchurl { - url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/Kiro%20CLI.dmg"; - hash = "sha256-NDeyXQO9NBsK3xqAEcO1gGn9ta+ZVQ1GNwZ4hbGUe3Q="; - }; - in { x86_64-linux = fetchurl { url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-x86_64-linux.tar.gz"; @@ -32,7 +26,10 @@ stdenv.mkDerivation (finalAttrs: { url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-aarch64-linux.tar.gz"; hash = "sha256-39hKSRi1l5ruSqObViksJkufiCOvLTaIkQzT3sNQFQQ="; }; - aarch64-darwin = darwinDmg; + aarch64-darwin = fetchurl { + url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/Kiro%20CLI.dmg"; + hash = "sha256-NDeyXQO9NBsK3xqAEcO1gGn9ta+ZVQ1GNwZ4hbGUe3Q="; + }; } .${system} or (throw "Unsupported system: ${system}"); diff --git a/pkgs/by-name/ki/kiro-cli/update.sh b/pkgs/by-name/ki/kiro-cli/update.sh index baff24e34e71..bedf83491dfc 100755 --- a/pkgs/by-name/ki/kiro-cli/update.sh +++ b/pkgs/by-name/ki/kiro-cli/update.sh @@ -63,7 +63,7 @@ echo "darwin hash: $darwin_hash" # Get current hashes from package.nix current_x86_hash=$(grep -A2 'x86_64-linux = fetchurl' "$PACKAGE_NIX" | grep -Po 'hash = "\K[^"]+') current_aarch64_hash=$(grep -A2 'aarch64-linux = fetchurl' "$PACKAGE_NIX" | grep -Po 'hash = "\K[^"]+') -current_darwin_hash=$(grep -A2 'darwinDmg = fetchurl' "$PACKAGE_NIX" | grep -Po 'hash = "\K[^"]+') +current_darwin_hash=$(grep -A2 'aarch64-darwin = fetchurl' "$PACKAGE_NIX" | grep -Po 'hash = "\K[^"]+') # Update version and hashes sed -i "s|version = \"$current_version\"|version = \"$latest_version\"|" "$PACKAGE_NIX" diff --git a/pkgs/by-name/ki/kiro/update.sh b/pkgs/by-name/ki/kiro/update.sh index 211dd624d020..07652514b9c2 100755 --- a/pkgs/by-name/ki/kiro/update.sh +++ b/pkgs/by-name/ki/kiro/update.sh @@ -12,7 +12,6 @@ SOURCES_JSON="${SCRIPT_DIR}/sources.json" # Platform configuration declare -A PLATFORM_URLS=( ["x86_64-linux"]="https://prod.download.desktop.kiro.dev/stable/metadata-linux-x64-stable.json" - ["x86_64-darwin"]="https://prod.download.desktop.kiro.dev/stable/metadata-dmg-darwin-x64-stable.json" ["aarch64-darwin"]="https://prod.download.desktop.kiro.dev/stable/metadata-dmg-darwin-arm64-stable.json" ) diff --git a/pkgs/by-name/le/legends-of-equestria/update.sh b/pkgs/by-name/le/legends-of-equestria/update.sh index 1035b733a8da..b3ac969539e1 100755 --- a/pkgs/by-name/le/legends-of-equestria/update.sh +++ b/pkgs/by-name/le/legends-of-equestria/update.sh @@ -60,5 +60,4 @@ applyUpdate() { } applyUpdate x86_64-linux Linux -applyUpdate x86_64-darwin macOS applyUpdate aarch64-darwin "macOS arm64" diff --git a/pkgs/by-name/le/lens/update.sh b/pkgs/by-name/le/lens/update.sh index 12174d9799fc..ec0f3bd9d32f 100755 --- a/pkgs/by-name/le/lens/update.sh +++ b/pkgs/by-name/le/lens/update.sh @@ -28,10 +28,9 @@ appimage_hash=$(manifest_hash '.x86_64.AppImage' "$linux_manifest") dmg_hash=$(manifest_hash '-latest.dmg' "$mac_manifest") arm64_dmg_hash=$(manifest_hash '-arm64.dmg' "$mac_manifest") -# The three platforms share one version but have distinct hashes. --system picks +# The two platforms share one version but have distinct hashes. --system picks # which source (and therefore which hash) update-source-version rewrites; passing # the hash explicitly avoids a download. The version is written on the first call, # so the darwin calls need --ignore-same-version to not early-exit as "unchanged". update-source-version lens "$version" "$appimage_hash" --system=x86_64-linux -update-source-version lens "$version" "$dmg_hash" --system=x86_64-darwin --ignore-same-version update-source-version lens "$version" "$arm64_dmg_hash" --system=aarch64-darwin --ignore-same-version diff --git a/pkgs/by-name/mi/mirrord/update.py b/pkgs/by-name/mi/mirrord/update.py index 5756363cfc7c..580aafb451c2 100755 --- a/pkgs/by-name/mi/mirrord/update.py +++ b/pkgs/by-name/mi/mirrord/update.py @@ -12,7 +12,6 @@ platforms = { "x86_64-linux": "linux_x86_64", "aarch64-linux": "linux_aarch64", "aarch64-darwin": "mac_universal", - "x86_64-darwin": "mac_universal", } if __name__ == "__main__": diff --git a/pkgs/by-name/mo/mochi/package.nix b/pkgs/by-name/mo/mochi/package.nix index 81d56f9eb8ae..c513e7211733 100644 --- a/pkgs/by-name/mo/mochi/package.nix +++ b/pkgs/by-name/mo/mochi/package.nix @@ -41,12 +41,8 @@ let inherit pname version meta; src = fetchurl { - url = "https://download.mochi.cards/releases/Mochi-${version}${lib.optionalString stdenv.hostPlatform.isAarch64 "-arm64"}.dmg"; - hash = - if stdenv.hostPlatform.isAarch64 then - "sha256-2NADaVzkibWjxBymeF1McGEQH6xHaqDMBg080kCI0F8=" - else - "sha256-XM4vQVQ9QtvqyDu2Wx/8/Z+8H2DetfCufJYrX/1JHFw="; + url = "https://download.mochi.cards/releases/Mochi-${version}-arm64.dmg"; + hash = "sha256-2NADaVzkibWjxBymeF1McGEQH6xHaqDMBg080kCI0F8="; }; sourceRoot = "."; diff --git a/pkgs/by-name/mo/mochi/update.sh b/pkgs/by-name/mo/mochi/update.sh index cc6e20044d54..64c69ee0f4a9 100755 --- a/pkgs/by-name/mo/mochi/update.sh +++ b/pkgs/by-name/mo/mochi/update.sh @@ -17,10 +17,8 @@ fi # Update version and hash for x86_64-linux (AppImage) update-source-version mochi "$latestVersion" --system=x86_64-linux -# Update hashes for darwin systems -for system in x86_64-darwin aarch64-darwin; do - url=$(nix-instantiate --eval --json -E "with import ./. { system = \"$system\"; }; mochi.src.url" | tr -d '"') - hash=$(nix-prefetch-url "$url") - sriHash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$hash") - update-source-version mochi "$latestVersion" "$sriHash" --system="$system" --ignore-same-version -done +# Update hash for aarch64-darwin +url=$(nix-instantiate --eval --json -E "with import ./. { system = \"aarch64-darwin\"; }; mochi.src.url" | tr -d '"') +hash=$(nix-prefetch-url "$url") +sriHash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$hash") +update-source-version mochi "$latestVersion" "$sriHash" --system=aarch64-darwin --ignore-same-version diff --git a/pkgs/by-name/no/notesnook/update.sh b/pkgs/by-name/no/notesnook/update.sh index ed977f182a0d..fcf8f5c6027e 100755 --- a/pkgs/by-name/no/notesnook/update.sh +++ b/pkgs/by-name/no/notesnook/update.sh @@ -18,7 +18,6 @@ fi for i in \ "x86_64-linux linux_x86_64.AppImage" \ "aarch64-linux linux_arm64.AppImage" \ - "x86_64-darwin mac_x64.dmg" \ "aarch64-darwin mac_arm64.dmg"; do set -- $i hash=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url "https://github.com/streetwriters/notesnook/releases/download/v$latestVersion/notesnook_$2")") diff --git a/pkgs/by-name/nr/nrfutil/update.sh b/pkgs/by-name/nr/nrfutil/update.sh index 72bb4763a361..c8329f892aec 100755 --- a/pkgs/by-name/nr/nrfutil/update.sh +++ b/pkgs/by-name/nr/nrfutil/update.sh @@ -17,7 +17,6 @@ declare -a packages architectures["x86_64-linux"]="x86_64-unknown-linux-gnu" architectures["aarch64-linux"]="aarch64-unknown-linux-gnu" # NOTE: segger-jlink is not yet packaged for darwin -# architectures["x86_64-darwin"]="x86_64-apple-darwin" # architectures["aarch64-darwin"]="aarch64-apple-darwin" packages=( diff --git a/pkgs/by-name/oc/ocis_5-bin/package.nix b/pkgs/by-name/oc/ocis_5-bin/package.nix index 2453d3df8c00..00e35dfab40c 100644 --- a/pkgs/by-name/oc/ocis_5-bin/package.nix +++ b/pkgs/by-name/oc/ocis_5-bin/package.nix @@ -30,7 +30,6 @@ let hash_amd64-linux = "sha256-tmUfDKLO35qCs1hauJQKhJhcnMhqOpcqDFtAggMFhLE="; hash_arm64-linux = "sha256-ggRDW1cnTHMQKvOvCDH3eptH3O3PgYaondlzOGHTjio="; hash_arm-linux = "sha256-uMLRow1NeHufSI5B4k5qSIfH3lTxg+WxzLxgdedAz40="; - hash_amd64-darwin = "sha256-LZ6n/f2MdbFaPnBCoJqZZ7HQiLG3Z6ZoatgFsxaFvMc="; hash_arm64-darwin = "sha256-k5X2ZInFS/HlToOZPX23TRJqlx/XM1ZG++Xr4BHn8SY="; } ."hash_${arch}-${os}"; @@ -73,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.intersectLists lib.platforms.linux ( lib.platforms.arm ++ lib.platforms.aarch64 ++ lib.platforms.x86 )) - ++ (lib.intersectLists lib.platforms.darwin (lib.platforms.aarch64 ++ lib.platforms.x86_64)); + ++ lib.platforms.darwin; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; mainProgram = "ocis"; diff --git a/pkgs/by-name/oc/ocis_5-bin/update.py b/pkgs/by-name/oc/ocis_5-bin/update.py index c2f717cb41d5..8436e735b6cb 100755 --- a/pkgs/by-name/oc/ocis_5-bin/update.py +++ b/pkgs/by-name/oc/ocis_5-bin/update.py @@ -251,7 +251,6 @@ def main(): systems = [ ("darwin", "arm64", "aarch64-darwin"), - ("darwin", "amd64", "x86_64-darwin"), ("linux", "arm64", "aarch64-linux"), ("linux", "arm", "armv7l-linux"), ("linux", "amd64", "x86_64-linux"), diff --git a/pkgs/by-name/or/orbstack/package.nix b/pkgs/by-name/or/orbstack/package.nix index 0f8fa3730fb9..d9ac7e1107af 100644 --- a/pkgs/by-name/or/orbstack/package.nix +++ b/pkgs/by-name/or/orbstack/package.nix @@ -8,28 +8,17 @@ let inherit (stdenvNoCC.hostPlatform) system; version = "2.2.1-20628"; - sourceData = { - aarch64-darwin = { - arch = "arm64"; - hash = "sha256-W8FxnDyYfExgxlvp/dZbRzCZDhaX7Byxwz5rujG/krU="; - }; - }; - sources = lib.mapAttrs ( - system: - { arch, hash }: - fetchurl { - url = "https://cdn-updates.orbstack.dev/${arch}/OrbStack_v${ - lib.replaceString "-" "_" version - }_${arch}.dmg"; - inherit hash; - } - ) sourceData; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "orbstack"; inherit version; - src = finalAttrs.passthru.sources.${system} or (throw "unsupported system ${system}"); + src = fetchurl { + url = "https://cdn-updates.orbstack.dev/arm64/OrbStack_v${ + lib.replaceString "-" "_" version + }_arm64.dmg"; + hash = "sha256-W8FxnDyYfExgxlvp/dZbRzCZDhaX7Byxwz5rujG/krU="; + }; # -snld prevents "ERROR: Dangerous symbolic link path was ignored" # -xr'!*:com.apple.*' prevents macOS extended attributes (e.g. macl or @@ -66,7 +55,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; passthru = { - inherit sources; updateScript = ./update.sh; }; diff --git a/pkgs/by-name/or/orbstack/update.sh b/pkgs/by-name/or/orbstack/update.sh index 39c1c2ffe787..582719072a99 100755 --- a/pkgs/by-name/or/orbstack/update.sh +++ b/pkgs/by-name/or/orbstack/update.sh @@ -4,21 +4,8 @@ set -eu -o pipefail -update_arch() { - local arch="$1" - local system="$2" +source_url="$(curl -L -I "https://orbstack.dev/download/stable/latest/arm64" | grep -i "location:" | awk '{print $2}' | tr -d '\r')" +version="$(echo "$source_url" | grep -o '\([0-9]\+\.\)\{2\}[0-9]\+_[0-9]\+' | sed 's/_/-/')" +hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$(nix-prefetch-url --type sha256 "$source_url")") - local source_url - source_url="$(curl -L -I "https://orbstack.dev/download/stable/latest/$arch" | grep -i "location:" | awk '{print $2}' | tr -d '\r')" - - local version - version="$(echo "$source_url" | grep -o '\([0-9]\+\.\)\{2\}[0-9]\+_[0-9]\+' | sed 's/_/-/')" - - local hash - hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$(nix-prefetch-url --type sha256 "$source_url")") - - update-source-version orbstack "$version" "$hash" --system="$system" --source-key="sources.$system" --ignore-same-version -} - -update_arch "arm64" "aarch64-darwin" -update_arch "amd64" "x86_64-darwin" +update-source-version orbstack "$version" "$hash" --ignore-same-version diff --git a/pkgs/by-name/os/osu-lazer-bin/update.sh b/pkgs/by-name/os/osu-lazer-bin/update.sh index 19508b7825e9..7a1edd076fc5 100755 --- a/pkgs/by-name/os/osu-lazer-bin/update.sh +++ b/pkgs/by-name/os/osu-lazer-bin/update.sh @@ -15,7 +15,6 @@ echo "Updating osu-lazer-bin from $old_version to $new_version..." for pair in \ 'aarch64-darwin osu.app.Apple.Silicon.zip' \ - 'x86_64-darwin osu.app.Intel.zip' \ 'x86_64-linux osu.AppImage' do set -- $pair diff --git a/pkgs/by-name/pd/pdfium-binaries/update.sh b/pkgs/by-name/pd/pdfium-binaries/update.sh index 7546a8926329..05957cc0d630 100755 --- a/pkgs/by-name/pd/pdfium-binaries/update.sh +++ b/pkgs/by-name/pd/pdfium-binaries/update.sh @@ -19,7 +19,6 @@ update-source-version pdfium-binaries $latestVersion || true for system in \ x86_64-linux \ aarch64-linux \ - x86_64-darwin \ aarch64-darwin; do hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url --unpack $(nix-instantiate --eval -E "with import ./. {}; pdfium-binaries.src.url" --system "$system" | tr -d '"'))) update-source-version pdfium-binaries $latestVersion $hash --system=$system --ignore-same-version @@ -28,7 +27,6 @@ done for system in \ x86_64-linux \ aarch64-linux \ - x86_64-darwin \ aarch64-darwin; do hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url --unpack $(nix-instantiate --eval -E "with import ./. {}; pdfium-binaries-v8.src.url" --system "$system" | tr -d '"'))) update-source-version pdfium-binaries-v8 $latestVersion $hash --system=$system --ignore-same-version diff --git a/pkgs/by-name/pg/pgsql-tools/update.sh b/pkgs/by-name/pg/pgsql-tools/update.sh index ddd35c318e8a..f6932338bd7f 100644 --- a/pkgs/by-name/pg/pgsql-tools/update.sh +++ b/pkgs/by-name/pg/pgsql-tools/update.sh @@ -19,7 +19,6 @@ update-source-version pgsql-tools "$latestVersion" --file=pkgs/by-name/pg/pgsql- declare -A platforms=( ["x86_64-linux"]="pgsqltoolsservice-linux-x64.tar.gz" ["aarch64-linux"]="pgsqltoolsservice-linux-arm64.tar.gz" - ["x86_64-darwin"]="pgsqltoolsservice-osx-x86.tar.gz" ["aarch64-darwin"]="pgsqltoolsservice-osx-arm64.tar.gz" ) diff --git a/pkgs/by-name/ph/phoenixd/update.sh b/pkgs/by-name/ph/phoenixd/update.sh index a983312c6a71..4c051abfede3 100755 --- a/pkgs/by-name/ph/phoenixd/update.sh +++ b/pkgs/by-name/ph/phoenixd/update.sh @@ -17,7 +17,6 @@ fi for system in \ aarch64-linux \ - x86_64-darwin \ aarch64-darwin; do hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; phoenixd.src.url" --system "$system" | tr -d '"'))) update-source-version phoenixd $latestVersion $hash --system=$system --ignore-same-version diff --git a/pkgs/by-name/pu/pulumi-bin/update.sh b/pkgs/by-name/pu/pulumi-bin/update.sh index f71812135552..4da7ff0fc381 100755 --- a/pkgs/by-name/pu/pulumi-bin/update.sh +++ b/pkgs/by-name/pu/pulumi-bin/update.sh @@ -141,11 +141,6 @@ EOF genSrcs "linux" "amd64" echo " ];" - echo " x86_64-darwin = [" - genMainSrc "darwin" "x64" - genSrcs "darwin" "amd64" - echo " ];" - echo " aarch64-linux = [" genMainSrc "linux" "arm64" genSrcs "linux" "arm64" diff --git a/pkgs/by-name/qq/qq/update.sh b/pkgs/by-name/qq/qq/update.sh index ecc1c769d0dd..af58939b7598 100755 --- a/pkgs/by-name/qq/qq/update.sh +++ b/pkgs/by-name/qq/qq/update.sh @@ -36,18 +36,14 @@ cat >sources.nix <sources.nix <sources.nix <sources.nix <sources.nix <)[^<]+') darwin_version=$(echo "$darwin_payload" | grep -oP '(?<=\s)\d+(?:\.\d+)+(?=/)') linux_amd64_url=$(echo "$linux_payload" | grep -oP "downLoad\('[^']*'" | head -1 | sed "s/downLoad('//;s/'$//") -darwin_amd64_url="https://package.mac.wpscdn.cn/mac_wps_pkg/${darwin_version}/WPS_Office_${darwin_version}(${darwin_version##*.})_x64.dmg" darwin_arm64_url="https://package.mac.wpscdn.cn/mac_wps_pkg/${darwin_version}/WPS_Office_${darwin_version}(${darwin_version##*.})_arm64.dmg" timestamp10=$(date '+%s') linux_amd64_md5hash=($(printf '%s' "$SECURITY_KEY${linux_amd64_url#$prefix}$timestamp10" | md5sum)) linux_amd64_hash=$(nix-prefetch-url --name "wpsoffice-cn-$linux_version.deb" "$linux_amd64_url?t=$timestamp10&k=$linux_amd64_md5hash") -darwin_amd64_hash=$(nix-prefetch-url --name "wpsoffice-cn-$darwin_version.dmg" "$darwin_amd64_url") darwin_arm64_hash=$(nix-prefetch-url --name "wpsoffice-cn-$darwin_version.dmg" "$darwin_arm64_url") linux_amd64_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$linux_amd64_hash") -darwin_amd64_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$darwin_amd64_hash") darwin_arm64_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$darwin_arm64_hash") cat > sources.nix << EOF @@ -41,10 +38,6 @@ cat > sources.nix << EOF url = "$linux_amd64_url"; hash = "$linux_amd64_hash"; }; - x86_64-darwin = { - url = "$darwin_amd64_url"; - hash = "$darwin_amd64_hash"; - }; aarch64-darwin = { url = "$darwin_arm64_url"; hash = "$darwin_arm64_hash"; diff --git a/pkgs/by-name/ya/yandex-cloud/update.py b/pkgs/by-name/ya/yandex-cloud/update.py index d6309118bf92..53d4555f061a 100644 --- a/pkgs/by-name/ya/yandex-cloud/update.py +++ b/pkgs/by-name/ya/yandex-cloud/update.py @@ -14,7 +14,6 @@ systems = [ ("aarch64", "darwin"), ("aarch64", "linux"), ("i686", "linux"), - ("x86_64", "darwin"), ("x86_64", "linux"), ] diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix index bd573c080e3b..34c8a05cac58 100644 --- a/pkgs/by-name/zo/zoom-us/package.nix +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -55,7 +55,6 @@ let # We write them on three lines like this (rather than using {}) so that the updater script can # find where to edit them. versions.aarch64-darwin = "7.1.0.83064"; - versions.x86_64-darwin = "7.1.0.83064"; # This is the fallback version so that evaluation can produce a meaningful result. versions.x86_64-linux = "7.1.0.3715"; diff --git a/pkgs/by-name/zo/zoom-us/update.sh b/pkgs/by-name/zo/zoom-us/update.sh index 25e8d58eb9a2..7147ecd8abfc 100755 --- a/pkgs/by-name/zo/zoom-us/update.sh +++ b/pkgs/by-name/zo/zoom-us/update.sh @@ -17,7 +17,6 @@ version_x86_64_linux=$(jq -r .zoom.version <<<"$linux_data") echo >&2 "=== Updating package.nix ..." # update-source-version expects to be at the root of nixpkgs (cd "$nixpkgs" && update-source-version --ignore-same-version --print-changes --version-key=versions.aarch64-darwin pkgsCross.aarch64-darwin.zoom-us "$version_aarch64_darwin") -(cd "$nixpkgs" && update-source-version --ignore-same-version --print-changes --version-key=versions.x86_64-darwin pkgsCross.x86_64-darwin.zoom-us "$version_x86_64_darwin") (cd "$nixpkgs" && update-source-version --ignore-same-version --print-changes --version-key=versions.x86_64-linux pkgsCross.gnu64.zoom-us "$version_x86_64_linux" --source-key=unpacked.src) echo >&2 "=== Done!" diff --git a/pkgs/development/compilers/flutter/update/get-artifact-hashes.nix.in b/pkgs/development/compilers/flutter/update/get-artifact-hashes.nix.in index 8edff6a2e876..b67f45d42bbd 100644 --- a/pkgs/development/compilers/flutter/update/get-artifact-hashes.nix.in +++ b/pkgs/development/compilers/flutter/update/get-artifact-hashes.nix.in @@ -21,7 +21,6 @@ let systemPlatforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; diff --git a/pkgs/development/compilers/flutter/update/get-dart-hashes.nix.in b/pkgs/development/compilers/flutter/update/get-dart-hashes.nix.in index 0972a3578b52..7b140b1d6d70 100644 --- a/pkgs/development/compilers/flutter/update/get-dart-hashes.nix.in +++ b/pkgs/development/compilers/flutter/update/get-dart-hashes.nix.in @@ -9,7 +9,6 @@ let { x86_64-linux = "linux-x64"; aarch64-linux = "linux-arm64"; - x86_64-darwin = "macos-x64"; aarch64-darwin = "macos-arm64"; } ."@platform@"; diff --git a/pkgs/development/compilers/flutter/update/update.py b/pkgs/development/compilers/flutter/update/update.py index 7a28cc46d949..971af0d17285 100755 --- a/pkgs/development/compilers/flutter/update/update.py +++ b/pkgs/development/compilers/flutter/update/update.py @@ -153,7 +153,7 @@ def get_artifact_hashes(flutter_compact_version): def get_dart_hashes(dart_version, channel): - platforms = ["x86_64-linux", "aarch64-linux", "x86_64-darwin", "aarch64-darwin"] + platforms = ["x86_64-linux", "aarch64-linux", "aarch64-darwin"] result_dict = {} for platform in platforms: code = load_code( diff --git a/pkgs/development/compilers/graalvm/community-edition/update.sh b/pkgs/development/compilers/graalvm/community-edition/update.sh index 30f1782e53b9..88c233e6d20f 100755 --- a/pkgs/development/compilers/graalvm/community-edition/update.sh +++ b/pkgs/development/compilers/graalvm/community-edition/update.sh @@ -82,14 +82,12 @@ if [[ "$product" == "graalvm-ce" ]]; then [aarch64-linux]="linux-aarch64" [x86_64-linux]="linux-x64" [aarch64-darwin]="macos-aarch64" - [x86_64-darwin]="macos-x64" ) else declare -r -A platforms=( [aarch64-linux]="linux-aarch64" [x86_64-linux]="linux-amd64" [aarch64-darwin]="macos-aarch64" - [x86_64-darwin]="macos-amd64" ) fi diff --git a/pkgs/development/python-modules/frida-python/update.sh b/pkgs/development/python-modules/frida-python/update.sh index 2dde81527470..88132590f18c 100755 --- a/pkgs/development/python-modules/frida-python/update.sh +++ b/pkgs/development/python-modules/frida-python/update.sh @@ -11,7 +11,6 @@ sed -i "s/version = \".*\"/version = \"$latest\"/" "$dir/default.nix" for system_platform in \ "x86_64-linux|manylinux1_x86_64" \ "aarch64-linux|manylinux2014_aarch64" \ - "x86_64-darwin|macosx_10_13_x86_64" \ "aarch64-darwin|macosx_11_0_arm64" do system="${system_platform%%|*}" diff --git a/pkgs/development/python-modules/semgrep/update.sh b/pkgs/development/python-modules/semgrep/update.sh index c5eecc39491f..58d492de5dce 100755 --- a/pkgs/development/python-modules/semgrep/update.sh +++ b/pkgs/development/python-modules/semgrep/update.sh @@ -105,7 +105,6 @@ update_core_platform() { # update_core_platform update_core_platform "x86_64-linux" "x86_64" "manylinux" update_core_platform "aarch64-linux" "aarch64" "manylinux" -update_core_platform "x86_64-darwin" "x86_64" "macosx" update_core_platform "aarch64-darwin" "arm64" "macosx" OLD_PWD=$PWD diff --git a/pkgs/development/tools/electron/binary/update.py b/pkgs/development/tools/electron/binary/update.py index 67efba73c362..1ee10323df6e 100755 --- a/pkgs/development/tools/electron/binary/update.py +++ b/pkgs/development/tools/electron/binary/update.py @@ -47,7 +47,6 @@ systems = { "x86_64-linux": "linux-x64", "armv7l-linux": "linux-armv7l", "aarch64-linux": "linux-arm64", - "x86_64-darwin": "darwin-x64", "aarch64-darwin": "darwin-arm64", } diff --git a/pkgs/development/tools/infisical/hashes.json b/pkgs/development/tools/infisical/hashes.json index f4b015db3c1c..3a88405c8e72 100644 --- a/pkgs/development/tools/infisical/hashes.json +++ b/pkgs/development/tools/infisical/hashes.json @@ -1,6 +1,5 @@ { "_comment": "@generated by pkgs/development/tools/infisical/update.sh" , "x86_64-linux": "sha256-/2fksPX6/hsz6hYGdn5iNah0LMR+avY0zf9UuNH8zAo=" - , "aarch64-linux": "sha256-lrkyolCSgLQiet287Br0aGYCP/daaYzJAaqMvsqsbsw=" , "aarch64-darwin": "sha256-pw06koxiY9gYvDw0b6tRTMy3BGYS36mxV0q8TWEA7vM=" } diff --git a/pkgs/development/tools/infisical/update.sh b/pkgs/development/tools/infisical/update.sh index dc2a855d9cf0..53f2b236dcd2 100755 --- a/pkgs/development/tools/infisical/update.sh +++ b/pkgs/development/tools/infisical/update.sh @@ -15,7 +15,6 @@ echo "Latest infisical release: $VERSION" ARCHS=( "x86_64-linux:linux_amd64" - "x86_64-darwin:darwin_amd64" "aarch64-linux:linux_arm64" "aarch64-darwin:darwin_arm64" ) diff --git a/pkgs/development/tools/selenium/chromedriver/binary.nix b/pkgs/development/tools/selenium/chromedriver/binary.nix index 84ab490d6dc9..745a2f864fd5 100644 --- a/pkgs/development/tools/selenium/chromedriver/binary.nix +++ b/pkgs/development/tools/selenium/chromedriver/binary.nix @@ -12,19 +12,6 @@ let (lib.importJSON ../../../../applications/networking/browsers/chromium/info.json) .chromium.chromedriver; - # See ./source.nix for Linux - allSpecs = { - - aarch64-darwin = { - system = "mac-arm64"; - hash = upstream-info.hash_darwin_aarch64; - }; - }; - - spec = - allSpecs.${stdenv.hostPlatform.system} - or (throw "missing chromedriver binary for ${stdenv.hostPlatform.system}"); - inherit (upstream-info) version; in stdenv.mkDerivation { @@ -32,8 +19,8 @@ stdenv.mkDerivation { inherit version; src = fetchzip { - url = "https://storage.googleapis.com/chrome-for-testing-public/${version}/${spec.system}/chromedriver-${spec.system}.zip"; - inherit (spec) hash; + url = "https://storage.googleapis.com/chrome-for-testing-public/${version}/mac-arm64/chromedriver-mac-arm64.zip"; + hash = upstream-info.hash_darwin_aarch64; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/web/playwright/browser-downloads-test.js b/pkgs/development/web/playwright/browser-downloads-test.js index 5f4ec96259c0..9db75a07d66b 100644 --- a/pkgs/development/web/playwright/browser-downloads-test.js +++ b/pkgs/development/web/playwright/browser-downloads-test.js @@ -15,7 +15,6 @@ const browserNames = Object.keys(browserDownloads); const hostPlatformBySystem = { "x86_64-linux": "ubuntu24.04-x64", "aarch64-linux": "ubuntu24.04-arm64", - "x86_64-darwin": "mac15", "aarch64-darwin": "mac15-arm64", }; diff --git a/pkgs/development/web/playwright/chromium-headless-shell.nix b/pkgs/development/web/playwright/chromium-headless-shell.nix index 645d15fd5559..e83de5fa56de 100644 --- a/pkgs/development/web/playwright/chromium-headless-shell.nix +++ b/pkgs/development/web/playwright/chromium-headless-shell.nix @@ -70,11 +70,7 @@ let darwin = fetchzip { inherit (download) url stripRoot; - hash = - { - aarch64-darwin = "sha256-qWrMOreqTOFhmFBROlXIPXrM3wqNT7iJJwpelVFke6I="; - } - .${system} or throwSystem; + hash = "sha256-qWrMOreqTOFhmFBROlXIPXrM3wqNT7iJJwpelVFke6I="; }; in { diff --git a/pkgs/development/web/playwright/chromium.nix b/pkgs/development/web/playwright/chromium.nix index 4d92563b30a1..1eb744ffd82d 100644 --- a/pkgs/development/web/playwright/chromium.nix +++ b/pkgs/development/web/playwright/chromium.nix @@ -128,11 +128,7 @@ let }; chromium-darwin = fetchzip { inherit (download) url stripRoot; - hash = - { - aarch64-darwin = "sha256-aJbvZQ1hY0FfDC+ZktfW2yNW3nwc0kh/P30+n/cmLf0="; - } - .${system} or throwSystem; + hash = "sha256-aJbvZQ1hY0FfDC+ZktfW2yNW3nwc0kh/P30+n/cmLf0="; }; in { diff --git a/pkgs/development/web/playwright/firefox.nix b/pkgs/development/web/playwright/firefox.nix index e757f9af593d..91c70ebcf75b 100644 --- a/pkgs/development/web/playwright/firefox.nix +++ b/pkgs/development/web/playwright/firefox.nix @@ -40,11 +40,7 @@ let }; firefox-darwin = fetchzip { inherit (download) url stripRoot; - hash = - { - aarch64-darwin = "sha256-Opwa5SbuAaXf2A+qrldHc6BkhRaOzzl0dy7R4vodG5w="; - } - .${system} or throwSystem; + hash = "sha256-Opwa5SbuAaXf2A+qrldHc6BkhRaOzzl0dy7R4vodG5w="; }; in { diff --git a/pkgs/development/web/playwright/update.sh b/pkgs/development/web/playwright/update.sh index 21d8b85cbc85..8043188eb16e 100755 --- a/pkgs/development/web/playwright/update.sh +++ b/pkgs/development/web/playwright/update.sh @@ -17,7 +17,7 @@ playwright_driver_file="$root/driver.nix" playwright_raw_repo_url="https://raw.githubusercontent.com/microsoft/playwright" playwright_mcp_package_file="$root/../../../by-name/pl/playwright-mcp/package.nix" browser_names=(chromium chromium-headless-shell firefox webkit ffmpeg) -browser_systems=(x86_64-linux aarch64-linux x86_64-darwin aarch64-darwin) +browser_systems=(x86_64-linux aarch64-linux aarch64-darwin) github_api_get() { curl "${github_api_curl_args[@]}" -fsSL "$1" diff --git a/pkgs/development/web/playwright/webkit.nix b/pkgs/development/web/playwright/webkit.nix index da2028c325b1..e3e191410ab1 100644 --- a/pkgs/development/web/playwright/webkit.nix +++ b/pkgs/development/web/playwright/webkit.nix @@ -202,11 +202,7 @@ let }; webkit-darwin = fetchzip { inherit (download) url stripRoot; - hash = - { - aarch64-darwin = "sha256-glVkYnthOFBPp1gZXTue9WwjP+oCgQpq6j9Mlm/bjmg="; - } - .${system} or throwSystem; + hash = "sha256-glVkYnthOFBPp1gZXTue9WwjP+oCgQpq6j9Mlm/bjmg="; }; in { diff --git a/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh b/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh index 34638be8d264..1e28cab67df2 100755 --- a/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh +++ b/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh @@ -41,6 +41,5 @@ if echo "$api_response" | jq -e '.packages | select(length == 1) | .any' > /dev/ else update "linux-amd64" "x86_64-linux" update "linux-arm64" "aarch64-linux" - update "darwin-amd64" "x86_64-darwin" update "darwin-arm64" "aarch64-darwin" fi