Skip to content

Commit

Permalink
linux: remove versions unmaintained upstream
Browse files Browse the repository at this point in the history 
It would be nice to have 4.17, but ATM it won't build;
some changes in the (shared) kernel config would be needed.
  • Loading branch information
@NeQuissimus @vcunat
NeQuissimus authored and vcunat committed Jul 7, 2018
1 parent 31d2cd8 commit 298e170
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 90 deletions.
22 changes: 0 additions & 22 deletions pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
View file

This file was deleted.

16 changes: 0 additions & 16 deletions pkgs/os-specific/linux/kernel/linux-testing.nix
View file

This file was deleted.

53 changes: 1 addition & 52 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13254,14 +13254,6 @@ with pkgs;
modDirVersionArg = linux_4_14.modDirVersion + "-hardened";
});

linux_copperhead_stable = (linux_4_16.override {
kernelPatches = linux_4_16.kernelPatches ++ [
kernelPatches.copperhead_4_16
kernelPatches.tag_hardened
];
modDirVersionArg = linux_4_16.modDirVersion + "-hardened";
});

# linux mptcp is based on the 4.4 kernel
linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix {
kernelPatches =
Expand Down Expand Up @@ -13324,44 +13316,6 @@ with pkgs;
];
};

linux_4_16 = callPackage ../os-specific/linux/kernel/linux-4.16.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
# See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
# when adding a new linux version
# kernelPatches.cpu-cgroup-v2."4.11"
kernelPatches.modinst_arg_list_too_long
]
++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
kernelPatches.mips_ext3_n32
];
};

linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.modinst_arg_list_too_long
] ++ lib.optionals ((platform.kernelArch or null) == "mips") [
kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
kernelPatches.mips_ext3_n32
];
};

linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
kernelPatches.modinst_arg_list_too_long
]
++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
kernelPatches.mips_ext3_n32
];
};

linux_riscv = callPackage ../os-specific/linux/kernel/linux-riscv.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
Expand Down Expand Up @@ -13530,7 +13484,7 @@ with pkgs;
linux = linuxPackages.kernel;

# Update this when adding the newest kernel major version!
linuxPackages_latest = linuxPackages_4_16;
linuxPackages_latest = linuxPackages_4_14;
linux_latest = linuxPackages_latest.kernel;

# Build the kernel modules for the some of the kernels.
Expand All @@ -13540,7 +13494,6 @@ with pkgs;
linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4);
linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
linuxPackages_4_16 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_16);
# Don't forget to update linuxPackages_latest!

# Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds.
Expand All @@ -13565,9 +13518,6 @@ with pkgs;
};
in tinyLinuxPackages.kernel;

# Build a kernel with bcachefs module
linuxPackages_testing_bcachefs = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing_bcachefs);

# Build a kernel for Xen dom0
linuxPackages_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux.override { features.xen_dom0=true; }));

Expand All @@ -13592,7 +13542,6 @@ with pkgs;
linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; }));

linuxPackages_copperhead_lts = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_copperhead_lts);
linuxPackages_copperhead_stable = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_copperhead_stable);

# Samus kernels
linuxPackages_samus_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_4_12);
Expand Down

3 comments on commit 298e170

@vcunat
Copy link
Member

@vcunat vcunat commented on 298e170 Jul 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I didn't really mean to leave the authorship this way. It's what squash via git rebase -i has left :-)

@edolstra
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a breaking change, which is not allowed on the stable branch:

# nixos-rebuild switch
building Nix...
building the system configuration...
error: attribute 'linux_testing' missing, at /nix/store/yhp876r4qxkalrg839vhvn2rjry09wrc-nixos-18.03.132835.e930c685d51/nixos/pkgs/top-level/all-packages.nix:13500:44
(use '--show-trace' to show detailed location information)

Please revert.

@vcunat
Copy link
Member

@vcunat vcunat commented on 298e170 Jul 9, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For reference, the missing linux_testing is back now: 5e10df3. I agree removal was over-zealous, even though the attribute makes not much sense ATM.

Please sign in to comment.