Skip to content

Comments

teleport_15: init at 15.2.2, teleport_12: remove #285922

Merged
tomberek merged 2 commits intoNixOS:masterfrom
justinas:teleport-15
Apr 17, 2024
Merged

teleport_15: init at 15.2.2, teleport_12: remove #285922
tomberek merged 2 commits intoNixOS:masterfrom
justinas:teleport-15

Conversation

@justinas
Copy link
Member

@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.

@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Feb 3, 2024
@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Feb 3, 2024
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Feb 3, 2024
@github-actions github-actions bot added 8.has: documentation This PR adds or changes documentation 8.has: changelog This PR adds or changes release notes labels Feb 4, 2024
@justinas justinas changed the title teleport_15: init at 15.0.0 teleport_15: init at 15.0.0, teleport_12: remove Feb 4, 2024
Copy link
Member Author

Choose a reason for hiding this comment

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

@justinas justinas marked this pull request as ready for review February 4, 2024 19:18
@justinas
Copy link
Member 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 { ... }

@ofborg ofborg bot added the 8.has: clean-up This PR removes packages or removes other cruft label Feb 4, 2024
@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
Member 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

@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
Member Author

Rebased.

@wegank wegank added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. 2.status: merge conflict This PR has merge conflicts with the target branch labels Mar 29, 2024
@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.
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 16, 2024
@ofborg ofborg bot requested a review from techknowlogick April 16, 2024 18:21
@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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog This PR adds or changes release notes 8.has: clean-up This PR removes packages or removes other cruft 8.has: documentation This PR adds or changes documentation 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants