Merge branch 'master2' of https://github.com/gnidorah/nixpkgs into staging

This commit is contained in:
Eelco Dolstra 2017-06-07 11:46:17 +02:00
commit 338cdea332
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 50 additions and 4 deletions

View file

@ -283,6 +283,7 @@
./services/misc/etcd.nix
./services/misc/felix.nix
./services/misc/folding-at-home.nix
./services/misc/fstrim.nix
./services/misc/gammu-smsd.nix
./services/misc/geoip-updater.nix
#./services/misc/gitit.nix