Tuomas Tynkkynen 8c4aeb1780 Merge staging into master ... Brings in: - changed output order for multiple outputs: https://github.com/NixOS/nixpkgs/pull/14766 - audit disabled by default https://github.com/NixOS/nixpkgs/pull/17916 Conflicts: pkgs/development/libraries/openldap/default.nix		2016-09-01 13:27:27 +03:00
..
checkinstall	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-04-18 13:49:22 +00:00
clib	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-07-15 14:41:01 +00:00
createrepo_c	createrepo_c: add meta and myself as a maintainer	2016-04-30 02:15:04 +00:00
disnix	treewide: Add lots of meta.platforms	2016-08-02 21:42:43 +03:00
dpkg	dpkg: 1.18.9 -> 1.18.10	2016-08-04 00:25:20 +02:00
fpm	fpm: 1.4.0 -> 1.6.2	2016-08-21 20:28:39 +08:00
gx	gx: add missing meta	2016-06-19 13:45:16 +01:00
koji	koji, opensp: Some meta fixes	2016-08-02 21:17:44 +03:00
libhif	libhif, rpm-ostree: fix broken meta	2016-04-30 16:23:53 +00:00
librepo	librepo: add meta and add myself as a maintainer	2016-04-30 16:01:26 +00:00
nix	Merge staging into master	2016-09-01 13:27:27 +03:00
nix-prefetch-scripts	nix-prefetch-scripts: Use correct output of 'nix'	2016-05-14 21:10:23 +03:00
nix-repl	nix-repl: Use 'dev' output of nix	2016-08-29 21:30:52 +03:00
nix-serve	nix-serve: fix meta eval	2016-06-16 15:54:29 +02:00
nixops	nixops: update to 1.4	2016-07-19 14:33:52 +00:00
nixui	Fix lots of fetchgit hashes (fallout from #15469)	2016-06-03 17:17:08 +03:00
nox	nox: add git as build input	2016-07-29 20:54:02 -05:00
opkg	opkg: add libxml2 as input	2016-08-09 21:24:59 +00:00
opkg-utils	Fix lots of fetchgit hashes (fallout from #15469)	2016-06-03 17:17:08 +03:00
packagekit	packagekit: vala -> vala_0_23	2016-08-21 20:18:21 +03:00
python2nix	rename iElectric to domenkozar to match GitHub	2016-05-17 13:00:47 +01:00
rpm	rpm: remove hack	2016-08-24 19:23:42 +00:00