From 0abfcbfa324677288ac52d543d3feb19b9a0adba Mon Sep 17 00:00:00 2001 From: nayeko <196556004+nayeko@users.noreply.github.com> Date: Sat, 15 Feb 2025 18:19:08 +0000 Subject: [PATCH 1/2] aliyun-cli: refactor --- pkgs/by-name/al/aliyun-cli/package.nix | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix index 3953e3634efc..d4bcafbe1f10 100644 --- a/pkgs/by-name/al/aliyun-cli/package.nix +++ b/pkgs/by-name/al/aliyun-cli/package.nix @@ -2,6 +2,8 @@ lib, buildGoModule, fetchFromGitHub, + writableTmpDirAsHomeHook, + nix-update-script, }: buildGoModule rec { @@ -9,11 +11,11 @@ buildGoModule rec { version = "3.0.211"; src = fetchFromGitHub { - rev = "v${version}"; owner = "aliyun"; - repo = pname; - fetchSubmodules = true; + repo = "aliyun-cli"; + tag = "v${version}"; hash = "sha256-6msh6bGL++nXVzwwNW6fFZbkN40ieL+SpgRownIs9aE="; + fetchSubmodules = true; }; vendorHash = "sha256-wHdSDBxDArVbD5+EgGcIpQ+NLg5BKXo2v3WM4ni1efc="; @@ -26,16 +28,20 @@ buildGoModule rec { "-X github.com/aliyun/aliyun-cli/cli.Version=${version}" ]; + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; + postInstall = '' - mv $out/bin/main $out/bin/aliyun + install -Dm755 $out/bin/main $out/bin/aliyun ''; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Tool to manage and use Alibaba Cloud resources through a command line interface"; homepage = "https://github.com/aliyun/aliyun-cli"; changelog = "https://github.com/aliyun/aliyun-cli/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ ornxka ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ ornxka ]; mainProgram = "aliyun"; }; } From bc241eb4057336902e7689e55caba3b2b617f553 Mon Sep 17 00:00:00 2001 From: nayeko <196556004+nayeko@users.noreply.github.com> Date: Sat, 15 Feb 2025 18:19:32 +0000 Subject: [PATCH 2/2] aliyun-cli: 3.0.211 -> 3.0.252 --- pkgs/by-name/al/aliyun-cli/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix index d4bcafbe1f10..f71e7018e9e4 100644 --- a/pkgs/by-name/al/aliyun-cli/package.nix +++ b/pkgs/by-name/al/aliyun-cli/package.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.211"; + version = "3.0.252"; src = fetchFromGitHub { owner = "aliyun"; repo = "aliyun-cli"; tag = "v${version}"; - hash = "sha256-6msh6bGL++nXVzwwNW6fFZbkN40ieL+SpgRownIs9aE="; + hash = "sha256-BNoNO8HQQGkUTR2MfpolF+PRo7YgT0hUbi5n+zPst6c="; fetchSubmodules = true; }; - vendorHash = "sha256-wHdSDBxDArVbD5+EgGcIpQ+NLg5BKXo2v3WM4ni1efc="; + vendorHash = "sha256-xwhq1UJ73Xxmt3NkpQMCrcl9N0F833N3/V+O+w1SVrQ="; subPackages = [ "main" ]; @@ -31,7 +31,7 @@ buildGoModule rec { nativeCheckInputs = [ writableTmpDirAsHomeHook ]; postInstall = '' - install -Dm755 $out/bin/main $out/bin/aliyun + mv $out/bin/main $out/bin/aliyun ''; passthru.updateScript = nix-update-script { };