summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'prism/master'tv2018-02-2831-229/+245
|\
| * Merge remote-tracking branch 'gum/master'lassulus2018-02-282-1/+1
| |\
| | * .gitignore: add resultmakefu2018-02-282-1/+1
| * | Merge remote-tracking branch 'gum/master'lassulus2018-02-2811-192/+50
| |\|
| | * ma pkgs.qcma: fix broken buildmakefu2018-02-271-22/+14
| | * ma pkgs.mcomix: disable testsmakefu2018-02-271-0/+4
| | * ma pkgs.dionaea: ripmakefu2018-02-271-50/+0
| | * ma pkgs.farpd: ripmakefu2018-02-271-63/+0
| | * ma pkgs: cleanup awesomecfg, custom, shackiemakefu2018-02-276-56/+30
| | * ma pkgs.opl-utils: remove license for nowmakefu2018-02-261-1/+2
| * | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-02-281-0/+2
| |\ \
| | * \ Merge branch 'master' of prism.r:stockholm into staging/jeschlijeschli2018-02-277-19/+55
| | |\ \
| | * \ \ Merge branch 'master' of prism.r:stockholm into staging/jeschlijeschli2018-02-2515-14/+150
| | |\ \ \
| | * \ \ \ Merge branch 'master' of prism.r:stockholm into staging/jeschlijeschli2018-02-1844-369/+686
| | |\ \ \ \
| | * | | | | brauerei: +backlightjeschli2018-02-181-0/+2
| * | | | | | Merge remote-tracking branch 'onondaga/master'prism/staging/ninlassulus2018-02-271-0/+19
| |\ \ \ \ \ \
| | * | | | | | nin im: copy irc script from tvnin2018-02-271-0/+19
| * | | | | | | Merge remote-tracking branch 'onondaga/master'lassulus2018-02-274-15/+25
| |\| | | | | |
| | * | | | | | nin git: remove irc announcenin2018-02-271-11/+0
| | * | | | | | nin: follow krebs nixpkgsnin2018-02-271-4/+1
| | * | | | | | Merge remote-tracking branch 'prism/master'nin2018-02-2745-195/+672
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | * | | | | | Merge branch 'master' of prism:stockholmnin2018-02-1127-323/+497
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'prism/master'nin2018-01-3042-216/+717
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of prism:stockholmnin2018-01-1159-151/+577
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | nin axon: add abletonnin2018-01-032-0/+24
| | * | | | | | | | | Merge branch 'master' of prism:stockholmnin2018-01-032-0/+21
| | |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | | nixpkgs: d09e425 -> c5bc83blassulus2018-02-271-1/+1
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'gum/master'lassulus2018-02-266-14/+42
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | ma git: init hydra-stockholmmakefu2018-02-261-0/+1
| | * | | | | | | | | ma programs-db: ripmakefu2018-02-262-13/+1
| | * | | | | | | | | ma hydra.wbob.r: initmakefu2018-02-263-1/+40
| * | | | | | | | | | l mail: add more mailboxeslassulus2018-02-251-2/+5
| * | | | | | | | | | l mail: use tags for mailboxeslassulus2018-02-251-3/+8
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | l: init dpdkmprism/staging/miclassulus2018-02-241-0/+26
| |/ / / / / / / /
| * | | | | | | | nixpkgs: c831224 -> d09e425lassulus2018-02-221-1/+1
| * | | | | | | | Merge remote-tracking branch 'prism/makefu'lassulus2018-02-223-1/+40
| |\ \ \ \ \ \ \ \
| | * | | | | | | | ma 6tests/secrets: add auth.nix dummymakefu2018-02-221-0/+1
| | * | | | | | | | ma x.r: add bluetoothmakefu2018-02-211-0/+36
| | * | | | | | | | ma urlwatch: taskwarrior is now on githubmakefu2018-02-191-1/+3
| * | | | | | | | | l baseX: run xmonad only in xmonad sessionlassulus2018-02-221-1/+2
| * | | | | | | | | l baseX: use network-managerlassulus2018-02-222-0/+25
* | | | | | | | | | tv gitrepos: add kopstv2018-02-281-0/+3
* | | | | | | | | | urlwatch: 2.7 -> 2.8tv2018-02-281-2/+2
* | | | | | | | | | os-release: use <stockholm-version>tv2018-02-289-3/+47
* | | | | | | | | | populate: 2.1.0 -> 2.3.0tv2018-02-282-2/+17
* | | | | | | | | | types: refactor sourcetv2018-02-282-60/+48
|/ / / / / / / / /
* | | | | | | | | Merge remote-tracking branch 'prism/tv'lassulus2018-02-191-1/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | github: update known hoststv2018-02-191-1/+5
* | | | | | | | | | l: php5 -> php7lassulus2018-02-191-1/+0
* | | | | | | | | | l vim: run gometalinterlassulus2018-02-191-0/+3