1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 18:12:46 +00:00
Commit graph

16670 commits

Author SHA1 Message Date
github-actions[bot] 9a27efeb34
Merge master into staging-next 2021-10-26 18:01:19 +00:00
Michael Swan 0ebf090e30 checksec: 2.4.0 -> 2.5.0 2021-10-26 09:34:37 +00:00
Martin Weinelt a47e0a6554 Merge remote-tracking branch 'origin/master' into staging-next 2021-10-25 21:03:48 +02:00
Sascha Grunert 4dde9c38a4
libbpf: 0.4.0 -> 0.5.0
Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
2021-10-25 12:12:59 +02:00
github-actions[bot] 6d5b2c70e0
Merge master into staging-next 2021-10-24 00:01:46 +00:00
Michal Sojka 393fc1f7ee kernelshark: 1.2 -> 2.0.2
Relevant upstream changes:

- Sources were moved from trace-cmd repository to a new repository.
- Makefile for building documentation is broken. Therefore, we don't
  build documentation. After upstream fixes it, we can build it again.
2021-10-23 22:19:10 +02:00
Michal Sojka 3d249d1d49 trace-cmd: 2.9.1 -> 2.9.5
Besides updating trace-cmd, this commit also switches from bundled
libtraceevent and libtracefs to their external sources. Upstream
copied those libraries to separate repositories (see
https://lore.kernel.org/linux-trace-devel/20210325172357.6e059c31@gandalf.local.home/).

Another change relates to documentation building, which upstream
reworked. We disable HTML documentation - previous versions did not
provide it too.

Finally, we enable parallel build, which is simpler if `buildPhase` is
not overridden.
2021-10-23 22:12:46 +02:00
Michal Sojka b068cd2e14 libtracefs: init at 1.2.5
This library is needed for recent versions of kernelshark.
2021-10-23 22:12:45 +02:00
Michal Sojka 12aa203193 libtraceevent: init at 1.4.0
This library is needed for recent versions of kernelshark.
2021-10-23 22:12:45 +02:00
Jonathan Ringer fc25d94010
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/jupyter-client/default.nix
	pkgs/development/python-modules/jupyterlab-git/default.nix
2021-10-22 09:33:07 -07:00
Sandro 367536a15c
Merge pull request #142511 from arcnmx/linux515rc 2021-10-22 15:13:09 +02:00
Mario Rodas c7a997f6e8
Merge pull request #142284 from marsam/update-lxc
lxc: 4.0.10 -> 4.0.11
2021-10-22 00:09:28 -05:00
arcnmx 146c830cff linux_testing: 5.13-rc6 -> 5.15-rc6 2021-10-21 12:29:09 -07:00
Sandro c52f72d97d
Merge pull request #142489 from lovesegfault/linux_xanmod-5.14.14-2 2021-10-21 20:23:03 +02:00
Samuel Dionne-Riel 16a55a22a5
Merge pull request #142015 from jkarlson/simplefb
linux: FB_SIMPLE
2021-10-21 13:47:49 -04:00
Bernardo Meurer 617d94d7da
linuxKernel.kernels.linux_xanmod: 5.14.14-1 -> 5.14.14-2 2021-10-21 10:20:05 -07:00
Sergei Trofimovich 92b0e34180
cramfsswap: fix parallel build failure (#142478)
Co-authored-by: Artturi <Artturin@artturin.com>
2021-10-21 20:19:09 +03:00
Sandro 0b005ad403
Merge pull request #141737 from michaeladler/zen-kernels 2021-10-21 11:17:02 +02:00
Sandro cf531718d8
Merge pull request #142381 from trofi/sequential-dmraid 2021-10-21 11:06:32 +02:00
Michael Adler f7297104ec linux_zen: 5.14.8-zen1 -> 5.14.14-zen1 2021-10-21 08:39:55 +02:00
Michael Adler 43b4591bbd linux_lqx: 5.14.11 -> 5.14.14 2021-10-21 08:36:26 +02:00
github-actions[bot] 54a42ab846
Merge master into staging-next 2021-10-21 06:01:21 +00:00
Jörg Thalheim 3897b34444
Merge pull request #142399 from Mic92/bcache-revert
Revert "linux_testing_bcachefs: upstream tarballs rather patchsets"
2021-10-21 06:59:10 +01:00
Bernardo Meurer 362ff9452e
Merge pull request #142436 from NixOS/linux_xanmod-5.14.14
linuxKernel.kernels.linux_xanmod: 5.14.12 -> 5.14.14
2021-10-20 18:52:53 -07:00
Peter Hoeg cdf77fdf20 i2c-tools: 4.2 -> 4.3 2021-10-21 09:09:55 +08:00
Bernardo Meurer 0530b5e15f
linuxKernel.kernels.linux_xanmod: 5.14.12 -> 5.14.14 2021-10-20 17:57:23 -07:00
github-actions[bot] 872437b0f0
Merge master into staging-next 2021-10-21 00:01:47 +00:00
Maximilian Bosch bb5aa0109b
linux: build hardened kernel with matching releases
Until now we merged kernel updates even if no hardened versions were
available yet. On one hand we don't want to delay patch-level updates,
on the other hand users of hardened kernels have frequent breakage now[1].

This change aims to provide a solution this issue:

* The hardened patchset now references the kernel version it's released
  for (including a sha256 hash for the fixed-output path of the source
  tarball).
* The `hardenedKernelFor`-function doesn't just append hardened patches
  now, but also overrides version & src to match the kernel version the
  patch was built & tested for.

Refs #140281

[1] https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.linuxPackages_hardened.kernel.x86_64-linux/all
2021-10-20 23:51:52 +02:00
Maximilian Bosch 65930caffe
linux: create maintainer team
Now there are a few more folks who should get pinged on kernel changes:

    $ nix-instantiate -E 'with import ./. {}; (map (x: x.github) linux.meta.maintainers)' --eval  --strict
    [ "TredwellGit" "mweinelt" "ma27" "nequissimus" "alyssais" "thoughtpolice" ]

Refs #140281
2021-10-20 23:49:33 +02:00
Jörg Thalheim 161d1b7f6e Revert "linux_testing_bcachefs: upstream tarballs rather patchsets"
This reverts commit 98ae18fa62.

Appearantly the consens is that a broken kernel is preferred over a
working one that is based on an outdated kernel:

98ae18fa62
2021-10-20 21:05:36 +02:00
Sergei Trofimovich dc05610fd4 dmraid: explicitly disable parallel building 2021-10-20 16:34:45 +01:00
github-actions[bot] cdc8393c04
Merge master into staging-next 2021-10-20 12:01:31 +00:00
TredwellGit 75dbbe37be linux/hardened/patches/5.4: 5.4.152-hardened1 -> 5.4.154-hardened1 2021-10-20 11:40:40 +00:00
TredwellGit cf9f5f74dd linux/hardened/patches/5.14: 5.14.11-hardened1 -> 5.14.13-hardened1 2021-10-20 11:40:39 +00:00
TredwellGit e94db0f89c linux/hardened/patches/5.10: 5.10.72-hardened1 -> 5.10.74-hardened1 2021-10-20 11:40:38 +00:00
TredwellGit a33fc5384b linux/hardened/patches/4.19: 4.19.210-hardened1 -> 4.19.212-hardened1 2021-10-20 11:40:37 +00:00
TredwellGit cf0d47c505 linux/hardened/patches/4.14: 4.14.250-hardened1 -> 4.14.251-hardened1 2021-10-20 11:40:36 +00:00
TredwellGit 25ef63bb78 linux: 5.4.154 -> 5.4.155 2021-10-20 11:40:01 +00:00
TredwellGit a96f1a866a linux: 5.14.13 -> 5.14.14 2021-10-20 11:39:55 +00:00
TredwellGit a3edfb9ee5 linux: 5.10.74 -> 5.10.75 2021-10-20 11:39:50 +00:00
TredwellGit e4f4df78fa linux: 4.19.212 -> 4.19.213 2021-10-20 11:39:33 +00:00
TredwellGit c4d7df2b7b linux: 4.14.251 -> 4.14.252 2021-10-20 11:39:09 +00:00
Sandro 8018eea2df
Merge pull request #142242 from ju1m/nmon 2021-10-20 13:22:04 +02:00
Emil Karlson 2ef28fb77d linux: do not build in DRM_SIMPLEDRM on newer kernels
After linux 5.14.11 FB_SIMPLE conflicts with DRM_SIMPLEDRM, which
will fail configuration, when DRM_SIMPLEDRM is configured as a module
and FB_SIMPLE gets requested as builtin.

Do not enable DRM_SIMPLEDRM as a temporary workaround, until good
enough migration path is found.
2021-10-20 13:11:28 +03:00
Mario Rodas e9db89f88d lxc: 4.0.10 -> 4.0.11 2021-10-19 21:19:32 -05:00
Julien Moutinho 85a18cf3fe nmon: fix cross-compiling 2021-10-19 21:13:48 +02:00
Vladimír Čunát 01df3cd7dd
Merge branch 'master' into staging-next 2021-10-19 19:24:43 +02:00
Maximilian Bosch 05344c4785
Merge pull request #142000 from LibreCybernetics/update-linux
Kernels 2021-10-17
2021-10-18 22:58:46 +02:00
github-actions[bot] 8863d12326
Merge master into staging-next 2021-10-18 12:01:18 +00:00
Jörg Thalheim 54bf57aa1b zfs: add docs why we strip symbols manual 2021-10-18 09:49:40 +02:00