nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-18 19:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #133760 from justinas/teleport-7-0-2

Browse Source 
teleport: 7.0.0 -> 7.0.2
This commit is contained in:
Artturi 2021-08-13 17:28:20 +03:00 committed by GitHub
commit 134801ac98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/servers/teleport/default.nix
View File

@ -1,5 +1,5 @@
# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev # 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 let
webassets = fetchFromGitHub { webassets = fetchFromGitHub {
owner = "gravitational"; owner = "gravitational";
@ -10,14 +10,14 @@ let
in in
buildGoModule rec { buildGoModule rec {
pname = "teleport"; pname = "teleport";
version = "7.0.0"; version = "7.0.2";
# This repo has a private submodule "e" which fetchgit cannot handle without failing. # This repo has a private submodule "e" which fetchgit cannot handle without failing.
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gravitational"; owner = "gravitational";
repo = "teleport"; repo = "teleport";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-2GQ3IP5jfT6vSni5hfDex09wXrnUmTpcvH2S6zc399I="; sha256 = "sha256-Sj7WQRgEiU5G/MDKFtEy/KJ2g0WENxbCnMA9CNcTUaY=";
}; };
vendorSha256 = null; vendorSha256 = null;
@ -25,7 +25,7 @@ buildGoModule rec {
subPackages = [ "tool/tctl" "tool/teleport" "tool/tsh" ]; subPackages = [ "tool/tctl" "tool/teleport" "tool/tsh" ];
tags = [ "webassets_embed" ]; tags = [ "webassets_embed" ];
nativeBuildInputs = [ zip makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
patches = [ patches = [
# https://github.com/NixOS/nixpkgs/issues/120738 # https://github.com/NixOS/nixpkgs/issues/120738
@ -41,7 +41,7 @@ buildGoModule rec {
mkdir -p build mkdir -p build
echo "making webassets" echo "making webassets"
cp -r ${webassets}/* webassets/ cp -r ${webassets}/* webassets/
make lib/web/build/webassets.zip make lib/web/build/webassets
''; '';
preCheck = '' preCheck = ''