Shea Levy 6da2d89016 Merge branch 'postgresql93-ossp-uuid-clean' of git://github.com/basvandijk/nixpkgs ... Configure postgresql-9.3 with support for the ossp-uuid module Conflicts: pkgs/servers/sql/postgresql/9.3.x.nix		2014-03-14 19:52:43 -04:00
..
applications	Merge branch 'darcsum' of git://github.com/falsifian/nixpkgs	2014-03-14 19:42:27 -04: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 'u/zfs-import' of git://github.com/wizeman/nixpkgs	2014-03-14 19:40:34 -04:00
servers	Merge branch 'postgresql93-ossp-uuid-clean' of git://github.com/basvandijk/nixpkgs	2014-03-14 19:52:43 -04: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 'darcsum' of git://github.com/falsifian/nixpkgs	2014-03-14 19:42:27 -04:00