diff options
| author | Artturi <Artturin@artturin.com> | 2021-08-13 17:28:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-13 17:28:20 +0300 |
| commit | 134801ac987501f248d2856515bb5dd157ec7434 (patch) | |
| tree | c655dbd16f4edfed2afb5a5bdd0aa369f89ea563 /pkgs/servers | |
| parent | d48bb58f313571d0525d99218033b395d29be407 (diff) | |
| parent | a3e27b8d21d911f2e0a581195d2f1fb4c636290a (diff) | |
| download | nixpkgs-134801ac987501f248d2856515bb5dd157ec7434.tar nixpkgs-134801ac987501f248d2856515bb5dd157ec7434.tar.gz nixpkgs-134801ac987501f248d2856515bb5dd157ec7434.tar.bz2 nixpkgs-134801ac987501f248d2856515bb5dd157ec7434.tar.lz nixpkgs-134801ac987501f248d2856515bb5dd157ec7434.tar.xz nixpkgs-134801ac987501f248d2856515bb5dd157ec7434.tar.zst nixpkgs-134801ac987501f248d2856515bb5dd157ec7434.zip | |
Merge pull request #133760 from justinas/teleport-7-0-2
teleport: 7.0.0 -> 7.0.2
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/teleport/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index fc5910a1ae5..97c8568e403 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v2.0-dev -{ lib, buildGoModule, zip, fetchFromGitHub, makeWrapper, xdg-utils }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, xdg-utils }: let webassets = fetchFromGitHub { owner = "gravitational"; @@ -10,14 +10,14 @@ let in buildGoModule rec { pname = "teleport"; - version = "7.0.0"; + version = "7.0.2"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "sha256-2GQ3IP5jfT6vSni5hfDex09wXrnUmTpcvH2S6zc399I="; + sha256 = "sha256-Sj7WQRgEiU5G/MDKFtEy/KJ2g0WENxbCnMA9CNcTUaY="; }; vendorSha256 = null; @@ -25,7 +25,7 @@ buildGoModule rec { subPackages = [ "tool/tctl" "tool/teleport" "tool/tsh" ]; tags = [ "webassets_embed" ]; - nativeBuildInputs = [ zip makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; patches = [ # https://github.com/NixOS/nixpkgs/issues/120738 @@ -41,7 +41,7 @@ buildGoModule rec { mkdir -p build echo "making webassets" cp -r ${webassets}/* webassets/ - make lib/web/build/webassets.zip + make lib/web/build/webassets ''; preCheck = '' |