Commit Graph

16027 Commits

Author SHA1 Message Date
Alyssa Ross
c9a581b05f
Merge remote-tracking branch 'nixpkgs/master' into staging-next
CONFLICT (rename/add): Rename pkgs/development/python-modules/jsonwatch/default.nix->pkgs/tools/misc/jsonwatch/default.nix in nixpkgs/master.  Added pkgs/tools/misc/jsonwatch/default.nix in HEAD
2021-12-09 01:43:58 +00:00
Jörg Thalheim
34ded15d49
Merge pull request #149258 from r-ryantm/auto-update/intel-cmt-cat
intel-cmt-cat: 4.2.0 -> 4.3.0
2021-12-08 18:13:56 +00:00
Bernardo Meurer
3e66b36dbe
Merge pull request #149611 from lovesegfault/linux_xanmod-5.15.6
linux_xanmod: 5.15.4 -> 5.15.6
2021-12-08 08:00:32 -08:00
Ryan Mulligan
e8719df5e0
Merge pull request #149616 from r-ryantm/auto-update/psftools
psftools: 1.1.0 -> 1.1.1
2021-12-08 06:44:58 -08:00
Ryan Mulligan
ac7824ff8e
Merge pull request #149522 from r-ryantm/auto-update/powercap
powercap: 0.3.1 -> 0.4.0
2021-12-08 06:44:26 -08:00
Ryan Mulligan
38839202f0
Merge pull request #149075 from r-ryantm/auto-update/system76-power
linuxKernel.packages.linux_5_15.system76-power: 1.1.18 -> 1.1.20
2021-12-08 06:40:08 -08:00
R. Ryantm
3546aec12c psftools: 1.1.0 -> 1.1.1 2021-12-08 13:02:25 +00:00
Bernardo Meurer
19945f7be5
linux_xanmod: 5.15.4 -> 5.15.6 2021-12-08 12:07:43 +00:00
github-actions[bot]
8c220e0dcb
Merge master into staging-next 2021-12-08 06:01:30 +00:00
R. Ryantm
5e1ce628fd powercap: 0.3.1 -> 0.4.0 2021-12-08 05:09:09 +00:00
TredwellGit
04bbfd1b88 linux_5_14: remove
https://lwn.net/ml/linux-kernel/1637500331152110@kroah.com/
https://github.com/openzfs/zfs/issues/12786
2021-12-08 00:15:07 +00:00
TredwellGit
a93b636340 linux/hardened/patches/5.4: 5.4.160-hardened1 -> 5.4.163-hardened1 2021-12-08 00:15:07 +00:00
TredwellGit
a4a70dcab4 linux/hardened/patches/5.15: 5.15.3-hardened1 -> 5.15.6-hardened1 2021-12-08 00:15:07 +00:00
TredwellGit
55969e856c linux/hardened/patches/5.10: 5.10.80-hardened1 -> 5.10.83-hardened1 2021-12-08 00:15:07 +00:00
TredwellGit
cfd35502f6 linux/hardened/patches/4.19: 4.19.217-hardened1 -> 4.19.219-hardened1 2021-12-08 00:15:07 +00:00
TredwellGit
d2bfac4ff9 linux/hardened/patches/4.14: 4.14.255-hardened1 -> 4.14.256-hardened1 2021-12-08 00:15:07 +00:00
TredwellGit
b4a903e20d linux-rt_5_4: 5.4.154-rt65 -> 5.4.161-rt66 2021-12-08 00:15:07 +00:00
TredwellGit
962956db96 linux-rt_5_10: 5.10.78-rt55 -> 5.10.78-rt56 2021-12-08 00:15:07 +00:00
TredwellGit
8a260ea0f3 linux: 5.4.161 -> 5.4.163 2021-12-08 00:15:07 +00:00
TredwellGit
cd32471748 linux: 5.15.4 -> 5.15.6 2021-12-08 00:15:07 +00:00
TredwellGit
342e0a3df9 linux: 5.10.81 -> 5.10.83 2021-12-08 00:15:07 +00:00
TredwellGit
9fc610cf3f linux: 4.9.290 -> 4.9.291 2021-12-08 00:15:07 +00:00
TredwellGit
cc06653c46 linux: 4.4.292 -> 4.4.293 2021-12-08 00:15:07 +00:00
TredwellGit
0868920a42 linux: 4.19.217 -> 4.19.219 2021-12-08 00:15:07 +00:00
TredwellGit
f4f1bfd261 linux: 4.14.255 -> 4.14.256 2021-12-08 00:15:07 +00:00
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
R. Ryantm
0ec9da1784 intel-cmt-cat: 4.2.0 -> 4.3.0 2021-12-07 05:47:04 +00:00
R. Ryantm
e2fcc2e69c linuxKernel.packages.linux_5_15.system76-power: 1.1.18 -> 1.1.20 2021-12-06 17:21:02 +00: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
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