Commit graph

200828 commits

Author SHA1 Message Date
Chuck
84d55716a9 Don't print header on stderr
Automated consumers can use 'sed 1d' or similar to remove this header.

This probably makes this output *easier* to consume correctly.  Having
this header show up in consumers' terminal or log output is probably not
useful, but hiding it without hiding all error messages would have been
more troublesome that just stripping it from stdout.

I.e., previously, unsophisticated use would show undesired output:
  $ some-other-tool
  This attribute set contains:
  This attribute set contains:
  This attribute set contains:
  This attribute set contains:
  <Actual some-other-tool output>

The simplest way to hide this undesired output would have been
nixos-option ... 2>/dev/null, which would hide all error messages.
We do not wish to encourage that.

Correct use would have been something like:
  nixos-option ... 2> >( grep --line-buffered -v 'This attribute set contains:')

After this change, correct use is simpler:
  nixos-option ... | sed 1d
or
  nixos-option ... | sed '1/This attribute set contains:/d'
if the caller don't know if this invocation of nixos-option will yield
an attribute listing or an option description.
2019-11-04 15:11:45 +01:00
Chuck
2ddd2d0760 Explain why header goes on stderr 2019-11-04 15:11:45 +01:00
Chuck
94a068fe36 Pass values by reference
Switch from convention "appease clang-tidy --checks='*'" to
"References are like non-nullptr pointers".  The clang-tidy check
"google-runtime-references" complains about non-const reference
arguments, but this is not a convention used in Nix.
2019-11-04 15:11:45 +01:00
Chuck
3d3ce8df7f Pass Context by reference
Switch from convention "appease clang-tidy --checks='*'" to
"References are like non-nullptr pointers".  The clang-tidy check
"google-runtime-references" complains about non-const reference
arguments, but this is not a convention used in Nix.
2019-11-04 15:11:45 +01:00
Chuck
c967e3fd3e Hold state and autoArgs by reference
Switch from convention "appease clang-tidy --checks='*'" to
"References are like non-nullptr pointers".  The clang-tidy check
"google-runtime-references" complains about non-const reference
arguments, but this is not a convention used in Nix.
2019-11-04 15:11:45 +01:00
Chuck
c457766a1f Use std::get_if 2019-11-04 15:11:45 +01:00
Chuck
88183eb484 Per reviewer request, cast the other side.
I don't think this matters.  As long as one or the other of these is
a std::string, I get an operator== that looks at content rather than
pointer equality.  I picked casting the constant over casting the dynamic
thing in hopes that the compiler would have a better chance at optimizing
away any runtime cost.

Deferring to reviewer.
2019-11-04 15:11:45 +01:00
Chuck
aa8e1d5f1e Always say which path component had trouble 2019-11-04 15:11:45 +01:00
Chuck
4ded9beea2 Add note: Keep error message in sync with nixos-option 2019-11-04 15:11:45 +01:00
Chuck
c352bfeaf0 Switch from east const to west const
For consistency with the Nix C++ convention.

