Commit graph

610 commits

Author SHA1 Message Date
obadz f35a835768 abort mass-rebuilder if less than 8Gb of memory is "available"
…where available is defined as "how much RAM can the kernel give to an
application immediately without having to reach for swap".
2018-06-28 20:53:46 +01:00
Graham Christensen 62f7f36a07
Merge remote-tracking branch 'origin/next'
into released
2018-05-09 17:39:32 -04:00
Graham Christensen 70d80939d2
Merge pull request #124 from Ekleog/nom
Nom
2018-05-09 17:38:28 -04:00
Graham Christensen 0915000eb7
Merge pull request #173 from knedlsepp/add-knedlsepp
Add knedlsepp to config.extra-known-users
2018-05-09 17:37:43 -04:00
Graham Christensen 6c4aa422b9
Merge pull request #174 from Synthetica9/patch-1
Add myself to config.extra-known-users
2018-05-09 17:37:31 -04:00
Patrick Hilhorst b9edceadf4
Add myself to config.extra-known-users 2018-05-07 23:35:45 +02:00
Josef Kemetmüller 3ba7d259ac Add knedlsepp to config.extra-known-users 2018-05-06 21:38:16 +02:00
Graham Christensen 38b26e6566
Merge pull request #172 from Ekleog/default-nix-2
Default to building with nix2
2018-05-04 11:44:17 -04:00
Graham Christensen 5160f28728
ofborg: stub in foo-bar and foo_bar commands 2018-05-04 11:41:44 -04:00
Graham Christensen bfeecc387c
Merge origin/released 2018-05-04 11:41:12 -04:00
Graham Christensen 59217d2902
Merge pull request #170 from xeji/add-xeji
add xeji to trusted users
2018-05-04 11:40:14 -04:00
Léo Gaspard aeaf93b9f4
Default to building with nix2
Nix is now mostly used in its version 2, so let's switch to that.
2018-05-04 16:02:04 +02:00
Uli Baum 4905d7f7af add xeji to trusted users 2018-05-04 15:14:17 +02:00
Léo Gaspard 206f15560f
Use nom as the comment parser 2018-05-04 15:01:19 +02:00
Léo Gaspard 0c1b07c30c
Simplify parse function using flat_map 2018-05-04 15:01:18 +02:00
Léo Gaspard d473806fc4
Add nom dependency 2018-05-04 14:59:11 +02:00
Graham Christensen 2318765308
Merge remote-tracking branch 'origin/released' into next 2018-05-03 21:50:31 -04:00
Graham Christensen 45c727cbfa
Merge pull request #162 from LnL7/update-nixpkgs
nixpkgs: 2018-02-23 -> 2018-04-11
2018-05-03 21:49:33 -04:00
Graham Christensen 42fb9e0686
Merge pull request #163 from samueldr/factoids/stateVersion
factoids: Adds !stateVersion
2018-05-03 21:48:40 -04:00
Graham Christensen c98dc63bc7
Merge pull request #161 from timokau/timokau-trusted
Add timokau to trusted users
2018-05-03 21:48:29 -04:00
Graham Christensen 87304afc7b
Merge pull request #165 from gilligan/gilligan-trusted-user
Add gilligan to trusted users
2018-05-03 21:48:21 -04:00
Graham Christensen 92039157f4
Merge pull request #166 from jlesquembre/patch-1
Asking for ofborg access
2018-05-03 21:48:12 -04:00
Graham Christensen d475d1be3d
Merge pull request #167 from woffs/addme
add woffs to config.extra-known-users
2018-05-03 21:48:06 -04:00
Graham Christensen 697bd19d64
Merge pull request #169 from WilliButz/add-willibutz
add willibutz to trusted users
2018-05-03 21:47:58 -04:00
WilliButz 3e148d91b5
add willibutz to trusted users 2018-05-03 16:14:02 +02:00
Frank Doepper edc8d0a1b9 add myself to config.extra-known-users
- as suggested by @Mic92 in #39569
- and sort ;-)
2018-04-27 11:45:21 +02:00
José Luis Lafuente a50f10477f
Asking for ofborg access
As suggested here: https://github.com/NixOS/nixpkgs/pull/39568#issuecomment-384896678
2018-04-27 10:36:17 +02:00
Tobias Pflug 483258f19d
Add gilligan to trusted users 2018-04-26 18:04:41 +02:00
Samuel Dionne-Riel 9889a92d82 factoids: Adds !stateVersion 2018-04-21 18:22:48 -04:00
Daiderd Jordan bf8ed0538f
run build on travis and make warnings fail 2018-04-12 23:39:45 +02:00
Daiderd Jordan 21751a4505
fix warnings with rust 1.25.0 2018-04-12 22:32:30 +02:00
Daiderd Jordan efdd718f08
nixpkgs: 2018-02-23 -> 2018-04-11 2018-04-12 21:35:07 +02:00
Timo Kaufmann 4e97ff8796 Add timokau to trusted users 2018-04-12 11:08:28 +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