Commit Graph

14163 Commits

Author SHA1 Message Date
Daniël de Kok
4db1c8b199 nvidia-settings: fix parallel build race condition
Fix a race condition that occurs in parallel builds of
nvidia-settings, frequently ending in the following error:

/bin/bash: _out/Linux_x86_64/antialias.png.h: No such file or directory
make[1]: *** [Makefile:320: _out/Linux_x86_64/antialias.png.h] Error 1

Upstream issue and fix from:
https://github.com/NVIDIA/nvidia-settings/issues/59
2021-02-02 08:33:24 +01:00
Tim Steinbach
b673417493
Revert "zfs: 2.0.1 -> 2.0.2"
This reverts commit e347e96601.
2021-02-01 20:23:03 -05:00
Jan Tojnar
8646063dd2
fwupd: 1.5.3 → 1.5.5
- https://github.com/fwupd/fwupd/releases/tag/1.5.4
- https://github.com/fwupd/fwupd/releases/tag/1.5.5
2021-02-01 21:27:05 +01:00
Tim Steinbach
67bdaf0655
linux/hardened/patches/5.4: 5.4.93-hardened1 -> 5.4.94-hardened1 2021-02-01 15:22:19 -05:00
Tim Steinbach
d30f2daf5e
linux/hardened/patches/5.10: 5.10.11-hardened1 -> 5.10.12-hardened1 2021-02-01 15:22:19 -05:00
Tim Steinbach
75f91c80bc
linux/hardened/patches/4.19: 4.19.171-hardened1 -> 4.19.172-hardened1 2021-02-01 15:22:18 -05:00
Tim Steinbach
e829b8379c
linux: 5.4.93 -> 5.4.94 2021-02-01 15:22:18 -05:00
Tim Steinbach
ab661e6635
linux: 5.10.11 -> 5.10.12 2021-02-01 15:22:18 -05:00
Tim Steinbach
9dbb058f91
linux: 4.9.253 -> 4.9.254 2021-02-01 15:22:17 -05:00
Tim Steinbach
3d3a55c7d3
linux: 4.4.253 -> 4.4.254 2021-02-01 15:22:17 -05:00
Tim Steinbach
3cd3d80bd9
linux: 4.19.171 -> 4.19.172 2021-02-01 15:22:17 -05:00
Tim Steinbach
9e19fc4949
linux: 4.14.217 -> 4.14.218 2021-02-01 15:22:16 -05:00
Henri Menke
e347e96601 zfs: 2.0.1 -> 2.0.2 2021-02-01 15:16:37 -05:00
Markus Kowalewski
119c1c55fd
linuxptp: fix license 2021-02-01 13:36:34 +01:00
Ninjatrappeur
4695a7ca51
Merge pull request #111498 from mweinelt/wpa_supplicant/owe
wpa_supplicant: backport support for OWE
2021-02-01 09:35:08 +01:00
Martin Weinelt
28f8b5f5f3 wpa_supplicant: backport support for OWE
The wpa_supplicant upstream is slow to push out new releases and has
been asked several times to do so. Support for Opportunistic Wireless
Encryption has been on master since late 2019 and still hasn't made it
into a release yet.

