diff --git a/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-config-hook.sh b/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-config-hook.sh index 65c4e3e689ada..0fda1c6e1c1a5 100644 --- a/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-config-hook.sh +++ b/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-config-hook.sh @@ -75,7 +75,14 @@ yarnBerryConfigHook() { export npm_config_nodedir="@nodeSrc@" export npm_config_node_gyp="@nodeGyp@" - YARN_IGNORE_PATH=1 @yarn_offline@ install --inline-builds + YARN_IGNORE_PATH=1 @yarn_offline@ install --mode=skip-build + if [[ -z "${dontYarnBerryPatchShebangs-}" ]]; then + echo "Running patchShebangs in between the Link and the Build step..." + patchShebangs node_modules + fi + if ! [[ "$YARN_ENABLE_SCRIPTS" == "0" || "$YARN_ENABLE_SCRIPTS" == "false" ]]; then + YARN_IGNORE_PATH=1 @yarn_offline@ install --inline-builds + fi echo "finished yarnBerryConfigHook" } diff --git a/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-fetcher.nix b/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-fetcher.nix index aced36b9b7001..df15e691d95fe 100644 --- a/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-fetcher.nix +++ b/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-fetcher.nix @@ -13,18 +13,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "yarn-berry-${toString berryVersion}-fetcher"; - version = "1.0.1"; + version = "1.2.1"; src = fetchFromGitLab { domain = "cyberchaos.dev"; owner = "yuka"; repo = "yarn-berry-fetcher"; - tag = "1.0.1"; - hash = "sha256-v92+aeGmT151TvcW7FvuooF3g+opdZw7QHY+CcLweJE="; + tag = "1.2.1"; + hash = "sha256-gBre1LGyDVhikigWoWWW5qZyDCHp4lDONPqg1CRtaFM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-TR9FT95WAaiRvoYBXeT0U6agF94BAdMswNncYysESKo="; + cargoHash = "sha256-KNVfwv+qaJEu3TqhCKpiTfuRvFIFcHstcpjre/QXDso="; env.YARN_ZIP_SUPPORTED_CACHE_VERSION = berryCacheVersion; env.LIBZIP_SYS_USE_PKG_CONFIG = 1;