diff options
| author | Nick Cao <nickcao@nichi.co> | 2023-10-11 13:59:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-11 13:59:54 -0400 |
| commit | 535734e71caf78cfc74c85832c1e5919ba31c97a (patch) | |
| tree | 85796875c4cae767f597460a6c1470ca20d17a49 | |
| parent | 36b174683a61f430e107e3ac87a783bfec6f3936 (diff) | |
| parent | 08da911795b3e56023dcf3d7e97d3cda518715b7 (diff) | |
| download | nixpkgs-535734e71caf78cfc74c85832c1e5919ba31c97a.tar nixpkgs-535734e71caf78cfc74c85832c1e5919ba31c97a.tar.gz nixpkgs-535734e71caf78cfc74c85832c1e5919ba31c97a.tar.bz2 nixpkgs-535734e71caf78cfc74c85832c1e5919ba31c97a.tar.lz nixpkgs-535734e71caf78cfc74c85832c1e5919ba31c97a.tar.xz nixpkgs-535734e71caf78cfc74c85832c1e5919ba31c97a.tar.zst nixpkgs-535734e71caf78cfc74c85832c1e5919ba31c97a.zip | |
Merge pull request #259865 from marsam/ssl-proxy-buildGo119Module
ssl-proxy: use buildGo119Module
| -rw-r--r-- | pkgs/tools/networking/ssl-proxy/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/tools/networking/ssl-proxy/default.nix b/pkgs/tools/networking/ssl-proxy/default.nix index 1aac650885b..5b72fb14fd9 100644 --- a/pkgs/tools/networking/ssl-proxy/default.nix +++ b/pkgs/tools/networking/ssl-proxy/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo118Module, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGo118Module rec { +buildGoModule rec { pname = "ssl-proxy"; version = "0.2.7"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec103ceb690..e1878868f58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -42117,7 +42117,9 @@ with pkgs; yazi = callPackage ../applications/file-managers/yazi { inherit (darwin.apple_sdk.frameworks) Foundation; }; - ssl-proxy = callPackage ../tools/networking/ssl-proxy { }; + ssl-proxy = callPackage ../tools/networking/ssl-proxy { + buildGoModule = buildGo119Module; # build fails with 1.20 + }; code-maat = callPackage ../development/tools/code-maat {}; } |