Commit graph

14417 commits

Author SHA1 Message Date
Tim Steinbach 13bc895a8f linux: 5.4.94 -> 5.4.95 2021-02-05 09:33:41 -05:00
Tim Steinbach 75d4d5fe85 linux: 5.10.12 -> 5.10.13 2021-02-05 09:33:41 -05:00
Tim Steinbach dc3a812217 linux: 4.9.254 -> 4.9.255 2021-02-05 09:33:41 -05:00
Tim Steinbach a72348cc48 linux: 4.4.254 -> 4.4.255 2021-02-05 09:33:41 -05:00
Tim Steinbach da98a8c94b linux: 4.19.172 -> 4.19.173 2021-02-05 09:33:41 -05:00
Tim Steinbach 165ca30ecf linux: 4.14.218 -> 4.14.219 2021-02-05 09:33:41 -05:00
github-actions[bot] bd1a0c9702
Merge staging-next into staging 2021-02-05 12:19:39 +00:00
Domen Kožar 9e1c01f500
--no-net is now --offline 2021-02-05 11:57:42 +00:00
Jan Tojnar da66296930
Merge branch 'staging-next' into staging
libkeyfinder no longer uses Qt so dontWrapQtApps is moot.
2021-02-04 19:34:26 +01:00
Sandro 2fe06d9478
Merge pull request #106661 from IvarWithoutBones/update-rtl8821ce
linuxPackages.rtl8821ce: 5.5.2_34066.20200325 -> unstable-2020-12-16
2021-02-04 18:41:02 +01:00
Sandro 31bc8c38e6
Merge pull request #111908 from primeos/fscryptctl
fscryptctl-experimental: 2017-10-23 -> 0.1.0
2021-02-04 18:13:29 +01:00
Tim Steinbach 429800ea40 zfs: Add test references 2021-02-04 09:38:46 -05:00
Jan Tojnar 91109ce94a
Merge branch 'staging-next' into staging 2021-02-04 15:02:14 +01:00
Ryan Mulligan a130a0a0d2
Merge pull request #111806 from r-ryantm/auto-update/pcm
pcm: 202011 -> 202101
2021-02-04 05:28:40 -08:00
Michael Weiss 6f6ce15938
fscryptctl-experimental: 2017-10-23 -> 0.1.0
Version 0.1.0 is based on the last commit that included support for V1
encryption policies. Version 1.0 is about to be released and will
include a PR which removes V1 policy support and adds V2 policy support.
Source: https://github.com/google/fscryptctl/issues/12#issuecomment-772888154

When version 1.0 is released we'll likely package it as fscryptctl and
mark fscryptctl-experimental as broken (referring to fscryptctl).
2021-02-04 13:39:00 +01:00
github-actions[bot] a93a3ec715
Merge staging-next into staging 2021-02-04 00:35:42 +00:00
Martin Weinelt 95164dc11b
wpa_supplicant: fix for security advisory 2020-2
A vulnerability was discovered in how wpa_supplicant processing P2P
(Wi-Fi Direct) group information from active group owners. The actual
parsing of that information validates field lengths appropriately, but
processing of the parsed information misses a length check when storing
a copy of the secondary device types. This can result in writing
attacker controlled data into the peer entry after the area assigned for
the secondary device type. The overflow can result in corrupting
pointers for heap allocations. This can result in an attacker within
radio range of the device running P2P discovery being able to cause
unexpected behavior, including termination of the wpa_supplicant process
and potentially arbitrary code execution.

https://w1.fi/security/2020-2/wpa_supplicant-p2p-group-info-processing-vulnerability.txt

