Commit graph

1294 commits

Author SHA1 Message Date
Graham Christensen 7be15ba6d1
Merge pull request #444 from cole-h/2018
2018-ification
2020-04-01 07:56:46 -04:00
Cole Helbling a87225519e
Silence cargo pedantry 2020-03-31 20:37:30 -07:00
Cole Helbling c37b652882
2018-ify carnix
Ran `nix-shell -p carnix --run ./nix/update-carnix.sh`.
2020-03-31 20:23:25 -07:00
Cole Helbling cbe2e62162
More 2018-ification and minor formatting changes
2018-ification changes include:
* replacing `extern crate` imports (except for ones annotated with
`#[macro_use]` to prevent touching more files; maybe in a follow-up)
* removing standalone imports; for example, `use serde_json;` -- the
code already uses `serde_json::*` where necessary

Minor formatting changes include:
* collapsing imports from the same root (e.g. `use std::io::Read; use
std::io::BufRead` -> `use std::io::{BufRead, Read};`
* separating `crate` imports from external imports from `std` imports --
this is how many project seem to order their imports, most notably the
official Rust repo
* moving some `use`s from the first line to below the file's doc comment
* changing file-level doc comments from `///` to `//!` (so they actually
show up as documentation)
* `rustfmt` messing with the `nom` macros in `src/commentparser.rs`

Most of the 2018-ification was done by `cargo fix --edition-idioms`, but
all changes were manually inspected to catch any detrimental changes,
and `cargo test`/`cargo check` still succeed.
2020-03-31 19:54:19 -07:00
Daiderd Jordan c7978aca74
fix incompatibilities with edition 2018 module changes
With this we could add `edition = "2018"` to enable new features like
async/await.
2020-03-31 19:29:41 -07:00
Graham Christensen c2ea19fe47
nixenv: unwrap the statsfile read later, after checking the return status 2020-03-31 19:42:07 -04:00
Graham Christensen 90fda07cf2
commitstatus: handle errors intsead of expecting them (mostly) 2020-03-31 19:05:18 -04:00
Graham Christensen 750bc88e5f
commitstatus: error: make debug 2020-03-31 19:04:38 -04:00
Graham Christensen 85649b0c79
Revert "Revert "commitstatus: return an error if we fail to set a status""
This reverts commit cf28b411f2.
2020-03-31 18:46:34 -04:00
Graham Christensen a8eb1743b0
evaluation: use ? to handle errors 2020-03-31 18:45:19 -04:00
Graham Christensen 0b936ea1cc
task/evaluate: move evaluation to its own class 2020-03-31 18:02:30 -04:00
Graham Christensen be7bc06238
Revert "evaluate: start to use error returns"
This reverts commit 9f383f4954.
2020-03-31 17:44:03 -04:00
Graham Christensen 9f383f4954
evaluate: start to use error returns 2020-03-31 17:43:55 -04:00
Graham Christensen 39af0ae208
evaluate task: move evaluation leg work in to another function, and just call it from the consumer implementation 2020-03-31 17:26:15 -04:00
Graham Christensen ea2f7cf474
commitstatus: fixup formatting 2020-03-31 17:25:53 -04:00
Graham Christensen cf28b411f2
Revert "commitstatus: return an error if we fail to set a status"
This reverts commit 0ae112f976.
2020-03-31 17:23:23 -04:00
Graham Christensen 0ae112f976
commitstatus: return an error if we fail to set a status 2020-03-31 17:23:20 -04:00
Graham Christensen 3e5132596b
Fixup whitespace 2020-03-31 17:22:54 -04:00
Graham Christensen 5730914971
commitstatus: Trim description to 140 characters if it is too long 2020-03-31 17:11:14 -04:00
Graham Christensen 9f70ab9c13
nixenv: filter out user setting warninsg too 2020-03-30 16:58:09 -04:00
Graham Christensen a2bbc8d258
remove warnings about user settings deeper in the stack 2020-03-30 16:31:00 -04:00
Graham Christensen 13ea5fded4
nixenv: ignore empty lines 2020-03-30 16:23:49 -04:00
Graham Christensen b50bc35026
nix-env: filter out warnings about user-specified settings when examining stderr 2020-03-30 16:21:51 -04:00
Graham Christensen da4a88255c
nixenv: send stats to a file 2020-03-30 15:52:01 -04:00
Graham Christensen 33258c16c6
Merge pull request #442 from flokli/ofborg-pass-rev
ofborg: pass rev
2020-03-30 08:31:04 -04:00
Florian Klink 5fadddfbb0 tasks/eval/nixpkgs: pass in rev, use proper rev and shortrev
Here, we can easily access the real commit ID, so pass it in instead of
a bogus rev and shortRev.

Hydra seems to have passed in rev all the time, and nixpkgs will soon
require `rev` to be set.

This initially broke nixpkgs eval in
5e8545e723,
so we now update ofborg to always pass `rev` when instantiating nixpkgs
to avoid breaking it.
2020-03-29 22:48:06 +02:00
Florian Klink 29ac8fbba9 ofborg: nix: pass rev to nixpkgs
Hydra seems to have passed in rev all the time, and nixpkgs will soon
require `rev` to be set.

This initially broke nixpkgs eval in
5e8545e723,
so we now update ofborg to always pass `rev` when instantiating nixpkgs
to avoid breaking it.
2020-03-29 22:34:49 +02:00
Silvan Mosberger 9066b702d0
Add check for lib tests
Without this, a big part of the lib tests aren't being done, which
previously lead to e.g. https://github.com/NixOS/nixpkgs/pull/76861
And this will also be useful for checked maintainers in https://github.com/NixOS/nixpkgs/pull/82461
2020-03-15 08:16:15 +01:00
Graham Christensen ea4b7f8aab
Merge pull request #436 from andir/update-nixpkgs
Update to current nixpkgs-unstable
2020-03-03 19:26:37 -05:00
Andreas Rammhold e3e32bc7c6
fix new linting issues 2020-02-22 12:59:04 +01:00
Andreas Rammhold 31205e3ce9
Update shell.nix to use openssl_1_0_2 2020-02-21 17:23:13 +01:00
Andreas Rammhold 41687fe743
Update to current nixpkgs-unstable
This required the introduction of an overlay file since ofBorg still
requires openssl 1.0.2. Updating to newer version of openssl also
requires updating the amqp library which requires some more involved
changes.

The php code is only updated to php 7.2 and not 7.3 (the default in
nixpkgs) since there seem to been a few syntax changes that aren't yet
compatible with composer2nix.

In previous versions of the rust infrastructure within nixpkgs we would
have been able to override all crates during the invocation of the
target crate. That `override` feature was removed as it caused a huge
eval overhead for larger projects. We did end up with (n^2)
instantiations of dependencies since they were being overriden on every
invocation of every dependency on every level further down the chain.
The current understanding is that the build tooling that each project is
using (e.g.  crate2nix, crate2nix, …) that is driving the actual build
could easily reintroduce that feature without the overhead.

pin to php72
2020-02-21 17:10:45 +01:00
Benjamin Hipple 2d4b91fb44 Cleanup whitespace in markdown table
Doesn't impact the rendered version, but makes the plain-text much easier to read
2020-02-16 19:09:25 -05:00
Francesco Gazzetta 4ce0177e1a Move fgaz to trusted users 2020-01-26 17:41:31 +01:00
worldofpeace 81b227e37c Tag cinnamon pkgs 2020-01-22 16:35:42 -05:00
Ryan Mulligan 7bb748fffb make check_outpaths error message after merging grammatical 2020-01-03 05:40:14 -08:00
Mario Rodas f73d5126f4
config.public.json: add marsam to trusted_users 2019-12-15 04:20:00 -05:00
Niklas Hambüchen ebfd4936c3
config.public.json: add nh2 to trusted_users 2019-12-15 04:23:37 +01:00
adisbladis 5dee76e9b2
Merge pull request #423 from xrelkd/released
config.public.json: add xrelkd to trusted_users
2019-12-07 12:59:25 +00:00
xrelkd 2ec7512616 config.public.json: add xrelkd to trusted_users 2019-12-07 10:21:14 +08:00
Graham Christensen 10919ddcf0
Merge pull request #413 from talyz/talyz-trusted-users
talyz: Add to trusted users
2019-11-29 15:12:56 -05:00
Graham Christensen 6b02d66a66
Merge pull request #415 from mmahut/patch-2
config.public.json: 1000101 to trusted_users
2019-11-29 15:07:54 -05:00
Graham Christensen 52df702880
Merge pull request #418 from cdepillabout/add-cdepillabout-trusted
config.public.json: add myself to trusted_users
2019-11-29 15:07:40 -05:00
Graham Christensen 28e2610560
Merge pull request #419 from Kiwi/kiwi
add @Kiwi to trusted users
2019-11-29 15:07:28 -05:00
Graham Christensen a62d07b4c6
Merge pull request #422 from filalex77/filalex77-trusted
Add filalex77 to trusted users
2019-11-29 15:07:05 -05:00
Oleksii Filonenko 5d26f0903b
Add filalex77 to trusted users 2019-11-26 09:15:06 +02:00
Robert Djubek 9219d67321
add @Kiwi to trusted users 2019-11-17 21:30:58 +00:00
Dennis Gosnell 8bcc3cc543
config.public.json: add myself to trusted_users 2019-11-15 15:26:51 +09:00
Marek Mahut 8650abf443
config.public.json: 1000101 to trusted_users 2019-11-07 11:59:53 +01:00
Léo Gaspard 50f5232b51 nixpkgs-rs: build .passthru.tests too
Fixes https://github.com/NixOS/ofborg/issues/368
2019-11-02 21:29:58 +01:00