Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 05bed043b77b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9ba43c07cb96
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Mar 31, 2019

  1. linux: 5.0-rc8 -> 5.1-rc2

    @NeQuissimus
    NeQuissimus committed Mar 31, 2019
    Copy the full SHA
    9ba43c0 View commit details
Showing with 5 additions and 5 deletions.
  1. +1 −1 pkgs/os-specific/linux/kernel/common-config.nix
  2. +4 −4 pkgs/os-specific/linux/kernel/linux-testing.nix
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/kernel/common-config.nix
View file
Original file line number Diff line number Diff line change
@@ -240,7 +240,7 @@ let
FANOTIFY = yes;
TMPFS = yes;
TMPFS_POSIX_ACL = yes;
FS_ENCRYPTION = { optional = true; tristate = whenAtLeast "4.9" "m"; };
FS_ENCRYPTION = if (versionAtLeast version "5.1") then yes else whenAtLeast "4.9" (option module);

EXT2_FS_XATTR = yes;
EXT2_FS_POSIX_ACL = yes;
8 changes: 4 additions & 4 deletions pkgs/os-specific/linux/kernel/linux-testing.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:

buildLinux (args // rec {
version = "5.0-rc8";
modDirVersion = "5.0.0-rc8";
extraMeta.branch = "5.0";
version = "5.1-rc2";
modDirVersion = "5.1.0-rc2";
extraMeta.branch = "5.1";

src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
sha256 = "1i58jljwc2y58ggahmh5643h3nckf3k00d0qnni4s9z1xw3w143p";
sha256 = "10x6d550cqyj7ipn2q13m03x5vnwv90wgs6532r8fnd86rkygmqb";
};

# Should the testing kernels ever be built on Hydra?