Commit Graph

13098 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Atemu
ea051b0417 zen-kernels: 5.10.6 -> 5.10.9 2021-01-20 12:01:57 +01:00
R. RyanTM
dacc16aedd lxcfs: 4.0.6 -> 4.0.7 2021-01-20 05:15:04 +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
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
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
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
Tim Steinbach
5d55162e2a
linux/hardened/patches/5.4: 5.4.89.a -> 5.4.90.a 2021-01-18 12:46:32 -05:00
Tim Steinbach
c08ed1556e
linux/hardened/patches/5.10: 5.10.7.a -> 5.10.8.a 2021-01-18 12:46:32 -05:00
Tim Steinbach
25d44d9c82
linux/hardened/patches/4.19: 4.19.167.a -> 4.19.168.a 2021-01-18 12:46:32 -05:00
Tim Steinbach
a108d17cc1
linux/hardened/patches/4.14: 4.14.215.a -> 4.14.216.a 2021-01-18 12:46:31 -05:00
Tim Steinbach
20d6f20083
linux: 5.4.89 -> 5.4.90 2021-01-18 12:46:31 -05:00
Tim Steinbach
370ad71e2a
linux: 5.10.7 -> 5.10.8 2021-01-18 12:46:31 -05:00
Tim Steinbach
44b24624d5
linux: 4.9.251 -> 4.9.252 2021-01-18 12:46:30 -05:00
Tim Steinbach
7c70204558
linux: 4.4.251 -> 4.4.252 2021-01-18 12:46:30 -05:00
Tim Steinbach
2818d367ea
linux: 4.19.167 -> 4.19.168 2021-01-18 12:46:30 -05:00
Tim Steinbach
d15ed07e0a
linux: 4.14.215 -> 4.14.216 2021-01-18 12:46:27 -05:00
Daniel Nagy
993c9fad7b
dstat: 0.7.3 -> 0.7.4
This change also switches dstat to python3. The patches introduced in this
commit are inspired by archlinux[0][1].

[0]:
e688b126c5/trunk/PKGBUILD
[1]: https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/dstat&id=e688b126c561e842b459ea1cc88e725f1f2a29cc
2021-01-18 10:50:46 +01:00
Atemu
4a0070fc9f zen-kernels: refactor suffix
Changing it required modifications in multiple places which is error-prone
2021-01-18 10:49:16 +01:00
github-actions[bot]
b7f20dcd02
Merge master into staging-next 2021-01-18 01:16:03 +00:00