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: 8593ce317d5b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 635d3bb0ed4e
Choose a head ref
  • 6 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 25, 2021

  1. linux: 5.9-rc3 -> 5.9-rc4 

    (cherry picked from commit ff268eb)
    @NeQuissimus
    NeQuissimus committed Jan 25, 2021
    Copy the full SHA
    8363230 View commit details

  2. linux: 5.9-rc4 -> 5.9-rc5 

    (cherry picked from commit 9a4468b)
    @NeQuissimus
    NeQuissimus committed Jan 25, 2021
    Copy the full SHA
    9f53697 View commit details

  3. linux: 5.9-rc5 -> 5.9-rc6 

    (cherry picked from commit 1d916fa)
    @NeQuissimus
    NeQuissimus committed Jan 25, 2021
    Copy the full SHA
    2cd4d94 View commit details

  4. linux: 5.9-rc6 -> 5.9-rc7 

    (cherry picked from commit 6fb67d3)
    @NeQuissimus
    Sridhar Ratnakumar authored and NeQuissimus committed Jan 25, 2021
    Copy the full SHA
    fd5b066 View commit details

  5. linux: 5.9-rc7 -> 5.9-rc8 

    (cherry picked from commit 4775f91)
    @NeQuissimus
    Sridhar Ratnakumar authored and NeQuissimus committed Jan 25, 2021
    Copy the full SHA
    fd3a424 View commit details

  6. linux: 5.9-rc8 -> 5.10-rc1 

    (cherry picked from commit 3088dcb)
    @NeQuissimus
    NeQuissimus committed Jan 25, 2021
    Copy the full SHA
    635d3bb View commit details
Showing with 6 additions and 6 deletions.
  1. +3 −3 pkgs/os-specific/linux/kernel/linux-testing.nix
  2. +3 −3 pkgs/os-specific/linux/kernel/manual-config.nix
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/kernel/linux-testing.nix
View file
Original file line number Diff line number Diff line change
@@ -3,15 +3,15 @@
with stdenv.lib;

buildLinux (args // rec {
version = "5.9-rc3";
extraMeta.branch = "5.9";
version = "5.10-rc1";
extraMeta.branch = "5.10";

# 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 = "1byckdxy0y5i3lgw3f3n7b4r3v1xb4g1z3ffiq3hp4ga4nf5xzw3";
sha256 = "1s4ywf93xrlkjjq3c4142qhmsvx3kl0xwkbc09ss6gln8lwqnga8";
};

# Should the testing kernels ever be built on Hydra?
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/kernel/manual-config.nix
View file
Original file line number Diff line number Diff line change
@@ -244,10 +244,10 @@ let
rm -fR drivers
# Keep all headers
find . -type f -name '*.h' -print0 | xargs -0 chmod u-w
find . -type f -name '*.h' -print0 | xargs -0 -r chmod u-w
# Keep linker scripts (they are required for out-of-tree modules on aarch64)
find . -type f -name '*.lds' -print0 | xargs -0 chmod u-w
find . -type f -name '*.lds' -print0 | xargs -0 -r chmod u-w
# Keep root and arch-specific Makefiles
chmod u-w Makefile
@@ -257,7 +257,7 @@ let
chmod u-w -R scripts
# Delete everything not kept
find . -type f -perm -u=w -print0 | xargs -0 rm
find . -type f -perm -u=w -print0 | xargs -0 -r rm
# Delete empty directories
find -empty -type d -delete