From 2a9a4592271769749c0da32819a6f757e2f821eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20van=20Br=C3=BCgge?= Date: Sun, 29 Dec 2024 15:59:19 +0000 Subject: [PATCH] tandoor-recipes: fix update script to use nixpkgs root as workdir This is what e.g. ./maintainers/scripts/update.nix expects --- pkgs/applications/misc/tandoor-recipes/update.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/tandoor-recipes/update.sh b/pkgs/applications/misc/tandoor-recipes/update.sh index 63021d76f6b7..f197ead847e4 100755 --- a/pkgs/applications/misc/tandoor-recipes/update.sh +++ b/pkgs/applications/misc/tandoor-recipes/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq +#!nix-shell -I nixpkgs=./ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq # shellcheck shell=bash @@ -36,6 +36,7 @@ popd # Use friendlier hashes yarn_hash=$(nix hash to-sri --type sha256 "$yarn_hash") -sed -i -E -e "s#version = \".*\"#version = \"$version\"#" common.nix -sed -i -E -e "s#hash = \".*\"#hash = \"$src_hash\"#" common.nix -sed -i -E -e "s#yarnHash = \".*\"#yarnHash = \"$yarn_hash\"#" common.nix +common="./pkgs/applications/misc/tandoor-recipes/common.nix" +sed -i -E -e "s#version = \".*\"#version = \"$version\"#" $common +sed -i -E -e "s#hash = \".*\"#hash = \"$src_hash\"#" $common +sed -i -E -e "s#yarnHash = \".*\"#yarnHash = \"$yarn_hash\"#" $common