Fixes: CVE-2021-0326
2021-02-04 00:31:38 +01:00
R. RyanTM 21063beadb pcm: 202011 -> 202101 2021-02-03 20:24:21 +00:00
Michael Weiss 25e3e66b65
iputils: 20200821 -> 20210202 (#111645) 2021-02-03 21:02:06 +01:00
Florian Klink 2a19c18a74 systemd: add note about nixpkgs-fmt 2021-02-03 20:25:52 +01:00
Henri Menke bde2fffbbe zfs: 2.0.1 -> 2.0.2 2021-02-03 11:18:48 -08:00
github-actions[bot] 571eb10996
Merge staging-next into staging 2021-02-03 18:22:22 +00:00
Florian Klink f61a3bf8e8 systemd: nixpkgs-fmt
This was recently introduced, and apparently not nixpkgs-fmt'ed.

While there's no global consensus on nixpkgs-fmt'ing everything,
indenting this by 2 more spaces won't hurt.
2021-02-03 18:56:07 +01:00
Florian Klink 49cb525712 systemd: 247.2 -> 247.3 2021-02-03 18:56:06 +01:00
Sandro 0829a51862
Merge pull request #109626 from holymonson/darwin-impure-cmds
darwin: add impure-cmds
2021-02-03 18:11:58 +01:00
Sandro 7e55500f54
Merge pull request #111177 from afontaine/enable-rx6000-gpus
common-config: Enable RX 6000 Series AMDGPU
2021-02-03 11:29:14 +01:00
github-actions[bot] d867b6f9eb
Merge staging-next into staging 2021-02-03 06:18:15 +00:00
Jörg Thalheim 60d9784263
Merge pull request #109635 from mroi/patch-pam
linux-pam: fix cross compilation on Darwin
2021-02-03 05:42:45 +00:00
Jörg Thalheim dec19cba44
Merge pull request #109644 from Izorkin/update-firewall 2021-02-03 05:41:42 +00:00
github-actions[bot] f9141c9fc1
Merge staging-next into staging 2021-02-03 00:39:57 +00:00
Michael Raskin e83ab2e04d
Merge pull request #111039 from 0x4A6F/master-firejail
firejail: 0.9.64 -> 0.9.64.2
2021-02-02 22:15:03 +00:00
Markus Kowalewski 2576e20085
open-isns: 0.100 -> 0.101 2021-02-02 21:39:49 +01:00
Jan Tojnar 75153ede17
Merge branch 'staging-next' into staging 2021-02-02 19:46:31 +01:00
Martin Weinelt 4499ac8c75
Merge pull request #110171 from r-ryantm/auto-update/openvswitch
openvswitch: 2.14.0 -> 2.14.1
2021-02-02 14:53:21 +01:00
Sandro ce9de14677
Merge pull request #110405 from pjjw/musl-elfutils 2021-02-02 14:18:21 +01:00
github-actions[bot] 1d1ce08e2b
Merge staging-next into staging 2021-02-02 12:24:27 +00:00
Daniël de Kok cf19c9f220
Merge pull request #111630 from danieldk/nvidia-settings-race
nvidia-settings: fix parallel build race condition
2021-02-02 13:03:03 +01:00
Sandro 24ae4d2b2a
Merge pull request #111607 from jtojnar/fwupd-1.5.5
fwupd: 1.5.3 → 1.5.5
2021-02-02 10:51:30 +01:00
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
github-actions[bot] efee2df4c4
Merge staging-next into staging 2021-02-02 06:20:03 +00:00
Tim Steinbach b673417493
Revert "zfs: 2.0.1 -> 2.0.2"
This reverts commit e347e96601.
2021-02-01 20:23:03 -05:00
github-actions[bot] 4c1eae9176
Merge staging-next into staging 2021-02-02 00:42:42 +00: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
github-actions[bot] 7044cd0c9d
Merge staging-next into staging 2021-02-01 18:31:04 +00:00
Dmitry Kalinkin f602c10ea7
Merge pull request #109368 from holymonson/check-headers
darwin: check apple headers
2021-02-01 12:12:03 -05:00
Markus Kowalewski 119c1c55fd
linuxptp: fix license 2021-02-01 13:36:34 +01:00
github-actions[bot] d2bf5aea5a
Merge staging-next into staging 2021-02-01 12:24:36 +00: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
Peter Woodman d96a69c963 musl-obstack: init at 1.2.2
in service of getting elfutils building against musl-libc, this library
is an extraction of the obstack functions from glibc/libiberty. this is
the approach taken by void and alpine linux.
2021-01-31 19:39:57 -05:00
Peter Woodman bcff2ac7eb musl-fts: init at 1.2.7
this is in service of getting elfutils building against musl-libc again.
the currently-included netbsd.fts package has a bunch of #define
collisions with current elfutils, so pulling this library in, which is
what both void and alpine linux do.
2021-01-31 19:39:57 -05:00
Dmitry Kalinkin 98cc48e3f7
Merge pull request #109052 from holymonson/bootstrap_cmds
darwin.bootstrap_cmds: update to 121
2021-01-31 19:07:51 -05: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
github-actions[bot] 03b81d1bef
Merge staging-next into staging 2021-01-31 18:27:42 +00:00
Philipp Mildenberger c67f9d2935 zfs: fix zfs legacy mount
Closes #110376
2021-01-31 17:03:23 +01:00
Sandro Jäckel 6dfb84d462
audit: Remove usage of stdenv.lib 2021-01-31 15:10:26 +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
github-actions[bot] f92395cf3c
Merge staging-next into staging 2021-01-31 06:19:43 +00: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
github-actions[bot] 81337921f5
Merge staging-next into staging 2021-01-31 00:46:33 +00:00
Dmitry Kalinkin 84b3d08ba6
Merge pull request #111057 from veprbl/pr/darwin_CF_fix_sandboxing
darwin.CF: fix sandboxed build
2021-01-30 19:30:51 -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
github-actions[bot] c72ffa864a
Merge staging-next into staging 2021-01-30 18:27:30 +00:00
Dmitry Kalinkin 7301135474
Merge pull request #111129 from holymonson/ICU
darwin.ICU: update to 66108 and restruct
2021-01-30 12:26:45 -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
Monson Shao c12df57435
darwin.apple-source-releases: implement headers check 2021-01-30 21:37:46 +08:00
Monson Shao 4bc22226a2
darwin.hfs: add appleHeaders and set headersOnly=true by default 2021-01-30 21:37:46 +08:00
Monson Shao 0681f7f979
darwin.Libsystem: add appleHeaders 2021-01-30 21:37:46 +08:00
Monson Shao e2fb835ce2
darwin.xnu: add appleHeaders 2021-01-30 21:37:46 +08:00
Monson Shao 1eb3a0d5c9
darwin.Libc: add appleHeaders 2021-01-30 21:37:46 +08:00
Monson Shao 4da71ef5af
darwin.CommonCrypto: add appleHeaders 2021-01-30 21:37:46 +08:00
Monson Shao c08b0b360a
darwin.Libinfo: add appleHeaders 2021-01-30 21:37:46 +08:00
Monson Shao 24feb6adb2
darwin.architecture: add appleHeaders 2021-01-30 21:37:45 +08:00
Monson Shao c02807ece4
darwin.launchd: add appleHeaders 2021-01-30 21:37:45 +08:00
Monson Shao 69625af7d1
darwin.libclosure: add appleHeaders 2021-01-30 21:37:45 +08:00
Monson Shao f4b4000e8f
darwin.libdispatch: add appleHeaders 2021-01-30 21:37:45 +08:00
Monson Shao 4efe7aae90
darwin.libplatform: add appleHeaders 2021-01-30 21:37:45 +08:00
Monson Shao e70c149458
darwin.libpthread: add appleHeaders 2021-01-30 21:37:44 +08:00
Monson Shao e6b3f18ee5
darwin.libutil: add appleHeaders 2021-01-30 21:37:44 +08:00
Monson Shao 79c264411e
darwin.removefile: add appleHeaders 2021-01-30 21:37:44 +08:00
R. RyanTM 5571278f0b ipset: 7.9 -> 7.10 2021-01-30 05:48:12 +00:00
github-actions[bot] e788d512e8
Merge staging-next into staging 2021-01-30 00:44:04 +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
R. RyanTM 84f357ec32
hwdata: 0.335 -> 0.343 2021-01-29 18:52:29 +01:00
Andrew Fontaine 6ebf1a17af
common-config: Enable RX 6000 Series AMDGPU
The kernel config parameter `DRM_AMD_DC_DCN3_0` is required to enable
the RX 6000 series GPUs, and is supported on kernels at least `5.9.12`.

Source: https://wiki.gentoo.org/wiki/AMDGPU#Installation
2021-01-29 12:05:57 -05:00
github-actions[bot] c367646dd4
Merge staging-next into staging 2021-01-29 12:23:58 +00: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
Monson Shao 145ed3fcbc
darwin.ICU: update to 66108 and restruct 2021-01-29 15:42:27 +08:00
Monson Shao 84410e29df
darwin.bootstrap_cmds: update to 121 2021-01-29 15:39:51 +08:00
Monson Shao 399dbcac67
darwin.apple-source-releases: drop sdkName in version 2021-01-29 15:39:32 +08:00
Yurii Izorkin b2e84fa59c
libcap: 2.46 -> 2.47 (#111014) 2021-01-29 07:02:26 +00:00
github-actions[bot] 3ac0ccda7a
Merge staging-next into staging 2021-01-29 00:43:57 +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
Dmitry Kalinkin 684963881b
darwin.CF: fix sandboxed build
Had to abandon the use of sourceRoot primarily because it prevents
stdenv from chmod'ing the ../configure into a writable file.
2021-01-28 16:55:53 -05: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] 2e78c8c736
Merge staging-next into staging 2021-01-28 12:23:55 +00: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] 7e0ff70afd
Merge staging-next into staging 2021-01-28 08:00:29 +00: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] eedadbb22b
Merge staging-next into staging 2021-01-28 00:45:34 +00: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] 06efb52369
Merge staging-next into staging 2021-01-27 18:28:34 +00: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] 1b5da764a7
Merge staging-next into staging 2021-01-27 12:24:09 +00: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
Thomas Tuegel 0e418a1a18
Merge pull request #108888 from ttuegel/feature--staging--qt-no-mkDerivation
Qt: Do not require mkDerivation
2021-01-26 16:24:41 -06:00
Sandro Jäckel f8cd0b402a
linuxPackages.rtlwifi_new: Add comment that commit does not exist on any branch on target repository 2021-01-26 15:19:02 +01:00
Sandro Jäckel 0e80a5f6cb
linuxPackages.acpi-call: Replace commit with equivalent from master 2021-01-26 15:19:00 +01:00
Sandro Jäckel a8758fdce5
bcachefs: Add comment that commit does not exist on any branch on target repository 2021-01-26 15:19:00 +01:00
Jan Tojnar 4709dce995
Merge branch 'staging-next' into staging 2021-01-26 13:54:54 +01: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
Thomas Tuegel 5590e365e4
qtbase: Check for wrapQtAppsHook in setupHook 2021-01-25 15:56:15 -06:00
github-actions[bot] a008c42d22
Merge staging-next into staging 2021-01-25 18:52:12 +00: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] c564d1e1ce
Merge staging-next into staging 2021-01-25 01:18:29 +00: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
Jörg Thalheim 7b1310166c
Merge pull request #110542 from Atemu/kernel-f2fs-compression
linux: enable F2FS compression
2021-01-24 21:53:58 +00:00
Jan Tojnar 3c5dff210a
Merge branch 'staging-next' into staging 2021-01-24 20:43:48 +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] 5d637e0016
Merge staging-next into staging 2021-01-24 06:44:06 +00: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 94482cb29c
Merge branch 'staging-next' into staging 2021-01-24 00:10:20 +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
Guillaume Girol 264abb7c7e
Merge branch 'staging' into audit-static 2021-01-23 16:48:41 +00: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
Dmitry Kalinkin 963286d5b6
Merge pull request #108590 from holymonson/apple_package_version
darwin: generate apple packages preparing for update macos sdk
2021-01-23 08:16:29 -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
Atemu 9d342077cd linux: enable F2FS compression
Fixes https://github.com/NixOS/nixpkgs/issues/110534
2021-01-22 22:35:34 +01: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
TredwellGit 53029f2070 linuxHeaders: 5.10.4 -> 5.10.9 2021-01-21 12:44:48 -05:00
Sandro dcbc11d071
Merge pull request #110331 from Roxxers/tomb-2.9
tomb: 2.8.1 -> 2.9
2021-01-21 17:51:52 +01:00
Atemu aa58df5312 zfs: use meta.broken instead of throw when incompatible with kernel
`throw` aborts eval when the package is touched in inappropriate places. See
https://github.com/NixOS/nixpkgs/issues/109001 for an adverse instance of that.

