From 1fcc12742d8788b475d3f6d9ec3b1a1119010de7 Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Mon, 26 May 2025 14:48:51 +0300 Subject: [PATCH 1/9] teleport: migrate to new buildTeleport This facilitates using different Go and wasm-bindgen-cli versions more easily, which will be needed for the new teleport_18 version. (cherry picked from commit 2dee29888f4022b8017dbe29b37cb5155c859f51) --- .../0001-fix-add-nix-path-to-exec-env.patch | 0 pkgs/build-support/teleport/default.nix | 215 ++++++++++++++++++ .../disable-wasm-opt-for-ironrdp.patch | 0 .../teleport/rdpclient.patch | 0 .../te => build-support}/teleport/tsh.patch | 0 pkgs/by-name/te/teleport/package.nix | 211 +---------------- pkgs/by-name/te/teleport_16/package.nix | 9 +- pkgs/by-name/te/teleport_17/package.nix | 16 +- pkgs/top-level/all-packages.nix | 2 + 9 files changed, 240 insertions(+), 213 deletions(-) rename pkgs/{by-name/te => build-support}/teleport/0001-fix-add-nix-path-to-exec-env.patch (100%) create mode 100644 pkgs/build-support/teleport/default.nix rename pkgs/{by-name/te => build-support}/teleport/disable-wasm-opt-for-ironrdp.patch (100%) rename pkgs/{by-name/te => build-support}/teleport/rdpclient.patch (100%) rename pkgs/{by-name/te => build-support}/teleport/tsh.patch (100%) diff --git a/pkgs/by-name/te/teleport/0001-fix-add-nix-path-to-exec-env.patch b/pkgs/build-support/teleport/0001-fix-add-nix-path-to-exec-env.patch similarity index 100% rename from pkgs/by-name/te/teleport/0001-fix-add-nix-path-to-exec-env.patch rename to pkgs/build-support/teleport/0001-fix-add-nix-path-to-exec-env.patch diff --git a/pkgs/build-support/teleport/default.nix b/pkgs/build-support/teleport/default.nix new file mode 100644 index 000000000000..c44c320addee --- /dev/null +++ b/pkgs/build-support/teleport/default.nix @@ -0,0 +1,215 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + fetchpatch, + makeWrapper, + binaryen, + cargo, + libfido2, + nodejs, + openssl, + pkg-config, + pnpm_10, + rustc, + stdenv, + xdg-utils, + wasm-pack, + nixosTests, +}: + +{ + version, + hash, + cargoHash, + pnpmHash, + vendorHash, + wasm-bindgen-cli, + buildGoModule, + + withRdpClient ? true, + extPatches ? [ ], +}: +let + + # This repo has a private submodule "e" which fetchgit cannot handle without failing. + src = fetchFromGitHub { + owner = "gravitational"; + repo = "teleport"; + tag = "v${version}"; + inherit hash; + }; + pname = "teleport"; + inherit version; + + rdpClient = rustPlatform.buildRustPackage (finalAttrs: { + pname = "teleport-rdpclient"; + inherit cargoHash; + inherit version src; + + buildAndTestSubdir = "lib/srv/desktop/rdp/rdpclient"; + + buildInputs = [ openssl ]; + nativeBuildInputs = [ pkg-config ]; + + # https://github.com/NixOS/nixpkgs/issues/161570 , + # buildRustPackage sets strictDeps = true; + nativeCheckInputs = finalAttrs.buildInputs; + + OPENSSL_NO_VENDOR = "1"; + + postInstall = '' + mkdir -p $out/include + cp ${finalAttrs.buildAndTestSubdir}/librdprs.h $out/include/ + ''; + }); + + webassets = stdenv.mkDerivation { + pname = "teleport-webassets"; + inherit src version; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + hash = cargoHash; + }; + + pnpmDeps = pnpm_10.fetchDeps { + inherit src pname version; + fetcherVersion = 1; + hash = pnpmHash; + }; + + nativeBuildInputs = [ + binaryen + cargo + nodejs + pnpm_10.configHook + rustc + rustc.llvmPackages.lld + rustPlatform.cargoSetupHook + wasm-bindgen-cli + wasm-pack + ]; + + patches = [ + ./disable-wasm-opt-for-ironrdp.patch + ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + + runHook postConfigure + ''; + + buildPhase = '' + PATH=$PATH:$PWD/node_modules/.bin + + pushd web/packages + pushd shared + # https://github.com/gravitational/teleport/blob/6b91fe5bbb9e87db4c63d19f94ed4f7d0f9eba43/web/packages/teleport/README.md?plain=1#L18-L20 + RUST_MIN_STACK=16777216 wasm-pack build ./libs/ironrdp --target web --mode no-install + popd + pushd teleport + vite build + popd + popd + ''; + + installPhase = '' + mkdir -p $out + cp -R webassets/. $out + ''; + }; +in +buildGoModule (finalAttrs: { + inherit pname src version; + inherit vendorHash; + proxyVendor = true; + + subPackages = [ + "tool/tbot" + "tool/tctl" + "tool/teleport" + "tool/tsh" + ]; + tags = [ + "libfido2" + "webassets_embed" + ] + ++ lib.optional withRdpClient "desktop_access_rdp"; + + buildInputs = [ + openssl + libfido2 + ]; + nativeBuildInputs = [ + makeWrapper + pkg-config + ]; + + patches = extPatches ++ [ + ./0001-fix-add-nix-path-to-exec-env.patch + ./rdpclient.patch + ./tsh.patch + ]; + + # Reduce closure size for client machines + outputs = [ + "out" + "client" + ]; + + preBuild = '' + cp -r ${webassets} webassets + '' + + lib.optionalString withRdpClient '' + ln -s ${rdpClient}/lib/* lib/ + ln -s ${rdpClient}/include/* lib/srv/desktop/rdp/rdpclient/ + ''; + + # Multiple tests fail in the build sandbox + # due to trying to spawn nixbld's shell (/noshell), etc. + doCheck = false; + + postInstall = '' + mkdir -p $client/bin + mv {$out,$client}/bin/tsh + # make xdg-open overrideable at runtime + wrapProgram $client/bin/tsh --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} + ln -s {$client,$out}/bin/tsh + ''; + + doInstallCheck = true; + + installCheckPhase = '' + export HOME=$(mktemp -d) + $out/bin/tsh version | grep ${version} > /dev/null + $client/bin/tsh version | grep ${version} > /dev/null + $out/bin/tbot version | grep ${version} > /dev/null + $out/bin/tctl version | grep ${version} > /dev/null + $out/bin/teleport version | grep ${version} > /dev/null + ''; + + passthru.tests = nixosTests.teleport; + + meta = { + description = "Certificate authority and access plane for SSH, Kubernetes, web applications, and databases"; + homepage = "https://goteleport.com/"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ + arianvp + justinas + sigma + tomberek + freezeboy + techknowlogick + juliusfreudenberger + ]; + platforms = lib.platforms.unix; + # go-libfido2 is broken on platforms with less than 64-bit because it defines an array + # which occupies more than 31 bits of address space. + broken = stdenv.hostPlatform.parsed.cpu.bits < 64; + }; +}) diff --git a/pkgs/by-name/te/teleport/disable-wasm-opt-for-ironrdp.patch b/pkgs/build-support/teleport/disable-wasm-opt-for-ironrdp.patch similarity index 100% rename from pkgs/by-name/te/teleport/disable-wasm-opt-for-ironrdp.patch rename to pkgs/build-support/teleport/disable-wasm-opt-for-ironrdp.patch diff --git a/pkgs/by-name/te/teleport/rdpclient.patch b/pkgs/build-support/teleport/rdpclient.patch similarity index 100% rename from pkgs/by-name/te/teleport/rdpclient.patch rename to pkgs/build-support/teleport/rdpclient.patch diff --git a/pkgs/by-name/te/teleport/tsh.patch b/pkgs/build-support/teleport/tsh.patch similarity index 100% rename from pkgs/by-name/te/teleport/tsh.patch rename to pkgs/build-support/teleport/tsh.patch diff --git a/pkgs/by-name/te/teleport/package.nix b/pkgs/by-name/te/teleport/package.nix index e6f772045d2a..93697b54bc97 100644 --- a/pkgs/by-name/te/teleport/package.nix +++ b/pkgs/by-name/te/teleport/package.nix @@ -1,212 +1,5 @@ { - lib, - buildGo123Module, - rustPlatform, - fetchFromGitHub, - fetchpatch, - makeWrapper, - binaryen, - cargo, - libfido2, - nodejs, - openssl, - pkg-config, - pnpm_10, - rustc, - stdenv, - xdg-utils, - wasm-bindgen-cli_0_2_95, - wasm-pack, - nixosTests, - - withRdpClient ? true, - - version ? "17.5.4", - hash ? "sha256-ojRIyPTrSG3/xuqdaUNrN4s5HP3E8pvzjG8h+qFEYrc=", - vendorHash ? "sha256-IHXwCp1MdcEKJhIs9DNf77Vd93Ai2as7ROlh6AJT9+Q=", - extPatches ? [ ], - cargoHash ? "sha256-qz8gkooQTuBlPWC4lHtvBQpKkd+nEZ0Hl7AVg9JkPqs=", - pnpmHash ? "sha256-YwftGEQTEI8NvFTFLMJHhYkvaIIP9+bskCQCp5xuEtY=", + teleport_17, }: -let - # This repo has a private submodule "e" which fetchgit cannot handle without failing. - src = fetchFromGitHub { - owner = "gravitational"; - repo = "teleport"; - rev = "v${version}"; - inherit hash; - }; - pname = "teleport"; - inherit version; - rdpClient = rustPlatform.buildRustPackage (finalAttrs: { - pname = "teleport-rdpclient"; - - inherit cargoHash; - inherit version src; - - buildAndTestSubdir = "lib/srv/desktop/rdp/rdpclient"; - - buildInputs = [ openssl ]; - nativeBuildInputs = [ pkg-config ]; - - # https://github.com/NixOS/nixpkgs/issues/161570 , - # buildRustPackage sets strictDeps = true; - nativeCheckInputs = finalAttrs.buildInputs; - - OPENSSL_NO_VENDOR = "1"; - - postInstall = '' - mkdir -p $out/include - cp ${finalAttrs.buildAndTestSubdir}/librdprs.h $out/include/ - ''; - }); - - webassets = stdenv.mkDerivation { - pname = "teleport-webassets"; - inherit src version; - - cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - hash = cargoHash; - }; - - pnpmDeps = pnpm_10.fetchDeps { - inherit src pname version; - fetcherVersion = 1; - hash = pnpmHash; - }; - - nativeBuildInputs = [ - binaryen - cargo - nodejs - pnpm_10.configHook - rustc - rustc.llvmPackages.lld - rustPlatform.cargoSetupHook - wasm-bindgen-cli_0_2_95 - wasm-pack - ]; - - patches = [ - ./disable-wasm-opt-for-ironrdp.patch - ]; - - configurePhase = '' - runHook preConfigure - - export HOME=$(mktemp -d) - - runHook postConfigure - ''; - - buildPhase = '' - PATH=$PATH:$PWD/node_modules/.bin - - pushd web/packages - pushd shared - # https://github.com/gravitational/teleport/blob/6b91fe5bbb9e87db4c63d19f94ed4f7d0f9eba43/web/packages/teleport/README.md?plain=1#L18-L20 - RUST_MIN_STACK=16777216 wasm-pack build ./libs/ironrdp --target web --mode no-install - popd - pushd teleport - vite build - popd - popd - ''; - - installPhase = '' - mkdir -p $out - cp -R webassets/. $out - ''; - }; -in -buildGo123Module (finalAttrs: { - inherit pname src version; - inherit vendorHash; - proxyVendor = true; - - subPackages = [ - "tool/tbot" - "tool/tctl" - "tool/teleport" - "tool/tsh" - ]; - tags = [ - "libfido2" - "webassets_embed" - ] - ++ lib.optional withRdpClient "desktop_access_rdp"; - - buildInputs = [ - openssl - libfido2 - ]; - nativeBuildInputs = [ - makeWrapper - pkg-config - ]; - - patches = extPatches ++ [ - ./0001-fix-add-nix-path-to-exec-env.patch - ./rdpclient.patch - ./tsh.patch - ]; - - # Reduce closure size for client machines - outputs = [ - "out" - "client" - ]; - - preBuild = '' - cp -r ${webassets} webassets - '' - + lib.optionalString withRdpClient '' - ln -s ${rdpClient}/lib/* lib/ - ln -s ${rdpClient}/include/* lib/srv/desktop/rdp/rdpclient/ - ''; - - # Multiple tests fail in the build sandbox - # due to trying to spawn nixbld's shell (/noshell), etc. - doCheck = false; - - postInstall = '' - mkdir -p $client/bin - mv {$out,$client}/bin/tsh - # make xdg-open overrideable at runtime - wrapProgram $client/bin/tsh --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} - ln -s {$client,$out}/bin/tsh - ''; - - doInstallCheck = true; - - installCheckPhase = '' - $out/bin/tsh version | grep ${version} > /dev/null - $client/bin/tsh version | grep ${version} > /dev/null - $out/bin/tbot version | grep ${version} > /dev/null - $out/bin/tctl version | grep ${version} > /dev/null - $out/bin/teleport version | grep ${version} > /dev/null - ''; - - passthru.tests = nixosTests.teleport; - - meta = { - description = "Certificate authority and access plane for SSH, Kubernetes, web applications, and databases"; - homepage = "https://goteleport.com/"; - license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ - arianvp - justinas - sigma - tomberek - freezeboy - techknowlogick - juliusfreudenberger - ]; - platforms = lib.platforms.unix; - # go-libfido2 is broken on platforms with less than 64-bit because it defines an array - # which occupies more than 31 bits of address space. - broken = stdenv.hostPlatform.parsed.cpu.bits < 64; - }; -}) +teleport_17 diff --git a/pkgs/by-name/te/teleport_16/package.nix b/pkgs/by-name/te/teleport_16/package.nix index 62921b92b311..2ef76956122c 100644 --- a/pkgs/by-name/te/teleport_16/package.nix +++ b/pkgs/by-name/te/teleport_16/package.nix @@ -1,10 +1,15 @@ { - teleport, + buildTeleport, + buildGo123Module, + wasm-bindgen-cli_0_2_95, }: -teleport.override { +buildTeleport rec { version = "16.5.13"; hash = "sha256-X9Ujgvp+2dFCoku0tjGW4W05X8QrnExFE+H1kMhf91A="; vendorHash = "sha256-0+7xbIONnZs7dPpfpHPmep+k4XxQE8TS/eKz4F5a3V0="; pnpmHash = "sha256-waBzmNs20wbuoBDObVFnJjEYs3NJ/bzQksVz7ltMD7M="; cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I="; + + wasm-bindgen-cli = wasm-bindgen-cli_0_2_95; + buildGoModule = buildGo123Module; } diff --git a/pkgs/by-name/te/teleport_17/package.nix b/pkgs/by-name/te/teleport_17/package.nix index 9e9d580d4c33..68e642564971 100644 --- a/pkgs/by-name/te/teleport_17/package.nix +++ b/pkgs/by-name/te/teleport_17/package.nix @@ -1,4 +1,16 @@ { - teleport, + buildTeleport, + buildGo123Module, + wasm-bindgen-cli_0_2_95, }: -teleport + +buildTeleport rec { + version = "17.5.4"; + hash = "sha256-ojRIyPTrSG3/xuqdaUNrN4s5HP3E8pvzjG8h+qFEYrc="; + vendorHash = "sha256-IHXwCp1MdcEKJhIs9DNf77Vd93Ai2as7ROlh6AJT9+Q="; + cargoHash = "sha256-qz8gkooQTuBlPWC4lHtvBQpKkd+nEZ0Hl7AVg9JkPqs="; + pnpmHash = "sha256-YwftGEQTEI8NvFTFLMJHhYkvaIIP9+bskCQCp5xuEtY="; + + wasm-bindgen-cli = wasm-bindgen-cli_0_2_95; + buildGoModule = buildGo123Module; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 862b7fb44364..1a9730d9e202 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4534,6 +4534,8 @@ with pkgs; teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { }; + buildTeleport = callPackage ../build-support/teleport { }; + telepresence = callPackage ../tools/networking/telepresence { pythonPackages = python3Packages; }; From 25ef88b40f85c3a10e9bdb88dc8808439fb8a86c Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Mon, 26 May 2025 14:50:46 +0300 Subject: [PATCH 2/9] wasm-bindgen-cli_0_2_99: init at 0.2.99 This is needed for teleport_18 (cherry picked from commit c6d1d4dd2cd4f359770310e342124aca57299b7b) --- .../wa/wasm-bindgen-cli_0_2_99/package.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 pkgs/by-name/wa/wasm-bindgen-cli_0_2_99/package.nix diff --git a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_99/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_99/package.nix new file mode 100644 index 000000000000..59a40d35f557 --- /dev/null +++ b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_99/package.nix @@ -0,0 +1,19 @@ +{ + buildWasmBindgenCli, + fetchCrate, + rustPlatform, +}: + +buildWasmBindgenCli rec { + src = fetchCrate { + pname = "wasm-bindgen-cli"; + version = "0.2.99"; + hash = "sha256-1AN2E9t/lZhbXdVznhTcniy+7ZzlaEp/gwLEAucs6EA="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + inherit (src) pname version; + hash = "sha256-HGcqXb2vt6nAvPXBZOJn7nogjIoAgXno2OJBE1trHpc="; + }; +} From 21037c0b4c8f5aeec1cc633bdb4e11229837fe53 Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Mon, 26 May 2025 14:52:31 +0300 Subject: [PATCH 3/9] teleport_18: init at 18.1.1 (cherry picked from commit f073e6214c3f901184a625869c8761b6ae6f892f) --- nixos/tests/teleport.nix | 1 + pkgs/by-name/te/teleport_18/package.nix | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/by-name/te/teleport_18/package.nix diff --git a/nixos/tests/teleport.nix b/nixos/tests/teleport.nix index e9b3193448d3..6b8acb332c43 100644 --- a/nixos/tests/teleport.nix +++ b/nixos/tests/teleport.nix @@ -11,6 +11,7 @@ let packages = with pkgs; { "16" = teleport_16; "17" = teleport_17; + "18" = teleport_18; }; minimal = package: { diff --git a/pkgs/by-name/te/teleport_18/package.nix b/pkgs/by-name/te/teleport_18/package.nix new file mode 100644 index 000000000000..72a558a5e20b --- /dev/null +++ b/pkgs/by-name/te/teleport_18/package.nix @@ -0,0 +1,16 @@ +{ + buildTeleport, + buildGo124Module, + wasm-bindgen-cli_0_2_99, +}: + +buildTeleport rec { + version = "18.1.1"; + hash = "sha256-xhf6WwgR3VwjtvFo0/b9A0RcyY7dklPfPUakludUmm8="; + vendorHash = "sha256-63pqTI92045/V8Gf+TDKUWLV9eO4hVKOHtgWbYnAf6I="; + pnpmHash = "sha256-ZuMMacsyr2rGLVDlaEwA7IbZZfGBuTRBOv4Q6XIjDek="; + cargoHash = "sha256-ia4We4IfIkqz82aFMVvXdzjDXw0w+OJSPVdutfau6PA="; + + wasm-bindgen-cli = wasm-bindgen-cli_0_2_99; + buildGoModule = buildGo124Module; +} From 6dc0ee4377591fd7fe03ddbb26555e680b6da567 Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Mon, 28 Jul 2025 11:45:08 +0200 Subject: [PATCH 4/9] teleport_16: 16.5.13 -> 16.5.14 Changelog: https://github.com/gravitational/teleport/releases/tag/v16.5.14 Diff: https://github.com/gravitational/teleport/compare/v16.5.13...v16.5.14 (cherry picked from commit 5fdc599923e1fbf57d6c023fe418945c4a3167e8) --- pkgs/by-name/te/teleport_16/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/te/teleport_16/package.nix b/pkgs/by-name/te/teleport_16/package.nix index 2ef76956122c..2361a28f817b 100644 --- a/pkgs/by-name/te/teleport_16/package.nix +++ b/pkgs/by-name/te/teleport_16/package.nix @@ -4,10 +4,10 @@ wasm-bindgen-cli_0_2_95, }: buildTeleport rec { - version = "16.5.13"; - hash = "sha256-X9Ujgvp+2dFCoku0tjGW4W05X8QrnExFE+H1kMhf91A="; - vendorHash = "sha256-0+7xbIONnZs7dPpfpHPmep+k4XxQE8TS/eKz4F5a3V0="; - pnpmHash = "sha256-waBzmNs20wbuoBDObVFnJjEYs3NJ/bzQksVz7ltMD7M="; + version = "16.5.14"; + hash = "sha256-24NVmJ97igUs45Ruuj9llRcHVsGMU1dtRm8f4R0pYG4="; + vendorHash = "sha256-PDgrfol2zrmS8yzvJQoK486nl+akD9LP4Sh5IVz/jNE="; + pnpmHash = "sha256-b6D7i68rX47+thleTeEfW+G72NxuqWNLmNXxJqe8ha8="; cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I="; wasm-bindgen-cli = wasm-bindgen-cli_0_2_95; From 48e58b28b4ec80d8c6bab538ddbb7684c6704dfa Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Mon, 28 Jul 2025 11:45:49 +0200 Subject: [PATCH 5/9] teleport_17: 17.5.4 -> 17.7.0 Changelogs: https://github.com/gravitational/teleport/releases/tag/v17.5.5 https://github.com/gravitational/teleport/releases/tag/v17.5.6 https://github.com/gravitational/teleport/releases/tag/v17.6.0 https://github.com/gravitational/teleport/releases/tag/v17.7.0 Diff: https://github.com/gravitational/teleport/compare/v17.5.4...v17.7.0 Also add fix for error: "ERROR: mkdir /homeless-shelter: permission denied" (cherry picked from commit 475e7fd75d2b2811365f800e031e2d25af33bbcc) --- pkgs/by-name/te/teleport_17/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/te/teleport_17/package.nix b/pkgs/by-name/te/teleport_17/package.nix index 68e642564971..7281deb93503 100644 --- a/pkgs/by-name/te/teleport_17/package.nix +++ b/pkgs/by-name/te/teleport_17/package.nix @@ -5,11 +5,11 @@ }: buildTeleport rec { - version = "17.5.4"; - hash = "sha256-ojRIyPTrSG3/xuqdaUNrN4s5HP3E8pvzjG8h+qFEYrc="; - vendorHash = "sha256-IHXwCp1MdcEKJhIs9DNf77Vd93Ai2as7ROlh6AJT9+Q="; + version = "17.7.0"; + hash = "sha256-+NfYpA6BDpD0/YCMj2y2torgw/ihd279SLTmPySIqvk="; + vendorHash = "sha256-NWZKLiub68OR0U3RkCOLCe4vrzXdOCitYm3ITOU3nhk="; cargoHash = "sha256-qz8gkooQTuBlPWC4lHtvBQpKkd+nEZ0Hl7AVg9JkPqs="; - pnpmHash = "sha256-YwftGEQTEI8NvFTFLMJHhYkvaIIP9+bskCQCp5xuEtY="; + pnpmHash = "sha256-I1mQ/F1ethOPA0jlrN+3ClByk7Ifw6LPbgjSvPx44D4="; wasm-bindgen-cli = wasm-bindgen-cli_0_2_95; buildGoModule = buildGo123Module; From f1982a4b8c299ddc94879e9c4efe3999b461bb32 Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Mon, 8 Sep 2025 15:48:50 +0200 Subject: [PATCH 6/9] teleport: rename references to rdp library to `librdpclient.h` The file was renamed upstream, so the patch and import have to be updated respectively. (cherry picked from commit b2570e4cb3b54f7408bf3898cafedf7d42776966) --- pkgs/build-support/teleport/default.nix | 2 +- pkgs/build-support/teleport/rdpclient.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/teleport/default.nix b/pkgs/build-support/teleport/default.nix index c44c320addee..afe2af40f91a 100644 --- a/pkgs/build-support/teleport/default.nix +++ b/pkgs/build-support/teleport/default.nix @@ -60,7 +60,7 @@ let postInstall = '' mkdir -p $out/include - cp ${finalAttrs.buildAndTestSubdir}/librdprs.h $out/include/ + cp ${finalAttrs.buildAndTestSubdir}/librdpclient.h $out/include/ ''; }); diff --git a/pkgs/build-support/teleport/rdpclient.patch b/pkgs/build-support/teleport/rdpclient.patch index 4f35cd184ab5..ad97288acec5 100644 --- a/pkgs/build-support/teleport/rdpclient.patch +++ b/pkgs/build-support/teleport/rdpclient.patch @@ -17,6 +17,6 @@ index 4357d7aa1..7e21a0076 100644 +#cgo LDFLAGS: -L${SRCDIR}/../../../../../lib -lpthread -ldl -lm -lssl -lcrypto +#cgo linux LDFLAGS: -l:librdp_client.a +#cgo darwin LDFLAGS: -framework CoreFoundation -framework Security -lrdp_client - #include + #include */ import "C" From c5f31425ce237445cb02ad508cafb7e112b37a2c Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Mon, 8 Sep 2025 15:49:52 +0200 Subject: [PATCH 7/9] teleport_18: 18.1.1 -> 18.2.0 Changelogs: https://github.com/gravitational/teleport/releases/tag/v18.1.2 https://github.com/gravitational/teleport/releases/tag/v18.1.3 https://github.com/gravitational/teleport/releases/tag/v18.1.4 https://github.com/gravitational/teleport/releases/tag/v18.1.5 https://github.com/gravitational/teleport/releases/tag/v18.1.6 https://github.com/gravitational/teleport/releases/tag/v18.1.7 https://github.com/gravitational/teleport/releases/tag/v18.1.8 https://github.com/gravitational/teleport/releases/tag/v18.2.0 Diff: https://github.com/gravitational/teleport/compare/v18.1.1...v18.2.0 (cherry picked from commit 2c32d077913a7b585b08249dec9c4626df9714f1) --- pkgs/by-name/te/teleport_18/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/te/teleport_18/package.nix b/pkgs/by-name/te/teleport_18/package.nix index 72a558a5e20b..f0c459886425 100644 --- a/pkgs/by-name/te/teleport_18/package.nix +++ b/pkgs/by-name/te/teleport_18/package.nix @@ -5,10 +5,10 @@ }: buildTeleport rec { - version = "18.1.1"; - hash = "sha256-xhf6WwgR3VwjtvFo0/b9A0RcyY7dklPfPUakludUmm8="; - vendorHash = "sha256-63pqTI92045/V8Gf+TDKUWLV9eO4hVKOHtgWbYnAf6I="; - pnpmHash = "sha256-ZuMMacsyr2rGLVDlaEwA7IbZZfGBuTRBOv4Q6XIjDek="; + version = "18.2.0"; + hash = "sha256-JWgGRv9pK76u7IxwqnBcuAI93XIKfIVvme7l+a/3J7c="; + vendorHash = "sha256-oPi/rIuwze2ZlyHfZ2MdDHHvdIaF2IZ2aklEVNRgoLo="; + pnpmHash = "sha256-wW4RT1uqOTpy8wKIsAOfIlxoOamTzPqEbFQRAub+sn4="; cargoHash = "sha256-ia4We4IfIkqz82aFMVvXdzjDXw0w+OJSPVdutfau6PA="; wasm-bindgen-cli = wasm-bindgen-cli_0_2_99; From d32c25ef77ac7269d5e710414da84a6391664012 Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Mon, 8 Sep 2025 15:52:47 +0200 Subject: [PATCH 8/9] teleport_17: 17.7.0 -> 17.7.3 Changelogs: https://github.com/gravitational/teleport/releases/tag/v17.7.1 https://github.com/gravitational/teleport/releases/tag/v17.7.2 https://github.com/gravitational/teleport/releases/tag/v17.7.3 Diff: https://github.com/gravitational/teleport/compare/v17.7.0...v17.7.3 (cherry picked from commit e171fab899c5237118128431aba6a262fe664a96) --- pkgs/by-name/te/teleport_17/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/te/teleport_17/package.nix b/pkgs/by-name/te/teleport_17/package.nix index 7281deb93503..35bd56a07432 100644 --- a/pkgs/by-name/te/teleport_17/package.nix +++ b/pkgs/by-name/te/teleport_17/package.nix @@ -1,16 +1,16 @@ { buildTeleport, - buildGo123Module, + buildGo124Module, wasm-bindgen-cli_0_2_95, }: buildTeleport rec { - version = "17.7.0"; - hash = "sha256-+NfYpA6BDpD0/YCMj2y2torgw/ihd279SLTmPySIqvk="; - vendorHash = "sha256-NWZKLiub68OR0U3RkCOLCe4vrzXdOCitYm3ITOU3nhk="; + version = "17.7.3"; + hash = "sha256-YSYkJRAeu7iPOs/gFnozZbks0Fx5srNH0VjrKvFmHZo="; + vendorHash = "sha256-7Rb94ERtp3H1Jwyh9d7AFT06d4xXdnfe5tpdvJQrbUQ="; cargoHash = "sha256-qz8gkooQTuBlPWC4lHtvBQpKkd+nEZ0Hl7AVg9JkPqs="; - pnpmHash = "sha256-I1mQ/F1ethOPA0jlrN+3ClByk7Ifw6LPbgjSvPx44D4="; + pnpmHash = "sha256-ZONs8z8mgBBQBmqaDGJKqhmtUKBrxE8BGYppbAqpQmg="; wasm-bindgen-cli = wasm-bindgen-cli_0_2_95; - buildGoModule = buildGo123Module; + buildGoModule = buildGo124Module; } From 674734f59768276f827a084b3828140570a8c2cb Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Mon, 8 Sep 2025 15:54:20 +0200 Subject: [PATCH 9/9] teleport_16: 16.5.14 -> 16.5.15 Changelog: https://github.com/gravitational/teleport/releases/tag/v16.5.15 Diff: https://github.com/gravitational/teleport/compare/v16.5.14...v16.5.15 (cherry picked from commit 266a75ebbbe336cc4be4f68e06679096795ec272) --- pkgs/by-name/te/teleport_16/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/te/teleport_16/package.nix b/pkgs/by-name/te/teleport_16/package.nix index 2361a28f817b..c8e14a52137b 100644 --- a/pkgs/by-name/te/teleport_16/package.nix +++ b/pkgs/by-name/te/teleport_16/package.nix @@ -1,15 +1,15 @@ { buildTeleport, - buildGo123Module, + buildGo124Module, wasm-bindgen-cli_0_2_95, }: buildTeleport rec { - version = "16.5.14"; - hash = "sha256-24NVmJ97igUs45Ruuj9llRcHVsGMU1dtRm8f4R0pYG4="; - vendorHash = "sha256-PDgrfol2zrmS8yzvJQoK486nl+akD9LP4Sh5IVz/jNE="; - pnpmHash = "sha256-b6D7i68rX47+thleTeEfW+G72NxuqWNLmNXxJqe8ha8="; + version = "16.5.15"; + hash = "sha256-DqNG6gl+KdjSbkE9Bwum8az8cLCSOmZwo9xpuWafHCA="; + vendorHash = "sha256-sZvRKLF2iZ3UpgGNUPuWMT7VTpnDa2uU0d1XjDKSmdo="; + pnpmHash = "sha256-8xnH9PkKz77whtq/LVYUjyG1Z1reRtW03Gv8sZ/1vww="; cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I="; wasm-bindgen-cli = wasm-bindgen-cli_0_2_95; - buildGoModule = buildGo123Module; + buildGoModule = buildGo124Module; }