diff options
| author | arcnmx <arcnmx@users.noreply.github.com> | 2021-10-21 12:27:44 -0700 |
|---|---|---|
| committer | arcnmx <arcnmx@users.noreply.github.com> | 2021-10-21 12:29:09 -0700 |
| commit | 146c830cff3669891ea8496098b6a8d227c93879 (patch) | |
| tree | 78a18a7307e6a7e37f0ac6999838781adf894aa1 /pkgs | |
| parent | 3ef1d2a9602c18f8742e1fb63d5ae9867092e3d6 (diff) | |
| download | nixpkgs-146c830cff3669891ea8496098b6a8d227c93879.tar nixpkgs-146c830cff3669891ea8496098b6a8d227c93879.tar.gz nixpkgs-146c830cff3669891ea8496098b6a8d227c93879.tar.bz2 nixpkgs-146c830cff3669891ea8496098b6a8d227c93879.tar.lz nixpkgs-146c830cff3669891ea8496098b6a8d227c93879.tar.xz nixpkgs-146c830cff3669891ea8496098b6a8d227c93879.tar.zst nixpkgs-146c830cff3669891ea8496098b6a8d227c93879.zip | |
linux_testing: 5.13-rc6 -> 5.15-rc6
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 717fdaee72a..6fb8dec9a13 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -410,7 +410,7 @@ let CIFS_POSIX = option yes; CIFS_FSCACHE = yes; CIFS_STATS = whenOlder "4.19" yes; - CIFS_WEAK_PW_HASH = yes; + CIFS_WEAK_PW_HASH = whenOlder "5.15" yes; CIFS_UPCALL = yes; CIFS_ACL = whenOlder "5.3" yes; CIFS_DFS_UPCALL = yes; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 2caea08416e..0754ff335ba 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,15 +3,15 @@ with lib; buildLinux (args // rec { - version = "5.13-rc6"; - extraMeta.branch = "5.12"; + version = "5.15-rc6"; + extraMeta.branch = lib.versions.majorMinor version; # modDirVersion needs to be x.y.z, will always add .0 modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "sha256-PunFd6tOsmrsPItp2QX4TEVxHnvvi1BMSwWio/DTlMU="; + sha256 = "1lp3jqwsbd97k3bx4crs8rc2wssyaf0v8x4kl4zv7g7ww2kkg2ii"; }; # Should the testing kernels ever be built on Hydra? |