ZFS now behaves like a regular broken package when it's, you know, broken.

It also still prints the helpful incompatibility notice when fully evaluated.
2021-01-21 14:58:00 +01:00
Roxie Gibson 7a737bfd29
tomb: 2.8.1 -> 2.9 2021-01-21 12:51:30 +00:00
github-actions[bot] 7d80106978
Merge staging-next into staging 2021-01-21 12:44:13 +00:00
Bruno Bigras 19dcf599fe compsize: 1.3 -> 1.4 2021-01-21 06:11:51 -05:00
Bruno Bigras a98faf18fd iwd: 1.10 -> 1.11 2021-01-20 23:50:51 -05:00
Bruno Bigras 17783d1176 ell: 0.35 -> 0.36 2021-01-20 23:50:25 -05:00
github-actions[bot] e5fef074d6
Merge staging-next into staging 2021-01-21 01:19:31 +00:00
Matthew Bauer ba5f50a76c
Merge pull request #107924 from matthewbauer/fix-duti
Fix duti on macOS Big Sur
2021-01-20 16:09:41 -06:00
Matthew Bauer dcbbbcdb05 duti: pass ApplicationServices directly 2021-01-20 15:30:57 -06:00
Guillaume Girol 0adfe8ca75
Merge pull request #109894 from pjjw/sysklogd-musl-patch
sysklogd: fix building against musl
2021-01-20 20:15:14 +00:00
Peter Woodman cba38a2f42 sysklogd: add explainer for musl patch 2021-01-20 14:27:30 -05:00
Sandro ec84cbf95f
Merge pull request #110107 from LeSuisse/cifs-utils-missing-python3-smbinfo
cifs-utils: missing python3 dependency for smbinfo
2021-01-20 20:12:37 +01:00
github-actions[bot] 49d7c98041
Merge staging-next into staging 2021-01-20 18:53:18 +00:00
Sandro 199ffe40e6
Merge pull request #110140 from holymonson/prepare-apple-sdk
darwin.apple-sdk: drop appleSdkVersion
2021-01-20 19:40:51 +01:00
Steven Pease a128336cf6 Use buildPlatform instead of targetPlatform for unxip instructions 2021-01-20 10:08:03 -08:00
Thomas Gerbet 5858d84658 cifs-utils: missing python3 dependency for smbinfo
Since cifs-utils 6.12, smbinfo needs Python to be usable.

