From eced5cf47d1f438e433290cec692ce16a1e32fee Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Mon, 20 Oct 2025 11:34:07 -0700 Subject: [PATCH 1/2] woodpecker: remove deprecated subcommands of nix hash --- .../tools/continuous-integration/woodpecker/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/continuous-integration/woodpecker/update.sh b/pkgs/development/tools/continuous-integration/woodpecker/update.sh index 98c2888c27de..10b16d9f5062 100755 --- a/pkgs/development/tools/continuous-integration/woodpecker/update.sh +++ b/pkgs/development/tools/continuous-integration/woodpecker/update.sh @@ -28,5 +28,5 @@ sed -i -E -e "s#version = \".*\"#version = \"$version\"#" common.nix # Woodpecker repository src_hash=$(nix-prefetch-url --type sha256 --unpack "https://github.com/woodpecker-ci/woodpecker/releases/download/v$version/woodpecker-src.tar.gz") -src_hash=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$src_hash") +src_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$src_hash") sed -i -E -e "s#srcHash = \".*\"#srcHash = \"$src_hash\"#" common.nix From 6e8317c620e07acfe9342393874c057df1ffebb4 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Mon, 20 Oct 2025 11:42:17 -0700 Subject: [PATCH 2/2] woodpecker: cleanup --- .../tools/continuous-integration/woodpecker/common.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix index ee8f8106657a..aaae68d75956 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -2,8 +2,7 @@ let version = "3.11.0"; srcHash = "sha256-mLyEHNMePVZI6MOSyeD9NMp9QXRXQ7h3LFSxHxpf878="; - # The tarball contains vendored dependencies - vendorHash = null; + vendorHash = null; # The tarball contains vendored dependencies in { inherit version vendorHash; @@ -38,11 +37,11 @@ in "-X go.woodpecker-ci.org/woodpecker/v3/version.Version=${version}" ]; - meta = with lib; { + meta = { homepage = "https://woodpecker-ci.org/"; changelog = "https://github.com/woodpecker-ci/woodpecker/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ ambroisie marcusramberg techknowlogick