Commit graph

4335 commits

Author SHA1 Message Date
John Ericson 9c213398b3 lib: Clean up how linux and gcc config is specified
Second attempt of 8929989614589ee3acd070a6409b2b9700c92d65; see that
commit for details.

This reverts commit 0bc275e634.
2021-01-23 10:01:28 -05:00
Jonathan Ringer 0bc275e634
Revert "lib: Clean up how linux and gcc config is specified"
This is a stdenv-rebuild, and should not be merged
into master

This reverts commit 8929989614.
2021-01-22 14:07:06 -08:00
John Ericson d95aebbe0e
Merge pull request #107214 from Ericson2314/linux-config-cleanup
lib: Clean up how linux and gcc config is specified
2021-01-22 15:15:58 -05:00
Kevin Cox 57d262775d
Merge pull request #110163 from Atemu/update/zen-kernels
zen-kernels: 5.10.6 -> 5.10.9
2021-01-22 13:26:05 -05:00
John Ericson 8929989614 lib: Clean up how linux and gcc config is specified
The `platform` field is pointless nesting: it's just stuff that happens
to be defined together, and that should be an implementation detail.

This instead makes `linux-kernel` and `gcc` top level fields in platform
configs. They join `rustc` there [all are optional], which was put there
and not in `platform` in anticipation of a change like this.

`linux-kernel.arch` in particular also becomes `linuxArch`, to match the
other `*Arch`es.

