From 0421c816badf8502a3abd6a82573b8d147690a44 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 9 Jun 2024 19:46:03 +0200 Subject: treewide: Simplify use of update-source-version - `--ignore-same-version` allows us to not call it twice. - with that, we can also omit version, to allow us updating e.g. `cargoDeps` hash --- pkgs/applications/audio/reaper/updater.sh | 8 ++------ pkgs/applications/blockchains/electrs/update.sh | 3 +-- pkgs/applications/blockchains/teos/update.sh | 3 +-- pkgs/applications/editors/sublime/4/common.nix | 5 +---- pkgs/applications/misc/rescuetime/default.nix | 5 +---- .../networking/browsers/palemoon/bin.nix | 5 +---- .../networking/browsers/tor-browser/update.nix | 3 +-- .../networking/browsers/vivaldi/update-vivaldi.sh | 3 +-- .../instant-messengers/feishu/default.nix | 3 +-- .../office/libreoffice/darwin/default.nix | 7 ++----- .../version-management/sublime-merge/common.nix | 5 +---- pkgs/applications/virtualization/lima/bin.nix | 12 ++++------- pkgs/by-name/db/dbeaver-bin/update.sh | 3 +-- pkgs/by-name/gm/gmic/package.nix | 6 +----- pkgs/by-name/sk/sketchybar-app-font/package.nix | 3 +-- pkgs/by-name/ya/yabai/package.nix | 3 +-- pkgs/development/libraries/librsvg/default.nix | 9 +-------- pkgs/development/php-packages/relay/default.nix | 3 +-- pkgs/development/tools/misc/blackfire/default.nix | 3 +-- .../development/tools/misc/blackfire/php-probe.nix | 3 +-- pkgs/development/tools/sauce-connect/update.sh | 3 +-- pkgs/development/web/bun/default.nix | 3 +-- pkgs/servers/plex/raw.nix | 5 +---- pkgs/shells/powershell/default.nix | 3 +-- pkgs/tools/misc/archi/update.sh | 3 +-- pkgs/tools/video/recyclarr/update.sh | 23 ++++------------------ 26 files changed, 34 insertions(+), 101 deletions(-) diff --git a/pkgs/applications/audio/reaper/updater.sh b/pkgs/applications/audio/reaper/updater.sh index 31832f7173c66..ef070c38aa229 100755 --- a/pkgs/applications/audio/reaper/updater.sh +++ b/pkgs/applications/audio/reaper/updater.sh @@ -9,18 +9,14 @@ function set_hash_for_linux() { local arch=$1 pkg_hash=$(nix-prefetch-url https://www.reaper.fm/files/${reaper_ver%.*}.x/reaper${reaper_ver/./}_linux_$arch.tar.xz) pkg_hash=$(nix hash to-sri "sha256:$pkg_hash") - # reset the version so the second architecture update doesn't get ignored - update-source-version reaper 0 "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" --system=$arch-linux - update-source-version reaper "${reaper_ver}" "$pkg_hash" --system=$arch-linux + update-source-version reaper "${reaper_ver}" "$pkg_hash" --system=$arch-linux --ignore-same-version } function set_hash_for_darwin() { local arch=$1 pkg_hash=$(nix-prefetch-url https://www.reaper.fm/files/${reaper_ver%.*}.x/reaper${reaper_ver/./}_universal.dmg) pkg_hash=$(nix hash to-sri "sha256:$pkg_hash") - # reset the version so the second architecture update doesn't get ignored - update-source-version reaper 0 "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" --system=$arch-darwin - update-source-version reaper "${reaper_ver}" "$pkg_hash" --system=$arch-darwin + update-source-version reaper "${reaper_ver}" "$pkg_hash" --system=$arch-darwin --ignore-same-version } set_hash_for_linux aarch64 diff --git a/pkgs/applications/blockchains/electrs/update.sh b/pkgs/applications/blockchains/electrs/update.sh index 14105d71a448a..db6a2fa5639f2 100755 --- a/pkgs/applications/blockchains/electrs/update.sh +++ b/pkgs/applications/blockchains/electrs/update.sh @@ -34,7 +34,6 @@ git -C $repo verify-tag v${version} rm -rf $repo/.git hash=$(nix hash path $repo) -(cd "$nixpkgs" && update-source-version electrs "$version" "$hash") -sed -i 's|cargoHash = .*|cargoHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";|' "$scriptDir/default.nix" +(cd "$nixpkgs" && update-source-version electrs "$version" "$hash" && update-source-version electrs --ignore-same-version --source-key=cargoDeps) echo echo "electrs: $oldVersion -> $version" diff --git a/pkgs/applications/blockchains/teos/update.sh b/pkgs/applications/blockchains/teos/update.sh index b7e344cda8447..f27be08299b2c 100755 --- a/pkgs/applications/blockchains/teos/update.sh +++ b/pkgs/applications/blockchains/teos/update.sh @@ -25,7 +25,6 @@ git -C "$repo" checkout "tags/v${version}" rm -rf "${repo}/.git" hashcheck=$(nix hash path "$repo") -(cd "$nixpkgs" && update-source-version teos "$version" "$hashcheck") -sed -i 's|cargoHash = .*|cargoHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";|' "${scriptDir}/default.nix" +(cd "$nixpkgs" && update-source-version teos "$version" "$hashcheck" && update-source-version teos --ignore-same-version --source-key=cargoDeps) echo echo "rust-teos: $oldVersion -> $version" diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix index f8083902fdde4..952194e0260c6 100644 --- a/pkgs/applications/editors/sublime/4/common.nix +++ b/pkgs/applications/editors/sublime/4/common.nix @@ -192,10 +192,7 @@ stdenv.mkDerivation (rec { fi for platform in ${lib.escapeShellArgs meta.platforms}; do - # The script will not perform an update when the version attribute is up to date from previous platform run - # We need to clear it before each run - update-source-version "${packageAttribute}.${primaryBinary}" 0 "${lib.fakeSha256}" --file="$versionFile" --version-key=buildVersion --source-key="sources.$platform" - update-source-version "${packageAttribute}.${primaryBinary}" "$latestVersion" --file="$versionFile" --version-key=buildVersion --source-key="sources.$platform" + update-source-version "${packageAttribute}.${primaryBinary}" "$latestVersion" --ignore-same-version --file="$versionFile" --version-key=buildVersion --source-key="sources.$platform" done ''; in diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 22a1964e466df..615fa2c10faeb 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -42,10 +42,7 @@ in mkDerivation rec { latestVersion="$(curl -sS https://www.rescuetime.com/release-notes/linux | pup '.release:first-of-type h2 strong text{}' | tr -d '\n')" for platform in ${lib.concatStringsSep " " meta.platforms}; do - # The script will not perform an update when the version attribute is up to date from previous platform run - # We need to clear it before each run - update-source-version ${pname} 0 $(yes 0 | head -64 | tr -d "\n") --system=$platform - update-source-version ${pname} "$latestVersion" --system=$platform + update-source-version ${pname} "$latestVersion" --system=$platform --ignore-same-version done ''; diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index 4e648d00919f4..4637385613eb5 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -184,10 +184,7 @@ stdenv.mkDerivation (finalAttrs: { )" for variant in gtk3 gtk2; do - # The script will not perform an update when the version attribute is up to date from previous platform run - # We need to clear it before each run - update-source-version palemoon-bin 0 "${lib.fakeHash}" --source-key="sources.$variant" - update-source-version palemoon-bin "$version" --source-key="sources.$variant" + update-source-version palemoon-bin "$version" --ignore-same-version --source-key="sources.$variant" done ''; }; diff --git a/pkgs/applications/networking/browsers/tor-browser/update.nix b/pkgs/applications/networking/browsers/tor-browser/update.nix index 4edb644d59f91..04b69d8ce208c 100644 --- a/pkgs/applications/networking/browsers/tor-browser/update.nix +++ b/pkgs/applications/networking/browsers/tor-browser/update.nix @@ -59,7 +59,6 @@ in writeShellScript "update-${pname}" '' sha256=$(grep "${name}-$arch-$version.tar.xz" "$HOME/shasums" | cut -d" " -f1) hash=$(nix hash to-sri --type sha256 "$sha256") - update-source-version "${pname}" "0" "sha256-${lib.fakeSha256}" --source-key="sources.$platform" - update-source-version "${pname}" "$version" "$hash" --source-key="sources.$platform" + update-source-version "${pname}" "$version" "$hash" --ignore-same-version --source-key="sources.$platform" done '' diff --git a/pkgs/applications/networking/browsers/vivaldi/update-vivaldi.sh b/pkgs/applications/networking/browsers/vivaldi/update-vivaldi.sh index 6e1d68f13994b..994257889ee69 100755 --- a/pkgs/applications/networking/browsers/vivaldi/update-vivaldi.sh +++ b/pkgs/applications/networking/browsers/vivaldi/update-vivaldi.sh @@ -8,8 +8,7 @@ version=$(curl -sS https://vivaldi.com/download/ | sed -rne 's/.*vivaldi-stable_ update_hash() { url="https://downloads.vivaldi.com/stable/vivaldi-stable_$version-1_$2.deb" hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "$url")) - update-source-version vivaldi 0 sha256-BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB= --system=$1 - update-source-version vivaldi "$version" "$hash" --system=$1 + update-source-version vivaldi "$version" "$hash" --system=$1 --ignore-same-version } update_hash aarch64-linux arm64 diff --git a/pkgs/applications/networking/instant-messengers/feishu/default.nix b/pkgs/applications/networking/instant-messengers/feishu/default.nix index 48a6ba12d1826..def3a487d9b44 100644 --- a/pkgs/applications/networking/instant-messengers/feishu/default.nix +++ b/pkgs/applications/networking/instant-messengers/feishu/default.nix @@ -220,8 +220,7 @@ stdenv.mkDerivation { new_version=$(echo $package_info | jq -r '.data.version_number' | sed -n 's/.*@V//p') sha256_hash=$(nix-prefetch-url $update_link) sri_hash=$(nix hash to-sri --type sha256 $sha256_hash) - update-source-version feishu 0 ${lib.fakeSha256} --system=$platform --source-key="sources.$platform" - update-source-version feishu $new_version $sri_hash $update_link --system=$platform --source-key="sources.$platform" + update-source-version feishu $new_version $sri_hash $update_link --system=$platform --ignore-same-version --source-key="sources.$platform" done ''; }; diff --git a/pkgs/applications/office/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/default.nix index a8060a183d9cd..c81d08d31d98f 100644 --- a/pkgs/applications/office/libreoffice/darwin/default.nix +++ b/pkgs/applications/office/libreoffice/darwin/default.nix @@ -63,11 +63,8 @@ stdenvNoCC.mkDerivation { #!nix-shell -i bash --argstr aarch64Url ${aarch64Url} --argstr x86_64Url ${x86_64Url} --argstr version ${version} ${updateNix} set -eou pipefail - # reset version first so that both platforms are always updated and in sync - update-source-version libreoffice-bin 0 ${lib.fakeSha256} --file=${defaultNixFile} --system=aarch64-darwin - update-source-version libreoffice-bin $newVersion $newAarch64Sha256 --file=${defaultNixFile} --system=aarch64-darwin - update-source-version libreoffice-bin 0 ${lib.fakeSha256} --file=${defaultNixFile} --system=x86_64-darwin - update-source-version libreoffice-bin $newVersion $newX86_64Sha256 --file=${defaultNixFile} --system=x86_64-darwin + 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 ''; meta = with lib; { diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index 811bed7694c1e..df5e36228290f 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -196,10 +196,7 @@ stdenv.mkDerivation (rec { fi for platform in ${lib.escapeShellArgs meta.platforms}; do - # The script will not perform an update when the version attribute is up to date from previous platform run - # We need to clear it before each run - update-source-version "${packageAttribute}.${primaryBinary}" 0 "${lib.fakeSha256}" --file="$versionFile" --version-key=buildVersion --source-key="sources.$platform" - update-source-version "${packageAttribute}.${primaryBinary}" "$latestVersion" --file="$versionFile" --version-key=buildVersion --source-key="sources.$platform" + update-source-version "${packageAttribute}.${primaryBinary}" "$latestVersion" --ignore-same-version --file="$versionFile" --version-key=buildVersion --source-key="sources.$platform" done ''; in diff --git a/pkgs/applications/virtualization/lima/bin.nix b/pkgs/applications/virtualization/lima/bin.nix index 952ec6304e294..7f0f195e07ec0 100644 --- a/pkgs/applications/virtualization/lima/bin.nix +++ b/pkgs/applications/virtualization/lima/bin.nix @@ -92,14 +92,10 @@ stdenvNoCC.mkDerivation { X86_64_LINUX_SHA256=$(cat SHA256SUMS | awk '/Linux-x86_64/{print $1}') # reset version first so that all platforms are always updated and in sync - update-source-version lima-bin 0 ${lib.fakeSha256} --file=${lima-bin} --system=aarch64-darwin - update-source-version lima-bin $LATEST_VERSION $AARCH64_DARWIN_SHA256 --file=${lima-bin} --system=aarch64-darwin - update-source-version lima-bin 0 ${lib.fakeSha256} --file=${lima-bin} --system=x86_64-darwin - update-source-version lima-bin $LATEST_VERSION $X86_64_DARWIN_SHA256 --file=${lima-bin} --system=x86_64-darwin - update-source-version lima-bin 0 ${lib.fakeSha256} --file=${lima-bin} --system=aarch64-linux - update-source-version lima-bin $LATEST_VERSION $AARCH64_LINUX_SHA256 --file=${lima-bin} --system=aarch64-linux - update-source-version lima-bin 0 ${lib.fakeSha256} --file=${lima-bin} --system=x86_64-linux - update-source-version lima-bin $LATEST_VERSION $X86_64_LINUX_SHA256 --file=${lima-bin} --system=x86_64-linux + update-source-version lima-bin $LATEST_VERSION $AARCH64_DARWIN_SHA256 --file=${lima-bin} --ignore-same-version --system=aarch64-darwin + update-source-version lima-bin $LATEST_VERSION $X86_64_DARWIN_SHA256 --file=${lima-bin} --ignore-same-version --system=x86_64-darwin + update-source-version lima-bin $LATEST_VERSION $AARCH64_LINUX_SHA256 --file=${lima-bin} --ignore-same-version --system=aarch64-linux + update-source-version lima-bin $LATEST_VERSION $X86_64_LINUX_SHA256 --file=${lima-bin} --ignore-same-version --system=x86_64-linux rm SHA256SUMS ''; diff --git a/pkgs/by-name/db/dbeaver-bin/update.sh b/pkgs/by-name/db/dbeaver-bin/update.sh index ad09144f9a4b0..ad8461e5a2eb8 100755 --- a/pkgs/by-name/db/dbeaver-bin/update.sh +++ b/pkgs/by-name/db/dbeaver-bin/update.sh @@ -20,6 +20,5 @@ do prefetch=$(nix-prefetch-url "https://github.com/dbeaver/dbeaver/releases/download/$latestVersion/dbeaver-ce-$latestVersion-$2") hash=$(nix-hash --type sha256 --to-sri $prefetch) - update-source-version dbeaver-bin 0 "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" --system=$1 - update-source-version dbeaver-bin $latestVersion $hash --system=$1 + update-source-version dbeaver-bin $latestVersion $hash --system=$1 --ignore-same-version done diff --git a/pkgs/by-name/gm/gmic/package.nix b/pkgs/by-name/gm/gmic/package.nix index 73906fa30db46..2afb1f4d40e99 100644 --- a/pkgs/by-name/gm/gmic/package.nix +++ b/pkgs/by-name/gm/gmic/package.nix @@ -99,11 +99,7 @@ stdenv.mkDerivation (finalAttrs: { fi for component in src gmic_stdlib; do - # The script will not perform an update when the version attribute is - # up to date from previous platform run; we need to clear it before - # each run - update-source-version "--source-key=$component" "gmic" 0 "${lib.fakeHash}" - update-source-version "--source-key=$component" "gmic" $latestVersion + update-source-version "--source-key=$component" "gmic" $latestVersion --ignore-same-version done ''; }; diff --git a/pkgs/by-name/sk/sketchybar-app-font/package.nix b/pkgs/by-name/sk/sketchybar-app-font/package.nix index d64cef79acf5e..286e00d231c9a 100644 --- a/pkgs/by-name/sk/sketchybar-app-font/package.nix +++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix @@ -73,8 +73,7 @@ lib.checkListOfEnum "sketchybar-app-font: artifacts" artifacts artifactList exit 0 fi for artifact in ${lib.escapeShellArgs (lib.mapAttrsToList(a: _: a) finalAttrs.passthru.sources)}; do - update-source-version "sketchybar-app-font" "0" "${lib.fakeHash}" --source-key="sources.$artifact" - update-source-version "sketchybar-app-font" "$NEW_VERSION" --source-key="sources.$artifact" + update-source-version "sketchybar-app-font" "$NEW_VERSION" --ignore-same-version --source-key="sources.$artifact" done ''; }; diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix index 6bdf50c25a9b2..e3734610ad06b 100644 --- a/pkgs/by-name/ya/yabai/package.nix +++ b/pkgs/by-name/ya/yabai/package.nix @@ -121,8 +121,7 @@ stdenv'.mkDerivation (finalAttrs: { exit 0 fi for platform in ${lib.escapeShellArgs finalAttrs.meta.platforms}; do - update-source-version "yabai" "0" "${lib.fakeHash}" --source-key="sources.$platform" - update-source-version "yabai" "$NEW_VERSION" --source-key="sources.$platform" + update-source-version "yabai" "$NEW_VERSION" --ignore-same-version --source-key="sources.$platform" done ''; }; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index a682b39bbcd80..866a66f115b67 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -184,14 +184,7 @@ stdenv.mkDerivation (finalAttrs: { jq nix ]} - # update-source-version does not allow updating to the same version so we need to clear it temporarily. - # Get the current version so that we can restore it later. - latestVersion=$(nix-instantiate --eval -A librsvg.version | jq --raw-output) - # Clear the version. Provide hash so that we do not need to do pointless TOFU. - # Needs to be a fake SRI hash that is non-zero, since u-s-v uses zero as a placeholder. - # Also cannot be here verbatim or u-s-v would be confused what to replace. - update-source-version librsvg 0 "sha256-${lib.fixedWidthString 44 "B" "="}" --source-key=cargoDeps > /dev/null - update-source-version librsvg "$latestVersion" --source-key=cargoDeps > /dev/null + update-source-version librsvg --ignore-same-version --source-key=cargoDeps > /dev/null '' ]; # Experimental feature: do not copy! diff --git a/pkgs/development/php-packages/relay/default.nix b/pkgs/development/php-packages/relay/default.nix index 3120607482c7b..56d826cb4b948 100644 --- a/pkgs/development/php-packages/relay/default.nix +++ b/pkgs/development/php-packages/relay/default.nix @@ -144,8 +144,7 @@ stdenv.mkDerivation (finalAttrs: { fi for source in ${lib.concatStringsSep " " (builtins.attrNames finalAttrs.passthru.updateables)}; do - update-source-version "$UPDATE_NIX_ATTR_PATH.updateables.$source" "0" "sha256-${lib.fakeSha256}" - update-source-version "$UPDATE_NIX_ATTR_PATH.updateables.$source" "$NEW_VERSION" + update-source-version "$UPDATE_NIX_ATTR_PATH.updateables.$source" "$NEW_VERSION" --ignore-same-version done ''; diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index eacae2aed8f7d..568af01cf4abd 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -88,8 +88,7 @@ stdenv.mkDerivation rec { fi for platform in ${lib.escapeShellArgs meta.platforms}; do - update-source-version "blackfire" "0" "${lib.fakeSha256}" --source-key="sources.$platform" - update-source-version "blackfire" "$NEW_VERSION" --source-key="sources.$platform" + update-source-version "blackfire" "$NEW_VERSION" --ignore-same-version --source-key="sources.$platform" done ''; }; diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index 0bfae8d3a3683..c30dde82aaa62 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -107,8 +107,7 @@ stdenv.mkDerivation (finalAttrs: { fi for source in ${lib.concatStringsSep " " (builtins.attrNames finalAttrs.passthru.updateables)}; do - update-source-version "$UPDATE_NIX_ATTR_PATH.updateables.$source" "0" "sha256-${lib.fakeSha256}" - update-source-version "$UPDATE_NIX_ATTR_PATH.updateables.$source" "$NEW_VERSION" + update-source-version "$UPDATE_NIX_ATTR_PATH.updateables.$source" "$NEW_VERSION" --ignore-same-version done ''; diff --git a/pkgs/development/tools/sauce-connect/update.sh b/pkgs/development/tools/sauce-connect/update.sh index d74cbe577b3c9..1c6f10b33046a 100755 --- a/pkgs/development/tools/sauce-connect/update.sh +++ b/pkgs/development/tools/sauce-connect/update.sh @@ -20,8 +20,7 @@ all_versions=$(jq --exit-status --raw-output \ <<< "$response") latest_version=$(sort --version-sort <<< "$all_versions" | tail -n 1) for platform in x86_64-linux x86_64-darwin; do - update-source-version sauce-connect 0 "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" \ - --source-key="passthru.sources.$platform" update-source-version sauce-connect "$latest_version" \ + --ignore-same-version \ --source-key="passthru.sources.$platform" done diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 019ed66411016..9b0a1f3a9bd35 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -75,8 +75,7 @@ stdenvNoCC.mkDerivation rec { exit 0 fi for platform in ${lib.escapeShellArgs meta.platforms}; do - update-source-version "bun" "0" "${lib.fakeHash}" --source-key="sources.$platform" - update-source-version "bun" "$NEW_VERSION" --source-key="sources.$platform" + update-source-version "bun" "$NEW_VERSION" --ignore-same-version --source-key="sources.$platform" done ''; }; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 54ffa4e426559..0a3d243d0a200 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -70,10 +70,7 @@ stdenv.mkDerivation rec { latestSha="$(nix-prefetch-url $dlUrl)" - # The script will not perform an update when the version attribute is up to date from previous platform run - # We need to clear it before each run - update-source-version plexRaw 0 $(yes 0 | head -64 | tr -d "\n") --system=$platform - update-source-version plexRaw "$latestVersion" "$latestSha" --system=$platform + update-source-version plexRaw "$latestVersion" "$latestSha" --system=$platform --ignore-same-version done ''; diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index a779534c2d63e..4c8d60b679eab 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -114,8 +114,7 @@ stdenv.mkDerivation rec { fi for platform in ${lib.escapeShellArgs meta.platforms}; do - update-source-version "powershell" "0" "${lib.fakeHash}" --source-key="sources.$platform" - update-source-version "powershell" "$NEW_VERSION" --source-key="sources.$platform" + update-source-version "powershell" "$NEW_VERSION" --ignore-same-version --source-key="sources.$platform" done ''; }; diff --git a/pkgs/tools/misc/archi/update.sh b/pkgs/tools/misc/archi/update.sh index 07d488637945b..d405a188d3d09 100755 --- a/pkgs/tools/misc/archi/update.sh +++ b/pkgs/tools/misc/archi/update.sh @@ -21,6 +21,5 @@ do prefetch=$(nix-prefetch-url https://www.archimatetool.com/downloads/archi/$latestVersion/$2) hash=$(nix-hash --type sha256 --to-sri $prefetch) - update-source-version archi 0 "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" --system=$1 - update-source-version archi $latestVersion $hash --system=$1 + update-source-version archi $latestVersion $hash --system=$1 --ignore-same-version done diff --git a/pkgs/tools/video/recyclarr/update.sh b/pkgs/tools/video/recyclarr/update.sh index 83942439cc284..c9e5d5731992a 100755 --- a/pkgs/tools/video/recyclarr/update.sh +++ b/pkgs/tools/video/recyclarr/update.sh @@ -24,23 +24,8 @@ function get_hash() { nix hash to-sri "sha256:$pkg_hash" } -# aarch64-darwin -# reset version first so that all platforms are always updated and in sync -update-source-version recyclarr 0 "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" --system="aarch64-darwin" -update-source-version recyclarr "$latestVersion" $(get_hash osx arm64 "$latestVersion") --system="aarch64-darwin" - -# x86_64-darwin -# reset version first so that all platforms are always updated and in sync -update-source-version recyclarr 0 "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" --system="x86_64-darwin" -update-source-version recyclarr "$latestVersion" $(get_hash osx x64 "$latestVersion") --system="x86_64-darwin" - -# aarch64-linux -# reset version first so that all platforms are always updated and in sync -update-source-version recyclarr 0 "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" --system="aarch64-linux" -update-source-version recyclarr "$latestVersion" $(get_hash linux arm64 "$latestVersion") --system="aarch64-linux" - -# x86_64-linux -# reset version first so that all platforms are always updated and in sync -update-source-version recyclarr 0 "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" --system="x86_64-linux" -update-source-version recyclarr "$latestVersion" $(get_hash linux x64 "$latestVersion") --system="x86_64-linux" +update-source-version recyclarr "$latestVersion" $(get_hash osx arm64 "$latestVersion") --system="aarch64-darwin" --ignore-same-version +update-source-version recyclarr "$latestVersion" $(get_hash osx x64 "$latestVersion") --system="x86_64-darwin" --ignore-same-version +update-source-version recyclarr "$latestVersion" $(get_hash linux arm64 "$latestVersion") --system="aarch64-linux" --ignore-same-version +update-source-version recyclarr "$latestVersion" $(get_hash linux x64 "$latestVersion") --system="x86_64-linux" --ignore-same-version -- cgit 1.4.1