diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-26 23:38:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-26 23:38:52 +0100 |
| commit | 22d282d4b3607b53d770f631be16091a8f16672a (patch) | |
| tree | 667d06a5ed519e8b078c04ddb34315b0e6090859 /pkgs | |
| parent | 450bc18707743c5aa3de9e7450732dadadbf50dd (diff) | |
| parent | a34b599add83d5c6cddb5c9ff400752b578b6e32 (diff) | |
Merge pull request #110878 from ymatsiuk/bumpteleport
teleport: 4.2.11 -> 5.1.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/teleport/default.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index 0b55b82d39e7..5cd3448f668f 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -1,16 +1,24 @@ # This file was generated by https://github.com/kamilchm/go2nix v2.0-dev { lib, buildGoPackage, zip, fetchFromGitHub }: +let + webassets = fetchFromGitHub { + owner = "gravitational"; + repo = "webassets"; + rev = "eb98cd28e34144c6473b79743066d1c63c6427ab"; + sha256 = "001a3bx8yyx1hq8y5yiy1jzp122q8gcl369lj0609gaxp6dk5bdw"; + }; +in buildGoPackage rec { pname = "teleport"; - version = "4.2.11"; + version = "5.1.0"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "00mkh6rmdgwwhbk3jmxgwl0aisnnqw6q6i5zl1hn69hvdny9liii"; + sha256 = "0jkr4max6mcn8k5nhlg71byb0yzr9kplpl1q96pdk2gbvkh7q6xb"; }; goPackagePath = "github.com/gravitational/teleport"; @@ -24,6 +32,7 @@ buildGoPackage rec { cd $NIX_BUILD_TOP/go/src/github.com/gravitational/teleport mkdir -p build echo "making webassets" + cp -r ${webassets}/* webassets/ make build/webassets.zip cat build/webassets.zip >> $NIX_BUILD_TOP/go/bin/teleport rm -fr build/webassets.zip |