The next step after is this to combine the *specific* machines from
`lib.systems.platforms` with `lib.systems.examples`, keeping just the
"multiplatform" ones for defaulting.
2021-01-21 22:44:09 -05:00
Tim Steinbach 50a5d4c773
linux/hardened/patches/5.4: 5.4.90.a -> 5.4.91.a 2021-01-20 12:36:58 -05:00
Tim Steinbach 3df0e82d66
linux/hardened/patches/5.10: 5.10.8.a -> 5.10.9.a 2021-01-20 12:36:57 -05:00
Tim Steinbach 66c9151443
linux/hardened/patches/4.19: 4.19.168.a -> 4.19.169.a 2021-01-20 12:36:57 -05:00
Tim Steinbach c74614795b
linux-rt_5_10: 5.10.4-rt22 -> 5.10.8-rt24 2021-01-20 12:36:57 -05:00
Tim Steinbach 3141316d4d
linux: 5.4.90 -> 5.4.91 2021-01-20 12:36:56 -05:00
Tim Steinbach 463f322988
linux: 5.10.8 -> 5.10.9 2021-01-20 12:36:56 -05:00
Tim Steinbach 1118a48175
linux: 4.19.168 -> 4.19.169 2021-01-20 12:36:56 -05:00
Atemu ea051b0417 zen-kernels: 5.10.6 -> 5.10.9 2021-01-20 12:01:57 +01:00
Jonathan Ringer 9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Tim Steinbach 5d55162e2a
linux/hardened/patches/5.4: 5.4.89.a -> 5.4.90.a 2021-01-18 12:46:32 -05:00
Tim Steinbach c08ed1556e
linux/hardened/patches/5.10: 5.10.7.a -> 5.10.8.a 2021-01-18 12:46:32 -05:00
Tim Steinbach 25d44d9c82
linux/hardened/patches/4.19: 4.19.167.a -> 4.19.168.a 2021-01-18 12:46:32 -05:00
Tim Steinbach a108d17cc1
linux/hardened/patches/4.14: 4.14.215.a -> 4.14.216.a 2021-01-18 12:46:31 -05:00
Tim Steinbach 20d6f20083
linux: 5.4.89 -> 5.4.90 2021-01-18 12:46:31 -05:00
Tim Steinbach 370ad71e2a
linux: 5.10.7 -> 5.10.8 2021-01-18 12:46:31 -05:00
Tim Steinbach 44b24624d5
linux: 4.9.251 -> 4.9.252 2021-01-18 12:46:30 -05:00
Tim Steinbach 7c70204558
linux: 4.4.251 -> 4.4.252 2021-01-18 12:46:30 -05:00
Tim Steinbach 2818d367ea
linux: 4.19.167 -> 4.19.168 2021-01-18 12:46:30 -05:00
Tim Steinbach d15ed07e0a
linux: 4.14.215 -> 4.14.216 2021-01-18 12:46:27 -05:00
Atemu 4a0070fc9f zen-kernels: refactor suffix
Changing it required modifications in multiple places which is error-prone
2021-01-18 10:49:16 +01:00
github-actions[bot] b7f20dcd02
Merge master into staging-next 2021-01-18 01:16:03 +00:00
Ben Siraphob 16d91ee628 pkgs/os-specific: stdenv.lib -> lib 2021-01-17 23:26:08 +07:00
Jan Tojnar b813710c04
Merge branch 'master' into staging-next 2021-01-14 02:24:17 +01:00
kraem e41f385b1c linux/hardened/patches/5.4: 5.4.88.a -> 5.4.89.a 2021-01-13 14:17:01 -05:00
kraem e408bd85f0 linux/hardened/patches/5.10: 5.10.6.a -> 5.10.7.a 2021-01-13 14:17:01 -05:00
kraem 2aab392665 linux/hardened/patches/4.19: 4.19.166.a -> 4.19.167.a 2021-01-13 14:17:01 -05:00
kraem 5b687cf099 linux/hardened/patches/4.14: 4.14.214.a -> 4.14.215.a 2021-01-13 14:17:01 -05:00
kraem 305aabb1ac linux: 5.4.88 -> 5.4.89 2021-01-13 14:17:01 -05:00
kraem 146d17dd60 linux: 5.10.6 -> 5.10.7 2021-01-13 14:17:01 -05:00
kraem a1f3d24a96 linux: 4.9.250 -> 4.9.251 2021-01-13 14:17:01 -05:00
kraem 290dce1c29 linux: 4.4.250 -> 4.4.251 2021-01-13 14:17:01 -05:00
kraem f462d8aee4 linux: 4.19.166 -> 4.19.167 2021-01-13 14:17:01 -05:00
kraem 4878fcd3c9 linux: 4.14.214 -> 4.14.215 2021-01-13 14:17:01 -05:00
github-actions[bot] f1bb6c74f9
Merge master into staging-next 2021-01-12 12:34:36 +00:00
Linus Heckemann 97c0e5d8a8
Merge pull request #107181 from lheckemann/generate-config-fix
linux: fix generate-config's handling of "no-choice" options
2021-01-12 11:13:58 +01:00
github-actions[bot] 757ad34b82
Merge master into staging-next 2021-01-11 18:42:29 +00:00
Tim Steinbach 18b09d883f
linux: 5.11-rc2 -> 5.11-rc3 2021-01-11 11:10:07 -05:00
Tim Steinbach d91f1b0f47
linux: Optional SECURITY_LOCKDOWN_LSM
The option has been removed in the most recent dot releases
2021-01-11 11:09:02 -05:00
github-actions[bot] 1cce663933
Merge staging-next into staging 2021-01-11 01:02:25 +00:00
github-actions[bot] 36bab113bf
Merge master into staging-next 2021-01-11 01:02:21 +00:00
Atemu 5eedbd86f4 linux_zen: 5.10.1 -> 5.10.6 2021-01-10 15:08:53 -08:00
Atemu b775e9f474 linux_lqx: 5.10.5 -> 5.10.6 2021-01-10 15:08:53 -08:00
github-actions[bot] 31f01e4bcc
Merge staging-next into staging 2021-01-10 01:03:39 +00:00
github-actions[bot] 433c7b069c
Merge master into staging-next 2021-01-10 01:03:35 +00:00
Tim Steinbach 85449b21bc
linux/hardened/patches/5.4: 5.4.87.a -> 5.4.88.a 2021-01-09 15:26:22 -05:00