This backports a rather simple patchset to enable OWE key management
and exposes it also via DBus, so it can be used from Network-Manager.
2021-02-01 00:20:07 +01:00
Philipp Mildenberger
c67f9d2935 zfs: fix zfs legacy mount
Closes #110376
2021-01-31 17:03:23 +01:00
Martin Weinelt
3e17f21396
batman-adv: 2020.4 -> 2021.0 (#111185)
* batman-adv: 2020.4 -> 2021.0

* batman-adv: add hexa to maintainers
2021-01-31 13:42:27 +01:00
Dmitry Kalinkin
161b9b2436
Merge pull request #99323 from eadwu/nvidia/hardware.nvidia.package
nixos: hardware.nvidia.package option for selecting nvidia package
2021-01-30 22:08:37 -05:00
Sandro Jäckel
ced3ec6ce3
treewide: update permanent url redirects 2021-01-30 21:48:57 +01:00
Mario Rodas
532b223c91
Merge pull request #111269 from r-ryantm/auto-update/ipset
ipset: 7.9 -> 7.10
2021-01-30 15:16:28 -05:00
Guillaume Girol
04af7c02cd
Merge pull request #108725 from veehaitch/ath_regd_optional
kernelPatches: ath driver: allow setting regulatory domain
2021-01-30 14:07:25 +00:00
R. RyanTM
5571278f0b ipset: 7.9 -> 7.10 2021-01-30 05:48:12 +00:00
Silvan Mosberger
aa48e205a2
Merge pull request #110787 from tfc/cartesian-product
lib/attrsets: add cartesianProductOfSets function
2021-01-29 20:22:12 +01:00
Tim Steinbach
f10d197ef8
linux: 5.11-rc3 -> 5.11-rc5 2021-01-29 14:00:30 -05:00
markuskowa
8c72a38ad0
Merge pull request #111001 from markuskowa/upd-rdma-core
rdma-core: 33.0 -> 33.1
2021-01-29 19:46:07 +01:00
github-actions[bot]
5953c2bc94
Merge master into staging-next 2021-01-29 12:23:53 +00:00
Jörg Thalheim
6e8964256c
Merge pull request #110724 from ilian/fix/nvidia-rt 2021-01-29 09:28:39 +00:00
github-actions[bot]
98b8e8ebf8
Merge master into staging-next 2021-01-29 00:43:53 +00:00
markuskowa
e29bef4b9c
Merge pull request #111009 from markuskowa/upd-isns
open-isns: 0.99 -> 0.100
2021-01-28 23:58:44 +01:00
Jacek Galowicz
001ba3934e Use lib.cartesianProducOfSets where lib.crossLists was used 2021-01-28 23:49:05 +01:00
IvarWithoutBones
f93b241bd5 linuxPackages.rtl8821ce: 5.5.2_34066.20200325 -> unstable-2020-12-16 2021-01-28 21:55:06 +01:00
0x4A6F
2451c4d1d6
firejail: 0.9.64 -> 0.9.64.2 2021-01-28 19:42:59 +00:00
Markus Kowalewski
a2498eabe2
rdma-core: 33.0 -> 33.1 2021-01-28 18:45:55 +01:00
Markus Kowalewski
886239148f
openisns: change attribute to open-isns
Make attribute consitent with pname to match the official name.
2021-01-28 15:28:06 +01:00
Markus Kowalewski
1e160f9321
open-isns: 0.99 -> 0.100
* update homepage + git repo source
* add maintainer
2021-01-28 15:27:51 +01:00
github-actions[bot]
2e6c34fd11
Merge master into staging-next 2021-01-28 12:23:51 +00:00
Daniël de Kok
b43756e22b
Merge pull request #110954 from LibreCybernetics/update-nvidia
nvidia.x11: 460.32.03 -> 460.39
2021-01-28 11:30:25 +01:00
github-actions[bot]
99c044f4e2
Merge master into staging-next 2021-01-28 08:00:25 +00:00
ajs124
ac05d50ffe linux/hardened/patches/5.4: 5.4.92-hardened1 -> 5.4.93-hardened1 2021-01-28 04:12:57 +01:00
ajs124
db0f608d85 linux/hardened/patches/5.10: 5.10.10-hardened1 -> 5.10.11-hardened1 2021-01-28 04:12:55 +01:00
ajs124
42ad658dc0 linux/hardened/patches/4.19: 4.19.170-hardened1 -> 4.19.171-hardened1 2021-01-28 04:11:25 +01:00
github-actions[bot]
a351855a1e
Merge master into staging-next 2021-01-28 00:45:30 +00:00
Tim Steinbach
84075b6eb0
linux: 5.4.92 -> 5.4.93 2021-01-27 18:14:31 -05:00
Tim Steinbach
36ce7b5576
linux: 5.10.10 -> 5.10.11 2021-01-27 18:14:30 -05:00
Tim Steinbach
eccaaef736
linux: 4.19.170 -> 4.19.171 2021-01-27 18:14:30 -05:00
Atemu
88f877e07d kernelPatches: drop export_kernel_fpu_functions
Hasn't been necessary since ZFS 0.8.3
2021-01-27 18:06:01 -05:00
Fabián Heredia Montiel
f9c1057e79 nvidia.x11: 460.32.03 -> 460.39 2021-01-27 13:17:48 -06:00
github-actions[bot]
bef2fbcd27
Merge master into staging-next 2021-01-27 18:28:31 +00:00
Sascha Grunert
057a240b0b
linuxPackages.oci-seccomp-bpf-hook: 1.2.0 -> 1.2.1
Signed-off-by: Sascha Grunert <mail@saschagrunert.de>
2021-01-27 15:37:55 +01:00
github-actions[bot]
2137c13b40
Merge master into staging-next 2021-01-27 12:24:05 +00:00
Jörg Thalheim
693c7cd0f7
Merge pull request #110797 from Atemu/update/zen-kernels
zen-kernels: 5.10.9 -> 5.10.10
2021-01-27 11:13:09 +00:00
Jan Tojnar
69fca326f8
Merge branch 'master' into staging-next 2021-01-26 13:53:25 +01:00
Emery Hemingway
13a6565c4c erofs-utils: 1.2 -> 1.2.1 2021-01-26 12:46:47 +01:00
github-actions[bot]
a127deeb88
Merge master into staging-next 2021-01-25 18:52:08 +00:00
Atemu
500908d7f0 zen-kernels: 5.10.9 -> 5.10.10
lqx2's parent is the same commit as zen1's
2021-01-25 18:32:25 +01:00
Pavol Rusnak
a6ce00c50c
treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
github-actions[bot]
b10ed56b8e
Merge master into staging-next 2021-01-25 01:18:25 +00:00
Tim Steinbach
c81f92751c linux: Remove 5.9 2021-01-24 18:17:56 -05:00
Tim Steinbach
85879ac1e2 linux-hardened: Remove 5.9 2021-01-24 18:17:56 -05:00
Tim Steinbach
944b6ea6e4 linux/hardened/patches/5.4: 5.4.91.a -> 5.4.92-hardened1 2021-01-24 18:17:56 -05:00
Tim Steinbach
a7221d3c6c linux/hardened/patches/5.10: 5.10.9.a -> 5.10.10-hardened1 2021-01-24 18:17:56 -05:00
Tim Steinbach
93f2a3f1a5 linux/hardened/patches/4.19: 4.19.169.a -> 4.19.170-hardened1 2021-01-24 18:17:56 -05:00
Tim Steinbach
5772d38d69 linux/hardened/patches/4.14: 4.14.216.a -> 4.14.217-hardened1 2021-01-24 18:17:56 -05:00
Tim Steinbach
071750d412 linux-hardened: Remove tag patch 2021-01-24 18:17:56 -05:00
Tim Steinbach
e80850fe42 linux-hardened: Fix update script 2021-01-24 18:17:56 -05:00
Tim Steinbach
d3cf0f85c5 linux: 5.4.91 -> 5.4.92 2021-01-24 18:17:56 -05:00
Tim Steinbach
92a6788df3 linux: 5.10.9 -> 5.10.10 2021-01-24 18:17:56 -05:00
Tim Steinbach
2bc54a5ab7 linux: 4.9.252 -> 4.9.253 2021-01-24 18:17:56 -05:00
Tim Steinbach
59bd2632d0 linux: 4.4.252 -> 4.4.253 2021-01-24 18:17:56 -05:00
Tim Steinbach
7001b6fd0c linux: 4.19.169 -> 4.19.170 2021-01-24 18:17:56 -05:00
Tim Steinbach
e6292e3721 linux: 4.14.216 -> 4.14.217 2021-01-24 18:17:56 -05:00
ilian
d3b3fa80a9 nvidia-x11: ignore linux-rt sanity check
Ignore the sanity check that prevents the Nvidia drivers from
being built for kernels with real-time patches.
Even though the driver might not be officially supported by
Nvidia for linux-rt, it seems to work without issues.
Attempting to install the driver for linux-rt fails with the
following error message:

The kernel you are installing for is a PREEMPT_RT kernel!

The NVIDIA driver does not support real-time kernels. If you
are using a stock distribution kernel, please install
a variant of this kernel that does not have the PREEMPT_RT
patch set applied; if this is a custom kernel, please
install a standard Linux kernel.  Then try installing the
NVIDIA kernel module again.

*** Failed PREEMPT_RT sanity check. Bailing out! ***
2021-01-24 23:15:24 +01:00
Jan Tojnar
cc8fd11ffb
Merge branch 'master' into staging-next 2021-01-24 20:41:42 +01:00
Sandro
81e3b9d15b
Merge pull request #110670 from siraben/double-quotes-fix
treewide: fix double quoted strings in one-liners
2021-01-24 16:17:14 +01:00
sternenseemann
2dd93a5c13 solo5: add missing test dependencies 2021-01-24 16:15:28 +01:00
volth
bc0d605cf1 treewide: fix double quoted strings in meta.description
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
2021-01-24 19:56:59 +07:00
github-actions[bot]
a2994c588a
Merge master into staging-next 2021-01-24 06:44:02 +00:00
Sandro
77f32f2f3c
Merge pull request #110628 from prusnak/stdenv-lib
treewide: stdenv.lib -> lib
2021-01-24 03:10:32 +01:00
Matthew Bauer
84408a6ad0
Merge pull request #100687 from spease/add-newer-xcode-hashes
darwin: update xcode versions
2021-01-23 20:04:50 -06:00
Pavol Rusnak
90f7338112
treewide: stdenv.lib -> lib 2021-01-24 01:49:49 +01:00
Jan Tojnar
01ee4ea574
Merge branch 'master' into staging-next 2021-01-24 00:09:45 +01:00
Sandro
3df6e76a15
Merge pull request #109395 from LibreCybernetics/update-nvidia-settings
nvidia-settings.stable: 460.27.04 -> 460.32.03
2021-01-23 22:57:35 +01:00
John Ericson
12881a7aa7
Merge pull request #110544 from Ericson2314/no-platform
top-level, lib: Remove platform attribute of platforms
2021-01-23 16:32:36 -05:00
John Ericson
9c213398b3 lib: Clean up how linux and gcc config is specified
Second attempt of 8929989614589ee3acd070a6409b2b9700c92d65; see that
commit for details.

This reverts commit 0bc275e634.
2021-01-23 10:01:28 -05:00
github-actions[bot]
58752914f4
Merge master into staging-next 2021-01-23 12:40:13 +00:00
Sander van der Burg
01ea0b5722 s6-linux-init: init at 1.0.6.0 2021-01-23 12:16:41 +01:00
Sander van der Burg
9af95960e2 skawarePackages: 2021-01 release
Maintainer notes
-----
The execline exec function interface changed quite drastically, and
backwards-compatibility to the old functions was dropped in-between
the last release and this one. Thus, downstream code might break.
At the end of this commit message is a compatibility interface.

-----
Release notes
-----

 Hello,

 Happy New Year to everyone!
 New versions of the skarnet.org packages are available.

 This is a major release. The skalibs major version number has been
bumped, which means that compatibility with previous versions is not
ensured. Other packages have been updated to build against the new
skalibs. If they only had their patch number increased, that's all
the modifications they had (save for possible bugfixes); but some
packages also received significant changes and underwent either a major
(compatibility not ensured) or minor (simple additions) release.

 Support for the 2.9.* branch of skalibs, and associated versions of
the other packages, is still ensured for a while, but users are always
strongly encouraged to upgrade.

 * General
   -------

 - Some rarely-triggered build bugs have been fixed.
 - -fno-stack-protector is not part of the default CFLAGS anymore;
stack protector policy now defaults to the compiler's settings.

* skalibs-2.10.0.0
  ----------------

 - Bugfixes.
 - Significant code cleanup.
 - New sysdep: chroot.
 - Lots of new functions, mostly to optimize the number of needed
fcntl() calls at open() time. Traces should generally be marginally
shorter than they were before.
 - Removal of the DJBUNIX_FLAG_NB and DJBUNIX_FLAG_COE macros, replaced
by the POSIX O_NONBLOCK and O_CLOEXEC macros wherever they were used.
 - Removal of the skalibs/webipc.h header, and better header separation.
 - Complete revamping of the pathexec functions, now separated into
exec_* (simple execution) and mexec_* (execution with merging of the
environment first). In true skalibs fashion, there is a little code,
and 3 pages of convenience macros (the exec.h header).
 - Complete rewrite of the locking functions, with a change of
underlying mechanisms. The skalibs locking primitives are now named
fd_lock(), fd_unlock() and fd_islocked().
 The Unix locks primitive space is a horror show. flock() is not
POSIX and does not have a way to test for a lock without taking it.
The POSIX lockf() only has exclusive locks, not shared ones. The least
bad option is fcntl(), which has shared and exclusive locks *and* a way
to check for a lock without taking it, but does not allow taking a
shared lock via a O_WRONLY file descriptor. Of all inconveniences this
is the most minor one, so now skalibs uses fcntl().

 https://skarnet.org/software/skalibs/
 git://git.skarnet.org/skalibs

 * nsss-0.1.0.0
   ------------

 - New --enable-libc-includes configure option. Without this option,
the pwd.h, grp.h and shadow.h headers are not installed anymore, so
by default installing nsss on a FHS system does not overwrite the
libc headers.

 https://skarnet.org/software/nsss/
 git://git.skarnet.org/nsss

 * utmps-0.1.0.0
   -------------

 - New --enable-libc-includes configure option. Without this option,
the utmpx.h header is not installed anymore, so by default installing
utmps on a FHS system does not overwrite the libc headers.

 https://skarnet.org/software/utmps/
 git://git.skarnet.org/utmps

 * execline-2.7.0.0
   ----------------

 - Bugfixes.
 - The trap program has changed. The "timeout" directive has been
removed; a "default" directive has been added, to handle all signals
for which a specific directive has not been given. Subprograms are
now run with the SIGNAL environment variable set to the signal number
(in addition to ! always being set to the application's pid).
 - The forstdin program has changed. It now exits 0 if it has read at
least one line, and 1 otherwise.
 - The default list of delimiters for backtick, withstdinas, forstdin
and forbacktickx has been set to "\n", so by default those programs
will read and/or split on lines and only lines.
 - The backtick, withstdinas, forstdin, forbacktickx, forx, getpid
and getcwd programs now have a -E option to activate autoimport.
(This saves the user from manually adding "importas var var" after
every use of these programs.)

 https://skarnet.org/software/execline/
 git://git.skarnet.org/execline

 * s6-2.10.0.0
   -----------

 It is imperative to restart your supervision trees, by rebooting if
necessary, after upgrading s6 to the new version. Otherwise, new s6
binaries interacting with service directories maintained by old
s6-supervise binaries may not work.
 If you are using s6-linux-init, it is necessary to upgrade to the
latest version of s6-linux-init at the same time as s6.

 - Bugfixes.
 - Significant code refactoring.
 - The internal locking system of service directories has changed,
allowing for a cleaner permissions model and official support of
relaxed permissions.
 - New binary to implement those relaxed permissions: s6-svperms.
 - The "nosetsid" file is not supported anymore in service directories.
Services are now always started in a new session.
 - s6-supervise now traps SIGINT: before dying, it sends a SIGINT to its
service's process group. This allows correct transmission of ^C when a
supervision tree is running in a terminal, even though every service
runs in its own session.
 - s6-svc -X doesn't exist anymore. s6-supervise now always closes stdin
and stdout on the last execution of the service.
 - The semantics of SIGHUP and SIGQUIT have changed for s6-supervise.
 - The set of commands sent by s6-svscanctl and received by s6-svscan
has been cleaned up and made more logical.
 - When told to exit normally (typically via s6-svscanctl -t), s6-svscan
now first waits for the whole supervision tree to die. The
.s6-svscan/finish script can now assume that all services are completely
down. (s6-svscanctl -b is an exception; it should not be used in normal
circumstances.)
 - The -s and -S options to s6-svscan are not supported anymore. Signal
management in s6-svscan has been streamlined: signals have a default
handler that can be overridden by a corresponding executable
.s6-svscan/SIGfoo file.
 - Default signal handlers for s6-svscan have more intuitive semantics.
 - New binary to help with management of user-owned supervision trees:
s6-usertree-maker.

 https://skarnet.org/software/s6/
 git://git.skarnet.org/s6

s6 now has man pages! Thanks to flexibeast for performing the conversion

work. Please allow some time for the man pages to be updated to reflect
the current HTML documentation. The repository can be found here:

 https://github.com/flexibeast/s6-man-pages

 * s6-linux-init-1.0.6.0
   ---------------------

 It *is necessary* to upgrade s6-linux-init at the same time as s6.
 It *is recommended*, although not strictly necessary, to create your
run-image directory again via a s6-linux-init-maker invocation. Old
images will still boot, as long as you are using an upgraded version
of s6-linux-init; but they may incorrectly handle signals sent to init,
so for instance Ctrl-Alt-Del may not work anymore, until you run
s6-linux-init-maker again.

 - New internal binary: s6-linux-init-nuke. This program is not meant
to be invoked by users directly: it simply removes a dependency to the
'kill' program in a rare case involving containers.

 https://skarnet.org/software/s6-linux-init/
 git://git.skarnet.org/s6-linux-init

 * s6-dns-2.3.4.0
   --------------

 - New library function: s6dns_message_parse_question().

 https://skarnet.org/software/s6-dns/
 git://git.skarnet.org/s6-dns

 * s6-networking-2.4.0.0
   ---------------------

 - Important refactoring of the tls code. The crypto tunnel now runs
as a child of the application, instead of the other way around. It is
now isolated in a s6-tls[cd]-io binary; s6-tlsc is now a simple wrapper
around s6-tlsc-io, and s6-tlsd is a simple wrapper around s6-tlsd-io.
 - New binaries: s6-ucspitlsc and s6-ucspitlsd. Those implement
opportunistic TLS via the UCSPI-TLS protocol.
 - The -K option to the tls binaries has changed semantics: it now
enforces a timeout for the handshake instead of dropping the connection
after some inactivity. Note that this option is only useful with the
bearssl backend: the libtls backend always performs a synchronous
handshake, with no way of interrupting it after a timeout expires.
 - The execline dependency is now optional. Disabling execline, however,
changes the behaviour of s6-tcpserver-access (which cannot support
exec files without it).

 https://skarnet.org/software/s6-networking/
 git://git.skarnet.org/s6-networking

 It is now possible to build the s6-networking package against OpenSSL
instead of LibreSSL, thanks to the libretls project:
 https://git.causal.agency/libretls/about/

 * mdevd-0.1.3.0
   -------------

 - New -C option to the mdevd program. This option makes mdevd
automatically spawn a mdevd-coldplug program when it's ready, allowing
mdevd to be used as a drop-in mdev -d replacement. (Note that the
coldplug is also performed if mdevd restarts after being killed, so
this feature should not be used in place of a proper service startup
sequence with a mdevd-coldplug oneshot depending on the mdevd longrun.
It has only been added for convenience.)

 https://skarnet.org/software/mdevd/
 git://git.skarnet.org/mdevd

 * Other packages
   --------------

 The following packages have received an update so they build with the

latest version of skalibs and other dependencies, but nothing has changed

except possibly some bugfixes, and hopefully not too many bug additions.

 - s6-rc-0.5.2.1. (It is not necessary to recompile your service
database. However, it is necessary to upgrade s6-rc along with s6, and
to reboot the system ASAP after upgrading.)
 - s6-portable-utils-2.2.3.1
 - s6-linux-utils-2.5.1.4
 - bcnm-0.0.1.2

 Enjoy,
 Bug-reports welcome.

--
 Laurent

-----
execline compat interface
-----

    /* Compatibility */

    #define pathexec_run(file, argv, envp) exec_ae(file, argv, envp)
    #define pathexec0_run(file, argv, envp) exec0_ae(file, argv, envp)
    #define xpathexec_run(file, argv, envp) xexec_ae(file, argv, envp)
    #define xpathexec0_run(file, argv, envp) xexec0_ae(file, argv, envp)

    #define pathexec_env(key, value) env_mexec(key, value)
    #define pathexec_fromenv(argv, envp, envlen) mexec_f(argv, envp, envlen)
    #define pathexec(argv) mexec(argv)
    #define pathexec0(argv) mexec0(argv)
    #define xpathexec_fromenv(argv, envp, envlen) xmexec_f(argv, envp, envlen)
    #define xpathexec(argv) xmexec(argv)
    #define xpathexec0(argv) xmexec0(argv)

    #define pathexec_r_name(file, argv, envp, envlen, modif, modiflen) mexec_afm(file, argv, envp, envlen, modif, modiflen)
    #define pathexec_r(argv, envp, envlen, modif, modiflen) mexec_fm(argv, envp, envlen, modif, modiflen)
    #define xpathexec_r_name(file, argv, envp, envlen, modif, modiflen) xmexec_afm(file, argv, envp, envlen, modif, modiflen)
    #define xpathexec_r(argv, envp, envlen, modif, modiflen) xmexec_fm(argv, envp, envlen, modif, modiflen)

    #endif

copied from 18e4356557 (diff-69efbe5d997280a1430a6af2fa38e3f5105e706076a26fc751885c505ca598c6R140)
2021-01-23 12:16:41 +01:00
github-actions[bot]
1c9084ac53
Merge staging-next into staging 2021-01-23 06:42:14 +00:00
Stig
c52a11e741
Merge pull request #110389 from tnias/usbguard_test_pr
nixos/tests/usbguard: init
2021-01-23 02:50:50 +01:00
Philipp Bartsch
b912846267 nixos/tests/usbguard: init 2021-01-23 01:19:11 +01:00
Jonathan Ringer
0bc275e634
Revert "lib: Clean up how linux and gcc config is specified"
This is a stdenv-rebuild, and should not be merged
into master

This reverts commit 8929989614.
2021-01-22 14:07:06 -08:00
peter woodman
e73020d217
alsaLib: fix build under musl-libc (#110413)
* alsaLib: fix build under musl-libc

there's a commit in upstream master that fixes the build issue here.
this patch is also applied in alpine linux.

* alsaLib: explainer for DL_ORIGIN patch
2021-01-22 21:30:50 +01:00
John Ericson
d95aebbe0e
Merge pull request #107214 from Ericson2314/linux-config-cleanup
lib: Clean up how linux and gcc config is specified
2021-01-22 15:15:58 -05:00
github-actions[bot]
08c4f9056e
Merge staging-next into staging 2021-01-22 18:52:00 +00:00
Kevin Cox
57d262775d
Merge pull request #110163 from Atemu/update/zen-kernels
zen-kernels: 5.10.6 -> 5.10.9
2021-01-22 13:26:05 -05:00
github-actions[bot]
a5bbeb4fb1
Merge staging-next into staging 2021-01-22 12:43:02 +00:00
John Ericson
8929989614 lib: Clean up how linux and gcc config is specified
The `platform` field is pointless nesting: it's just stuff that happens
to be defined together, and that should be an implementation detail.

This instead makes `linux-kernel` and `gcc` top level fields in platform
configs. They join `rustc` there [all are optional], which was put there
and not in `platform` in anticipation of a change like this.

`linux-kernel.arch` in particular also becomes `linuxArch`, to match the
other `*Arch`es.

The next step after is this to combine the *specific* machines from
`lib.systems.platforms` with `lib.systems.examples`, keeping just the
"multiplatform" ones for defaulting.
2021-01-21 22:44:09 -05:00
Philipp Bartsch
de3377bff0 usbguard: install shell completion 2021-01-22 00:33:21 +01:00
github-actions[bot]
27c8ef972c
Merge staging-next into staging 2021-01-21 18:51:36 +00:00