summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * tv x220: enable{All => Redistributable}Firmwaretv2017-07-121-1/+1
| * move source config from module system to 1systems/*/source.nixtv2017-07-1023-81/+140
| * shell: don't populate when source doesn't evaluatetv2017-07-081-3/+4
| * shell: call proxy nix-shell with --runtv2017-07-081-1/+1
* | Merge remote-tracking branch 'ni/master'lassulus2017-07-061-1/+1
|\|
| * tv nixpkgs: 412b0a1 -> 057f89btv2017-07-041-1/+1
* | Merge branch 'master' of prism:stockholmnin2017-07-0614-75/+276
|\|
| * shared nixpkgs: 58e2270 -> 72c9ed7lassulus2017-07-041-1/+1
| * tv: turn pkgs into an overlaytv2017-07-022-39/+53
| * shell: use stockholm libtv2017-06-301-4/+3
| * shell: use getopttv2017-06-301-14/+15
| * shell: use writeOut to create cmdspkgtv2017-06-301-6/+3
| * shell: rename hook attribute to shelltv2017-06-301-11/+6
| * shell: use writeDashtv2017-06-301-16/+8
| * pkgs.whatsupnix: print gawk output ASAPtv2017-06-301-2/+2
| * shell: use stockholm overlaytv2017-06-301-8/+4
| * shell: inline qtargettv2017-06-301-3/+3
| * shell: using proxy implies populated targettv2017-06-301-10/+6
| * shell: mark shellHook as shtv2017-06-301-1/+1
| * shell: inittv2017-06-291-0/+210
| * krebs.build.source: stockholm default is <stockholm>tv2017-06-271-1/+0
| * tv: stockholm is really just <stockholm>tv2017-06-271-4/+1
| * make test: use build and evaluatetv2017-06-271-6/+5
| * Makefile: call build with whatsupnixtv2017-06-271-6/+12
| * tv: configure stockholm for buildbottv2017-06-271-9/+13
| * tv mu: chromiumDev -> chromiumtv2017-06-271-1/+1
| * tv mu: kde4 -> plasma5, maybetv2017-06-271-4/+3
| * tv mu: security.wrappers.slock.{slock => source}tv2017-06-271-1/+1
| * tv alnus nixpkgs: e924319 -> 9b948eatv2017-06-271-1/+1
| * tv: add htop to default systemPackagestv2017-06-275-5/+2
| * tv: properly use symlinkJoin pathstv2017-06-252-2/+2
* | nin nixpkgs 6916f24 -> 01c3847nin2017-07-041-1/+1
* | nin nixpkgs: 0afb6d7 -> 6916f24nin2017-06-271-1/+1
|/
* concat: RIPtv2017-06-202-44/+50
* tv dummy_secrets: inittv2017-06-205-1/+16
* gitrepos: don't announce brain's cgit linktv2017-06-191-5/+7
* tv gitrepos: announce braintv2017-06-191-9/+12
* tv: add whatsupnixtv2017-06-191-0/+1
* tv nixpkgs: 99dfb6d -> 412b0a1tv2017-06-191-1/+1
* tv: admit dummy_secretstv2017-06-191-1/+4
* krebs: update ciko's mail addresstv2017-06-181-0/+1
* xu: use krebszones, thanks 838f40d!tv2017-06-181-12/+1
* types.label: drop redundant isStringtv2017-06-181-2/+1