colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

teleport_15: init at 15.2.2

This commit is contained in:
Justinas Stankevicius 2024-02-03 02:14:12 +02:00
parent 787303bccb
commit 3b16464200
10 changed files with 3440 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/doc/manual/release-notes/rl-2405.section.md
View File

@ -37,6 +37,10 @@ In addition to numerous new and upgraded packages, this release has the followin
Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for PipeWire and
`services.pipewire.wireplumber.configPackages` for WirePlumber instead."
- `teleport` has been upgraded from major version 14 to major version 15.
Refer to upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/)
and release notes for [v15](https://goteleport.com/docs/changelog/#1500-013124).
- A new option `systemd.sysusers.enable` was added. If enabled, users and
groups are created with systemd-sysusers instead of with a custom perl script.

1
nixos/tests/teleport.nix
View File

@ -11,6 +11,7 @@ let
"default" = teleport;
"12" = teleport_12;
"13" = teleport_13;
"14" = teleport_14;
};
minimal = package: {

6
pkgs/servers/teleport/12/default.nix
View File

@ -1,5 +1,5 @@
{ callPackage, ... }@args:
callPackage ../generic.nix ({
{ ... }@args:
import ../generic.nix (args // {
version = "12.4.32";
hash = "sha256-dYriqQwrc3tfLv+/G/W8n+4cLbPUq7lq1/kGH/GIsHs=";
vendorHash = "sha256-R7gWdUIrc7VLe+9/En47FI3G9x2V1VGUVTrT/kmA9c4=";
@ -14,4 +14,4 @@ callPackage ../generic.nix ({
# https://github.com/NixOS/nixpkgs/issues/120738
../tsh.patch
];
} // builtins.removeAttrs args [ "callPackage" ])
})

6
pkgs/servers/teleport/13/default.nix
View File

@ -1,5 +1,5 @@
{ callPackage, ... }@args:
callPackage ../generic.nix ({
args:
import ../generic.nix (args // {
version = "13.4.14";
hash = "sha256-g11D5lekI3pUpKf5CLUuNjejs0gN/bEemHkCj3akha0=";
vendorHash = "sha256-kiDhlR/P81u/yNq72JuskES/UzMrTFzJT0H3xldGk8I=";
@ -14,4 +14,4 @@ callPackage ../generic.nix ({
# https://github.com/NixOS/nixpkgs/issues/120738
../tsh.patch
];
} // builtins.removeAttrs args [ "callPackage" ])
})

6
pkgs/servers/teleport/14/default.nix
View File

@ -1,5 +1,5 @@
{ callPackage, ... }@args:
callPackage ../generic.nix ({
args:
import ../generic.nix (args // {
version = "14.3.0";
hash = "sha256-yTbJeHCmPlelq7BrZQRY3XyNQiovV7NQ1tNh2NfYGbk=";
vendorHash = "sha256-lHsgSbY1nqQminU67QgV6FbHXNlv5tCMv2oVq48S33M=";
@ -14,4 +14,4 @@ callPackage ../generic.nix ({
# https://github.com/NixOS/nixpkgs/issues/120738
../tsh_14.patch
];
} // builtins.removeAttrs args [ "callPackage" ])
})

3354
pkgs/servers/teleport/15/Cargo.lock generated Normal file
View File

File diff suppressed because it is too large Load Diff

26
pkgs/servers/teleport/15/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ wasm-bindgen-cli, ... }@args:
import ../generic.nix (args // {
version = "15.2.2";
hash = "sha256-LzJaskFaBtWkodeuT4mDNTs4+6FZj2OI+ZtjogU3KzQ=";
vendorHash = "sha256-D62Jk6LKdbprvkzAKoQVnEKdGQp5ITJYFf53q6154pU=";
yarnHash = "sha256-jpcjO1wT6m8J7LNQVeWo1j2G5P+sexrnNF1ipCZ8lCU=";
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"boring-4.4.0" = "sha256-4wdl2kIA5oHQ0H6IddKQ+B5kRwrTeMbKe1+tAYZt2uw=";
"ironrdp-async-0.1.0" = "sha256-BKaVPr3O4D7DdwNJUjrU1zB7OwmJZnpJeyuMx+FqKjI=";
"sspi-0.10.1" = "sha256-fkclC/plTh2d8zcmqthYmr5yXqbPTeFxI1VuaPX5vxk=";
};
};
extPatches = [
# https://github.com/NixOS/nixpkgs/issues/120738
../tsh_14.patch
];
# wasm-bindgen-cli version must match the version of wasm-bindgen in Cargo.lock
wasm-bindgen-cli = wasm-bindgen-cli.override {
version = "0.2.91";
hash = "sha256-f/RK6s12ItqKJWJlA2WtOXtwX4Y0qa8bq/JHlLTAS3c=";
cargoHash = "sha256-3vxVI0BhNz/9m59b+P2YEIrwGwlp7K3pyPKt4VqQuHE=";
};
})

