Vladimír Čunát 97006eb5ed Merge #2638: fix weechat build on darwin ... Conflicts (trivial): pkgs/development/python-modules/pycrypto/default.nix		2014-06-09 19:37:06 +02:00
..
applications	Merge #2638: fix weechat build on darwin	2014-06-09 19:37:06 +02:00
build-support	Addnig a package to copy nix-prefetch-* to bin/. Hopefully fixes #1130	2014-06-09 01:11:03 +04:00
data	Merge pull request #2741 from bergey/nafees	2014-05-28 08:37:29 +02:00
desktops	nautilus-sendto: add to gnome 3.10	2014-05-29 12:38:50 +02:00
development	Merge #2638: fix weechat build on darwin	2014-06-09 19:37:06 +02:00
games	Merge pull request #2876 from auntieNeo/typespeed	2014-06-09 12:11:23 +04:00
misc	fceux: Add package for a NES emulator.	2014-06-07 15:08:57 -07:00
os-specific	kernel: Add 3.15	2014-06-08 16:39:47 -05:00
servers	mysql-connector-java: Bump to version 5.1.31	2014-06-09 19:11:33 +02:00
shells
stdenv	Change stdenv on darwin to not set NIX_ENFORCE_PURITY	2014-05-29 02:43:10 -05:00
test
tools	tinc: Update from 1.0.23 to 1.0.24	2014-06-09 15:14:05 +02:00
top-level	Merge #2638: fix weechat build on darwin	2014-06-09 19:37:06 +02:00