Issue introduced in 033208fd46.
2021-01-20 18:39:42 +01:00
Tim Steinbach 50a5d4c773
linux/hardened/patches/5.4: 5.4.90.a -> 5.4.91.a 2021-01-20 12:36:58 -05:00
Tim Steinbach 3df0e82d66
linux/hardened/patches/5.10: 5.10.8.a -> 5.10.9.a 2021-01-20 12:36:57 -05:00
Tim Steinbach 66c9151443
linux/hardened/patches/4.19: 4.19.168.a -> 4.19.169.a 2021-01-20 12:36:57 -05:00
Tim Steinbach c74614795b
linux-rt_5_10: 5.10.4-rt22 -> 5.10.8-rt24 2021-01-20 12:36:57 -05:00
Tim Steinbach 3141316d4d
linux: 5.4.90 -> 5.4.91 2021-01-20 12:36:56 -05:00
Tim Steinbach 463f322988
linux: 5.10.8 -> 5.10.9 2021-01-20 12:36:56 -05:00
Tim Steinbach 1118a48175
linux: 4.19.168 -> 4.19.169 2021-01-20 12:36:56 -05:00
Monson Shao 2467f5e4d2
darwin.apple-sdk: drop appleSdkVersion
In fact no one is using appleSdkVersion, and stdenv is decoupled with sdk.
2021-01-21 00:26:16 +08:00
Ryan Mulligan 069f9663e6
Merge pull request #110065 from r-ryantm/auto-update/libfabric
libfabric: 1.11.1 -> 1.11.2
2021-01-20 07:27:19 -08:00
R. RyanTM ab04d96f2c openvswitch: 2.14.0 -> 2.14.1 2021-01-20 14:07:49 +00:00
github-actions[bot] 77750c1f20
Merge staging-next into staging 2021-01-20 12:43:41 +00:00
Atemu ea051b0417 zen-kernels: 5.10.6 -> 5.10.9 2021-01-20 12:01:57 +01:00
Jörg Thalheim 1f32ecb82d
Merge pull request #110083 from r-ryantm/auto-update/lxcfs
lxcfs: 4.0.6 -> 4.0.7
2021-01-20 08:07:18 +00:00
Monson Shao 9d5cece352
darwin: generate apple packages preparing for update macos sdk 2021-01-20 15:19:13 +08:00
R. RyanTM dacc16aedd lxcfs: 4.0.6 -> 4.0.7 2021-01-20 05:15:04 +00:00
Steven Pease 0fdab8d560 Merge branch 'master' into add-newer-xcode-hashes 2021-01-19 20:42:30 -08:00
Steven Pease d8c1c0dc50 Update to XCode 12.3 2021-01-19 20:41:39 -08:00
R. RyanTM 78a5845e39 libfabric: 1.11.1 -> 1.11.2 2021-01-20 03:04:31 +00:00
Kira Bruneau 9788188273 pkgs/os-specific/windows: fix evaluation after stdenv.lib -> lib
Fixes the evaluation of packages in pkgs/os-specific/windows that
weren't updated to include a new lib parameter after the refactor from
stdenv.lib -> lib (#109490).

I originally only intended this change to fix
`pkgsCross.mingw32.buildPackages.gcc` & `pkgsCross.mingwW64.buildPackages.gcc`
to support building wine with `mingwSupport`, but I noticed this was
an issue for all updated windows packages. Most of these other
packages fail to build for other reasons.
2021-01-19 21:34:45 -05:00
github-actions[bot] b27f238893
Merge staging-next into staging 2021-01-20 01:20:12 +00:00
zowoq 31f5dd3f36 treewide: editorconfig fixes
- remove trailing whitespace
- use spaces for indentation
2021-01-20 09:11:11 +10:00
Thomas Gerbet 033208fd46 cifs-utils: 6.9 -> 6.12
This notably fixes CVE-2020-14342.
2021-01-19 21:30:29 +01:00
github-actions[bot] e064950cb7
Merge staging-next into staging 2021-01-19 18:52:27 +00:00
Sandro 829a060202
Merge pull request #107040 from nagy/dstat-python3
dstat: 0.7.3 -> 0.7.4
2021-01-19 17:57:35 +01:00
Sandro 47409af354
Merge pull request #109906 from pjjw/linux-pam-musl-fix
linux-pam: remove broken musl pam_exec patch
2021-01-19 15:07:15 +01:00
Jan Tojnar fc7bd322df
Merge branch 'staging-next' into staging 2021-01-19 13:50:04 +01:00
Mario Rodas f417ebf945
Merge pull request #109071 from marsam/update-lxc
lxc: 4.0.5 -> 4.0.6
2021-01-19 06:54:08 -05:00
Jonathan Ringer 9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Peter Woodman a51b7570d4
linux-pam: remove broken musl pam_exec patch
it looks like this build wasn't tested with musl-libc after upgrading to
1.5.1, and has been broken in this configuration since, as the removed
patch does not apply cleanly. the good news is it's been fixed upstream,
rendering it unnecessary.
2021-01-19 02:41:52 -05:00
Peter Woodman a47a55e433 sysklogd: fix building against musl
taking guidance from alpine linux's patch[1], removed a few ifdefs and
fixed up some includes.

[1]: https://git.alpinelinux.org/aports/tree/main/sysklogd/fix-includes.patch
2021-01-18 23:29:12 -05:00
github-actions[bot] e8a1f18e58
Merge staging-next into staging 2021-01-19 01:18:25 +00:00
Jörg Thalheim 90b88c416d
Merge pull request #81545 from yesbox/ebtables-legacy
ebtables: restore legacy commands
2021-01-18 21:01:01 +00:00
Sandro 83ef622cdf
Merge pull request #105647 from r-ryantm/auto-update/fwts
fwts: 20.09.00 -> 20.11.00
2021-01-18 20:47:36 +01:00
Jesper Geertsen Jonsson 1cb447c961 ebtables: restore "legacy" commands
ebtables 2.0.11 renamed the ebtables commands
from "ebtables*" to "ebtables-legacy-*".

Of course this breaks legacy packages and scripts
that depends on the ebtables commands.

The idea behind this upstream change appears to be that
ebtables-nft replaces ebtables and distributions should
rename either the ebtables-legacy or ebtables-nft commands
to provide the ebtables commands.

For nix a better fit is for packages to specify either the
ebtables or the ebtables-nft package, while both packages
provide the same commands.

This patch restores the ebtables package so it functions again.
2021-01-18 20:27:17 +01:00