-
-
Notifications
You must be signed in to change notification settings - Fork 14.5k
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
Merge NixOS into Nixpkgs #1041
Comments
It looks to me like a very good idea. I'm for it! On Fri, Oct 04, 2013 at 03:59:58AM -0700, Eelco Dolstra wrote:
|
Sounds good to me. Eelco Dolstra notifications@github.com writes:
|
@bluescreen303 Yeah, that's basically why I want to do this now. If we do it after the release, we'll have to keep two repositories alive for a while. |
For the downsides:
|
What I'm not clear about: can we somehow "merge" the github issues/PRs? There are quite many for both nixos and nixpkgs. |
There is a script to move issues to another GitHub project, but it doesn't keep comment authorship: https://github.com/collective/collective.developermanual/blob/master/gh-issues-import.py |
I just wrote a mail to Github asking if they know a way to merge projects while keeping all issues with comments. |
Cool, thanks! |
I use nixpkgs on Ubuntu on a couple of machines, but still +1 for merging. Looking forward to easily git bisect the whole of NixOS and more easily recreate exact builds (no more manual work to match nixos/nixpkgs versions). |
+1 |
I'm fine with this change, too. There are more reasons to merge: Eg should "creating an iso or an usb image of nixos" be a nixpkgs or a nixos project? The more I think about it the earlier this should be done. |
awesome! 🍺 |
+1 On Sun, Oct 6, 2013 at 6:06 PM, Rok Garbas notifications@github.com wrote:
|
Okay, I'll do the merge now. Cross fingers... I'll turn off commits to the NixOS repo first. |
Do we have to reopen pull requests now or will they be handled in any other way? |
Excerpts from Jaka Hudoklin's message of Do Okt 10 19:58:59 +0200 2013:
Closing and reopening is unlikely to be wrong. Marc Weber |
This can be closed? |
Yes, closing now... |
Thanks, +1 |
I'd like to merge the NixOS tree into the Nixpkgs repository, as has been discussed a few times in the past. The reasons for merging them are:
There are also downsides to merging:
<nixpkgs>
references).I did a test merge, available here: https://github.com/edolstra/nixpkgs/tree/merge-test. It imports nixos/master as a subdirectory "nixos" in the root directory of Nixpkgs (keeping all history). While I was at it, I also renamed pkgs/lib to lib because it never really made sense to have it in pkgs.
Note that GitHub unfortunately doesn't show history across renames, but "git log --follow" does (and GitHub's "blame" also works fine).
The text was updated successfully, but these errors were encountered: