Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

teleport_15: init at 15.2.2, teleport_12: remove #285922

Merged
merged 2 commits into from
Apr 17, 2024

Conversation

justinas
Copy link
Contributor

@justinas justinas commented Feb 3, 2024

Description of changes

Adding Teleport 15, a new major version.

Removing Teleport 12, because it is effectively EOL as the upstream only officially supports the 3 latest major versions at any given time.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@@ -154,7 +182,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;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Teleport changed the license to AGPLv3 (or later) staring with version 15. https://goteleport.com/blog/teleport-oss-switches-to-agpl-v3/

@justinas justinas marked this pull request as ready for review February 4, 2024 19:18
@justinas
Copy link
Contributor Author

justinas commented Feb 4, 2024

I am not sure how to make the by-name check happy given multiple versions living in teleport/14 teleport/15 etc.

@justinas justinas force-pushed the teleport-15 branch 2 times, most recently from 42b9360 to 98f9398 Compare February 4, 2024 21:50
@infinisil
Copy link
Member

infinisil commented Feb 4, 2024

The pkgs/by-name only requires new packages to use it, and that is based on whether the new definition looks like <attr> = callPackage ..., which is the case here.

Since there's a generic.nix file used by all the versions, you're a bit more restricted in what you can do, but there's some options:

  • My recommendation: Avoid pkgs/by-name for now by creating a package set for all versions, either like this:

      teleportVersions = callPackages ../servers/teleport { };
      inherit (teleportVersions) teleport_14 teleport_15 teleport;

    Or if you don't want to expose teleportVersions to users:

      inherit (callPackages ../servers/teleport { })
        teleport_14 teleport_15 teleport;
  • Alternatively, expose generic.nix as pkgs.teleportGeneric, such that you can refactor the individual versions to use pkgs/by-name, each of which taking teleportGeneric as an argument:

    { teleportGeneric }:
    teleportGeneric { ... }

@justinas justinas changed the title teleport_15: init at 15.0.0, teleport_12: remove teleport_15: init at 15.0.1, teleport_12: remove Feb 6, 2024
@justinas
Copy link
Contributor Author

justinas commented Feb 6, 2024

Thanks for the advice @infinisil , I ended up utilizing callPackages and the check passes now.

@justinas justinas changed the title teleport_15: init at 15.0.1, teleport_12: remove teleport_15: init at 15.1.3, teleport_12: remove Mar 10, 2024
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/3614

pkgs/servers/teleport/generic.nix Outdated Show resolved Hide resolved
pkgs/servers/teleport/14/default.nix Outdated Show resolved Hide resolved
pkgs/servers/teleport/13/default.nix Outdated Show resolved Hide resolved
@justinas justinas force-pushed the teleport-15 branch 2 times, most recently from 05346af to 03576b8 Compare March 20, 2024 18:10
@SuperSandro2000
Copy link
Member

Can you rebase? otherwise LGTM

@justinas
Copy link
Contributor Author

Rebased.

@justinas justinas changed the title teleport_15: init at 15.1.3, teleport_12: remove teleport_15: init at 15.2.2, teleport_12: remove Apr 16, 2024
EOL as v15 has been released.
@tomberek
Copy link
Contributor

Result of nixpkgs-review pr 285922 run on x86_64-linux 1

2 packages blacklisted:
  • nixos-install-tools
  • tests.nixos-functions.nixos-test
6 packages built:
  • teleport (teleport_15)
  • teleport.client (teleport_15.client)
  • teleport_13
  • teleport_13.client
  • teleport_14
  • teleport_14.client

@tomberek tomberek merged commit 2c88a89 into NixOS:master Apr 17, 2024
25 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants