Skip to content

cvs: adopt and modernize#347762

Closed
AndersonTorres wants to merge 4 commits intoNixOS:masterfrom
museoa:adopt-cvs
Closed

cvs: adopt and modernize#347762
AndersonTorres wants to merge 4 commits intoNixOS:masterfrom
museoa:adopt-cvs

Conversation

@AndersonTorres
Copy link
Member

@AndersonTorres AndersonTorres commented Oct 10, 2024

Besides migrating to by-name and reformatting, it also picks the patches from their pristine locations.
Since at least the xz-incident we should strive to use pristine sources whenever possible.

Closes #347374 (hopefully)

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.11 Release Notes (or backporting 23.11 and 24.05 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.

@AndersonTorres AndersonTorres marked this pull request as ready for review October 10, 2024 15:43
@AndersonTorres
Copy link
Member Author

AndersonTorres commented Oct 10, 2024

@joshuakb2 can you please test this PR?

@joshuakb2
Copy link

joshuakb2 commented Oct 10, 2024

@AndersonTorres sure, I'll let you know when I've tested it.

@joshuakb2
Copy link

joshuakb2 commented Oct 10, 2024

@AndersonTorres yes, this cvs build is working for me. It does not try to use rsh.

@joshuakb2
Copy link

joshuakb2 commented Oct 10, 2024

@AndersonTorres since the cvs binary is now built with a direct reference to the SSH executable, do you think the ssh package
to use should also be configurable? Or the text editor, for that matter?

@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Oct 10, 2024
@AndersonTorres
Copy link
Member Author

AndersonTorres commented Oct 10, 2024

I don't think it matters so much.

The current method for customization has some annoying pitfalls; e.g. optional parameters can possibly clash with existing or future packages - https://github.com/NixOS/nixpkgs/pull/342692/files#r1785284171

Besides, I am waiting Atemu's experiments at #312432 before trying anything too savage in terms of customization.
For now the defaults established here are good enough.

@nixos-discourse
Copy link

nixos-discourse commented Oct 21, 2024

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

https://discourse.nixos.org/t/prs-already-reviewed/2617/2051

@nixos-discourse
Copy link

nixos-discourse commented Nov 7, 2024

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/4809

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 10, 2024
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 15, 2024
AndersonTorres and others added 4 commits December 9, 2024 20:06
@AndersonTorres
cvs: refactor and adopt
3de3a80 
- hammer
- nixfmt-rfc-style
- finalAttrs
- no nested with
- meta.mainProgram
@AndersonTorres
cvs: unpack the patches from getcwd-chroot.patch
6be864b 
This removes that uncanny preConfigure.
@AndersonTorres
cvs: pick patches from their origins instead of vendoring them
b15f303
@AndersonTorres @joshuakb2
cvs: new options ___forceSSH and ___withEditor
eaaddd4 
Co-authored-by: Joshua baker <joshuakb2@gmail.com>
@AndersonTorres
Copy link
Member Author

AndersonTorres commented Dec 9, 2024 •
edited
Loading

Closing since I no longer have time to deal with this.

@github-actions github-actions bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. and removed 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Dec 9, 2024
@AndersonTorres AndersonTorres deleted the adopt-cvs branch December 14, 2024 18:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@AndersonTorres @joshuakb2 @nixos-discourse @wegank