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

lib: rename maintainers-list.nix into maintainers/maintainer-list.nix #36275

Merged
merged 2 commits into from Mar 6, 2018

Conversation

oxij
Copy link
Member

@oxij oxij commented Mar 4, 2018

Much saner git log ./lib.

@oxij
Copy link
Member Author

oxij commented Mar 4, 2018

The ofborg error is pretty interesting. What is this? I don't even.

@oxij oxij force-pushed the lib/maintainers-list branch 3 times, most recently from 86cc5c6 to 94453db Compare March 4, 2018 03:22
@Profpatsch
Copy link
Member

Maybe it has something to do with the change to checkMeta? I’d put that into a separate commit anyway.

@oxij
Copy link
Member Author

oxij commented Mar 4, 2018

Nah, now it's bugs in derivations. Will fix one by one as obborg finds them.

@Profpatsch
Copy link
Member

Ah, but then this should be two PRs, really.

@grahamc
Copy link
Member

grahamc commented Mar 4, 2018

The error is on master, not on your branch. The original PR didn't pass checks, and ofborg doesn't handle it well when master is already broken.

@oxij
Copy link
Member Author

oxij commented Mar 4, 2018

All the things evaluate here. @grahamc or @Profpatsch can you pick up two top commits from here to master? I will then rebase to clean this up to match the topic.

@grahamc
Copy link
Member

grahamc commented Mar 4, 2018

I pushed the last two, but I think you meant the last three?

@oxij
Copy link
Member Author

oxij commented Mar 4, 2018

Rebased onto #36279.

@oxij
Copy link
Member Author

oxij commented Mar 4, 2018

@grahamc Well, yes (I need to go to sleep ASAP, I guess). Anyway, this branch looks good to me. Waiting for ofborg.

@oxij
Copy link
Member Author

oxij commented Mar 4, 2018

Yay! This now closes #36279, I guess.

@Profpatsch
Copy link
Member

Okay, the broken evaluations have been fixed in #36279.

@oxij
Copy link
Member Author

oxij commented Mar 4, 2018 via email

@oxij
Copy link
Member Author

oxij commented Mar 4, 2018 via email

@oxij oxij changed the title lib: move maintainers-list.nix into maintainers lib: rename maintainers-list.nix into maintainers/maintainer-list.nix Mar 4, 2018
Many commits unrelated to `lib` touch that file, this will make `git log ./lib` much saner.

This is what I meant in NixOS#36119 (comment).
@oxij
Copy link
Member Author

oxij commented Mar 6, 2018

ping

@7c6f434c
Copy link
Member

7c6f434c commented Mar 6, 2018

@GrahamcOfBorg eval

@7c6f434c 7c6f434c merged commit 1bd790d into NixOS:master Mar 6, 2018
vcunat pushed a commit that referenced this pull request Mar 7, 2018
lib: rename maintainers-list.nix into maintainers/maintainer-list.nix
(cherry picked from commit 1bd790d)
The intention is to reduce conflicts during maintenance.
matthewbauer added a commit to matthewbauer/nixpkgs that referenced this pull request Mar 18, 2018
matthewbauer added a commit that referenced this pull request Mar 19, 2018
dotlambda pushed a commit that referenced this pull request Mar 20, 2018
@oxij oxij deleted the lib/maintainers-list branch September 8, 2018 22:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants