obadz 3de6e5be50 Merge branch 'master' into staging ... Conflicts: pkgs/applications/misc/navit/default.nix pkgs/applications/networking/mailreaders/alpine/default.nix pkgs/applications/networking/mailreaders/realpine/default.nix pkgs/development/compilers/ghc/head.nix pkgs/development/libraries/openssl/default.nix pkgs/games/liquidwar/default.nix pkgs/games/spring/springlobby.nix pkgs/os-specific/linux/kernel/perf.nix pkgs/servers/sip/freeswitch/default.nix pkgs/tools/archivers/cromfs/default.nix pkgs/tools/graphics/plotutils/default.nix		2016-08-27 23:54:54 +01:00
..
4store	4store: 1.1.5 -> 1.1.6 (convert from builderDefsPackage)	2016-05-08 18:29:40 +01:00
apache-httpd	apacheHttpd: use sha256 hash instead of sha1	2016-08-25 03:14:40 +02:00
apache-modules	treewide: Make explicit that 'dev' output of apacheHttpd is used	2016-08-23 03:26:54 +03:00
apt-cacher-ng
couchdb	treewide: Fix meta.platforms related typos	2016-08-02 21:17:44 +03:00
darkhttpd
gatling	gatling: remove unused dependency on polarssl	2016-07-10 10:26:14 +02:00
jboss	treewide: Add lots of meta.platforms	2016-08-02 21:42:43 +03:00
jetty	jetty: 9.3.9 -> 9.3.10	2016-06-26 05:58:35 +00:00
lighttpd	lighttpd: 1.4.39 -> 1.4.40	2016-07-19 15:55:22 +02:00
micro-httpd	Captialize meta.description of all packages	2016-06-20 13:55:52 +02:00
mini-httpd	Captialize meta.description of all packages	2016-06-20 13:55:52 +02:00
myserver
nginx	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-08-12 09:46:53 +00:00
nix-binary-cache	nix-binary-cache: take into account Nix split (mulitple-outputs)	2016-04-22 00:57:43 +02:00
openresty
pshs
redstore	redstore: add home page and license fields	2016-08-17 22:43:06 +02:00
spawn-fcgi	treewide: Add lots of meta.platforms	2016-08-02 21:42:43 +03:00
thttpd	treewide: Add lots of meta.platforms	2016-08-02 21:42:43 +03:00
tomcat	treewide: Add lots of meta.platforms	2016-08-02 21:42:43 +03:00
webfs
winstone
yaws