Skip to content

teleport: Re-add possibility for overrides#444580

Merged
philiptaron merged 1 commit intoNixOS:masterfrom
JuliusFreudenberger:teleport-revert-overrides
Sep 20, 2025
Merged

teleport: Re-add possibility for overrides#444580
philiptaron merged 1 commit intoNixOS:masterfrom
JuliusFreudenberger:teleport-revert-overrides

Conversation

@JuliusFreudenberger
Copy link
Contributor

The interface for the overrides withRdpClient and extPatches was removed with #411095.

Resolves #411095 (comment).
Also has to be backported to restore the interface there as stated in #441311 (comment).

This is an intermediate fix to restore old functionality until #404946 or similar provides some other means.

Things done

  • Built on platform:
    • x86_64-linux (using the override)
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

The interface for the overrides `withRdpClient` and `extPatches` was
removed with NixOS#411095.
@JuliusFreudenberger
Copy link
Contributor Author

@simonzkl, I tested a build with the old interface, which is restored with this PR. Could you please test, if the flag really comes into effect?

@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Sep 20, 2025
@JuliusFreudenberger
Copy link
Contributor Author

Also pinging @philiptaron as you were also involved.

@philiptaron philiptaron added this pull request to the merge queue Sep 20, 2025
Merged via the queue into NixOS:master with commit bbf0cc7 Sep 20, 2025
31 of 34 checks passed
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Sep 20, 2025

Backport failed for release-25.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-25.05
git worktree add -d .worktree/backport-444580-to-release-25.05 origin/release-25.05
cd .worktree/backport-444580-to-release-25.05
git switch --create backport-444580-to-release-25.05
git cherry-pick -x ec923b65ee39a1a7d599a903edab305784a5925b

@JuliusFreudenberger JuliusFreudenberger deleted the teleport-revert-overrides branch September 21, 2025 14:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants