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

treewide/nixos: remove with lib; part 5 #335647

Merged

Conversation

Stunkymonkey
Copy link
Contributor

@Stunkymonkey Stunkymonkey commented Aug 18, 2024

Description of changes

part of #208242

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.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Aug 18, 2024
@Stunkymonkey Stunkymonkey force-pushed the treewide-nixos-remove-with-lib-5 branch 4 times, most recently from 99e4290 to b6d660d Compare August 18, 2024 17:47
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Aug 18, 2024
@philiptaron philiptaron self-requested a review August 19, 2024 19:35
@Stunkymonkey Stunkymonkey force-pushed the treewide-nixos-remove-with-lib-5 branch from b6d660d to c3fb945 Compare August 27, 2024 19:46
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Aug 27, 2024
@Stunkymonkey Stunkymonkey force-pushed the treewide-nixos-remove-with-lib-5 branch 3 times, most recently from 9d0f3ee to 8e72466 Compare August 28, 2024 18:51
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Aug 28, 2024
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 10, 2024
@Stunkymonkey Stunkymonkey force-pushed the treewide-nixos-remove-with-lib-5 branch 3 times, most recently from eabf1bb to 89aa355 Compare September 11, 2024 18:35
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 12, 2024
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 27, 2024
@Stunkymonkey Stunkymonkey force-pushed the treewide-nixos-remove-with-lib-5 branch from 89aa355 to 22e80f8 Compare November 23, 2024 17:48
@github-actions github-actions bot added the 6.topic: deepin Desktop environment and its components label Nov 23, 2024
@Stunkymonkey Stunkymonkey force-pushed the treewide-nixos-remove-with-lib-5 branch 2 times, most recently from 94861a8 to 1b627fa Compare November 23, 2024 17:56
@Stunkymonkey Stunkymonkey removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 23, 2024
@Stunkymonkey Stunkymonkey force-pushed the treewide-nixos-remove-with-lib-5 branch from 1b627fa to 203f700 Compare November 24, 2024 09:07
@philiptaron
Copy link
Contributor

Felix, is this with the new script or old?

@Stunkymonkey
Copy link
Contributor Author

@philiptaron this was done with the new one. But the commit messages are not yet improved...

@philiptaron
Copy link
Contributor

If we split this part 5 and the part 6 into groups of 50, I think I can reviews them all this coming week.

@Stunkymonkey Stunkymonkey force-pushed the treewide-nixos-remove-with-lib-5 branch from 5dce9e7 to d013bf0 Compare December 8, 2024 12:22
Copy link
Contributor

@philiptaron philiptaron left a comment

Choose a reason for hiding this comment

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

Whew, it's at zero defects this time.

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Dec 9, 2024
@Stunkymonkey
Copy link
Contributor Author

@philiptaron can we agree, that when you find a single defect in this kind of MRs -> mention it an abort any further reading?

just to safe you some time

@philiptaron
Copy link
Contributor

@philiptaron can we agree, that when you find a single defect in this kind of MRs -> mention it an abort any further reading?

Sure, I can do that. Now that we have a script that ought to reliably yield zero defects that's a sane default.

@philiptaron philiptaron merged commit 0311f6c into NixOS:master Dec 10, 2024
35 checks passed
@philiptaron
Copy link
Contributor

No error reports the next day. Looking at tranche 6 now.

@K900
Copy link
Contributor

K900 commented Dec 10, 2024

#363775

How many of these do we need to explode to realize that we need better testing? I believe we're currently at 4/5.

@philiptaron
Copy link
Contributor

@K900, the PRs done with the old sed-based script were definitely too low quality. We paused any merges of changes produced with that tool.

So please do not count those initial failures as being part of this one.

The new script that Felix uses in this PR is subject to time-of-script-run issues, where unless there is a merge conflict (not guaranteed) things like #363775 are possible.

On a personal note, I find the characterization of one quickly fixed defect across ~1,000 LOC change as an "explosion" to be unkind. You yourself have made many defects, merged them to master, then fixed them. That's good. Please don't harangue others for behavior you engage in.

I'm all ears for a testing strategy that produces fewer defects, that is actually able to be run by humans without a build lab. It's certainly not my intention to check in code that causes defects.

@Mic92
Copy link
Member

Mic92 commented Dec 10, 2024

@philiptaron I think you can run this:

nix-eval-jobs --workers <replaceme> --force-recurse --flake .#legacyPackages.x86_64-linux.nixosTests --force-recurse

Replace replaceme with: maximum_ram_usage / 4GB

It's not perfect because it won't cover modules without tests into account, but it is a start.

@Stunkymonkey
Copy link
Contributor Author

i can confirm my script completely ignores the line in #363768.

We should have run nix-build . -A nixosTests.redis to prevent this. Are there any other commands that are more "leightweight" to detect this? i tried nix-instantiate --parse but no success.

@Mic92
Copy link
Member

Mic92 commented Dec 12, 2024

Not sure if light-weight alternatives give you decent coverage. Our nix-community x86 machine might be a good target to run this for a bit longer.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: deepin Desktop environment and its components 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants