From 0ff79c1c20672743865fe2a0ed5be5357c663b4b Mon Sep 17 00:00:00 2001 From: aleksana Date: Sun, 24 Nov 2024 16:52:51 +0800 Subject: [PATCH] treewide: fix update script in by-name --- pkgs/by-name/_1/_1password-cli/update.sh | 2 +- pkgs/by-name/ca/castopod/update.sh | 2 +- pkgs/by-name/na/nanorc/package.nix | 2 -- .../up/update-python-libraries/update-python-libraries.py | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/_1/_1password-cli/update.sh b/pkgs/by-name/_1/_1password-cli/update.sh index 0ef07bf6ab48..9f0e2b70b2d0 100755 --- a/pkgs/by-name/_1/_1password-cli/update.sh +++ b/pkgs/by-name/_1/_1password-cli/update.sh @@ -6,7 +6,7 @@ set -eu ROOT="$(dirname "$(readlink -f "$0")")" NIX_DRV="$ROOT/package.nix" if [ ! -f "$NIX_DRV" ]; then - echo "ERROR: cannot find default.nix in $ROOT" + echo "ERROR: cannot find package.nix in $ROOT" exit 1 fi diff --git a/pkgs/by-name/ca/castopod/update.sh b/pkgs/by-name/ca/castopod/update.sh index 742788dc8ddf..343cf1579059 100755 --- a/pkgs/by-name/ca/castopod/update.sh +++ b/pkgs/by-name/ca/castopod/update.sh @@ -3,7 +3,7 @@ set -euo pipefail nixpkgs="$(git rev-parse --show-toplevel)" -castopod_nix="$nixpkgs/pkgs/applications/audio/castopod/default.nix" +castopod_nix="$(dirname "$0")/package.nix" # https://www.meetup.com/api/guide/#p02-querying-section query=' diff --git a/pkgs/by-name/na/nanorc/package.nix b/pkgs/by-name/na/nanorc/package.nix index f233503e1e0f..da0f65e197d3 100644 --- a/pkgs/by-name/na/nanorc/package.nix +++ b/pkgs/by-name/na/nanorc/package.nix @@ -47,8 +47,6 @@ stdenv.mkDerivation rec { oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"' | sed 's|\\.|-|g')" latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags git@github.com:${owner}/${repo} '*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3)" if [ "$oldVersion" != "$latestTag" ]; then - nixpkgs="$(git rev-parse --show-toplevel)" - default_nix="$nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix" newTag=$(echo $latestTag | sed 's|\.|-|g') update-source-version ${pname} "$newTag" --version-key=version --print-changes else diff --git a/pkgs/by-name/up/update-python-libraries/update-python-libraries.py b/pkgs/by-name/up/update-python-libraries/update-python-libraries.py index b8e1b81b437a..06baecf366ce 100755 --- a/pkgs/by-name/up/update-python-libraries/update-python-libraries.py +++ b/pkgs/by-name/up/update-python-libraries/update-python-libraries.py @@ -6,7 +6,7 @@ You can pass in multiple files or paths. You'll likely want to use `` - $ ./update-python-libraries ../../pkgs/development/python-modules/**/default.nix + $ ./update-python-libraries ../../development/python-modules/**/default.nix `` to update all non-pinned libraries in that folder. """