summary refs log tree commit diff
diff options
context:
space:
mode:
authorBen Siraphob <bensiraphob@gmail.com>2021-08-01 12:09:03 +0700
committerGitHub <noreply@github.com>2021-08-01 12:09:03 +0700
commitdb927ce63ce9787d1791b862cf4279c17667c5fa (patch)
tree11cf05c144606dc25697fa1c74642f32b6f3289f
parent6e6b1d1a1bdae2073a902e42441c94c4c736d4fa (diff)
parent9a6d7eab73b9642eaea666e04bd9c18460511c40 (diff)
downloadnixpkgs-db927ce63ce9787d1791b862cf4279c17667c5fa.tar
nixpkgs-db927ce63ce9787d1791b862cf4279c17667c5fa.tar.gz
nixpkgs-db927ce63ce9787d1791b862cf4279c17667c5fa.tar.bz2
nixpkgs-db927ce63ce9787d1791b862cf4279c17667c5fa.tar.lz
nixpkgs-db927ce63ce9787d1791b862cf4279c17667c5fa.tar.xz
nixpkgs-db927ce63ce9787d1791b862cf4279c17667c5fa.tar.zst
nixpkgs-db927ce63ce9787d1791b862cf4279c17667c5fa.zip
Merge pull request #132260 from hercules-ci/ghostunnel-1.6.0
ghostunnel: 1.5.3 -> 1.6.0
-rw-r--r--pkgs/tools/networking/ghostunnel/default.nix16
1 files changed, 13 insertions, 3 deletions
diff --git a/pkgs/tools/networking/ghostunnel/default.nix b/pkgs/tools/networking/ghostunnel/default.nix
index 5d00b493bc3..c5b7d3db0f1 100644
--- a/pkgs/tools/networking/ghostunnel/default.nix
+++ b/pkgs/tools/networking/ghostunnel/default.nix
@@ -7,16 +7,25 @@
 
 buildGoModule rec {
   pname = "ghostunnel";
-  version = "1.5.3";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "ghostunnel";
     repo = "ghostunnel";
     rev = "v${version}";
-    sha256 = "15rmd89j7sfpznzznss899smizbyshprsrvsdmrbhb617myd9fpy";
+    sha256 = "sha256-EE8gCm/gOp3lmCx1q4PahulipLoBZnEatNAVUXzHIVw=";
   };
 
-  vendorSha256 = "1i95fx4a0fh6id6iy6afbva4pazr7ym6sbwi9r7la6gxzyncd023";
+  vendorSha256 = "sha256-XgmvqB1PCfL2gSDqwqauSixk8vlINHRmX6U0h9EXXdU=";
+
+  deleteVendor = true;
+
+  # The certstore directory isn't recognized as a subpackage, but is when moved
+  # into the vendor directory.
+  postUnpack = ''
+    mkdir -p $sourceRoot/vendor/ghostunnel
+    mv $sourceRoot/certstore $sourceRoot/vendor/ghostunnel/
+  '';
 
   meta = with lib; {
     description = "A simple TLS proxy with mutual authentication support for securing non-TLS backend applications";
@@ -26,4 +35,5 @@ buildGoModule rec {
   };
 
   passthru.tests.nixos = nixosTests.ghostunnel;
+  passthru.tests.podman = nixosTests.podman-tls-ghostunnel;
 }