cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #224379 from justinas/teleport-12-1-5

Browse source 
teleport: 12.1.0 -> 12.1.5
This commit is contained in:
Robert Scott 2023-04-05 18:51:24 +01:00 committed by GitHub
commit a4908b5e2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 1880 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/servers/teleport/11.nix → pkgs/servers/teleport/11/default.nix
View file

@ -1,5 +1,5 @@
{ callPackage, ... }@args: { callPackage, ... }@args:
callPackage ./generic.nix ({ callPackage ../generic.nix ({
version = "11.3.5"; version = "11.3.5";
hash = "sha256-/InWly0jCiPBlgM/qgS6ErMv7Hhg5PW9sldda1oaUIg="; hash = "sha256-/InWly0jCiPBlgM/qgS6ErMv7Hhg5PW9sldda1oaUIg=";
vendorHash = "sha256-NkiFLEHBNjxUOSuAlVugAV14yCCo3z6yhX7LZQFKhvA="; vendorHash = "sha256-NkiFLEHBNjxUOSuAlVugAV14yCCo3z6yhX7LZQFKhvA=";

8
pkgs/servers/teleport/12.nix
View file

@ -1,8 +0,0 @@
{ callPackage, ... }@args:
callPackage ./generic.nix ({
version = "12.1.0";
hash = "sha256-rM8ehf4Bb+IvbLLeZEfQZnq6ViAp4d3RiYv1lGYbrOc=";
vendorHash = "sha256-euzu6GROCZnmawLnh549ETlfLDqKFuUG9YM6klXO3z0=";
cargoHash = "sha256-p8N07EITd+EAMJxMqBtg+1kOuqa94e5c3NtT3Z4VL6g=";
yarnHash = "sha256-zwKjuP85VCCghpRdwGtaul9VtMF5ByMJ45QU7wgrteg=";
} // builtins.removeAttrs args [ "callPackage" ])

1861
pkgs/servers/teleport/12/Cargo.lock generated Normal file
View file

File diff suppressed because it is too large Load diff

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

@ -0,0 +1,13 @@
{ callPackage, ... }@args:
callPackage ../generic.nix ({
version = "12.1.5";
hash = "sha256-bPnXZTe4LB50W2UT/sA+2Or/LJMqcEuPpTTF8ue/2Ak=";
vendorHash = "sha256-mznhfliYpsJJJSL17Q7WXX0SkIn+Bcb1fzYdLRTRDI0=";
yarnHash = "sha256-cElFTxolQnJAbpln2aGjlTJr/hbUML4QHeHQ3yrWVqU=";
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"rdp-rs-0.1.0" = "sha256-n4x4w7GZULxqaR109das12+ZGU0xvY3wGOTWngcwe4M=";
};
};
} // builtins.removeAttrs args [ "callPackage" ])

7
pkgs/servers/teleport/generic.nix
View file

@ -4,14 +4,12 @@
, fetchFromGitHub , fetchFromGitHub
, fetchYarnDeps , fetchYarnDeps
, makeWrapper , makeWrapper
, symlinkJoin
, CoreFoundation , CoreFoundation
, AppKit , AppKit
, libfido2 , libfido2
, nodejs , nodejs
, openssl , openssl
, pkg-config , pkg-config
, protobuf
, Security , Security
, stdenv , stdenv
, xdg-utils , xdg-utils
@ -24,7 +22,8 @@
, version , version
, hash , hash
, vendorHash , vendorHash
, cargoHash , cargoHash ? null
, cargoLock ? null
, yarnHash , yarnHash
}: }:
let let
@ -39,7 +38,7 @@ let
rdpClient = rustPlatform.buildRustPackage rec { rdpClient = rustPlatform.buildRustPackage rec {
pname = "teleport-rdpclient"; pname = "teleport-rdpclient";
inherit cargoHash; inherit cargoHash cargoLock;
inherit version src; inherit version src;
buildAndTestSubdir = "lib/srv/desktop/rdp/rdpclient"; buildAndTestSubdir = "lib/srv/desktop/rdp/rdpclient";

4
pkgs/top-level/all-packages.nix
View file

@ -12672,10 +12672,10 @@ with pkgs;
telegraf = callPackage ../servers/monitoring/telegraf { }; telegraf = callPackage ../servers/monitoring/telegraf { };
teleport_11 = callPackage ../servers/teleport/11.nix { teleport_11 = callPackage ../servers/teleport/11 {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;
}; };
teleport_12 = callPackage ../servers/teleport/12.nix { teleport_12 = callPackage ../servers/teleport/12 {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;
}; };
teleport = teleport_12; teleport = teleport_12;