Nikolay Amiantov 1f79dc2d6a Merge commit 'refs/pull/14421/head' of git://github.com/NixOS/nixpkgs		2016-04-07 03:00:45 +03:00
..
applications	neovim: Fix build by via order of buildInputs	2016-04-06 21:08:23 +02:00
build-support	Merge commit 'bde820' from staging	2016-04-06 01:18:28 +03:00
data	tzdata: 2016b -> 2016c	2016-03-31 02:53:31 +02:00
desktops	Merge pull request #14370 from jgillich/patch-5	2016-04-01 18:04:20 +02:00
development	Merge pull request #14503 from obadz/haskell-dnssd	2016-04-07 00:05:30 +02:00
games	anki: 2.0.33 -> 2.0.35	2016-04-05 19:11:36 -07:00
misc	hplip: canonicalise 56-hpmud.rules' paths if installed	2016-04-04 22:14:21 +02:00
os-specific	kernel: Don't patchELF manually	2016-04-06 17:19:43 +03:00
servers	mini-httpd: update to version 1.6	2016-04-04 15:06:32 +02:00
shells	Merge pull request #14343 from mayflower/upstream-zsh-zprofile	2016-04-01 14:44:38 +00:00
stdenv	Merge commit 'bde820' from staging	2016-04-06 01:18:28 +03:00
test	Replace references to all-packages.nix, by references to the top-level of nixpkgs repository.	2016-03-13 18:25:52 +00:00
tools	Merge commit 'refs/pull/14421/head' of git://github.com/NixOS/nixpkgs	2016-04-07 03:00:45 +03:00
top-level	Merge pull request #14499 from rnhmjoj/uncertainties	2016-04-06 18:14:34 +02:00