Commit graph

578 commits

Author SHA1 Message Date
Daiderd Jordan efdd718f08
nixpkgs: 2018-02-23 -> 2018-04-11 2018-04-12 21:35:07 +02:00
Graham Christensen ee6fb69566
Merge pull request #159 from LnL7/test-travis
add green checkmarks
2018-04-11 13:56:50 -04:00
Daiderd Jordan 5d8fcf76da
use bash shebangs 2018-04-11 19:33:38 +02:00
Daiderd Jordan a84023796f
add travis config 2018-04-11 19:02:42 +02:00
Daiderd Jordan 59279e227d
cleanup make-pr.sh and fix set -e usage 2018-04-11 18:36:23 +02:00
Daiderd Jordan 6b8268d691
don't set pipefail in make-pr.sh
It's not used and doesn't work in POSIX shell.
2018-04-11 18:30:58 +02:00
Daiderd Jordan ba17bf556b
show make-pr.sh output in tests 2018-04-11 18:30:13 +02:00
Daiderd Jordan bead09b601
don't depend on gitconfig for tests 2018-04-11 18:09:53 +02:00
Daiderd Jordan c56013fb54
improve repo clone error 2018-04-11 18:09:18 +02:00
Daiderd Jordan 38d2fe8672
add shell.nix argument for nix version 2018-04-11 18:08:23 +02:00
Daiderd Jordan 04d0c2f540
don't force daemon for tests 2018-04-11 18:07:39 +02:00
Graham Christensen 3d81ba6d9f
Merge remote-tracking branch 'origin/released' into next 2018-04-10 19:11:45 -04:00
Graham Christensen bb25fb4d69
Merge pull request #154 from coreyoconnor/add-coreyoconnor
add coreyoconnor to trusted users
2018-04-10 19:11:15 -04:00
Graham Christensen bfa6af6929
Merge pull request #153 from LnL7/nix-test-ansi
fix tests with nix 2.0
2018-04-10 19:01:53 -04:00
Graham Christensen 8ef78db40b
Merge pull request #157 from etu/released
Add etu to config.extra-known-users
2018-04-10 18:59:59 -04:00
Graham Christensen 79d8023a87
Merge pull request #158 from FRidh/feature/stdenv
Add stdenv tag
2018-04-10 18:59:47 -04:00
Daiderd Jordan 1ef2b3cb59
fix build tests with nix 2.0 2018-04-10 23:57:27 +02:00
Daiderd Jordan 5b5498955a
fix nix tests with nix 2.0 2018-04-10 23:57:24 +02:00
Frederik Rietdijk b0fc318c36 Add stdenv tag 2018-04-10 19:35:50 +02:00
Elis Hirwing d4f4abc460
Add etu to config.extra-known-users 2018-04-09 20:24:11 +02:00
Corey O'Connor d3c21bd8a3 add coreyoconnor to trusted users 2018-04-05 14:12:04 -07:00
Graham Christensen ab2b5c5db4
Merge pull request #152 from obadz/patch-1
add obadz to trusted users
2018-03-31 15:39:48 -04:00
Graham Christensen 2c34c5b972
Merge remote-tracking branch 'origin/released' into next 2018-03-31 15:39:24 -04:00
obadz f6172c8497 add obadz to trusted users 2018-03-31 20:38:47 +01:00
Graham Christensen c39c867659
Merge pull request #151 from Infinisil/patch-1
Add infinisil to config.extra-known-users
2018-03-31 15:24:52 -04:00
Silvan Mosberger cf556ceee6
Add infinisil to config.extra-known-users 2018-03-31 21:21:41 +02:00
Graham Christensen 5fb2d054ed
Merge pull request #150 from ryantm/patch-1
add r-ryantm to trusted users
2018-03-30 11:06:26 -04:00
Ryan Mulligan 3f0e68c25a
add r-ryantm to trusted users
I'm moving my nixpkgs update bot over to this account.
2018-03-30 08:00:35 -07:00
Graham Christensen f272f96b7d
Merge pull request #147 from 7c6f434c/fix-operator-docs
Document my experience with re-setting-up a builder
2018-03-27 15:17:52 -04:00
Graham Christensen 1c94eedf0c
Merge pull request #138 from tadfisher/patch-1
Add tadfisher to extra-known-users
2018-03-27 15:17:38 -04:00
Graham Christensen cf4309bd79
Merge pull request #139 from brainrape/patch-1
Add brainrape to config.extra-known-users
2018-03-27 15:17:27 -04:00
Graham Christensen 3a011a0676
Merge pull request #142 from akru/released
Add akru to config.extra-known-users
2018-03-27 15:17:18 -04:00
Michael Raskin d1abff67f6 Document my experience with re-setting-up a builder 2018-03-25 23:58:58 +02:00
Alexander Krupenkin 8a4b1b84ba
Add akru to config.extra-known-users 2018-03-22 19:52:21 +03:00
Graham Christensen d11552addb
Merge pull request #140 from Ekleog/next
Handle capitalized user names
2018-03-20 13:46:10 -04:00
Léo Gaspard c88d98b6a2
Handle capitalized user names 2018-03-20 18:37:16 +01:00
Márton Boros 4d7338f71a
Add brainrape to config.extra-known-users
Hi!
I maintain Idris packages here:
https://github.com/NixOS/nixpkgs/tree/master/pkgs/development/idris-modules
They are not included in the main package set, so won't build automatically. I'd like to occasionally trigger some builds. 
Please consider adding me.
Thanks!
2018-03-20 10:48:08 +01:00
Tad Fisher bf9687b3b1
Add tadfisher to extra-known-users 2018-03-19 12:05:33 -07:00
Graham Christensen 5820df9683
Own the merge conflict label 2018-03-18 22:02:15 -04:00
Graham Christensen 022e2090d0
Merge pull request #136 from NixOS/request-id
Pass a request-id along with build jobs and results
2018-03-18 20:28:20 -04:00
Graham Christensen e86fc6b75f
Pass a request-id along with build jobs and results 2018-03-18 19:57:56 -04:00
Graham Christensen 2c5b55d060
Merge remote-tracking branch 'origin/next' into next 2018-03-18 19:53:17 -04:00
Graham Christensen dc06ba12e7
Merge pull request #135 from Ekleog/next
Simplify log_snippet
2018-03-18 19:15:31 -04:00
Léo Gaspard ff71d83893
Simplify log_snippet 2018-03-19 00:13:36 +01:00
Graham Christensen b7a296e8bb
Merge remote-tracking branch 'origin/released' into next 2018-03-18 19:01:47 -04:00
Graham Christensen 0065a13461
Merge pull request #130 from matthewbauer/patch-1
Add to trusted_users
2018-03-18 18:59:58 -04:00
Graham Christensen 41da488b9b
Merge pull request #134 from NixOS/log-instantiation-failures
Log instantiation failures
2018-03-18 18:59:29 -04:00
Graham Christensen 38c48da6e2
Bump version: 0.1.4 2018-03-18 18:42:58 -04:00
Graham Christensen a0e336bc02
Clean up result partition 2018-03-18 18:41:46 -04:00
Graham Christensen ec75dba4da
Pass the last 10 lines to the build-result in all cases 2018-03-18 18:31:57 -04:00