diff --git a/pkgs/by-name/aw/aws-cdk-cli/missing-hashes.json b/pkgs/by-name/aw/aws-cdk-cli/missing-hashes.json index 07816f807684..d4e3201c1a22 100644 --- a/pkgs/by-name/aw/aws-cdk-cli/missing-hashes.json +++ b/pkgs/by-name/aw/aws-cdk-cli/missing-hashes.json @@ -25,16 +25,16 @@ "@esbuild/win32-arm64@npm:0.28.1": "551ada5396e1f10e3d3592dd60a148a7257af1ab2317bba09e9ed18a6d7ee7e5961c68eb1fbaee4e8c1961b504807493e1b8f5c700dd1fb990f0cb36b240ad57", "@esbuild/win32-ia32@npm:0.28.1": "2676ace6b4d63721da34873974152e869aed9fc8bd9fdff4b8df14a3a3e68b78a9b4566e643b90b948b4e85773cbf288a33a59d13979caaadd43b5adad68312c", "@esbuild/win32-x64@npm:0.28.1": "8d658b74ed9b7494b3799093551d4c928a7916865ed42d00a135156cbd08612b53072e9e424f0687c10a93a444d30d6b0294b6a1d5fdba78078d706646ba558f", - "@nx/nx-darwin-arm64@npm:22.7.5": "4f8435566c4b7ea0de0c8953f994849b91ad85867f6cdfce67fc0bb7404a760131dad7bdb7c789f82980d349c1a6df255be03807da260cbc5396284395865f28", - "@nx/nx-darwin-x64@npm:22.7.5": "3d63123766ce58602f08c5c2e9e896d9bbba402c53f3918a0ea5eebab25cd2f48fb992ac654ea648088564b1347f920509f7a20ad25c538d227a11292024ce64", - "@nx/nx-freebsd-x64@npm:22.7.5": "6fa6ba0ab68e6fd9742c5bdc8cacbd67d3be6334b967c9dfa3a3fa5e64b689fa1d7b50f807420227ad470c53ad5cf8343240d35ed89ca8d3e62a921a4857e8b9", - "@nx/nx-linux-arm-gnueabihf@npm:22.7.5": "7fd2f207688a8353012f8363cc28868e927840c2378dba466a67dff50eabbf24362e6654e183c1308479d435e8326444ae4ab803e3f5bdf84061915124183f4f", - "@nx/nx-linux-arm64-gnu@npm:22.7.5": "03c8fa25e5833fe4746995624b15e72258b7050ee70a6d80ed4c2b0f5e8b740774264d1decf70eea61387028886b2360953675d554f2ee8b4ae784adf738ed7b", - "@nx/nx-linux-arm64-musl@npm:22.7.5": "ea449f0b82c027b6eae5f2a060d26624bee91b487b601ccb5ab250ff33140f4bd60cf004e8f5f1e495b9bd391c17bda4758635ddb80f1af29b234eb067517b2c", - "@nx/nx-linux-x64-gnu@npm:22.7.5": "96aad2912ef8a607147cb5831ddbfc6f08b3c657c44879c738055fde274259e2dfc7e507485c52c194e79445ca2410cf618e31e2d2af00f7563f04055beea3c7", - "@nx/nx-linux-x64-musl@npm:22.7.5": "1f61915a2e93a6b930b81b8205407e2c961f7878a5131f136027b86bd35a579fe65b52a47088c4818c6e6426b3aa79ece8ce30119a3e44dd4d5a681efd7cde4a", - "@nx/nx-win32-arm64-msvc@npm:22.7.5": "3f4668ce48fd341f487b99c72e7678ebdfa0964591a58947752bf050a4bb21bf27ee920ac4554433e0efd73beca923a17a6dfc90e35c8b5ee1f92fd4a7f2caa0", - "@nx/nx-win32-x64-msvc@npm:22.7.5": "c44700bd537a0f2571d75285302d332c0fa31a648a822937cd81362c7b4fcb8c8ecabb98559c0b7bcdb537acd051b4f3926bcd9e369095260fc6aa8d079e3c04", + "@nx/nx-darwin-arm64@npm:22.7.6": "b336dcf04ce9c07d4bfe908fadb6bf5cc791342b4991439f5a7c0075d587c3d4570696c44b5d595735accda2bdf29c04a56dd0705b499f6a6b70f9886d833097", + "@nx/nx-darwin-x64@npm:22.7.6": "391780c2f14249c92a32b1245099e3d98241719f2cdf0b81289dc28948d011f18089ba94e272394b28aa2fbe5904119b954a633fc8bf82e8250bb00821e06d28", + "@nx/nx-freebsd-x64@npm:22.7.6": "bebebd506d74cbb62e3cbf3afbcb66e125e2ad3e3cd346e1ee51bf11167561649c6e60db751292e64f3b3a8c8a424d803979392c78a191c08ef510093ff93ab0", + "@nx/nx-linux-arm-gnueabihf@npm:22.7.6": "56d67d7536b0e89c08949bba7f94c071ced817195c37f3d947113888e0f624a8b21d31aad13107c86ac2225705298112ac593c359675540fcc47f74adb25f6eb", + "@nx/nx-linux-arm64-gnu@npm:22.7.6": "e61ff5c461d96294182c0ee823f627c37e925972a50375a4499b3089dcbadd9249cdbc995d5f573271a5aa7cb7a82690575a4ee51e149b6e3959559172d390ff", + "@nx/nx-linux-arm64-musl@npm:22.7.6": "0c0e5ba1583a49063779edd776555e11dbaf85f11600756b62774283ca1d8c2a84ddfdfe7c0f175275d0401a6aedc84deac831534bb3e5588841d719429477ee", + "@nx/nx-linux-x64-gnu@npm:22.7.6": "d65682bc14813e0f1e8e1bc5356081b6ecfde7a2fc3236e1d813f0da8ffc712b3b1641c8ebd4389e577348db549757efa2084fd16119fc6393e242331b2bad9e", + "@nx/nx-linux-x64-musl@npm:22.7.6": "924ed33a107b6647abe10acd77fe41f113e82dd83961b05d73c8b3a3c7c85d60cb35cae3a976497a8ef4fd48ab574d4ae5b683efd225fd4c404408b0ab87c1f9", + "@nx/nx-win32-arm64-msvc@npm:22.7.6": "feda72abfa06e7143a795993888ff2da73936a3bab4e2ca787b102322494abb3b3f24a944dd51c1de409afc19e921c6c98879d80f27921e848254d2a432cdc09", + "@nx/nx-win32-x64-msvc@npm:22.7.6": "5066816d70bcb55051259fc3acde32fef67f9359e15810e64dd3c93e11db40632e11a517dd3b1993a468632a8d75335ce550499711a23b5e7166f3130175bcda", "@unrs/resolver-binding-android-arm-eabi@npm:1.11.1": "04dd38b694c1680bfec192b499e188700398a414886a08a8a7c72815db56ac147df03d88c73ff6fff7ac3e0a01dc41978054b3622b49463e0d684c5168557fcc", "@unrs/resolver-binding-android-arm64@npm:1.11.1": "763626adc34dd2b4af677b5ced6493e7b2b1935351a5c9137f1c9561d11faf97b94015e6876e57e85c33ff563564314c92c0882a4780a57f2225cbbd779a695d", "@unrs/resolver-binding-darwin-arm64@npm:1.11.1": "03b477fdfec55dbabe488fe0962417bddaa38b028d2670053469f1d24163907b097aac15b565f6974449bee398a38d5e3e1525f2b515ce57e243149021b7aa2f", diff --git a/pkgs/by-name/aw/aws-cdk-cli/package.nix b/pkgs/by-name/aw/aws-cdk-cli/package.nix index 8cc53b5a19ad..7a9edef0e3fc 100644 --- a/pkgs/by-name/aw/aws-cdk-cli/package.nix +++ b/pkgs/by-name/aw/aws-cdk-cli/package.nix @@ -10,7 +10,6 @@ python3, unzip, testers, - nix-update-script, }: let @@ -18,19 +17,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "aws-cdk-cli"; - version = "2.1129.0"; + version = "2.1131.0"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cdk-cli"; tag = "cdk@v${finalAttrs.version}"; - hash = "sha256-KXbNrzylyY+RSp4Da9rMSEn7UdPTHU9iDID/qXGL+io="; + hash = "sha256-66kMwa9IJN0Culc+oAUazKBlXE3nRoPJ2/0/OaTRxjI="; }; missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; - hash = "sha256-jh/EW+scTCJ698jKr1eRYeckRhgE+SmOjfUUgJ7GbFU="; + hash = "sha256-BVjva74w/6zHv6JKAPCBt5Pu72ztGSJYX5h4QffABkk="; }; nativeBuildInputs = [ @@ -129,12 +128,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; - updateScript = nix-update-script { - extraArgs = [ - "--version-regex" - "cdk@v(.*)" - ]; - }; + updateScript = ./update.sh; }; meta = { diff --git a/pkgs/by-name/aw/aws-cdk-cli/update.sh b/pkgs/by-name/aw/aws-cdk-cli/update.sh new file mode 100755 index 000000000000..e035b03d31b2 --- /dev/null +++ b/pkgs/by-name/aw/aws-cdk-cli/update.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p coreutils nix nix-update yarn-berry_4.yarn-berry-fetcher + +set -euo pipefail + +package_dir=$(realpath "$(dirname "$0")") + +# Update the source first. offlineCache cannot be updated until the hashes +# missing from the new yarn.lock have been regenerated below. +nix-update "$UPDATE_NIX_PNAME" --src-only --version-regex 'cdk@v(.*)' "$@" + +updated_version=$(nix-instantiate --eval --strict --attr "$UPDATE_NIX_PNAME.version" --raw) + +if [[ "$updated_version" == "$UPDATE_NIX_OLD_VERSION" ]]; then + echo "Package is already up to date: $updated_version" + exit 0 +fi + +src_path=$(nix-build --attr "$UPDATE_NIX_PNAME.src" --no-link) +yarn-berry-fetcher missing-hashes "$src_path/yarn.lock" >"$package_dir/missing-hashes.json" + +# Regenerate the hash of the Yarn offline cache after updating its missing hashes. +nix-update "$UPDATE_NIX_PNAME" --version skip