tobias/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-11-12 02:36:39 +01:00
Code Issues Packages Projects Releases Wiki Activity
84138 commits 197 branches 129 tags 14 GiB
Commit graph

3 commits

Author SHA1 Message Date
Joachim Schiele 2a88417f03 nixos/doc: fix to: ~/.nix-defexpr wasn't created, fixes #6606 2016-01-20 04:59:16 +01:00
Vladimír Čunát e51f73652d Merge recent master into staging 
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
 2014-08-30 10:04:02 +02:00
Mikey Ariel a099ca4505 Chunk NixOS manual 
[Squashed commits to make git blame etc. more likely to work. -ED]
 2014-08-26 19:03:49 +02:00