Skip to content

all-packages.nix: reorder git-and-tools expressions#202465

Merged
AndersonTorres merged 1 commit intoNixOS:masterfrom
atorres1985-contrib:git-and-tools-are-back
Dec 1, 2022
Merged

all-packages.nix: reorder git-and-tools expressions#202465
AndersonTorres merged 1 commit intoNixOS:masterfrom
atorres1985-contrib:git-and-tools-are-back

Conversation

@AndersonTorres
Copy link
Copy Markdown
Member

@AndersonTorres AndersonTorres commented Nov 23, 2022

This commit serves as first step for refactor them in the next set of commits.

Description of changes

A scary reordering of lines.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Nov 23, 2022
@AndersonTorres
Copy link
Copy Markdown
Member Author

AndersonTorres commented Nov 23, 2022

For the log: next I will group all those expressions inside a typical recurseIntoAttrs thing.

@zowoq
Copy link
Copy Markdown
Contributor

zowoq commented Nov 23, 2022

For the log: next I will group all those expressions inside a typical recurseIntoAttrs thing.

So you're basically reverting #109396?

@AndersonTorres
Copy link
Copy Markdown
Member Author

AndersonTorres commented Nov 23, 2022 •
edited
Loading

So you're basically reverting #109396?

Partially, I would say.

Forcing anyone to prefix everything with gitAndTools. is bad, this is not my idea.

They will all stay in the top-level - but transparently, using inherit (recurseIntoAttrs <path to git and tools>) <the git tools>.

Hopefully no one will notice...

@zowoq
Copy link
Copy Markdown
Contributor

zowoq commented Nov 23, 2022 •
edited
Loading

They will all stay in the top-level - but transparently, using inherit (recurseIntoAttrs ) .

Frankly I think this is a waste of time and effort, strong no from me.

(And I don't mean just your time and effort in making these PRs, I also mean everyone else's who has to deal with it in the future)

@AndersonTorres AndersonTorres marked this pull request as draft November 24, 2022 02:38
@ofborg ofborg bot added 2.status: merge conflict This PR has merge conflicts with the target branch 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. and removed 2.status: merge conflict This PR has merge conflicts with the target branch 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Nov 24, 2022
@AndersonTorres
Copy link
Copy Markdown
Member Author

AndersonTorres commented Nov 24, 2022

Maybe not. This already happens within Nixpkgs, especially

  • coherent sets of packages like desktop managers
  • plugins to shells and other utilities

I will give this a shot.

@zowoq
Copy link
Copy Markdown
Contributor

zowoq commented Nov 24, 2022 •
edited
Loading

  • coherent sets of packages like desktop managers

  • plugins to shells and other utilities

This is very different from these.

cc @alyssais @cole-h @Mic92 @ryantm from #109396

@ofborg ofborg bot added 2.status: merge conflict This PR has merge conflicts with the target branch 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. and removed 2.status: merge conflict This PR has merge conflicts with the target branch 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Nov 24, 2022
@ofborg ofborg bot added 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. and removed 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Nov 24, 2022
@AndersonTorres AndersonTorres marked this pull request as ready for review November 28, 2022 23:46
@AndersonTorres
Copy link
Copy Markdown
Member Author

AndersonTorres commented Nov 30, 2022

For now this is OK. I will leave the "next shot" to another future PR.

@zowoq
Copy link
Copy Markdown
Contributor

zowoq commented Nov 30, 2022

I will leave the "next shot" to another future PR.

If this means recurseIntoAttrs then consider this a very strong pre-emptive objection to that.

@AndersonTorres
all-packages.nix: reorder git-and-tools expressions
29db827 
This commit serves as first step for refactor them in the next set of commits.
@AndersonTorres AndersonTorres merged commit 0b23f22 into NixOS:master Dec 1, 2022
@vcunat
Copy link
Copy Markdown
Member

vcunat commented Dec 3, 2022

Uh, this didn't just reorder the lines, probably just due to "conflicts" accumulated over time. Example:

-  subsurface = libsForQt5.callPackage ../applications/misc/subsurface { };
+  subsurface = libsForQt514.callPackage ../applications/misc/subsurface { };

@vcunat vcunat mentioned this pull request Dec 3, 2022
Merged
13 tasks
@zowoq zowoq mentioned this pull request Dec 3, 2022
Merged
13 tasks
@zowoq
Copy link
Copy Markdown
Contributor

zowoq commented Dec 3, 2022

#204250

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: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@AndersonTorres @zowoq @vcunat