nixpkgs/pkgs
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
..
applications openscad: bump 2013.06 -> 2014.03 2014-03-14 22:21:15 +01:00
build-support Merge branch 'nix-run' of git://github.com/rickynils/nixpkgs 2014-03-14 18:52:50 -04:00
data manpages: update from 3.61 to 3.62 2014-03-13 08:53:09 +02:00
desktops goffice: minor update, dep cleanup 2014-03-13 22:54:58 +01:00
development keybinder: remove redundant arg 2014-03-14 13:28:41 +01:00
games
misc Merge branch 'nix-run' of git://github.com/rickynils/nixpkgs 2014-03-14 18:52:50 -04:00
os-specific Merge branch 'pkgs/systemd/journald_http_gateway' of git://github.com/offlinehacker/nixpkgs 2014-03-14 19:16:59 -04:00
servers dovecot22: Update from 2.2.6 to 2.2.12 2014-03-14 10:34:21 +01:00
shells
stdenv
test
tools Merge branch 'pkgs/openvpn/openvpn_learnaddress' of git://github.com/offlinehacker/nixpkgs 2014-03-14 18:39:28 -04:00
top-level Merge branch 'nix-run' of git://github.com/rickynils/nixpkgs 2014-03-14 18:52:50 -04:00