Eelco Dolstra 800f9c2037 Show correct position info for errors in submodules ... E.g. The unique option `fileSystems./.device' is defined multiple times, in `/etc/nixos/configuration.nix' and `/etc/nixos/foo.nix'. This requires passing file/value tuples to the merge functions.		2013-10-30 14:57:43 +01:00
doc	Unify the Nixpkgs and NixOS version numbers	2013-10-10 13:28:22 +02:00
lib	Show correct position info for errors in submodules	2013-10-30 14:57:43 +01:00
maintainers/scripts	Fix references to pkgs/lib	2013-10-10 13:28:22 +02:00
nixos	Show correct position info for errors in submodules	2013-10-30 14:57:43 +01:00
pkgs	calibre: upgrade 1.5.0 -> 1.8.0	2013-10-30 15:44:03 +02:00
.gitignore	Merge .gitignore files	2013-10-10 13:28:22 +02:00
.version	Unify the Nixpkgs and NixOS version numbers	2013-10-10 13:28:22 +02:00
COPYING
default.nix