Commit graph

14877 commits

Author SHA1 Message Date
github-actions[bot] 799ebbc91d
Merge master into staging-next 2021-04-21 18:13:29 +00: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] 9b3e698b14
Merge master into staging-next 2021-04-21 12:06:23 +00: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] 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] 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
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
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
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
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] 9e804db1da
Merge master into staging-next 2021-04-18 12:06:01 +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
Atemu 0036ccebc2 zen-kernels: 5.11.14 -> 5.11.15 2021-04-17 20:45:33 +02: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
fortuneteller2k 5476e46eb6 linux_xanmod: 5.11.14 -> 5.11.15 2021-04-17 02:09:01 +08: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
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
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