summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'gum/master'lassulus2017-10-032-17/+31
|\
| * Merge remote-tracking branch 'lass/master'makefu2017-10-014-9/+10
| |\
| * | ma cake.r: update configmakefu2017-10-011-16/+29
| | |
| * | ma source: add patch for prootmakefu2017-10-011-1/+2
| | |
* | | Merge remote-tracking branch 'ni/master'lassulus2017-10-039-98/+18
|\ \ \
| * | | tv mu systemPackages: build KDE locale manuallytv2017-10-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Because nixpkgs d7e9248debe66225bae1788c347bfe6c62e38a6e nixpkgs-17.09 fixup
| * | | mv stro nixpkgs: 17.03 -> 17.09tv2017-10-031-2/+2
| | | |
| * | | tv alnus nixpkgs: 17.03 -> 17.09tv2017-10-031-1/+1
| | | |
| * | | tv brscan4: init at 0.4.4-4tv2017-10-031-0/+8
| | | | | | | | | | | | | | | | Refs https://github.com/NixOS/nixpkgs/pull/30065
| * | | tv gnupg: gnupg21 -> gnupg22tv2017-10-031-1/+1
| | | | | | | | | | | | | | | | nixpkgs-17.09 fixup
| * | | tv mfcl2700dn*: RIPtv2017-10-033-90/+0
| | | | | | | | | | | | | | | | nixpkgs-17.09 fixup
| * | | tv nixpkgs: 17.03 -> 17.09tv2017-10-031-2/+2
| | | |
| * | | Merge remote-tracking branch 'prism/master'tv2017-10-0333-88/+113
| |\ \ \
| * | | | tv gitrepos: #krebs -> #xxxtv2017-10-011-1/+1
| | | | |
* | | | | l pass: gnupg1 -> gnupglassulus2017-10-031-1/+1
| | | | |
* | | | | l ejabberd: copy tv's stufflassulus2017-10-032-98/+161
| | | | |
* | | | | l websites lass: use addSSLlassulus2017-10-031-29/+3
| | | | |
* | | | | buildbot slave service: clean workingDir on changelassulus2017-10-031-0/+2
| | | | |
* | | | | ircd: raise default_floodcount to 1000lassulus2017-10-031-0/+1
| |/ / / |/| | |
* | | | tinc module: workaround nixpkgs's lib.types.typestv2017-10-031-4/+3
| | | | | | | | | | | | | | | | Introduced by nixpkgs 152c63c9ff82276e225ac4a4fa71c791d33e443d
* | | | l weechat: open mosh portlassulus2017-10-031-0/+5
| | | |
* | | | l sqlBackup: set mysql.dataDir to /var/mysqllassulus2017-10-031-1/+2
| | | |
* | | | nixpkgs: 670b4e2 -> 07ca7b6lassulus2017-10-031-1/+1
| | | |
* | | | l copyq: fix startuplassulus2017-10-031-1/+4
| | | |
* | | | l nixpkgs: b61d084 -> 07ca7b6lassulus2017-10-031-1/+1
| | | |
* | | | l prism.r: track nginx changeslassulus2017-10-021-1/+6
| | | |
* | | | l wine: pkgs.wineFull -> pkgs.winelassulus2017-10-021-1/+1
| | | |
* | | | l ejabberd: RIPlassulus2017-10-022-31/+0
| | | |
* | | | l nixpkgs: 670b4e2 -> b61d084lassulus2017-10-021-1/+1
| | | |
* | | | krebs.tinc: import types explicitlylassulus2017-10-021-0/+1
| | | |
* | | | Revert "l nixpkgs: 670b4e2 -> 5ac8389"lassulus2017-10-021-1/+1
| | | | | | | | | | | | | | | | This reverts commit f1908e0fa546bde76a95d3da20521d6170cd08f8.
* | | | Merge branch 'master' into staging/17.09lassulus2017-10-014-9/+10
|\ \ \ \
| * | | | l hosts: update android rsa keylassulus2017-10-011-1/+1
| | |_|/ | |/| |
| * | | l authorized lass-android for weechatlassulus2017-10-012-9/+5
| | | |
| * | | l users: add lass-androidlassulus2017-10-012-0/+5
| | |/ | |/|
* | | l nixpkgs: 670b4e2 -> 5ac8389lassulus2017-10-011-1/+1
| | |
* | | Merge branch 'master' into staging/17.09lassulus2017-10-0198-670/+2424
|\| |
| * | ma tools: disable skypemakefu2017-10-012-2/+1
| | |
| * | Merge remote-tracking branch 'lass/master'makefu2017-10-019-18/+18
| |\|
| | * #krebs@irc.r -> #xxx@irc.rlassulus2017-10-013-3/+3
| | |
| | * l #krebs@irc.r -> #xxx@irc.rlassulus2017-10-013-4/+4
| | |
| | * tv gitrepos: ni.r/#retiolum -> irc.r/#krebstv2017-10-011-2/+2
| | |
| | * #retiolum@ni.r -> #krebs@irc.rlassulus2017-10-013-6/+6
| | |
| | * l: #retiolum@ni.r -> #krebs@irc.rlassulus2017-10-015-10/+10
| | |
| * | ma: #retiolum -> #xxxmakefu2017-10-013-3/+3
| | |
| * | ma cake.r: initmakefu2017-10-013-0/+48
| | |
| * | ma irc: ni.r -> irc.rmakefu2017-10-014-4/+5
| |/
| * htodog.r: add irc.rlassulus2017-10-012-0/+2
| |
| * puyak.r: merge multiple boot configslassulus2017-10-011-6/+5
| |
| * puyak.r: fix syntaxlassulus2017-09-301-1/+1
| |