Merge remote-tracking branch 'origin/master' into flakes
This commit is contained in:
commit
092ee24627
|
@ -170,18 +170,6 @@ if builtins ? getEnv then builtins.getEnv "PATH" else ""</programlisting>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
|
|
||||||
<varlistentry xml:id='builtin-splitVersion'>
|
|
||||||
<term><function>builtins.splitVersion</function>
|
|
||||||
<replaceable>s</replaceable></term>
|
|
||||||
|
|
||||||
<listitem><para>Split a string representing a version into its
|
|
||||||
components, by the same version splitting logic underlying the
|
|
||||||
version comparison in <link linkend="ssec-version-comparisons">
|
|
||||||
<command>nix-env -u</command></link>.</para></listitem>
|
|
||||||
|
|
||||||
</varlistentry>
|
|
||||||
|
|
||||||
|
|
||||||
<varlistentry xml:id='builtin-concatLists'>
|
<varlistentry xml:id='builtin-concatLists'>
|
||||||
<term><function>builtins.concatLists</function>
|
<term><function>builtins.concatLists</function>
|
||||||
<replaceable>lists</replaceable></term>
|
<replaceable>lists</replaceable></term>
|
||||||
|
@ -1272,6 +1260,19 @@ Evaluates to <literal>[ " " [ "FOO" ] " " ]</literal>.
|
||||||
</para></listitem>
|
</para></listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
|
|
||||||
|
<varlistentry xml:id='builtin-splitVersion'>
|
||||||
|
<term><function>builtins.splitVersion</function>
|
||||||
|
<replaceable>s</replaceable></term>
|
||||||
|
|
||||||
|
<listitem><para>Split a string representing a version into its
|
||||||
|
components, by the same version splitting logic underlying the
|
||||||
|
version comparison in <link linkend="ssec-version-comparisons">
|
||||||
|
<command>nix-env -u</command></link>.</para></listitem>
|
||||||
|
|
||||||
|
</varlistentry>
|
||||||
|
|
||||||
|
|
||||||
<varlistentry xml:id='builtin-stringLength'>
|
<varlistentry xml:id='builtin-stringLength'>
|
||||||
<term><function>builtins.stringLength</function>
|
<term><function>builtins.stringLength</function>
|
||||||
<replaceable>e</replaceable></term>
|
<replaceable>e</replaceable></term>
|
||||||
|
|
|
@ -228,7 +228,7 @@ struct ConnectionHandle
|
||||||
|
|
||||||
~ConnectionHandle()
|
~ConnectionHandle()
|
||||||
{
|
{
|
||||||
if (!daemonException && std::uncaught_exception()) {
|
if (!daemonException && std::uncaught_exceptions()) {
|
||||||
handle.markBad();
|
handle.markBad();
|
||||||
debug("closing daemon connection because of an exception");
|
debug("closing daemon connection because of an exception");
|
||||||
}
|
}
|
||||||
|
|
|
@ -170,7 +170,7 @@ public:
|
||||||
|
|
||||||
~JSONPlaceholder()
|
~JSONPlaceholder()
|
||||||
{
|
{
|
||||||
assert(!first || std::uncaught_exception());
|
assert(!first || std::uncaught_exceptions());
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T>
|
template<typename T>
|
||||||
|
|
|
@ -1196,7 +1196,7 @@ void _interrupted()
|
||||||
/* Block user interrupts while an exception is being handled.
|
/* Block user interrupts while an exception is being handled.
|
||||||
Throwing an exception while another exception is being handled
|
Throwing an exception while another exception is being handled
|
||||||
kills the program! */
|
kills the program! */
|
||||||
if (!interruptThrown && !std::uncaught_exception()) {
|
if (!interruptThrown && !std::uncaught_exceptions()) {
|
||||||
interruptThrown = true;
|
interruptThrown = true;
|
||||||
throw Interrupted("interrupted by the user");
|
throw Interrupted("interrupted by the user");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue