Skip to content

Commit

Permalink
teleport: Downgrade Go to 1.22 until upstream supports 1.23
Browse files Browse the repository at this point in the history
Fixes NixOS#348922.

Signed-off-by: Anders Kaseorg <[email protected]>
  • Loading branch information
andersk committed Oct 15, 2024
1 parent a3c0b3b commit de03d0c
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions pkgs/servers/teleport/generic.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ lib
, buildGoModule
, buildGo122Module
, rustPlatform
, fetchFromGitHub
, fetchYarnDeps
Expand Down Expand Up @@ -134,7 +134,7 @@ let
'';
};
in
buildGoModule rec {
buildGo122Module rec {
inherit pname src version;
inherit vendorHash;
proxyVendor = true;
Expand All @@ -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 ''
Expand Down

0 comments on commit de03d0c

Please sign in to comment.