[Nix-dev] NixOS merged into Nixpkgs

[Eelco Dolstra]

Hi,

I've merged the NixOS tree into the Nixpkgs tree.  From now on, the NixOS
sources live in the "nixos" subdirectory of the Nixpkgs repository:

  https://github.com/NixOS/nixpkgs/tree/master/nixos

The motivation for the merge is explained here:

  https://github.com/NixOS/nixpkgs/issues/1041

What this merge means for you:

* If you're not a NixOS user, you can ignore this (as well as the "nixos"
subdirectory in Nixpkgs).

* If you're a NixOS user but not a developer, nothing changes: you can update to
a NixOS based on the merged trees by running "nixos-rebuild switch --upgrade" as
usual.

* The Nixpkgs issue tracker on GitHub (https://github.com/NixOS/nixpkgs/issues)
should be used for filing NixOS issues.  Please use the "nixos" label for issues
that are purely NixOS problems.

* If you're a NixOS developer, you can throw away your NixOS tree since the
Nixpkgs tree now contains everything.  If you have outstanding commits in your
NixOS tree that you want to move to Nixpkgs, you should be able to do this as
follows:

  $ cd /my/nixpkgs/tree
  $ git pull /my/nixos/tree
  $ git rebase

Git will magically figure out that all changes need to be merged into the
"nixos" subdirectory.

* The merge kept all history.  Commands like "git blame" automatically follow
history across renames.  However, "git log" does not, so you need to say "git
log --follow" for files in the nixos subdirectory.  Unfortunately, GitHub
doesn't use --follow in its web interface, so browsing the history in GitHub is
now suboptimal.

-- 
Eelco Dolstra | LogicBlox, Inc. | http://nixos.org/~eelco/