Commit Graph

15070 Commits

Author SHA1 Message Date
Luke Granger-Brown
66c672f3e9
Merge pull request #120317 from hmenke/zfs
zfsUnstable: 2.1.0-rc3 -> 2.1.0-rc4
2021-04-23 22:32:45 +01:00
Alyssa Ross
7134116d6b
netbsd.common: just export the sources
"common" is just a lot of shared code, not a component in and of
itself.  There's no Makefile, so if we try to build it Make will go up
a directory and try to build all of NetBSD.
2021-04-23 20:59:57 +00:00
John Ericson
068a59a394
Merge pull request #120355 from alyssais/netbsd-libutil
netbsd.libutil: fix build
2021-04-23 16:56:03 -04:00
aszlig
a3f298e48f
Merge pull request #119096 (update kbd, add tests)
The kbd package was outdated for years and the last version bump has
been in 2017 and the package has no maintainer. The pull request in
question adds @davidak as maintainer, updates the package to version
2.4.0 and adds a keymap test for the "bone" layout.

Since the dvp and neo layouts are now included, we now no longer need
the kbdKeymaps package.

While the package is one of the dependencies of systemd, its impact is
nonetheless relatively low, because the worst that could happen is that
the keymap can't be set at boot time but it should not break any
software further down the line.

This is the reason why I'm merging this regardless of only having tested
this via running the "keymap" NixOS VM test but without testing on a
real system yet.
2021-04-23 20:12:36 +02:00
Alyssa Ross
554874700a
netbsd.libkern: remove
libkern is only used as part of building the kernel.  There's no
reason for us to have a seperate package for it.
2021-04-23 17:22:06 +00:00
Alyssa Ross
01ea399625
netbsd.libutil: fix build
Tested by building pkgsCross.x86_64-netbsd.netbsd.libutil on
x86_64-linux.
2021-04-23 15:52:30 +00:00
John Ericson
53a2aee7d7
Merge pull request #120347 from alyssais/netbsd-librt
netbsd.librt: fix build
2021-04-23 11:42:34 -04:00
John Ericson
8fec31c93f
Merge pull request #120348 from alyssais/netbsd-librpcsvc
netbsd.librpcsvc: fix build
2021-04-23 11:39:45 -04:00
John Ericson
a45420985f
Merge pull request #120350 from alyssais/netbsd-libpthread
netbsd.libpthread: fix build
2021-04-23 11:39:12 -04:00
Alyssa Ross
e8a81f2f99
netbsd.libcrypt: fix build
Tested by building pkgsCross.x86_64-netbsd.netbsd.libcrypt on
x86_64-linux.
2021-04-23 15:20:41 +00:00
Alyssa Ross
870ce0999b
netbsd.libpthread: fix build
Tested by building pkgsCross.x86_64-netbsd.netbsd.libpthread on
x86_64-linux.
2021-04-23 15:15:30 +00:00
Alyssa Ross
152179f71d
netbsd.librpcsvc: fix build
Tested by building pkgsCross.x86_64-netbsd.netbsd.librpcsvc on
x86_64-linux.
2021-04-23 14:59:58 +00:00
Alyssa Ross
be7a9bab0f
netbsd.librt: fix build
This is another one of those packages that's just a rebuild of a
certain part of libc...

Tested by building pkgsCross.x86_64-netbsd.netbsd.librt on
x86_64-linux.

libc's postPatch was entirely fixes for librt, so move that to librt
and inherit it in libc.
2021-04-23 14:48:35 +00:00
davidak
77c103298c kbd: add myself as maintainer 2021-04-23 16:41:12 +02:00
davidak
f250c8f6df kbd: format using nixpkgs-fmt 2021-04-23 16:41:11 +02:00
davidak
513143fe4e kbd: add tests and update them 2021-04-23 16:41:11 +02:00
davidak
fabdd46503 kbdKeymaps: remove
dvp and neo are now included in kbd

