joachifm 245f200dd8 Merge pull request #11987 from angus-g/caddy ...

Add Caddy and its NixOS module

2016-04-11 09:20:21 +02:00

..

applications

virtinst: Fix cherry-pick merge

2016-04-10 01:26:45 +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

totem: build with gst-libav and gst-plugins-ugly

2016-04-10 19:06:37 +02:00

development

Merge pull request #14561 from micxjo/update-botan

2016-04-10 11:56:11 +02:00

games

liberal-crime-squad: init at 2016-03-03

2016-04-10 20:24:45 -03:00

misc

hplip: canonicalise 56-hpmud.rules' paths if installed

2016-04-04 22:14:21 +02:00

os-specific

fan-networking: updated patches from Ubuntu

2016-04-10 16:07:03 -04:00

servers

pure-ftpd: fix meta.license

2016-04-10 19:48:01 +02:00

shells

Merge pull request #14526 from Profpatsch/fish-completions

2016-04-09 20:08:46 +03: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

partimage: correct the patch SHA256

2016-04-10 20:41:42 +02:00

top-level

Merge pull request #11987 from angus-g/caddy

2016-04-11 09:20:21 +02:00