Alyssa Ross
16fb150e03
Merge remote-tracking branch 'nixpkgs/master' into staging-next
...
Conflicts:
pkgs/development/libraries/libunwind/default.nix
2021-12-07 23:56:16 +00:00
Martin Weinelt
96f5b351b2
iw: 5.9 -> 5.16
2021-12-07 11:30:47 +01:00
github-actions[bot]
41895efeb5
Merge master into staging-next
2021-12-06 12:01:16 +00:00
Jörg Thalheim
c7fa870f5a
Merge pull request #148535 from martinetd/bpf
...
bpf update: bcc remove linux kernel dep + devendor libbpf again, bpftrace 0.13.0 -> 0.14.0 + remove kernel dep, pahole 1.20 -> 1.22 + remove submodule, libbpf revert 0.6.0 -> 0.5.0 (unusable)
2021-12-06 08:33:14 +00:00
Jonathan Ringer
5263fb820e
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/development/python-modules/django-rq/default.nix
pkgs/top-level/all-packages.nix
2021-12-05 22:02:00 -08:00
Dominique Martinet
fa857bb435
bpftrace: fix build with libbpf 0.6.0
...
libbpf 0.6.0 relies on typeof in bpf/btf.h to pick the right version of
btf_dump__new() but that's not valid c++.
see https://github.com/iovisor/bpftrace/issues/2068
2021-12-06 07:15:56 +09:00
markuskowa
a1ca92a931
Merge pull request #147960 from hjones2199/pps-up
...
pps-tools: 1.0.2 -> 1.0.3
2021-12-05 20:50:13 +01:00
Jörg Thalheim
423aff986c
Merge remote-tracking branch 'upstream/master' into HEAD
2021-12-05 19:41:20 +01:00
Christian Kögler
7980f52d0c
yabai: 3.3.4 -> 3.3.10
2021-12-05 19:15:43 +01:00
Jörg Thalheim
3f47d85f94
Merge pull request #148702 from Stunkymonkey/treewide-pname-version-3
...
treewide: use pname&version instead of name
2021-12-05 17:27:34 +00:00
Ryan Mulligan
542e917e99
Merge pull request #148061 from astro/drbd_upstream
...
drbd: update, fix, add test
2021-12-05 09:10:22 -08:00
Felix Buehler
8d0267dc8f
treewide: use pname&version instead of name
2021-12-05 15:38:17 +01:00
github-actions[bot]
89378919a6
Merge master into staging-next
2021-12-05 12:01:19 +00:00
Fabian Affolter
94722b8c03
Merge pull request #148648 from fabaff/bump-cpuid
...
cpuid: 20211114 -> 20211129
2021-12-05 09:51:49 +01:00
Sandro
c083769088
Merge pull request #147606 from kshlm/udisks-2.9.4
2021-12-05 07:44:12 +01:00
github-actions[bot]
5a1288f93b
Merge master into staging-next
2021-12-05 00:01:53 +00:00
Fabian Affolter
62b03e2c39
cpuid: 20211114 -> 20211129
2021-12-05 00:23:39 +01:00
Sergei Trofimovich
134db1c397
sysdig: fix pending upstream inclusion for ncurses-6.3
...
Without the change the build fails as:
sysdig/userspace/sinspui/cursescomponents.cpp: In member function 'void curses_textbox::print_no_data()':
sysdig/userspace/sinspui/cursescomponents.cpp:878:15: error: format not a string literal and no format arguments [-Werror=format-security]
878 | wstr.c_str());
| ^
2021-12-04 19:34:21 +00:00
github-actions[bot]
d4c54e7f61
Merge master into staging-next
2021-12-04 18:01:05 +00:00
Jörg Thalheim
668e376180
Merge pull request #148584 from Mic92/sgx-sdk-improve-drv
...
sgx-sdk: improve derivation
2021-12-04 13:30:05 +00:00
Jörg Thalheim
dd2001942d
sgx-sdk: enable parallel building
2021-12-04 14:29:03 +01:00
Vincent Haupert
8a713779ee
sgx-sdk: remove superfluous ncurses
input
2021-12-04 14:09:20 +01:00
Dominique Martinet
559fe43665
nixos/tests: add bpf test
...
test bcc and bpftrace briefly
2021-12-04 21:12:07 +09:00
Dominique Martinet
2318433b73
bcc: remove submodule
...
reverting libbpf back to 0.5.0 fixes bcc compilation with our libbpf
This also shows this was a libbpf bug rather than a bcc problem...
2021-12-04 21:12:07 +09:00
Dominique Martinet
78a4ea51e4
libbpf: install linux/btf.h
...
This installs the linux/btf.h header in libbpf, which is necessarily
compatible with bpf/btf.h
Note that we also ship the linux header's linux/btf.h with glibc,
but explicit buildInputs should have priority over default headers so
hopefully this one will always be used.
2021-12-04 21:12:07 +09:00
Dominique Martinet
292cea9418
bpftrace: 0.13.0 -> 0.14.0
2021-12-04 21:12:07 +09:00
Dominique Martinet
eb774dd039
bpftrace: move from linux kernel packages to normal package
...
bpftrace doesn't actually need to be a kernel package anymore.
It used to require path to kernel sources, but we build our kernels
with IKHEADER and BTF so the currently running configuration can always
be found automatically without any patch
2021-12-04 21:07:10 +09:00
Dominique Martinet
efe6967e93
bcc: move from linux-kernels packages to normal packages
...
bcc doesn't really need kernel itself, it just cares about module path.
It's actually better to use /run/booted-system/kernel-modules/lib/modules
for two reasons:
- no need to rebuild bcc for each new kernel
- can use a newer bcc with a booted kernel that doesn't match the current
system
2021-12-04 21:07:09 +09:00
github-actions[bot]
a3ef129c42
Merge master into staging-next
2021-12-04 12:01:10 +00:00
Guillaume Girol
abab86e212
Merge pull request #147691 from hmenke/sof-firmware
...
sof-firmware: 1.9 -> 1.9.2
2021-12-04 09:52:39 +00:00
github-actions[bot]
c6934c5adf
Merge master into staging-next
2021-12-04 06:01:19 +00:00
github-actions[bot]
67691cf506
Merge master into staging-next
2021-12-04 00:01:30 +00:00
Jonathan Ringer
4034242a8a
amdgpu-pro: fix homepage
2021-12-03 11:21:23 -08:00
Jan Tojnar
f0faf7cf3f
fwupd: 1.7.1 → 1.7.2 ( #147032 )
2021-12-03 20:59:15 +02:00
github-actions[bot]
904ed45698
Merge master into staging-next
2021-12-03 18:01:12 +00:00
Thiago Kenji Okada
22c80fdf53
Merge pull request #148045 from arkivm/fix-mxu
...
mxu11x0: 1.4 -> 4.1
2021-12-03 10:34:40 -03:00
github-actions[bot]
503c981111
Merge master into staging-next
2021-12-03 12:01:25 +00:00
Jörg Thalheim
fa4f5b9332
Merge pull request #147849 from Mic92/zen
...
linux_zen: 5.15.3-zen1 -> 5.15.5-zen1
2021-12-03 09:19:13 +00:00
Kaushal M
5750281892
udisks2 - 2.8.4 -> 2.9.4
...
Update to a version that supports the ntfs3 kernel module.
2021-12-03 07:52:42 +05:30
Jonathan Ringer
2e6fadac4e
Merge remote-tracking branch 'origin/staging-next' into staging
...
Conflicts:
pkgs/development/python-modules/django-rq/default.nix
2021-12-02 16:07:50 -08:00
github-actions[bot]
987163192b
Merge master into staging-next
2021-12-03 00:01:31 +00:00
Sandro
0d03c4318b
Merge pull request #147771 from nixinator/xsos-init
2021-12-02 23:36:09 +01:00
github-actions[bot]
61ce96a63a
Merge staging-next into staging
2021-12-02 18:01:48 +00:00
github-actions[bot]
bcc4d12e17
Merge master into staging-next
2021-12-02 18:01:11 +00:00
nixinator
18bab16610
xsos:init at 0.7.19
2021-12-02 17:09:07 +00:00
Jörg Thalheim
72e8045ebc
Merge pull request #146993 from ElXreno/ell_iwd
...
ell: 0.45 -> 0.46; iwd: 1.19 -> 1.20
2021-12-02 16:28:29 +00:00
Sascha Grunert
089fdb8dfa
libbpf: 0.5.0 -> 0.6.0
...
Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
2021-12-02 09:28:23 +01:00
github-actions[bot]
b58b9075cd
Merge staging-next into staging
2021-12-01 00:02:28 +00:00
github-actions[bot]
80fce0f4a7
Merge master into staging-next
2021-12-01 00:01:49 +00:00
Ryan Mulligan
036b909421
drbd: 8.4.4 -> 9.19.1, ocf-resource-agents: init at 4.10.0
2021-11-30 21:43:42 +01:00