3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

5321 commits

Author SHA1 Message Date
TredwellGit ac29586638 linux/hardened/patches/5.14: 5.14.14-hardened1 -> 5.14.16-hardened1 2021-11-05 17:26:10 +00:00
TredwellGit 0b37e93d6b linux/hardened/patches/5.10: 5.10.75-hardened1 -> 5.10.77-hardened1 2021-11-05 17:26:02 +00:00
TredwellGit d4efdd46c7 linux/hardened/patches/4.19: 4.19.213-hardened1 -> 4.19.215-hardened1 2021-11-05 17:25:53 +00:00
TredwellGit 6cbce22479 linux/hardened/patches/4.14: 4.14.252-hardened1 -> 4.14.254-hardened1 2021-11-05 17:25:45 +00:00
TredwellGit 962be21e1d linux_latest-libre: 18413 -> 18452 2021-11-05 17:25:22 +00:00
TredwellGit a2dd7acdd8 linux: 5.4.156 -> 5.4.157 2021-11-05 17:24:59 +00:00
TredwellGit 104950bafd linux: 5.14.15 -> 5.14.16 2021-11-05 17:24:53 +00:00
TredwellGit 4deb3cf76a linux: 5.10.76 -> 5.10.77 2021-11-05 17:24:45 +00:00
TredwellGit 5cab1474d9 linux: 4.9.288 -> 4.9.289 2021-11-05 17:24:37 +00:00
TredwellGit 6292af0d46 linux: 4.4.290 -> 4.4.291 2021-11-05 17:24:31 +00:00
TredwellGit c1f9eef4bc linux: 4.19.214 -> 4.19.215 2021-11-05 17:24:25 +00:00
TredwellGit 6ad7cc4323 linux: 4.14.253 -> 4.14.254 2021-11-05 17:24:19 +00:00
Bernardo Meurer 6d89239857
linuxKernel.kernels.linux_xanmod: 5.14.15 -> 5.14.16 2021-11-04 09:49:03 -07:00
Jörg Thalheim 5406db45f2
Merge pull request #143657 from Mic92/zen
linux_zen: 5.14.14-zen1 -> 5.14.15-zen1
2021-11-04 15:57:28 +00:00
Sandro Jäckel 8547db919a
treewide: switch `builtins.fromJSON(builtins.readFile ./file.json)` to lib.importJSON ./file.json 2021-11-03 14:43:52 +01:00
Vladimír Čunát f62cbdfcdb
Merge #143252: linux: include Cherryview pinctrl driver 2021-11-02 14:07:38 +01:00
github-actions[bot] bd0051cd54
Merge master into staging-next 2021-11-01 18:01:02 +00:00
Maximilian Bosch 64ccb795db
Merge pull request #143234 from Ma27/ofborg-kernel-pings
linux: make sure that src/version actually refer to the declaring file
2021-11-01 14:13:46 +01:00
github-actions[bot] cc41bb5851
Merge master into staging-next 2021-11-01 12:01:00 +00:00
Maximilian Bosch 63185299f4
linux: make sure that src/version actually refer to the declaring file
With this change it's ensured that `builtins.unsafeGetAttrPos` actually
points to `<nixpkgs/pkgs/os-specific/linux/kernel/linux-x.y.nix>` when
retrieving the position of `src` or `version` of
`linuxPackages.kernel`.

This is relevant to make sure that ofborg pinging maintainers on kernel updates
actually works[1]. While the underlying issue should be fixed in ofborg
or Nix itself, this is IMHO a pragmatic change to ensure that all kernel
maintainers are automatically notified on updates.

[1] https://github.com/NixOS/nixpkgs/pull/143113#issuecomment-953319957
2021-11-01 10:06:00 +01:00
Dominik Xaver Hörl 9d91ebe17e linux: init 5.15 2021-11-01 08:34:59 +01:00
github-actions[bot] 81d84138b5
Merge master into staging-next 2021-10-31 00:01:33 +00:00
Jörg Thalheim 3b1921413d linux_zen: 5.14.14-zen1 -> 5.14.15-zen1 2021-10-29 15:18:52 +02:00
Justin Sleep 64ae396829 linux: build in Cherryview pinctrl driver
This allows integrated keyboards on Braswell and Cherryview devices to function properly.
2021-10-28 11:53:14 -05:00
Bernardo Meurer 3bd2ecaf33
linuxKernel.kernels.linux_xanmod: 5.14.14-2 -> 5.14.15-1 2021-10-27 18:42:18 -07:00
github-actions[bot] 22401dcc39
Merge master into staging-next 2021-10-27 18:01:02 +00:00
TredwellGit 748cc60427 linux_latest-libre: 18380 -> 18413 2021-10-27 09:53:28 +00:00
TredwellGit 55af4f5da2 linux-rt_5_4: 5.4.143-rt64 -> 5.4.154-rt65 2021-10-27 09:53:20 +00:00
TredwellGit 67e5b8b626 linux: 5.4.155 -> 5.4.156 2021-10-27 09:52:46 +00:00
TredwellGit 0719e92d1b linux: 5.14.14 -> 5.14.15 2021-10-27 09:52:41 +00:00
TredwellGit 4bd2c087e0 linux: 5.10.75 -> 5.10.76 2021-10-27 09:52:34 +00:00
TredwellGit 19735ff280 linux: 4.9.287 -> 4.9.288 2021-10-27 09:52:29 +00:00
TredwellGit 3a69f006d9 linux: 4.4.289 -> 4.4.290 2021-10-27 09:52:24 +00:00
TredwellGit b7efb90537 linux: 4.19.213 -> 4.19.214 2021-10-27 09:52:20 +00:00
TredwellGit 20e62a2b01 linux: 4.14.252 -> 4.14.253 2021-10-27 09:52:14 +00: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
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
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 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