diff --git a/pkgs/by-name/aw/aws-assume-role/0001-add-go.mod-go.sum.patch b/pkgs/by-name/aw/aws-assume-role/0001-add-go.mod-go.sum.patch new file mode 100644 index 000000000000..861a37fa9fbb --- /dev/null +++ b/pkgs/by-name/aw/aws-assume-role/0001-add-go.mod-go.sum.patch @@ -0,0 +1,53 @@ +From 7eff498538c201cabae769e20715282a1aab2266 Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Mon, 4 Nov 2024 21:25:33 +0800 +Subject: [PATCH] add go.mod & go.sum + +--- + go.mod | 10 ++++++++++ + go.sum | 16 ++++++++++++++++ + 2 files changed, 26 insertions(+) + create mode 100644 go.mod + create mode 100644 go.sum + +diff --git a/go.mod b/go.mod +new file mode 100644 +index 0000000..5d3a1fa +--- /dev/null ++++ b/go.mod +@@ -0,0 +1,10 @@ ++module github.com/remind101/assume-role ++ ++go 1.23.2 ++ ++require ( ++ github.com/aws/aws-sdk-go v1.55.5 ++ gopkg.in/yaml.v2 v2.4.0 ++) ++ ++require github.com/jmespath/go-jmespath v0.4.0 // indirect +diff --git a/go.sum b/go.sum +new file mode 100644 +index 0000000..b35ff93 +--- /dev/null ++++ b/go.sum +@@ -0,0 +1,16 @@ ++github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU= ++github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= ++github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= ++github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= ++github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= ++github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= ++github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= ++github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= ++github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= ++github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= ++github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= ++gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= ++gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= ++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= ++gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= ++gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +-- +2.46.1 + diff --git a/pkgs/tools/admin/aws-assume-role/default.nix b/pkgs/by-name/aw/aws-assume-role/package.nix similarity index 67% rename from pkgs/tools/admin/aws-assume-role/default.nix rename to pkgs/by-name/aw/aws-assume-role/package.nix index 1e160919af4a..f7785c457a32 100644 --- a/pkgs/tools/admin/aws-assume-role/default.nix +++ b/pkgs/by-name/aw/aws-assume-role/package.nix @@ -1,13 +1,17 @@ -{ lib -, fetchFromGitHub -, buildGoModule +{ + lib, + fetchFromGitHub, + buildGoModule, }: buildGoModule rec { pname = "aws-assume-role"; version = "0.3.2"; - outputs = [ "out" "doc" ]; + outputs = [ + "out" + "doc" + ]; src = fetchFromGitHub { owner = "remind101"; @@ -16,11 +20,14 @@ buildGoModule rec { sha256 = "sha256-7+9qi9lYzv1YCFhUyla+5Gqs5nBUiiazhFwiqHzMFd4="; }; - vendorHash = null; + deleteVendor = true; - postPatch = '' - go mod init github.com/remind101/assume-role - ''; + vendorHash = "sha256-NIY6w/hQQ357KHEDEHUYVLbkQKsm8FLtRf3/AbbgukA="; + + patches = [ + # Generate with go mod init github.com/remind101/assume-role && go mod tidy + ./0001-add-go.mod-go.sum.patch + ]; postInstall = '' install -Dm444 -t $out/share/doc/aws-assume-role README.md diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15df049d6aaa..9bd69239d32e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3121,8 +3121,6 @@ with pkgs; awsume = python3Packages.callPackage ../tools/admin/awsume { }; - aws-assume-role = callPackage ../tools/admin/aws-assume-role { }; - aws-lambda-rie = callPackage ../tools/admin/aws-lambda-runtime-interface-emulator { }; aws-mfa = python3Packages.callPackage ../tools/admin/aws-mfa { };