summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* l codimd: fix by using old versionHEADmasterlassulus18 hours1-2/+13
* nixpkgs-unstable: 7827d3f -> c196652lassulus21 hours1-3/+3
* nixpkgs: cb2cdab -> 07e6648lassulus21 hours1-3/+3
* m: use correct tinc addresses for amy/claraJörg Thalheim3 days1-4/+4
* Merge remote-tracking branch 'enklave/master'lassulus4 days5-16/+33
|\
| * j krops: fix unstableJeschli4 days1-1/+1
| * j emacs: udpateJeschli4 days2-15/+29
| * exim: remove because upstream has caught uptv4 days1-12/+0
| * krops: 1.16.0 -> 1.17.0tv4 days1-0/+0
| * ma wbob.r: hardware.enableRedistributableFirmwaremakefu4 days1-1/+1
| * ma pkgs.bin2iso: use mirror of original sourcesmakefu4 days1-10/+8
| * ma: hardware.enableAllFirmware -> hardware.enableRedistributableFirmwaremakefu4 days5-6/+5
| * shack/glados: remove version, google -> google_translatemakefu4 days1-6/+3
| * shack/glados: fix regression, disable influx publisher, disable archivingmakefu4 days1-23/+20
| * shack/node-light: bump to latest hashmakefu4 days1-2/+2
| * ma bureautomation: add frosch,daily-standupmakefu4 days4-37/+107
| * nixpkgs-unstable: 471869c -> 7827d3flassulus4 days1-3/+3
| * nixpkgs: c75de8b -> c5aabb0lassulus4 days1-3/+3
| * nixpkgs-unstable: 4cd2cb4 -> 471869classulus4 days1-3/+3
| * l uriel: enableAllFirmware -> enableRedistributableFirmwarelassulus4 days1-1/+1
| * l mors.r: remove broken ts3 clientlassulus4 days1-1/+0
| * l: add host amy/claraJörg Thalheim4 days1-0/+56
| * nixpkgs: 7952807 -> c75de8blassulus4 days1-3/+3
| * wolf.r: disable swapmakefu4 days1-4/+0
| * shack/*: fix regression with mkYarnPackage and pypi2nix generated filesmakefu4 days6-12/+49
| * ma bureautomation: fix all the regression, add openwrt-luci-rpc as dependencymakefu4 days7-70/+44
| * ma bureautomation: fix home-assistant regression with darkskymakefu4 days2-2/+1
| * ma bureautomation: set service name for google_say to fix regressionmakefu4 days1-8/+10
| * ma phpfpm: set listen.owner in configmakefu4 days2-0/+2
| * rtorrent module: set listen.owner in phpfpmmakefu4 days1-3/+2
| * shack/muellshack: mkYarnPackage is not vendored anymore, using pkgs.yarn2nix-...makefu4 days1-1/+1
| * reaktor2: fix invalid character crashlassulus4 days1-0/+3
| * external: change palos ssh keyIngolf Wagner4 days1-1/+1
| * ma pkgs._4nxci: bump to 4.03makefu4 days1-2/+2
| * j reagenzglas: Add alacrittyJeschli9 days1-0/+1
| * j reagenzglas: add rustJeschli9 days1-0/+1
| * j rust: add gccJeschli9 days1-0/+1
* | nixpkgs: c5aabb0 -> cb2cdablassulus4 days1-3/+3
* | Merge remote-tracking branch 'ni/master'lassulus6 days2-12/+0
|\ \
| * \ Merge remote-tracking branch 'prism/master'tv6 days44-136/+1176
| |\ \
| * | | exim: remove because upstream has caught uptv6 days1-12/+0
| * | | krops: 1.16.0 -> 1.17.0tv2019-10-231-0/+0
* | | | Merge remote-tracking branch 'gum/master'lassulus6 days13-85/+146
|\ \ \ \
| * | | | ma wbob.r: hardware.enableRedistributableFirmwaremakefu11 days1-1/+1
| * | | | ma pkgs.bin2iso: use mirror of original sourcesmakefu11 days1-10/+8
| * | | | ma: hardware.enableAllFirmware -> hardware.enableRedistributableFirmwaremakefu11 days5-6/+5
| * | | | shack/glados: remove version, google -> google_translatemakefu11 days1-6/+3
| * | | | shack/glados: fix regression, disable influx publisher, disable archivingmakefu11 days1-23/+20
| * | | | shack/node-light: bump to latest hashmakefu11 days1-2/+2
| * | | | ma bureautomation: add frosch,daily-standupmakefu12 days4-37/+107
| | |/ / | |/| |