From ef106247652c112bfb38aedd8feffe76b628d425 Mon Sep 17 00:00:00 2001 From: Han Verstraete Date: Thu, 2 Sep 2021 23:43:44 +0200 Subject: [PATCH 1/2] maintainers: add welteki --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 35ccd0b1d983..45e93d4e06a5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11612,6 +11612,16 @@ githubId = 9002575; name = "Weihua Lu"; }; + welteki = { + email = "welteki@pm.me"; + github = "welteki"; + githubId = 16267532; + name = "Han Verstraete"; + keys = [{ + longkeyid = "rsa4096/0x11F7BAEA856743FF"; + fingerprint = "2145 955E 3F5E 0C95 3458 41B5 11F7 BAEA 8567 43FF"; + }]; + }; wheelsandmetal = { email = "jakob@schmutz.co.uk"; github = "wheelsandmetal"; From 7588cd14813ce7d1cf262382b862c1aa76ae5637 Mon Sep 17 00:00:00 2001 From: Han Verstraete Date: Wed, 8 Sep 2021 09:09:52 +0200 Subject: [PATCH 2/2] faas-cli: init at 0.13.13 --- pkgs/development/tools/faas-cli/default.nix | 42 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/tools/faas-cli/default.nix diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix new file mode 100644 index 000000000000..d74e9b35a2b6 --- /dev/null +++ b/pkgs/development/tools/faas-cli/default.nix @@ -0,0 +1,42 @@ +{ lib, stdenv, buildGoModule, fetchFromGitHub }: +let + faasPlatform = platform: + let cpuName = platform.parsed.cpu.name; in { + "aarch64" = "arm64"; + "armv7l" = "armhf"; + }.${cpuName} or cpuName; +in +buildGoModule rec { + pname = "faas-cli"; + # When updating version change rev. + version = "0.13.13"; + rev = "72816d486cf76c3089b915dfb0b66b85cf096634"; + platform = faasPlatform stdenv.targetPlatform; + + src = fetchFromGitHub { + owner = "openfaas"; + repo = "faas-cli"; + rev = version; + sha256 = "0mmrakyy2qmkldld7pxf5bx6whdadq2r52b68f9p9z7yqrdimix8"; + }; + + CGO_ENABLED = 0; + + vendorSha256 = null; + + subPackages = [ "." ]; + + ldflags = [ + "-s" "-w" + "-X github.com/openfaas/faas-cli/version.GitCommit=${rev}" + "-X github.com/openfaas/faas-cli/version.Version=${version}" + "-X github.com/openfaas/faas-cli/commands.Platform=${platform}" + ]; + + meta = with lib; { + homepage = "https://github.com/openfaas/faas-cli"; + description = "Official CLI for OpenFaaS "; + license = licenses.mit; + maintainers = with maintainers; [ welteki ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a30b941f17b..662a0aed6dcf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13836,6 +13836,8 @@ with pkgs; ezquake = callPackage ../games/ezquake { }; + faas-cli = callPackage ../development/tools/faas-cli { }; + findbugs = callPackage ../development/tools/analysis/findbugs { }; findnewest = callPackage ../development/tools/misc/findnewest { };