13
pkgs/servers/teleport/default.nix Normal file
View File

@ -0,0 +1,13 @@
{ callPackages, lib, ... }@args:
let
f = args: rec {
teleport_12 = import ./12 args;
teleport_13 = import ./13 args;
teleport_14 = import ./14 args;
teleport_15 = import ./15 args;
teleport = teleport_15;
};
# Ensure the following callPackages invocation includes everything 'generic' needs.
f' = lib.setFunctionArgs f (builtins.functionArgs (import ./generic.nix));
in
callPackages f' (builtins.removeAttrs args [ "callPackages" ])

37
pkgs/servers/teleport/generic.nix
View File

@ -6,14 +6,19 @@
, makeWrapper
, CoreFoundation
, AppKit
, binaryen
, cargo
, libfido2
, nodejs
, openssl
, pkg-config
, rustc
, Security
, stdenv
, xdg-utils
, yarn
, wasm-bindgen-cli
, wasm-pack
, prefetch-yarn-deps
, nixosTests
@ -69,12 +74,23 @@ let
pname = "teleport-webassets";
inherit src version;
nativeBuildInputs = [
nodejs
yarn
prefetch-yarn-deps
cargoDeps = rustPlatform.importCargoLock cargoLock;
RUSTFLAGS = builtins.concatStringsSep " " [
"-C linker=lld"
];
nativeBuildInputs = [ nodejs yarn prefetch-yarn-deps ] ++
lib.optional (lib.versionAtLeast version "15") [
binaryen
cargo
rustc
rustc.llvmPackages.lld
rustPlatform.cargoSetupHook
wasm-bindgen-cli
wasm-pack
];
configurePhase = ''
export HOME=$(mktemp -d)
'';
@ -88,7 +104,16 @@ let
--ignore-engines --ignore-scripts
patchShebangs .
yarn build-ui-oss
${if lib.versionAtLeast version "15"
then ''
PATH=$PATH:$PWD/node_modules/.bin
pushd web/packages/teleport
# https://github.com/gravitational/teleport/blob/6b91fe5bbb9e87db4c63d19f94ed4f7d0f9eba43/web/packages/teleport/README.md?plain=1#L18-L20
RUST_MIN_STACK=16777216 wasm-pack build ./src/ironrdp --target web --mode no-install
vite build
popd
''
else "yarn build-ui-oss"}
'';
installPhase = ''
@ -154,7 +179,7 @@ buildGoModule rec {
meta = with lib; {
description = "Certificate authority and access plane for SSH, Kubernetes, web applications, and databases";
homepage = "https://goteleport.com/";
license = licenses.asl20;
license = if lib.versionAtLeast version "15" then licenses.agpl3Plus else licenses.asl20;
maintainers = with maintainers; [ arianvp justinas sigma tomberek freezeboy techknowlogick ];
platforms = platforms.unix;
# go-libfido2 is broken on platforms with less than 64-bit because it defines an array

11
pkgs/top-level/all-packages.nix
View File

@ -13631,16 +13631,9 @@ with pkgs;
telegraf = callPackage ../servers/monitoring/telegraf { };
teleport_12 = callPackage ../servers/teleport/12 {
inherit (callPackages ../servers/teleport {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;
};
teleport_13 = callPackage ../servers/teleport/13 {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;
};
teleport_14 = callPackage ../servers/teleport/14 {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;
};
teleport = teleport_14;
}) teleport_12 teleport_13 teleport_14 teleport_15 teleport;
telepresence = callPackage ../tools/networking/telepresence {
pythonPackages = python3Packages;