Commit graph

15805 commits

Author SHA1 Message Date
github-actions[bot] 9c688591fc
Merge master into staging-next 2021-07-19 06:01:30 +00:00
Bernardo Meurer 56a017774e
Merge pull request #130510 from lovesegfault/kernel-pass-buildPackages
buildLinux: pass buildPackages to linuxManualConfig
2021-07-18 17:14:01 -07:00
github-actions[bot] dde34afc63
Merge staging-next into staging 2021-07-19 00:02:18 +00:00
github-actions[bot] dc802b2e19
Merge master into staging-next 2021-07-19 00:01:36 +00:00
Sandro d0f62aae75
Merge pull request #130501 from SuperSandro2000/remove-noop-phases-mass
Convert phases that contain ":" to dont* = true
2021-07-18 23:46:50 +02:00
Sandro d5bd34ebf2
treewide: convert phases that contain ":" to dont* = true (#130500) 2021-07-18 23:42:48 +02:00
Maximilian Bosch fc98ebad15
Merge pull request #130577 from maxeaubrey/maxine-add-to-maintainers
pkgs: add maxeaubrey to maintainers
2021-07-18 21:52:22 +02:00
Maxine Aubrey dbf4e2980d
pkgs: add maxeaubrey to maintainers 2021-07-18 21:23:26 +02:00
TredwellGit f011a85f28 linux/hardened/patches/5.4: 5.4.130-hardened1 -> 5.4.132-hardened1 2021-07-18 15:47:33 +00:00
TredwellGit e6ed15ffc4 linux/hardened/patches/5.12: 5.12.15-hardened1 -> 5.12.17-hardened1 2021-07-18 15:47:32 +00:00
TredwellGit b724837096 linux/hardened/patches/5.10: 5.10.48-hardened1 -> 5.10.50-hardened1 2021-07-18 15:47:31 +00:00
TredwellGit 888c46fe62 linux/hardened/patches/4.19: 4.19.196-hardened1 -> 4.19.197-hardened1 2021-07-18 15:47:30 +00:00
TredwellGit 73667e11f3 linux/hardened/patches/4.14: 4.14.238-hardened1 -> 4.14.239-hardened1 2021-07-18 15:47:29 +00:00
TredwellGit 9e7fd90e15 linux-rt_5_10: 5.10.47-rt45 -> 5.10.47-rt46 2021-07-18 15:46:57 +00:00
TredwellGit 5d99998e07 linux: 5.4.130 -> 5.4.132 2021-07-18 15:46:23 +00:00
TredwellGit 677dcff2aa linux: 5.12.15 -> 5.12.17 2021-07-18 15:46:18 +00:00
TredwellGit a2259ae9a6 linux: 5.10.48 -> 5.10.50 2021-07-18 15:46:13 +00:00
TredwellGit cb978946c1 linux: 4.19.196 -> 4.19.197 2021-07-18 15:46:06 +00:00
TredwellGit e3eace9baa linux: 4.14.238 -> 4.14.239 2021-07-18 15:46:00 +00:00
github-actions[bot] 6ab169b9ca
Merge staging-next into staging 2021-07-18 06:02:58 +00:00
github-actions[bot] f2eada4ab8
Merge master into staging-next 2021-07-18 06:01:33 +00:00
Ben Siraphob 00cfd7ecd6
Merge pull request #130378 from Atemu/update/linux_lqx
linux_lqx: 5.12.14 -> 5.12.17
2021-07-18 09:54:28 +07:00
Bernardo Meurer 290aeb344f
buildLinux: pass buildPackages to linuxManualConfig
We should be using the _same_ buildPackages when we generate the
configuration (which happens in buildLinux) as when we actually build
the kernel (which happens in linuxManualConfig).

This change enforces that when we callPackage `manual-config.nix` we
pass on whatever `buildPackages` that `buildLinux` itself was called
with.
2021-07-17 18:57:35 -07:00
github-actions[bot] 08a8809bfe
Merge staging-next into staging 2021-07-18 00:02:06 +00:00
github-actions[bot] 382fdc7ad3
Merge master into staging-next 2021-07-18 00:01:24 +00:00
Felix Buehler 82cb33a0ae treewide: remove meta.version 2021-07-18 00:07:38 +02:00
Sandro Jäckel dc48d23a0f
Convert phases that contain ":" to dont* = true 2021-07-17 23:39:16 +02:00
github-actions[bot] 11332e9137
Merge staging-next into staging 2021-07-17 18:01:28 +00:00
github-actions[bot] d6b748b2b3
Merge master into staging-next 2021-07-17 18:00:56 +00:00
Jörg Thalheim c47f7739f0
Merge pull request #130416 from marsam/update-lxc
lxc: 4.0.9 -> 4.0.10
2021-07-17 14:10:27 +01:00
github-actions[bot] 732bd85cf5
Merge staging-next into staging 2021-07-17 12:01:55 +00:00
github-actions[bot] 4ee4d805d2
Merge master into staging-next 2021-07-17 12:01:22 +00:00
Domen Kožar 04e87db370
Merge pull request #130397 from TredwellGit/firmwareLinuxNonfree
firmwareLinuxNonfree: 2021-05-11 -> 2021-07-16
2021-07-17 08:13:52 +02:00
github-actions[bot] ee007cdc35
Merge master into staging-next 2021-07-17 06:01:21 +00:00
Jörg Thalheim 08846decc9 Merge remote-tracking branch 'upstream/staging-next' into HEAD 2021-07-17 07:38:25 +02:00
TredwellGit ea4358edf2 firmwareLinuxNonfree: 2021-05-11 -> 2021-07-16 2021-07-16 21:00:56 +00:00
Vladimír Čunát d7427b0d8b
xf86_input_wacom: also fix xorg-wacom.pc
I didn't notice that $(out) wouldn't get expanded there,
and that naturally caused issues for reverse dependencies.
2021-07-16 17:35:02 +02:00
Vladimír Čunát bf051e91d6
setools: fix build
I assume it broke with python 3.8 -> 3.9.
Updating would be another way, but that would require also updating some
dependencies, and I'm not a selinux person so I chose a simple patch.
2021-07-16 16:58:48 +02:00
Vladimír Čunát 6a10c72d90
xf86_input_wacom: fix build
I suspect that some of the stdenv changes (PR #127736 maybe?)
affected how the newline was handled.  Anyway, it was ugly,
so let's use a more standard approach.
2021-07-16 16:31:48 +02:00
github-actions[bot] 9fe75f18c0
Merge master into staging-next 2021-07-16 12:01:03 +00:00
Jörg Thalheim aaaa05c78e
Merge pull request #130117 from helsinki-systems/feat/hyperv-daemons-python3
hyperv-daemons: use python3 for kernels that support it
2021-07-16 10:14:56 +01:00
Vladimír Čunát 3ea417e47f
Merge branch staging into staging-next
The staging version is a bit older already, used in pre-test:
https://hydra.nixos.org/eval/1685435
2021-07-16 09:59:01 +02:00
github-actions[bot] e69bb567a4
Merge staging-next into staging 2021-07-16 06:01:38 +00:00
github-actions[bot] 7959589ea0
Merge master into staging-next 2021-07-16 06:01:04 +00:00
Bernardo Meurer 91ffffd904
Merge pull request #129806 from lovesegfault/kernel-extra-build-flags
linux: groundwork to enable LLVM/LTO builds
2021-07-15 22:14:59 -07:00
Mario Rodas f3d55bc29e lxc: 4.0.9 -> 4.0.10 2021-07-16 04:20:00 +00:00
Mario Rodas 7f120cddae lxcfs: 4.0.8 -> 4.0.9 2021-07-16 04:20:00 +00:00
Atemu 85f28b5c4f linux_lqx: 5.12.14 -> 5.12.17 2021-07-15 20:15:25 +02:00
github-actions[bot] 2165de1758
Merge staging-next into staging 2021-07-15 18:02:07 +00:00
github-actions[bot] 2ccf7ae45c
Merge master into staging-next 2021-07-15 18:01:27 +00:00
Sandro 0a14335919
Merge pull request #130281 from TredwellGit/linux 2021-07-15 19:22:07 +02:00
Sandro 9ebf03320d
Merge pull request #129818 from ck3d/mii-tool 2021-07-15 18:26:46 +02:00
TredwellGit 26af402042 linux_latest-libre: 18132 -> 18165 2021-07-15 08:16:06 +00:00
TredwellGit 2913c53891 linux-rt_5_4: 5.4.123-rt59 -> 5.4.129-rt61 2021-07-15 08:16:06 +00:00
TredwellGit d2f67b4efb linux: 5.13.1 -> 5.13.2 2021-07-15 08:16:06 +00:00
TredwellGit aa445dcd9a linux: 4.9.274 -> 4.9.275 2021-07-15 08:16:06 +00:00
TredwellGit 0637e4c7c6 linux: 4.4.274 -> 4.4.275 2021-07-15 08:16:06 +00:00
Guillaume Girol 9d4a4d7c62
Merge pull request #127918 from misuzu/linux-lirc
linux: enable LIRC
2021-07-14 18:44:18 +00:00
github-actions[bot] 6630d8e9bb
Merge staging-next into staging 2021-07-14 18:01:45 +00:00
misuzu 3f63c29812 linux: enable LIRC 2021-07-14 18:20:22 +03:00
Jörg Thalheim 7afa51c2bd Merge remote-tracking branch 'upstream/master' into HEAD 2021-07-14 15:45:51 +02:00
Abdelhakim Qbaich e1e1f539f0 nvidia-x11: compile nvidia-uvm.ko with HMM support 2021-07-14 00:24:54 -07:00
Bernardo Meurer e21183a95d
buildLinux: preserve structuredExtraConfig and extraMakeFlags in passthru
This allows users to override custom kernel packages (e.g. linux_xanmod)
that set their own structuredExtraConfig with ease.
2021-07-13 18:35:39 -07:00
Sandro Jäckel 388a4ef423
treewide: convert all links git.archlinux.org to github.com/archlinux/svntogit-* 2021-07-14 03:35:21 +02:00
ajs124 698bf970e1 hyperv-daemons: use python3 for kernels that support it
Support for python3 was added in 8a99c92009
it is therefore supported in every kernel including and after 4.19
2021-07-13 19:34:57 +02:00
Timo Kaufmann c29191d61b
Merge pull request #121881 from berbiche/kinect-audio-setup-init
kinect-audio-setup: init at 0.5
2021-07-12 22:36:03 +02:00
Bernardo Meurer ea167e8ccb
buildLinux: take and propagate extraMakeFlags
This is just for practicity, as it allows users of buildLinux to pass
along extra flags they need in the kernel's make invocation. This makes,
for example, supporting LLVM _much_ easier, and could enable us in the
future to provide clang-built kernels.
2021-07-12 10:39:52 -07:00
Bernardo Meurer 89deec5623
buildLinux: apply hostPlatform.linux-kernel.makeFlags to generate-config.pl
This enforces that the configuration generated will obey any/all flags
set in the platform/stdenv configuration. This is crucial, for example,
if you'd like to build a kernel using clang.

Without this patch, anything you set in
`stdenv.hostPlatform.linux-kernel.makeFlags` is wholly ignored during
config generation, causing (for example) any changes in the desired
toolchain (e.g. `LLVM`, `LLVM_IAS`) to not be reflected in the generated
config, and for the subsequent build to fail.
2021-07-12 10:39:51 -07:00
Bernardo Meurer 61ab7e84de
linuxManualConfig: patch all shebangs in scripts/
There are many scripts in `scripts/` which may be called by the build,
depending on how the user chooses to configure the kernel. For example,
`scripts/jobserver-exec` is called whenever the kernel is being built
with LLVM tooling, and without this patch that build will fail due to
the broken shebang.

This patch makes us fix _all_ scripts, as well as add a dependency on
python3Minimal, since a lot of the aforementioned scripts are written in
Python3 instead of shell.
2021-07-12 10:39:51 -07:00
Nicolas Berbiche 100a01c272
kinect-audio-setup: init at v0.5
Co-authored-by: timokau <timokau@zoho.com>
2021-07-12 13:00:42 -04:00
github-actions[bot] fccc3b83d0
Merge staging-next into staging 2021-07-12 06:01:59 +00:00
github-actions[bot] 5efb7d8d19
Merge master into staging-next 2021-07-12 06:01:25 +00:00
Bernardo Meurer fae510fe05
Merge pull request #129879 from lovesegfault/kernel-fix-build-id
linuxManualConfig: don't mangle `--build-id`
2021-07-11 19:10:30 -07:00
github-actions[bot] babb761ac6
Merge staging-next into staging 2021-07-11 18:01:59 +00:00
John Ericson c2ba734993
Merge pull request #129809 from Ericson2314/bsd-rsync
netbsd: Use rsync to speed up source merging
2021-07-11 11:06:22 -04:00
Martin Weinelt bcda9c8cfc Merge remote-tracking branch 'origin/master' into staging-next 2021-07-11 16:11:09 +02:00
github-actions[bot] 606194e1c0
Merge staging-next into staging 2021-07-11 00:02:23 +00:00
John Ericson 75db7f8eb0 netbsd: Use rsync to speed up source merging
The find -exec that was there before is quite slow on my machine. This
is much faster.
2021-07-10 21:20:29 +00:00
Maxine Aubrey 66618844e3
bluez: 5.59 -> 5.60 2021-07-10 22:21:26 +02:00
Bernardo Meurer 31bb7be11a
linuxManualConfig: don't mangle --build-id
In order to have our linux builds be reproducible we patch the
`Makefile` to use `--build-id=none` as opposed to the default
`--build-id=sha1`. The way we've been doing this, however, caused the
flag to be mangled, and being set to `--build-id=none=sha1`. While bfd
seems to parse this normally, lld will loudly complain that the flag
does not exist:

```
linux>   LD      .tmp_vmlinux.kallsyms1
linux> ld.lld: error: unknown --build-id style: none=sha1
```

With this change the flag is now correctly set to `--build-id=none`.
2021-07-10 13:17:52 -07:00
Martin Weinelt 9488ed9685
Merge pull request #127183 from mweinelt/bluez 2021-07-10 21:43:42 +02:00
Martin Weinelt b7e408dd17
Merge branch 'master' into staging-next 2021-07-10 20:15:53 +02:00
Markus Kowalewski 4d881f9149
linuxptp: 3.1 -> 3.1.1
fixes CVEs 2021-3570 and 2021-3571
2021-07-10 13:04:27 +02:00
Christian Kögler 370a25c0ee nettools: Add mii-tool 2021-07-10 12:38:19 +02:00
github-actions[bot] a7cb61bc54
Merge staging-next into staging 2021-07-09 18:01:46 +00:00
github-actions[bot] c786eaf612
Merge master into staging-next 2021-07-09 18:01:06 +00:00
Sandro df0d321258
Merge pull request #123765 from hyperfekt/update-bcachefs 2021-07-09 16:30:43 +02:00
github-actions[bot] e8bfeeb928
Merge staging-next into staging 2021-07-09 12:01:58 +00:00
github-actions[bot] 30ff0457a4
Merge master into staging-next 2021-07-09 12:01:24 +00:00
hyperfekt 12cee96e74 bcachefs-tools: 2020-11-17 -> 2021-07-08 2021-07-09 02:50:37 +02:00
hyperfekt cb1b1cf9c6 linux_testing_bcachefs: 5.9.0-2020.11.20 -> 5.13-2021-07-08
Changes the package to apply a patchset to the appropriate minor kernel
instead of using its initial release, which means it will benefit from
revision updates.
2021-07-09 02:45:34 +02:00
TredwellGit 43fba78fec linux/hardened/patches/5.4: 5.4.129-hardened1 -> 5.4.130-hardened1 2021-07-08 23:09:31 +00:00
TredwellGit 9af983cd00 linux/hardened/patches/5.12: 5.12.14-hardened1 -> 5.12.15-hardened1 2021-07-08 23:09:30 +00:00
TredwellGit b36d829bb1 linux/hardened/patches/5.10: 5.10.47-hardened1 -> 5.10.48-hardened1 2021-07-08 23:09:29 +00:00
TredwellGit 25b73ac6a2 linux-rt_5_10: 5.10.41-rt42 -> 5.10.47-rt45 2021-07-08 23:08:56 +00:00
TredwellGit 32235d4868 linux: 5.4.129 -> 5.4.130 2021-07-08 23:08:16 +00:00
TredwellGit ea4cb23952 linux: 5.13 -> 5.13.1 2021-07-08 23:08:10 +00:00
TredwellGit e0f9f09c17 linux: 5.12.14 -> 5.12.15 2021-07-08 23:08:03 +00:00
TredwellGit 9462b074a8 linux: 5.10.47 -> 5.10.48 2021-07-08 23:07:58 +00:00
github-actions[bot] 45ea39aeca
Merge staging-next into staging 2021-07-08 12:02:00 +00:00