teleport: Downgrade Go to 1.22 until upstream supports 1.23

Fixes #348922. Signed-off-by: Anders Kaseorg <andersk@mit.edu>
NixOS · Oct 23, 2024 · aa1c556 · aa1c556
1 parent fc5fcd5
commit aa1c556
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/servers/teleport/generic.nix
@@ -156,11 +156,6 @@ buildGoModule rec {
   # Reduce closure size for client machines
   outputs = [ "out" "client" ];
 
-  prePatch = ''
-    # TODO: remove after https://github.com/NixOS/nixpkgs/pull/332852 merges
-    sed -i 's/go 1.22.6/go 1.22.5/' go.mod
-  '';
-
   preBuild = ''
     cp -r ${webassets} webassets
   '' + lib.optionalString withRdpClient ''

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -12743,6 +12743,7 @@ with pkgs;
 
   inherit (callPackages ../servers/teleport {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;
+    buildGoModule = buildGo122Module;
   }) teleport_15 teleport_16 teleport;
 
   telepresence = callPackage ../tools/networking/telepresence {