From 066a710a9cccc9e556ed200c6a8ab3a773d20667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=B8rlaag?= <114830266+Borlaag@users.noreply.github.com> Date: Sun, 18 Dec 2022 18:24:04 -0500 Subject: [PATCH 1/2] maintainers: add borlaag --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 97179337e778..35ff0df6ad3a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1960,6 +1960,12 @@ githubId = 1743184; name = "Boris Babić"; }; + borlaag = { + email = "borlaag@proton.me"; + github = "Borlaag"; + githubId = 114830266; + name = "Børlaag"; + }; bosu = { email = "boriss@gmail.com"; github = "bosu"; From f240364f73182345de8135750c573bcd67207a5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=B8rlaag?= <114830266+Borlaag@users.noreply.github.com> Date: Mon, 19 Dec 2022 01:50:22 +0000 Subject: [PATCH 2/2] extism-cli: init at 0.1.0 --- pkgs/development/tools/extism-cli/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/tools/extism-cli/default.nix diff --git a/pkgs/development/tools/extism-cli/default.nix b/pkgs/development/tools/extism-cli/default.nix new file mode 100644 index 000000000000..dc96452a4175 --- /dev/null +++ b/pkgs/development/tools/extism-cli/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenvNoCC, fetchFromGitHub, python3, makeBinaryWrapper }: + +stdenvNoCC.mkDerivation rec { + pname = "extism-cli"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "extism"; + repo = "cli"; + rev = "97935786166e82154266b82410028482800e6061"; + sha256 = "sha256-LRzXuZQt5h3exw43UXUwLVIhveYVFw/SQ2YtHI9ZnWc="; + }; + + buildInputs = [ python3 ]; + nativeBuildInputs = [ makeBinaryWrapper ]; + + installPhase = '' + runHook preInstall + + install -D -m 755 ./extism_cli/__init__.py "$out/bin/extism" + + # The extism cli tries by default to install a library and header into /usr/local which does not work on NixOS. + # Pass a reasonable writable directory which can still be overwritten with another --prefix argument. + wrapProgram "$out/bin/extism" \ + --add-flags '--prefix $HOME/.local' + + runHook postInstall + ''; + + meta = with lib; { + description = "The extism CLI is used to manage Extism installations"; + homepage = "https://github.com/extism/cli"; + license = licenses.bsd3; + maintainers = with maintainers; [ borlaag ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a71bdc01d07..aece8ee52545 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4409,6 +4409,8 @@ with pkgs; eternal-terminal = callPackage ../tools/networking/eternal-terminal {}; + extism-cli = callPackage ../development/tools/extism-cli {}; + extrude = callPackage ../tools/security/extrude { }; fastly = callPackage ../misc/fastly {