NixOS/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

ghostunnel: 1.8.4 -> 1.10.0 (#528177)

Browse Source
This commit is contained in:
Guillaume Girol
2026-06-17 18:54:20 +00:00
committed by GitHub
parent c5eab8042c f394e3ecfd
commit e096545465
3 changed files with 40 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/networking/ghostunnel.nix
+6 -1
View File
@@ -192,7 +192,12 @@ let
++ optional (config.cacert != null) "cacert:${config.cacert}";
};
script = concatStringsSep " " (
[ "${mainCfg.package}/bin/ghostunnel" ]
[
"${mainCfg.package}/bin/ghostunnel"
# ghostunnel's landlock rules don't like reading the CA certs from /etc
# because they are links to /nix/store, which isn't part of its rules
"--disable-landlock"
]
++ optional (config.keystore != null) "--keystore=$CREDENTIALS_DIRECTORY/keystore"
++ optional (config.cert != null) "--cert=$CREDENTIALS_DIRECTORY/cert"
++ optional (config.key != null) "--key=$CREDENTIALS_DIRECTORY/key"
pkgs/by-name/gh/ghostunnel/package.nix
+8 -4
View File
@@ -1,5 +1,4 @@
{
stdenv,
buildGoModule,
fetchFromGitHub,
lib,
@@ -9,16 +8,21 @@
buildGoModule rec {
pname = "ghostunnel";
version = "1.8.4";
version = "1.10.0";
src = fetchFromGitHub {
owner = "ghostunnel";
repo = "ghostunnel";
rev = "v${version}";
hash = "sha256-NnRm1HEdfK6WI5ntilLSwdR2B5czG5CIcMFzl2TzEds=";
hash = "sha256-BntQCauAgnaiNn31nrVEsHFvQv7zK6D0z/rInbCVTr0=";
};
vendorHash = "sha256-vP8OtjpYNMm1KkNfD3pmNrHh3HRy1GkzUbfLKWKhHbo=";
patches = [
# upstream left an untidied go.mod/go.sum in v1.10.0
./pkg-errors.patch
];
vendorHash = "sha256-pd7fTP0BAgpd4mD8ZG8Ak9fFF2sC0JGCDbPG8tAnWvw=";
deleteVendor = true;
pkgs/by-name/gh/ghostunnel/pkg-errors.patch
+26
View File
@@ -0,0 +1,26 @@
diff --git a/go.mod b/go.mod
index d06c2e9117..f560c1cc69 100644
--- a/go.mod
+++ b/go.mod
@@ -192,6 +192,7 @@
github.com/nwaples/rardecode v1.1.3 // indirect
github.com/pelletier/go-toml/v2 v2.3.0 // indirect
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
+ github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.67.5 // indirect
diff --git a/go.sum b/go.sum
index 4dea0025f3..1edce71302 100644
--- a/go.sum
+++ b/go.sum
@@ -460,6 +460,9 @@
github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
github.com/pires/go-proxyproto v0.11.0 h1:gUQpS85X/VJMdUsYyEgyn59uLJvGqPhJV5YvG68wXH4=
github.com/pires/go-proxyproto v0.11.0/go.mod h1:ZKAAyp3cgy5Y5Mo4n9AlScrkCZwUy0g3Jf+slqQVcuU=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=