summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* m: use correct tinc addresses for amy/claraJörg Thalheim2019-11-151-4/+4
* Merge remote-tracking branch 'enklave/master'lassulus2019-11-145-16/+33
|\
| * j krops: fix unstableJeschli2019-11-141-1/+1
| * j emacs: udpateJeschli2019-11-142-15/+29
| * exim: remove because upstream has caught uptv2019-11-141-12/+0
| * krops: 1.16.0 -> 1.17.0tv2019-11-141-0/+0
| * ma wbob.r: hardware.enableRedistributableFirmwaremakefu2019-11-141-1/+1
| * ma pkgs.bin2iso: use mirror of original sourcesmakefu2019-11-141-10/+8
| * ma: hardware.enableAllFirmware -> hardware.enableRedistributableFirmwaremakefu2019-11-145-6/+5
| * shack/glados: remove version, google -> google_translatemakefu2019-11-141-6/+3
| * shack/glados: fix regression, disable influx publisher, disable archivingmakefu2019-11-141-23/+20
| * shack/node-light: bump to latest hashmakefu2019-11-141-2/+2
| * ma bureautomation: add frosch,daily-standupmakefu2019-11-144-37/+107
| * nixpkgs-unstable: 471869c -> 7827d3flassulus2019-11-141-3/+3
| * nixpkgs: c75de8b -> c5aabb0lassulus2019-11-141-3/+3
| * nixpkgs-unstable: 4cd2cb4 -> 471869classulus2019-11-141-3/+3
| * l uriel: enableAllFirmware -> enableRedistributableFirmwarelassulus2019-11-141-1/+1
| * l mors.r: remove broken ts3 clientlassulus2019-11-141-1/+0
| * l: add host amy/claraJörg Thalheim2019-11-141-0/+56
| * nixpkgs: 7952807 -> c75de8blassulus2019-11-141-3/+3
| * wolf.r: disable swapmakefu2019-11-141-4/+0
| * shack/*: fix regression with mkYarnPackage and pypi2nix generated filesmakefu2019-11-146-12/+49
| * ma bureautomation: fix all the regression, add openwrt-luci-rpc as dependencymakefu2019-11-147-70/+44
| * ma bureautomation: fix home-assistant regression with darkskymakefu2019-11-142-2/+1
| * ma bureautomation: set service name for google_say to fix regressionmakefu2019-11-141-8/+10
| * ma phpfpm: set listen.owner in configmakefu2019-11-142-0/+2
| * rtorrent module: set listen.owner in phpfpmmakefu2019-11-141-3/+2
| * shack/muellshack: mkYarnPackage is not vendored anymore, using pkgs.yarn2nix-...makefu2019-11-141-1/+1
| * reaktor2: fix invalid character crashlassulus2019-11-141-0/+3
| * external: change palos ssh keyIngolf Wagner2019-11-141-1/+1
| * ma pkgs._4nxci: bump to 4.03makefu2019-11-141-2/+2
| * j reagenzglas: Add alacrittyJeschli2019-11-091-0/+1
| * j reagenzglas: add rustJeschli2019-11-091-0/+1
| * j rust: add gccJeschli2019-11-091-0/+1
* | nixpkgs: c5aabb0 -> cb2cdablassulus2019-11-141-3/+3
* | Merge remote-tracking branch 'ni/master'lassulus2019-11-122-12/+0
|\ \
| * \ Merge remote-tracking branch 'prism/master'tv2019-11-1244-136/+1176
| |\ \
| * | | exim: remove because upstream has caught uptv2019-11-121-12/+0
| * | | krops: 1.16.0 -> 1.17.0tv2019-10-231-0/+0
* | | | Merge remote-tracking branch 'gum/master'lassulus2019-11-1213-85/+146
|\ \ \ \
| * | | | ma wbob.r: hardware.enableRedistributableFirmwaremakefu2019-11-071-1/+1
| * | | | ma pkgs.bin2iso: use mirror of original sourcesmakefu2019-11-071-10/+8
| * | | | ma: hardware.enableAllFirmware -> hardware.enableRedistributableFirmwaremakefu2019-11-075-6/+5
| * | | | shack/glados: remove version, google -> google_translatemakefu2019-11-071-6/+3
| * | | | shack/glados: fix regression, disable influx publisher, disable archivingmakefu2019-11-071-23/+20
| * | | | shack/node-light: bump to latest hashmakefu2019-11-071-2/+2
| * | | | ma bureautomation: add frosch,daily-standupmakefu2019-11-054-37/+107
| | |/ / | |/| |
* | | | nixpkgs-unstable: 471869c -> 7827d3fnixpkgslassulus2019-11-061-3/+3
* | | | nixpkgs: c75de8b -> c5aabb0lassulus2019-11-051-3/+3
|/ / /
* | | nixpkgs-unstable: 4cd2cb4 -> 471869classulus2019-11-021-3/+3