summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* l blue.r: dont populate nixpkgs-unstablelassulus2019-12-021-0/+3
|
* Merge remote-tracking branch 'ni/master'lassulus2019-12-026-51/+125
|\
| * krops: 1.18.0 -> 1.18.1tv2019-12-021-0/+0
| |
| * tv im: add weechat relay supporttv2019-12-021-0/+13
| |
| * tv im: add mosh supporttv2019-12-021-5/+30
| |
| * tv im: configs -> modulestv2019-12-024-25/+73
| |
| * iana-etc module: allow adding new servicestv2019-12-021-26/+14
| | | | | | | | This fixes a bug which only allowed modifying existing services.
* | update-nixpkgs-unstable: fix commit msglassulus2019-12-011-1/+1
| |
* | l: remove archprismlassulus2019-12-011-38/+0
| |
* | bepasty-server use python3lassulus2019-12-011-4/+4
|/
* Merge remote-tracking branch 'prism/master'tv2019-11-297-100/+138
|\
| * Merge branch 'master' of http://cgit.gum.r/stockholmlassulus2019-11-296-100/+137
| |\
| | * shack: streamline ssh-key deployment onto puyak and wolfmakefu2019-11-253-14/+13
| | |
| | * gitlab-ci: add puyak deploymentmakefu2019-11-251-2/+16
| | |
| | * ma shack/prometheus: import alerting-rules from mayflowermakefu2019-11-252-84/+108
| | | | | | | | | | | | see: https://github.com/mayflower/nixexprs/blob/master/modules/monitoring/alert-rules.nix
| * | ci: redownload all reposlassulus2019-11-291-0/+1
| |/
* | krops: 1.17.0 -> 1.18.0tv2019-11-291-0/+0
| |
* | Merge remote-tracking branch 'prism/master'tv2019-11-2734-2832/+214
|\|
| * l codimd: remove deprecated overridelassulus2019-11-251-13/+1
| |
| * newsbot-js: fix build on 19.09lassulus2019-11-244-272/+204
| |
| * delete mbmb-riplassulus2019-11-2424-2315/+0
| |
| * nixpkgs: 07e6648 -> 4ad6f14lassulus2019-11-241-3/+3
| |
| * nixpkgs-unstable: c196652 -> e89b215lassulus2019-11-241-3/+3
| |
| * l autowifi: convert to submodulelassulus2019-11-204-229/+6
| |
* | krebs exim-smarthost: RIP slash16tv2019-11-271-2/+1
|/
* l codimd: fix by using old versionlassulus2019-11-171-2/+13
|
* nixpkgs-unstable: 7827d3f -> c196652lassulus2019-11-171-3/+3
|
* nixpkgs: cb2cdab -> 07e6648lassulus2019-11-171-3/+3
|
* m: use correct tinc addresses for amy/claraJörg Thalheim2019-11-151-4/+4
| | | | Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
* 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
| | | | | | | | what could possibly go wrong?!
| * 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
| | | | | | | | Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
| * 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
| |