diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-04-17 18:40:51 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-04-17 18:40:51 -0400 |
| commit | 33c2a76c5e1dac06d2963ad626d1083ed4b96f06 (patch) | |
| tree | 90e5ce60f3d7ea83f41f54c86971e19aae6b3594 /pkgs/os-specific | |
| parent | d1009f4d99dbb6600f08ab0ef214806acc675670 (diff) | |
| parent | cdfda4b455d0d904428fd157fba323f131fe8f6f (diff) | |
| download | nixlib-33c2a76c5e1dac06d2963ad626d1083ed4b96f06.tar nixlib-33c2a76c5e1dac06d2963ad626d1083ed4b96f06.tar.gz nixlib-33c2a76c5e1dac06d2963ad626d1083ed4b96f06.tar.bz2 nixlib-33c2a76c5e1dac06d2963ad626d1083ed4b96f06.tar.lz nixlib-33c2a76c5e1dac06d2963ad626d1083ed4b96f06.tar.xz nixlib-33c2a76c5e1dac06d2963ad626d1083ed4b96f06.tar.zst nixlib-33c2a76c5e1dac06d2963ad626d1083ed4b96f06.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 142cf0aaf929..cdb19fd54ab7 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.115"; + version = "4.19.116"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1hh170z3mv181l6cc6qqc12wif5jsmxbh2qxbq6b9km5irydkchi"; + sha256 = "0r3vdc3npl1bn06w9v6wsq7d5mm7bnhm9wsz36pb9ar3xhimvrlf"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index f4293b5bffc0..b2de6ea86899 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.32"; + version = "5.4.33"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1czjjnln1cqrnjxw0md6mpw9haw9abdyvmxnjds56ym4nzx9jb8r"; + sha256 = "0q9q48ij6vppfcrdf7fr24pvpwsd13pxjkdni6rnjq9a60hrcmxm"; }; } // (args.argsOverride or {})) |