:~(
2019-11-04 15:11:45 +01:00
Chuck
b8db81573a Support submodules (Fixes #13121) 2019-11-04 15:11:45 +01:00
Chuck
88349921a4 clang-format 2019-11-04 15:11:45 +01:00
Chuck
6b405f9789 Fix missing "using ThrownError" 2019-11-04 15:11:45 +01:00
Chuck
0adf77e2ee Narrow the «not defined» check to just ThrownError 2019-11-04 15:11:45 +01:00
Chuck
c7c684aaa3 Preserve type of rethrown exceptions 2019-11-04 15:11:45 +01:00
Chuck
d89ccc1554 Correct syntax for license specification 2019-11-04 15:11:45 +01:00
Chuck
2336982957 Add license
This is important because this contains some code copied from nix (as an
interim expediency until that functionality can be exported via nix's
API).  The license specified here must be compatible with this borrowing.
Select the same license that nix is released under: lgpl2Plus.
2019-11-04 15:11:45 +01:00
Chuck
f3eedb6020 Parallel build is the default, so no need to specify 2019-11-04 15:11:45 +01:00
Chuck
e1ecc2b6c1 Remove list sorting 2019-11-04 15:11:45 +01:00
Chuck
36c00c1080 Use format strings, not concatenation, in error messages 2019-11-04 15:11:44 +01:00
Chuck
4af8dbf896 Reformat for 4-space indentation
Specifically, with
  clang-format --style='{ IndentWidth: 4, BreakBeforeBraces: Mozilla, ColumnLimit: 120, PointerAlignment: Middle }'
which was the clang-format invocation that produced the fewest diffs on
the nix source out of ~20 that I tried.
2019-11-04 15:11:44 +01:00
Chuck
74f05df671 nixos/nixos-option: Fix references to old name 2019-11-04 15:11:44 +01:00
Chuck
26c45dfec2 nixos/nixos-option: Show options' types #27920 2019-11-04 15:11:44 +01:00
Chuck
59c5bfc86b nixos/nixos-option: Rewrite in a more suitable language
Also add --all, which shows the value of all options.  Diffing the --all
output on either side of contemplated changes is a lovely way to better
understand what's going on inside nixos.
2019-11-04 15:11:44 +01:00
Lancelot SIX
ac3b7b4868
Merge pull request #72768 from jojosch/dbeaver_6.2.4
dbeaver: 6.2.3 -> 6.2.4
2019-11-04 14:55:41 +01:00
Vladimir Serov
d8606230a5
[fix] android-studio: added certificate bundle to /etc/pki
This fixes Flutter SDK failing on flutter pub, due to missing certificates.
Flutter does not check /etc/ssl, and can only find them in /etc/pki.
2019-11-04 16:53:02 +03:00
Mario Rodas
4aa4fc9424
Merge pull request #72753 from marsam/update-protobuf
protobuf: 3.9.1 -> 3.9.2, 3.10.0 -> 3.10.1
2019-11-04 08:48:31 -05:00
Robert Hensing
64a8f2e48d
Merge pull request #71301 from nathyong/p4v-openssl-patch
p4v: explicitly depend on openssl 1.0 series
2019-11-04 14:35:43 +01:00
Franz Pletz
e7ef62dae8
Merge pull request #72770 from matthiasbeyer/restart-mpd
mpd: restart always
2019-11-04 12:14:56 +00:00
R. RyanTM
e834edcbdd zsh-history-substring-search: 1.0.1 -> 1.0.2 2019-11-04 11:08:40 +00:00
scalavision
d9b40f6397 deeptools: init at 3.3.1 2019-11-04 02:42:36 -08:00
scalavision
f379992680 pythonPackages.deeptoolsIntervals: init at 0.1.9 2019-11-04 02:42:36 -08:00
scalavision
1994ed8c7e pythonPackages.pybigwig: init at 0.3.17 2019-11-04 02:42:36 -08:00
scalavisison
e764c16083 pythonPackages.py2bit: init at 0.3.0 2019-11-04 02:42:36 -08:00
Jos van Bakel
018f66f6d8 pythonPackages.moderngl-window: init at 1.2.0 2019-11-04 02:42:09 -08:00
Jos van Bakel
2d5aa98874 pythonPackages.pyglet: 1.3.2 -> 1.4.2 2019-11-04 02:42:09 -08:00
Jonathan Ringer
062a4d4081 paperwork`: add missing dependency 2019-11-04 01:54:26 -08:00
Evan Stoll
c6705f54c9 cargo-geiger: run tests; skip tests that require network connectivity
- Add note on how we might be able to run all tests in the future
2019-11-04 01:53:39 -08:00
Evan Stoll
c49707f50f cargo-geiger: init at 0.7.3 2019-11-04 01:53:39 -08:00
Edmund Wu
8fea620113 sourcehut.gitsrht: build git-srht-shell 2019-11-04 01:46:59 -08:00
Edmund Wu
9051e284ce sourcehut.core: fix build 2019-11-04 01:46:59 -08:00
Edmund Wu
9e78d12878 pythonPackages.sqlalchemy-utils: 0.34.2 -> 0.35.0 2019-11-04 01:46:59 -08:00
Edmund Wu
78bbf841ea scmsrht: 0.15.3 -> 0.16.0 2019-11-04 01:46:59 -08:00
Edmund Wu
09570b1b0c todosrht: 0.51.11 -> 0.51.13 2019-11-04 01:46:59 -08:00
Edmund Wu
0d487aef71 pastesrht: 0.7.1 -> 0.7.3 2019-11-04 01:46:59 -08:00
Edmund Wu
eb9b2ac6a0 metasrht: 0.35.3 -> 0.37.0 2019-11-04 01:46:59 -08:00
Edmund Wu
2269781690 hgsrht: 0.16.0 -> 0.16.2 2019-11-04 01:46:59 -08:00
Edmund Wu
7967cb05ad gitsrht: 0.34.2 -> 0.35.6 2019-11-04 01:46:59 -08:00
Edmund Wu
257f5d6303 dispatchsrht: 0.11.1 -> 0.12.3 2019-11-04 01:46:59 -08:00
Edmund Wu
9bc8540d86 buildsrht: 0.47.9 -> 0.48.0 2019-11-04 01:46:59 -08:00