summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* shell: split init.proxy off from init.envtv2017-07-251-30/+23
* tv pkgs simple: add missing default.nixtv2017-07-231-0/+24
* tv nginx krebs-pages: inittv2017-07-231-0/+13
* tv pkgs: mimic krebs' simple overlaytv2017-07-237-20/+11
* make populate: use get-sourcetv2017-07-231-7/+1
* shell: add --default=TARGET option to parse-targettv2017-07-231-15/+34
* shell: add quote commandtv2017-07-231-12/+20
* shell: add support for --puretv2017-07-231-1/+2
* shell: add parse-target commandtv2017-07-231-21/+19
* shell: add get-source commandtv2017-07-231-7/+21
* lib.eval-source: sanitize sourcetv2017-07-231-1/+7
* tv caxi: RIPtv2017-07-232-28/+0
* tv nix.vim: add yaml syntaxtv2017-07-231-0/+1
* Merge branch 'staging/make-fix'lassulus2017-07-221-1/+7
|\
| * make install: repair by using source.nixlassulus2017-07-221-1/+7
* | tv ejabberd: 2.1.13 -> upstreamtv2017-07-224-130/+162
* | shell: drop unused config variabletv2017-07-221-4/+0
|/
* Merge remote-tracking branch 'ni/master'lassulus2017-07-143-5/+14
|\
| * shell test: dummy_secrets=true before populatetv2017-07-141-1/+2
| * tv source: no secret-{common,master} when dummy_secretstv2017-07-141-2/+4
| * tv bash: add /* sh */tv2017-07-141-2/+2
| * tv bash: cd to repo at stockholm workspacetv2017-07-141-0/+6
* | nin source: fix dummy-secrets pathlassulus2017-07-141-1/+1
* | Merge remote-tracking branch 'onondaga/master'lassulus2017-07-147-27/+42
|\ \ | |/ |/|
| * move source config from module system to 1systems/*/source.nixnin2017-07-137-27/+42
* | merge shared into krebstv2017-07-1441-1235/+1
* | shell: support --usertv2017-07-132-7/+11
|/
* Merge remote-tracking branch 'prism/master'tv2017-07-1318-52/+81
|\
| * Merge remote-tracking branch 'ni/master'lassulus2017-07-122-2/+2
| |\
| * \ Merge remote-tracking branch 'ni/master'lassulus2017-07-120-0/+0
| |\ \
| * \ \ Merge branch 'staging/source'lassulus2017-07-1241-137/+229
| |\ \ \
| | * | | tv alnus source: overrid nixpkgs reftv2017-07-122-1/+1
| | * | | tv source: make nixpkgs ref easily overridabletv2017-07-121-16/+21
| | * | | lib.eval-source: allow source to be a listtv2017-07-121-3/+1
| | * | | move source config from module system to 1systems/*/source.nixlassulus2017-07-1217-51/+80
| | * | | nin nixpkgs 6916f24 -> 01c3847nin2017-07-121-1/+1
| | * | | nin nixpkgs: 0afb6d7 -> 6916f24nin2017-07-121-1/+1
| * | | | Merge remote-tracking branch 'ni/master'lassulus2017-07-061-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of prism:stockholmnin2017-07-0614-75/+276
| |\ \ \ \ \
| * | | | | | nin nixpkgs 6916f24 -> 01c3847nin2017-07-041-1/+1
| * | | | | | nin nixpkgs: 0afb6d7 -> 6916f24nin2017-06-271-1/+1
* | | | | | | tv nixpkgs: 1b57bf2 -> 94941cbtv2017-07-131-1/+1
* | | | | | | tv: systemPackages += kpastetv2017-07-121-0/+1
* | | | | | | tv vim: RIP ctrlptv2017-07-121-42/+2
* | | | | | | tv backup: add xu-home-nomictv2017-07-121-0/+6
* | | | | | | tv pulse: add 32-bit supporttv2017-07-121-1/+14
* | | | | | | Makefile: reimplement {deploy,test} using shelltv2017-07-121-31/+6
* | | | | | | tv xserver: stop feh leaking into systemPackagestv2017-07-121-0/+5
* | | | | | | tv xserver: xrdb without -mergetv2017-07-121-1/+1
* | | | | | | tv xserver: systemPackages += xdotooltv2017-07-121-0/+1