Commit Graph

200543 Commits

Author SHA1 Message Date
Linus Heckemann
6f41b1c842
Merge pull request #68193 from chkno/nixos-option-rewrite
nixos-option C++ rewrite with --all
2019-11-04 16:55:04 +01:00
Matthew Bauer
5ae0b8fd9e
Merge pull request #72566 from kolbycrouch/master
retroarch: update cores
2019-11-04 10:41:13 -05:00
Matthew Bauer
d20670fbfc
Merge pull request #72735 from nh2/libjpeg-turbo-static
libjpeg-turbo: Add flag to build static libraries as well
2019-11-04 10:40:38 -05:00
Matthew Bauer
2fa566028e
Merge pull request #72778 from alapshin/hunspell-dicts-ru
hunspell-dicts: add Russian dictionary
2019-11-04 10:36:49 -05:00
Keito Kajitani
faf06da0df rictydiminished-with-firacode: fonttools requires python3 (#72762)
* rictydiminished-with-firacode: fonttools requires python3

* rictydiminished-with-firacode: python3 is sufficient, purge python3Full
2019-11-04 16:23:34 +01:00
Daiderd Jordan
9b773fd98a
inkscape: fix darwin build
Cairo is also a dependency now.

    /tmp/nix-build-inkscape-0.92.4.drv-0/inkscape-0.92.4/src/display/drawing-context.h:20:10: fatal error: 'cairo.h' file not found
    #include <cairo.h>
             ^~~~~~~~~
    1 error generated.
2019-11-04 16:03:18 +01:00
Tim Steinbach
c97ca709c1
linux: 5.4-rc5 -> 5.4-rc6 2019-11-04 09:38:27 -05:00
Andrei Lapshin
ed2484f48a hunspell-dicts: add Russian dictionary 2019-11-04 17:31:20 +03:00
Robin Gloster
754e315fb5 release-notes 20.03: added notice for rewritten nixos-option 2019-11-04 15:14:42 +01:00
Tim Steinbach
348bafc1df
vivaldi: 2.9.1705.31-1 -> 2.9.1705.38-1 2019-11-04 09:13:16 -05:00
Chuck
1e7985942b snake_case -> camelCase 2019-11-04 15:11:45 +01:00
Chuck
445145d5b9 Support aggregate types attrsOf and listOf 2019-11-04 15:11:45 +01:00
Chuck
a3e31df4d7 (clang-format for has_example) 2019-11-04 15:11:45 +01:00
Chuck
57a5752300 Add maintainer 2019-11-04 15:11:45 +01:00
Chuck
5646240870 Only print example when there is one 2019-11-04 15:11:45 +01:00
Chuck
4d17d5b31f snake_case -> camelCase 2019-11-04 15:11:45 +01:00
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
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