includes documentation in release notes and alias
2021-04-23 16:41:06 +02:00
davidak
d83b116910 kbd: 2.0.4 -> 2.4.0 2021-04-23 16:37:37 +02:00
Alyssa Ross
7cdc46f4e3 netbsd.libterminfo: add missing $makeFlags 2021-04-23 14:18:48 +00:00
Alyssa Ross
b4373892ce netbsd.libterminfo: add missing bsdSetupHook dep
82c231d17e ("netbsd: Generalize builder to any-bsd setup hook")
missed libterminfo when it added bsdSetupHook to every other
package.  (I checked it didn't miss anything else.)

It also didn't change a NETBSDSRCDIR to BSDSRCDIR, but in fairness
that line was added about half an hour before the setupHook change was
merged in a16384e118.

Fixes: 82c231d17e ("netbsd: Generalize builder to any-bsd setup hook")
2021-04-23 14:18:48 +00:00
Henri Menke
33fff37020
zfsUnstable: 2.1.0-rc3 -> 2.1.0-rc4 2021-04-23 11:25:37 +02:00
Julien Moutinho
45e5d726b2 nixos/apparmor: improve code readability 2021-04-23 07:20:19 +02:00
Julien Moutinho
7996dfb1a1 apparmor: 3.0.0 -> 3.0.1 2021-04-23 07:17:57 +02:00
Julien Moutinho
8f9b29d168 apparmor: 2.13.5 -> 3.0.0 2021-04-23 07:17:56 +02:00
Julien Moutinho
05d334cfe2 Revert "Revert "apparmor: fix and improve the service""
This reverts commit 420f89ceb2.
2021-04-23 07:17:55 +02:00
John Ericson
951e194cb3
Merge pull request #120255 from alyssais/netbsd-libm
netbsd.libm: fix build
2021-04-22 20:24:05 -04:00
Alyssa Ross
5c24380395
netbsd.libm: fix build
Tested building pkgsCross.x86_64-netbsd.netbsd.libm from x86_64-linux.

At some point we should probably set SHLIBINSTALLDIR in the setupHook,
but I think I'd like to get everything working first, and then make
changes that affect all the builds like that.  It's easier to spot
regressions when you know _everything_ worked before.
2021-04-23 00:17:05 +00:00
github-actions[bot]
0d97d9f23b
Merge staging-next into staging 2021-04-23 00:15:42 +00:00
github-actions[bot]
481a9bc47c
Merge master into staging-next 2021-04-23 00:15:39 +00:00
John Ericson
e4b05fbf47 netbsd: Make boostrapping more orthodox and don't rely on splicing
- No splicing makes everything less finnicky.

- Normal bootstrapping matches e.g. linux where kernel headers are also
`stdenvNoCC` but part of this stage.
2021-04-22 23:24:24 +00:00
Luflosi
9df2614d08
usbip: fix listing functionality (#120267)
Closes https://github.com/NixOS/nixpkgs/issues/116380.
2021-04-23 01:13:28 +02:00
Alyssa Ross
760c0428cb netbsd.i18n_module: fix build
Tested building pkgsCross.x86_64-netbsd.netbsd.i18n_module from
x86_64-linux.
2021-04-22 18:33:14 +00:00
Alyssa Ross
c5ab13fc00 netbsd.libresolv: fix build
Tested building pkgsCross.x86_64-netbsd.netbsd.libresolv from
x86_64-linux.
2021-04-22 18:32:27 +00:00
github-actions[bot]
cdece2032d
Merge staging-next into staging 2021-04-22 18:14:30 +00:00
github-actions[bot]
b95da5efb6
Merge master into staging-next 2021-04-22 18:14:27 +00:00
John Ericson
a16384e118
Merge pull request #119916 from Ericson2314/bsd-setup-hook
netbsd: Generalize builder to any-bsd setup hook
2021-04-22 12:34:47 -04:00
Alyssa Ross
a2d88c63c6 netbsd.libterminfo: fix build
Tested building netbsd.libterminfo and
pkgsCross.x86_64-netbsd.netbsd.libterminfo from x86_64-linux.
2021-04-22 15:58:38 +00:00
John Ericson
82c231d17e netbsd: Generalize builder to any-bsd setup hook
Do this to get ready for other BSDs.
2021-04-22 15:54:32 +00:00
John Ericson
ff94ed255a
Merge pull request #120225 from alyssais/netbsd-libossaudio
netbsd.libossaudio: fix build
2021-04-22 11:53:12 -04:00
Alyssa Ross
8c48bb08d7
netbsd.libossaudio: fix build
The file this was trying to modify doesn't even exist.

Tested by building pkgsCross.x86_64-netbsd.netbsd.libossaudio from
x86_64-linux.
2021-04-22 15:38:07 +00:00
John Ericson
162eace854
Merge pull request #120192 from alyssais/netbsd-ld.elf_so
netbsd.ld_elf_so: fix build
2021-04-22 11:14:13 -04:00
Graham Christensen
c86bd27503
Merge pull request #119664 from eyJhb/displaylink-5.4
displaylink: 5.3.1 -> 5.4.0 (+evdi)
2021-04-22 13:36:31 +00:00
github-actions[bot]
1eabfe5413
Merge staging-next into staging 2021-04-22 12:06:27 +00:00
github-actions[bot]
120744d620
Merge master into staging-next 2021-04-22 12:06:24 +00:00
Alyssa Ross
2a16327a83
netbsd.ld_elf_so: fix build
Tested building pkgsCross.x86_64-netbsd.netbsd.ld_elf_so from
x86_64-linux.
2021-04-22 10:34:56 +00:00
Michael Weiss
3e01d42024
maintainers: remove tavyc
Their last commit was dcc84d8 from 2017.
Thank you for your contributions.
2021-04-22 11:34:25 +02:00
fortuneteller2k
1dfdf07669 linux_xanmod: 5.11.15 -> 5.11.16 2021-04-22 15:39:14 +08:00
github-actions[bot]
dde5369c50
Merge staging-next into staging 2021-04-22 06:05:54 +00:00
github-actions[bot]
8248f4db36
Merge master into staging-next 2021-04-22 06:05:51 +00:00
Sandro
cfb3bfa841
Merge pull request #120088 from primeos/nvme-cli 2021-04-22 03:55:33 +02:00
Sandro
d4d8ab2b6a
Merge pull request #120041 from Mic92/isgx 2021-04-22 03:52:52 +02:00
Sandro
2df2e5f330
Merge pull request #118269 from midchildan/feat/fuse/add-darwin 2021-04-22 03:27:36 +02:00
Sandro
5cbd461845
nvme-cli: add mic92 as maintainer
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
2021-04-22 02:33:31 +02:00
Jörg Thalheim
d0a90eb51a
linuxPackages.isgx: limit to x86_64 2021-04-21 23:39:53 +02:00
github-actions[bot]
af82393e36
Merge staging-next into staging 2021-04-21 18:13:31 +00:00
github-actions[bot]
799ebbc91d
Merge master into staging-next 2021-04-21 18:13:29 +00:00
Michael Weiss
c88a223e38
nvme-cli: Remove myself as maintainer 2021-04-21 18:54:54 +02:00
Michael Weiss
7b29dd9f75
nvme-cli: 1.13 -> 1.14 2021-04-21 18:51:25 +02:00
Henri Menke
b14062b75c zfsUnstable: 2.0.4 -> 2.1.0-rc3
In https://github.com/openzfs/zfs/commit/658fb802 OpenZFS introduced a
new compatibility feature. This is accompanied by some default profiles
which are located in the $out output of the Nix derivation. However,
these compatibility profiles are used by both the zpool executable
located in $out and the libzfs library located in $lib. This
inadvertently creates a cycle, because zpool refers to $lib to link
against libzfs but libzfs refers back to $out for the compatibility
profiles.

There are two possible routes to rectify this problem:

 1. Patch the zpool source code to not read the compatibility profiles
    and adjust the build system to put them into the $lib output.

 2. Simply remove the $out/$lib split.

Since no other derivation in nixpkgs refers to the $lib output
explicitly we opt for the latter, because this is also in accordance
with upstream.
2021-04-21 09:08:18 -07:00
github-actions[bot]
a260b67879
Merge staging-next into staging 2021-04-21 12:06:26 +00:00
github-actions[bot]
9b3e698b14
Merge master into staging-next 2021-04-21 12:06:23 +00:00
Jörg Thalheim
7745b7a9d1
isgx: fix support for 5.11 2021-04-21 11:12:49 +02:00
Samuel Gräfenstein
840805562b
linuxPackages.rtw88: 2021-04-01 -> 2021-04-19 2021-04-21 10:03:49 +02:00
Martin Weinelt
c15541a27c
dropwatch. 1.5.1 -> 1.5.3 (#119989)
* dropwatch. 1.5.1 -> 1.5.3

https://github.com/nhorman/dropwatch/releases/tag/v1.5.2
https://github.com/nhorman/dropwatch/releases/tag/v1.5.3

Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
2021-04-21 06:28:39 +01:00
github-actions[bot]
6faea022df
Merge staging-next into staging 2021-04-21 00:15:23 +00:00
github-actions[bot]
99c7bab106
Merge master into staging-next 2021-04-21 00:15:20 +00:00
Sascha Grunert
0540805a62 linuxPackages.oci-seccomp-bpf-hook: 1.2.1 -> 1.2.2
Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
2021-04-21 06:05:09 +10:00
github-actions[bot]
e09786ff64
Merge staging-next into staging 2021-04-20 18:13:19 +00:00
github-actions[bot]
b08c9b444b
Merge master into staging-next 2021-04-20 18:13:16 +00:00
Anderson Torres
30b7492d9b
Merge pull request #118228 from lourkeur/teck-programmer
teck-programmer: init at 1.1.1
2021-04-20 15:08:00 -03:00
Tim Steinbach
d9448c95c5 linux/hardened/patches/5.4: 5.4.111-hardened1 -> 5.4.112-hardened1 2021-04-20 09:33:47 -04:00
Tim Steinbach
bbb8deabb3 linux/hardened/patches/5.11: 5.11.13-hardened1 -> 5.11.14-hardened1 2021-04-20 09:33:47 -04:00
Tim Steinbach
0d9829b7e5 linux/hardened/patches/5.10: 5.10.29-hardened1 -> 5.10.30-hardened1 2021-04-20 09:33:47 -04:00
Tim Steinbach
b67475c4cd linux/hardened/patches/4.19: 4.19.186-hardened1 -> 4.19.187-hardened1 2021-04-20 09:33:47 -04:00
Tim Steinbach
4cd76dbf0c linux: 5.4.111 -> 5.4.112 2021-04-20 09:33:47 -04:00
Tim Steinbach
d48f518a08 linux: 5.11.13 -> 5.11.14 2021-04-20 09:33:47 -04:00
Tim Steinbach
ed540048c8 linux: 5.10.29 -> 5.10.30 2021-04-20 09:33:47 -04:00
Tim Steinbach
1831a7e8cc linux: 4.19.186 -> 4.19.187 2021-04-20 09:33:47 -04:00
Jörg Thalheim
3e8217986f
Merge pull request #118121 from martinetd/bcc-devendor-libbpf
bcc: devendor libbpf
2021-04-20 14:19:39 +01:00
Louis Bettens
3c0e1f309f teck-udev-rules: init 2021-04-20 09:10:43 +02:00
John Ericson
7e0addbbca
Merge pull request #119891 from Ericson2314/tiny-netbsd-cleanup
netbsd.mkDerviation: remove pointless `attrs.src or`
2021-04-19 16:30:17 -04:00
John Ericson
5910c5375f netbsd.mkDerviation: remove pointless attrs.src or
`attrs` overrides these defaults already.
2021-04-19 19:49:22 +00:00
github-actions[bot]
ea5bd4364e
Merge staging-next into staging 2021-04-19 18:11:54 +00:00
github-actions[bot]
6ef7c23763
Merge master into staging-next 2021-04-19 18:11:51 +00:00
Sandro
2ef3a9fa87
Merge pull request #119873 from Atemu/update/zen-kernels
zen-kernels: 5.11.14 -> 5.11.15
2021-04-19 19:19:33 +02:00
midchildan
f8f5ae544b
afuse: add darwin build 2021-04-20 00:51:47 +09:00
midchildan
67db526c02
btfs: add darwin build 2021-04-20 00:51:41 +09:00
Linus Heckemann
50d091cc65
Merge pull request #119770 from qzle/ramdisks
kernel: Remove CONFIG_BLK_DEV_RAM=y (remove /dev/ram* devices)
2021-04-19 14:17:42 +02:00
eyjhb
e153deef61
evdi: v1.7.2 -> unstable-20210401 2021-04-19 08:35:00 +02:00
eyjhb
2bc26039f3
displaylink: 5.3.1 -> 5.4.0 2021-04-19 08:34:48 +02:00
Alyssa Ross
ddcb48cc3d
netbsd.sys: actually build the kernel
Before, we were only building the headers, firmware, and bootloader.

CONFIG could be overridden to use another pre-defined kernel, but
there's no way to pass a custom kernel configuration yet.

Tested booting the built kernel in a NetBSD VM.
2021-04-18 19:16:51 +00:00
Alyssa Ross
37ac32a351
netbsd.config: init at 8.0
Needed to build the NetBSD kernel.
2021-04-18 19:04:27 +00:00
Alyssa Ross
3e9decc557
netbsd.cksum: init at 8.0
We need the source directory of this package for config(1), so we
might as well just package it.
2021-04-18 19:04:26 +00:00
John Ericson
3ad122f494
Merge pull request #119793 from alyssais/netbsd-sys
netbsd.sys: fix build
2021-04-18 14:45:37 -04:00
github-actions[bot]
f42b75df03
Merge staging-next into staging 2021-04-18 18:10:40 +00:00
github-actions[bot]
b57b2b362c
Merge master into staging-next 2021-04-18 18:10:37 +00:00
John Ericson
75d12e9ad4
Merge pull request #119799 from alyssais/netbsd-maint
netbsd: add myself as maintainer
2021-04-18 12:58:35 -04:00
Alyssa Ross
bdb8ec0ce6
netbsd.sys: set platforms
I don't think there's any reason for this not to be set.  Maybe it was
from before netbsd.headers overrode meta.platforms for its
constituents.
2021-04-18 16:46:28 +00:00
Dmitry Kalinkin
6eeab63be4
Merge pull request #107431 from veprbl/pr/darling_src_fix
darwin.darling.src: fix build on case-sensitive filesystems
2021-04-18 09:55:45 -04:00
Alyssa Ross
d8a6f55942
netbsd: add myself as maintainer 2021-04-18 12:30:22 +00:00
github-actions[bot]
2095c2cd0d
Merge staging-next into staging 2021-04-18 12:06:03 +00:00
github-actions[bot]
9e804db1da
Merge master into staging-next 2021-04-18 12:06:01 +00:00
Alyssa Ross
f7e988de8c
netbsd.sys: set FIRMWAREDIR
Otherwise, would try to install firmware to /libdata/firmware.
2021-04-18 12:04:03 +00:00
Alyssa Ross
8603012521
netbsd.sys: add missing uudecode dependency 2021-04-18 12:02:29 +00:00
Alyssa Ross
05e8b0de1a
netbsd.uuencode: init at 8.0
Required to build the NetBSD kernel.
2021-04-18 12:02:28 +00:00
Alyssa Ross
529b539494
netbsd.mkDerivation: popd in moveUsrDir
Permanently changing the directory here was breaking the kernel build,
which needs to do other things after moveUsrDir.
2021-04-18 12:02:25 +00:00
Daniël de Kok
df7a12d567
Merge pull request #119601 from pimeys/nvidia-460.73.01
nvidia-x11: 460.67 -> 460.73.01
2021-04-18 10:23:30 +02:00
Robert Helgesson
831e64bad4
Drop maintainership for some packages 2021-04-18 09:00:18 +02:00
Jens Nolte
610d831a4b kernel: Remove CONFIG_BLK_DEV_RAM=y (remove /dev/ram* devices)
This option allows to use portions of the system RAM as block devices.
It was configured to 'y' (built-in, therefore not unloadable or
reconfigurable) and configured 16 4MB RAM disks which, to my knowledge,
currently have no purpose in NixOS.

Removing the option restores it to it's default value of 'm', which
enables it to be loaded at runtime (which is also required to be able to
change it's configuration without rebuilding the kernel).
2021-04-18 05:34:55 +02:00
Symphorien Gibol
fbb8dbdac6 fuse: fix mount.fuse -o setuid=...
when mounting a fuse fs by fstab on can write:
/nix/store/sdlflj/bin/somefuseexe#argument /mountpoint fuse setuid=someuser

mount is run by root, and setuid is a way to tell mount.fuse to run
somefuseexe as someuser instead. Under the hood, mount.fuse uses su.
The problem is that mount is run by systemd in a seemingly very empty
environment not containing /run/current-system/sw/bin nor
/run/wrappers/bin in $PATH, so mount fails with "su command not found".

We now patch the command to run su with an absolute path.

man mount.fuse3 indicates that this option is reserved to root (or with
enough capabilities) so not using
/run/wrappers/bin/su is thus correct. It has the very small advantage of
possibly working on non nixos.
2021-04-17 21:51:40 +02:00
Atemu
0036ccebc2 zen-kernels: 5.11.14 -> 5.11.15 2021-04-17 20:45:33 +02:00
github-actions[bot]
33182b194a
Merge staging-next into staging 2021-04-17 18:10:41 +00:00
github-actions[bot]
8156636ab9
Merge master into staging-next 2021-04-17 18:10:38 +00:00
Sandro
ebcf1f92fe
Merge pull request #119650 from fortuneteller2k/update-xanmod
linux_xanmod: 5.11.14 -> 5.11.15
2021-04-17 18:10:48 +02:00
Pavol Rusnak
29bb19258a
treewide: use https for github URIs 2021-04-17 17:59:08 +02:00
Jörg Thalheim
b2a1e04eed
Merge remote-tracking branch 'upstream/staging-next' into HEAD 2021-04-17 16:37:04 +02:00
fortuneteller2k
5476e46eb6 linux_xanmod: 5.11.14 -> 5.11.15 2021-04-17 02:09:01 +08:00
Calum MacRae
28192c446c
spacebar: fix builds on macOS Big Sur 2021-04-16 17:19:17 +01:00
Calum MacRae
2c82907da4
apple-sdk: generate SkyLight framework outputs 2021-04-16 17:19:17 +01:00
Calum MacRae
914c604a01
apple-sdk: fix PrivateFrameworks symlinks
With the absence of these symlinks, private frameworks aren't exposed
to the linker.
2021-04-16 17:19:17 +01:00
Maximilian Bosch
84670bf681
wpa_supplicant: review fixes 2021-04-16 13:28:26 +02:00
Maximilian Bosch
08ced9d67f
nixos/wpa_supplicant: make new behavior opt-in 2021-04-16 13:18:46 +02:00
Maximilian Bosch
de0a39166b
wpa_supplicant: allow both imperative and declarative networks
For a while now it's possible to specify an additional config file in
`wpa_supplicant`[1]. In contrast to the file specified via `-c` this was
supposed to be used for immutable settings and not e.g. additional
networks.

However I'm a little bit unhappy about the fact that one has to choose
between a fully imperative setup and a fully declarative one where the
one would have to write credentials for e.g. WPA2-enterprise networks
into the store.

The primary problem with the current state of `wpa_supplicant` is that
if the `SAVE_CONFIG` command is invoked (e.g. via `wpa_cli`), all known
networks will be written to `/etc/wpa_supplicant.conf` and thus all
declarative networks would get out of sync with the declarative
settings.

To work around this, I had to change the following things:

* The `networking.wireless`-module now uses `-I` for declarative config,
  so the user-controlled mode can be used along with the
  `networks`-option.

* I added an `ro`-field to the `ssid`-struct in the
  `wpa_supplicant`-sources. This will be set to `1` for each network
  specified in the config passed via `-I`.

  Whenever config is written to the disk, those networks will be
  skipped, so changes to declarative networks are only temporary.

[1] https://w1.fi/cgit/hostap/commit/wpa_supplicant?id=e6304cad47251e88d073553042f1ea7805a858d1
2021-04-16 13:18:25 +02:00
Julius de Bruijn
952d9a35d3 The driver download url has changed 2021-04-16 11:48:20 +02:00
Julius de Bruijn
e4f3e9b009 nvidia-x11: 460.67 -> 460.73.01 2021-04-16 11:05:10 +02:00
Martin Weinelt
cd7a519012
Merge branch 'master' into staging-next 2021-04-16 01:32:09 +02:00
Sandro
6de0cfabf9
Merge pull request #119533 from fortuneteller2k/update-xanmod
linux_xanmod: 5.11.13 -> 5.11.14
2021-04-15 23:19:35 +02:00
Kasper
fc141a889d
libselinux: fix build with musl (#119472)
Co-authored-by: Kasper Gałkowski <kpg@posteo.net>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-15 23:18:51 +02:00
Sandro
47761b6aa8
Merge pull request #119520 from Atemu/update/zen-kernels
zen-kernels: 5.11.13 -> 5.11.14
2021-04-15 23:15:20 +02:00
github-actions[bot]
dfd4f14303
Merge master into staging-next 2021-04-15 18:13:27 +00:00
fortuneteller2k
fc0daf4bd3 linux_xanmod: 5.11.13 -> 5.11.14 2021-04-15 19:56:59 +08:00
Alyssa Ross
ea50a8c811
netbsd.man: fix hash
This was identical to the hash for "misc" above, so was obviously just
a copy and paste error.
2021-04-15 09:24:14 +00:00
Atemu
87e667540a zen-kernels: 5.11.13 -> 5.11.14 2021-04-15 10:36:16 +02:00
Alyssa Ross
93d0f1c237 netbsd.libc: fix build 2021-04-15 03:55:50 +00:00
Alyssa Ross
314aa175d3 netbsd: bison -> byacc
These are only mostly compatible, and libc won't build with bison.
2021-04-15 03:55:50 +00:00
Alyssa Ross
3b5b199012 netbsd.statHook: init
This fixes the build of various NetBSD programs on Linux,
e.g. netbsd.statHook.
2021-04-15 02:59:26 +00:00
Martin Weinelt
7cf67850c0
Merge branch 'master' into staging-next 2021-04-15 01:01:26 +02:00
Alyssa Ross
2dba1df37e
Revert "netbsd: take fetchcvs from buildPackages to fix eval"
This reverts commit 6dff63294a.

We have a more general fix now, so don't need this any more.
2021-04-14 21:38:23 +00:00
github-actions[bot]
eb8e023674
Merge master into staging-next 2021-04-14 18:11:01 +00:00
sternenseemann
6dff63294a netbsd: take fetchcvs from buildPackages to fix eval
For some reason fetchcvs was taken from the cross package set when
cross compiling netbsd.* instead of from buildPackages. I suspect that
this was no issue previously because it just could be substituted as it
only ever produced fixed output derivations. However since
00a2084a40 the evaluation of fetchcvs
would depend on `stdenv.cc` (via its openssh dependency). Since
netbsd.libc is required to evaluate stdenv.cc this caused a infinite
recursion when staging the cross stdenv for pkgsCross.amd64-netbsd. The
fix for this is pretty easy: Just take fetchcvs from buildPackages
explicitly instead of hoping for mkDerivation to get it right.

Resolves #119323.
2021-04-14 14:58:08 +00:00
Vladimír Čunát
d2eb7a7887
Merge branch 'staging' into staging-next
A few conflicts but relatively clear ones (I think).
2021-04-14 10:08:25 +02:00
Ninjatrappeur
be07f22e46
Merge pull request #119347 from mweinelt/wpa_supplicant 2021-04-13 20:14:25 +02:00
Martin Weinelt
4480a056c9
hostapd: add patch for CVE-2021-30004
In wpa_supplicant and hostapd 2.9, forging attacks may occur because
AlgorithmIdentifier parameters are mishandled in tls/pkcs1.c and
tls/x509v3.c.

Fixes: CVE-2021-30004
2021-04-13 19:32:22 +02:00
Tim Steinbach
b9446623dc linux/hardened/patches/5.4: 5.4.109-hardened1 -> 5.4.111-hardened1 2021-04-13 12:46:15 -04:00
Tim Steinbach
cafd9c382d linux/hardened/patches/5.11: 5.11.11-hardened1 -> 5.11.13-hardened1 2021-04-13 12:46:15 -04:00
Tim Steinbach
e52ba0e7b6 linux/hardened/patches/5.10: 5.10.27-hardened1 -> 5.10.29-hardened1 2021-04-13 12:46:15 -04:00
Tim Steinbach
517f128cc7 linux/hardened/patches/4.19: 4.19.184-hardened1 -> 4.19.186-hardened1 2021-04-13 12:46:15 -04:00
Tim Steinbach
bb6534f61c linux/hardened/patches/4.14: 4.14.228-hardened1 -> 4.14.230-hardened1 2021-04-13 12:46:15 -04:00
Tim Steinbach
5a28ce6480 linux_latest-libre: 17920 -> 17990 2021-04-13 12:46:15 -04:00
Tim Steinbach
c0a9755988 linux-rt_5_10: 5.10.25-rt35 -> 5.10.27-rt36 2021-04-13 12:46:15 -04:00