summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* m krops.nix: prepare for buildbotlassulus2018-09-081-6/+4
* Merge remote-tracking branch 'gum/master' into HEADlassulus2018-09-083-15/+40
|\
| * ma krops.nix: fix stockholm.filemakefu2018-09-081-14/+16
| * ma share/gum-client: initmakefu2018-09-042-1/+24
* | krops.nix: add cilassulus2018-09-081-0/+5
* | l krops: remove broken config arglassulus2018-09-071-1/+1
* | l krops: prepare .ci for buildbotlassulus2018-09-071-7/+5
* | Revert "l krops: get target as argument"lassulus2018-09-072-5/+12
* | buildbot-stockholm: use krops.nixlassulus2018-09-071-7/+9
* | l krops: get dummy-secrets via relative pathlassulus2018-09-071-1/+1
* | l krops: get target as argumentlassulus2018-09-072-12/+5
* | Merge remote-tracking branch 'gum/master'lassulus2018-09-0454-323/+957
|\|
| * wolf.r: add mobile mpd web frontendsmakefu2018-09-032-1/+34
| * ma rompr: init (but will never use it)makefu2018-09-021-0/+76
| * ma pkgs.cozy-audiobooks: use pythonPackages instead of variablesmakefu2018-09-011-3/+2
| * ma vim: move to editormakefu2018-08-302-104/+99
| * ma pkgs.bento4: init at 1.5.1-624makefu2018-08-302-0/+30
| * ma pkgs.cozy-audiobooks: init at 0.6.0makefu2018-08-291-0/+100
| * ma 1system: ip4 -> ipv4.addressesmakefu2018-08-295-6/+6
| * retiolum-bootstrap: forceSSLmakefu2018-08-291-4/+1
| * ma krops.nix: initmakefu2018-08-2926-21/+136
| * Merge remote-tracking branch 'lass/master'makefu2018-08-2835-381/+255
| |\
| * | ma events-publisher: bumpmakefu2018-08-241-2/+2
| * | ma hw/smartcard: initmakefu2018-08-171-0/+18
| * | ma pkgs.ifdnfc: init at 2016-03-01makefu2018-08-171-0/+45
| * | gitlab-ci: clean up ssh key after deploymakefu2018-08-171-0/+2
| * | ma nur.nix: remove modules part (for now)makefu2018-08-171-1/+0
| * | gitlab-ci.yml: add deployment to nur-packages for makefumakefu2018-08-171-0/+12
| * | ma pkgs.beef: bump version, fix packagemakefu2018-08-165-108/+348
| * | ma nur.nix: don't export customized configmakefu2018-08-161-1/+0
| * | ma extra-gui: rm arduino-envmakefu2018-08-161-1/+0
| * | ma pkgs.drozer: fix buildmakefu2018-08-161-4/+5
| * | ma pkgs.arduino-user-env,pkqgen-ger: ripmakefu2018-08-161-35/+0
| * | ma pkgs/default: remove stockholm dependencymakefu2018-08-161-5/+5
| * | ma pkgs/nur.nix: initmakefu2018-08-161-0/+9
* | | Merge remote-tracking branch 'ni/master'lassulus2018-09-045-11/+39
|\ \ \
| * \ \ Merge remote-tracking branch 'prism/master'tv2018-08-2967-497/+666
| |\ \ \ | | | |/ | | |/|
| * | | tv gitrepos: cgit-clear-cache on post-receivetv2018-08-281-5/+22
| * | | krebs git: allow git user to rwx cgit cache-roottv2018-08-281-1/+6
| * | | cgit-clear-cache: inittv2018-08-282-3/+9
| * | | nix-writers: 4d08293 -> 5d79992tv2018-08-241-0/+0
| * | | krops: 1.3.0 -> 1.3.1tv2018-08-231-2/+2
| * | | krops: 1.1.0 -> 1.3.0tv2018-08-141-2/+2
* | | | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-09-041-0/+73
|\ \ \ \
| * | | | j: +gitjeschli2018-09-041-0/+73
* | | | | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-09-045-1/+16
|\| | | |
| * | | | j steam: remove dead codejeschli2018-09-041-10/+0
| * | | | j enklave: +cgitjeschli2018-09-043-1/+3
| * | | | Merge remote-tracking branch 'origin/master'jeschli2018-08-2151-413/+500
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/staging/jeschli'jeschli2018-08-212-1/+7
| |\ \ \ \ \