diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2019-10-08 13:18:51 -0400 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2019-10-08 13:18:51 -0400 |
| commit | ecb95c8bcb3751e04e7a384b4d3398f5e31ede2e (patch) | |
| tree | 6c42f92a04086189be31715f6b2fc32ada6897f7 /pkgs/os-specific | |
| parent | e14ccd72856ed4e1abad2b9b3a8d655f67313d51 (diff) | |
| download | nixpkgs-ecb95c8bcb3751e04e7a384b4d3398f5e31ede2e.tar nixpkgs-ecb95c8bcb3751e04e7a384b4d3398f5e31ede2e.tar.gz nixpkgs-ecb95c8bcb3751e04e7a384b4d3398f5e31ede2e.tar.bz2 nixpkgs-ecb95c8bcb3751e04e7a384b4d3398f5e31ede2e.tar.lz nixpkgs-ecb95c8bcb3751e04e7a384b4d3398f5e31ede2e.tar.xz nixpkgs-ecb95c8bcb3751e04e7a384b4d3398f5e31ede2e.tar.zst nixpkgs-ecb95c8bcb3751e04e7a384b4d3398f5e31ede2e.zip | |
linux: 5.4-rc1 -> 5.4-rc2
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 4235c26aea1..731d44d69a3 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4-rc1"; + version = "5.4-rc2"; extraMeta.branch = "5.4"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1a9h0g249b3aznn6jz92y5vpr02v921mgf72rj0nbblcfhrimzk9"; + sha256 = "0dnn771wydwc4sngy9a3szvflbw9g97ann4iix4k4bq4gr18jw2c"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 9764fddf019..87fa9c8f08e 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -96,7 +96,7 @@ let # Required for deterministic builds along with some postPatch magic. ++ optional (stdenv.lib.versionAtLeast version "4.13") ./randstruct-provide-seed.patch # Fixes determinism by normalizing metadata for the archive of kheaders - ++ optional (stdenv.lib.versionAtLeast version "5.2") ./gen-kheaders-metadata.patch; + ++ optional (stdenv.lib.versionAtLeast version "5.2" && stdenv.lib.versionOlder version "5.4") ./gen-kheaders-metadata.patch; prePatch = '' for mf in $(find -name Makefile -o -name Makefile.include -o -name install.sh); do |