Shea Levy 0c12dd3ded Merge branch 'pkgs/systemd/journald_http_gateway' of git://github.com/offlinehacker/nixpkgs ... systemd: python support & journal http gateway Conflicts: nixos/modules/misc/ids.nix		2014-03-14 19:16:59 -04:00
..
assertions.nix
check-config.nix
crashdump.nix
ids.nix	Merge branch 'pkgs/systemd/journald_http_gateway' of git://github.com/offlinehacker/nixpkgs	2014-03-14 19:16:59 -04:00
lib.nix
locate.nix
nixpkgs.nix
passthru.nix
version.nix	Don't set the default channel to 13.10 when installing from master	2013-11-11 11:26:15 +01:00