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.

Sign up for GitHub

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

Jump to bottom

cvs: adopt and modernize #347762

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

cvs: adopt and modernize #347762

wants to merge 5 commits into from
+80 −359

Conversation

AndersonTorres
Copy link
Member

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

@joshuakb2 can you please test this PR?

@joshuakb2
Copy link

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

@joshuakb2
Copy link

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

@joshuakb2
Copy link

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

AndersonTorres and others added 5 commits October 10, 2024 16:33
@AndersonTorres
cvs: migrate to by-name
9585658
@AndersonTorres
cvs: refactor and adopt
650f66c 
- hammer
- nixfmt-rfc-style
- finalAttrs
- no nested with
- meta.mainProgram
@AndersonTorres
cvs: unpack the patches from getcwd-chroot.patch
27d0379 
This removes that uncanny preConfigure.
@AndersonTorres
cvs: pick patches from their origins instead of vendoring them
7a4e2ac
@AndersonTorres @joshuakb2
cvs: new options ___forceSSH and ___withEditor
1ef5e6c 
Co-authored-by: Joshua baker <joshuakb2@gmail.com>
@AndersonTorres
Copy link
Member Author

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.

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: 11-100 10.rebuild-linux: 11-100 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@AndersonTorres @joshuakb2