Skip to content

Commit 03d12a6

Browse files
woodpecker-{agent,cli,server}: 2.8.3 -> 3.0.1, invert deprecation wrapper for woodpecker-cli (NixOS#375606)
2 parents 2b65970 + 32be348 commit 03d12a6

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

pkgs/development/tools/continuous-integration/woodpecker/cli.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ buildGoModule {
1818

1919
meta = common.meta // {
2020
description = "Command line client for the Woodpecker Continuous Integration server";
21-
mainProgram = "woodpecker";
21+
mainProgram = "woodpecker-cli";
2222
};
2323
}

pkgs/development/tools/continuous-integration/woodpecker/common.nix

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{ lib, fetchzip }:
22
let
3-
version = "2.8.3";
4-
srcHash = "sha256-/Ozzibz2BhVSxQeH9tg3cC5uVl0gEA/Hw2AMOELW/I8=";
3+
version = "3.0.1";
4+
srcHash = "sha256-BJHvZhi/jjVH/NZKqGwL2ZiYGxM72EtJ0KTO21IigAY=";
55
# The tarball contains vendored dependencies
66
vendorHash = null;
77
in
@@ -18,26 +18,24 @@ in
1818
cd $out/bin
1919
for f in *; do
2020
if [ "$f" = cli ]; then
21-
mv -- "$f" "woodpecker"
2221
# Issue a warning to the user if they call the deprecated executable
23-
cat >woodpecker-cli << EOF
22+
cat >woodpecker << EOF
2423
#!/bin/sh
25-
echo 'WARNING: calling \`woodpecker-cli\` is deprecated, use \`woodpecker\` instead.' >&2
26-
$out/bin/woodpecker "\$@"
24+
echo 'WARNING: calling \`woodpecker\` is deprecated, use \`woodpecker-cli\` instead.' >&2
25+
$out/bin/woodpecker-cli "\$@"
2726
EOF
28-
chmod +x woodpecker-cli
29-
patchShebangs woodpecker-cli
30-
else
31-
mv -- "$f" "woodpecker-$f"
27+
chmod +x woodpecker
28+
patchShebangs woodpecker
3229
fi
30+
mv -- "$f" "woodpecker-$f"
3331
done
3432
cd -
3533
'';
3634

3735
ldflags = [
3836
"-s"
3937
"-w"
40-
"-X go.woodpecker-ci.org/woodpecker/v2/version.Version=${version}"
38+
"-X go.woodpecker-ci.org/woodpecker/v3/version.Version=${version}"
4139
];
4240

4341
meta = with lib; {

0 commit comments

Comments
 (0)