mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-14 06:00:33 +03:00
linux_testing_bcachefs: fully deprecate in favor of 'linux_testing'
Follow-up to https://github.com/NixOS/nixpkgs/pull/267640 for 23.11 post-release
This commit is contained in:
parent
8772aa52b6
commit
10207ea919
5 changed files with 5 additions and 67 deletions
|
@ -122,15 +122,8 @@ in
|
||||||
inherit assertions;
|
inherit assertions;
|
||||||
# needed for systemd-remount-fs
|
# needed for systemd-remount-fs
|
||||||
system.fsPackages = [ pkgs.bcachefs-tools ];
|
system.fsPackages = [ pkgs.bcachefs-tools ];
|
||||||
|
|
||||||
# FIXME: Replace this with `linuxPackages_testing` after NixOS 23.11 is released
|
|
||||||
# FIXME: Replace this with `linuxPackages_latest` when 6.7 is released, remove this line when the LTS version is at least 6.7
|
# FIXME: Replace this with `linuxPackages_latest` when 6.7 is released, remove this line when the LTS version is at least 6.7
|
||||||
boot.kernelPackages = lib.mkDefault (
|
boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_testing;
|
||||||
# FIXME: Remove warning after NixOS 23.11 is released
|
|
||||||
lib.warn "Please upgrade to Linux 6.7-rc1 or later: 'linuxPackages_testing_bcachefs' is deprecated. Use 'boot.kernelPackages = pkgs.linuxPackages_testing;' to silence this warning"
|
|
||||||
pkgs.linuxPackages_testing_bcachefs
|
|
||||||
);
|
|
||||||
|
|
||||||
systemd.services = lib.mapAttrs' (mkUnits "") (lib.filterAttrs (n: fs: (fs.fsType == "bcachefs") && (!utils.fsNeededForBoot fs)) config.fileSystems);
|
systemd.services = lib.mapAttrs' (mkUnits "") (lib.filterAttrs (n: fs: (fs.fsType == "bcachefs") && (!utils.fsNeededForBoot fs)) config.fileSystems);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,46 +0,0 @@
|
||||||
{ lib
|
|
||||||
, stdenv
|
|
||||||
, fetchpatch
|
|
||||||
, kernel
|
|
||||||
, commitDate ? "2023-06-28"
|
|
||||||
# bcachefs-tools stores the expected-revision in:
|
|
||||||
# https://evilpiepirate.org/git/bcachefs-tools.git/tree/.bcachefs_revision
|
|
||||||
# but this does not means that it'll be the latest-compatible revision
|
|
||||||
, currentCommit ? "4d2faeb4fb58c389dc9f76b8d5ae991ef4497e04"
|
|
||||||
, diffHash ? "sha256-DtMc8P4lTRzvS6PVvD7WtWEPsfnxIXSpqMsKKWs+edI="
|
|
||||||
, kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage
|
|
||||||
, argsOverride ? {}
|
|
||||||
, ...
|
|
||||||
} @ args:
|
|
||||||
# NOTE: bcachefs-tools should be updated simultaneously to preserve compatibility
|
|
||||||
(kernel.override ( args // {
|
|
||||||
|
|
||||||
argsOverride = {
|
|
||||||
version = "${kernel.version}-bcachefs-unstable-${commitDate}";
|
|
||||||
modDirVersion = kernel.modDirVersion;
|
|
||||||
|
|
||||||
extraMeta = {
|
|
||||||
homepage = "https://bcachefs.org/";
|
|
||||||
branch = "master";
|
|
||||||
maintainers = with lib.maintainers; [ davidak Madouura raitobezarius YellowOnion ];
|
|
||||||
};
|
|
||||||
} // argsOverride;
|
|
||||||
|
|
||||||
structuredExtraConfig = with lib.kernel; {
|
|
||||||
BCACHEFS_FS = module;
|
|
||||||
BCACHEFS_QUOTA = option yes;
|
|
||||||
BCACHEFS_POSIX_ACL = option yes;
|
|
||||||
# useful for bug reports
|
|
||||||
FTRACE = option yes;
|
|
||||||
};
|
|
||||||
|
|
||||||
kernelPatches = [ {
|
|
||||||
name = "bcachefs-${currentCommit}";
|
|
||||||
|
|
||||||
patch = fetchpatch {
|
|
||||||
name = "bcachefs-${currentCommit}.diff";
|
|
||||||
url = "https://evilpiepirate.org/git/bcachefs.git/rawdiff/?id=${currentCommit}&id2=v${lib.versions.majorMinor kernel.version}";
|
|
||||||
sha256 = diffHash;
|
|
||||||
};
|
|
||||||
} ] ++ kernelPatches;
|
|
||||||
}))
|
|
|
@ -562,6 +562,10 @@ mapAliases ({
|
||||||
'';
|
'';
|
||||||
linux_latest_hardened = linuxPackages_latest_hardened;
|
linux_latest_hardened = linuxPackages_latest_hardened;
|
||||||
|
|
||||||
|
# Added 2023-11-18
|
||||||
|
linuxPackages_testing_bcachefs = throw "'linuxPackages_testing_bcachefs' has been removed, please use 'linuxPackages_testing', or any other linux kernel with bcachefs support";
|
||||||
|
linux_testing_bcachefs = throw "'linux_testing_bcachefs' has been removed, please use 'linux_testing', or any other linux kernel with bcachefs support";
|
||||||
|
|
||||||
lld_7 = throw "lld_7 has been removed from nixpkgs"; # Added 2023-11-19
|
lld_7 = throw "lld_7 has been removed from nixpkgs"; # Added 2023-11-19
|
||||||
lldb_7 = throw "lldb_7 has been removed from nixpkgs"; # Added 2023-11-19
|
lldb_7 = throw "lldb_7 has been removed from nixpkgs"; # Added 2023-11-19
|
||||||
llvmPackages_7 = throw "llvmPackages_7 has been removed from nixpkgs"; # Added 2023-11-19
|
llvmPackages_7 = throw "llvmPackages_7 has been removed from nixpkgs"; # Added 2023-11-19
|
||||||
|
|
|
@ -28141,10 +28141,6 @@ with pkgs;
|
||||||
linuxPackages_testing = linuxKernel.packages.linux_testing;
|
linuxPackages_testing = linuxKernel.packages.linux_testing;
|
||||||
linux_testing = linuxKernel.kernels.linux_testing;
|
linux_testing = linuxKernel.kernels.linux_testing;
|
||||||
|
|
||||||
# FIXME: Remove and alias to `linux(Packages)_testing`` after 23.11 is released
|
|
||||||
linuxPackages_testing_bcachefs = linuxKernel.packages.linux_testing_bcachefs;
|
|
||||||
linux_testing_bcachefs = linuxKernel.kernels.linux_testing_bcachefs;
|
|
||||||
|
|
||||||
# Realtime kernel
|
# Realtime kernel
|
||||||
linuxPackages-rt = linuxKernel.packageAliases.linux_rt_default;
|
linuxPackages-rt = linuxKernel.packageAliases.linux_rt_default;
|
||||||
linuxPackages-rt_latest = linuxKernel.packageAliases.linux_rt_latest;
|
linuxPackages-rt_latest = linuxKernel.packageAliases.linux_rt_latest;
|
||||||
|
|
|
@ -200,13 +200,6 @@ in {
|
||||||
then latest
|
then latest
|
||||||
else testing;
|
else testing;
|
||||||
|
|
||||||
# FIXME: Remove after 23.11 is released
|
|
||||||
linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix {
|
|
||||||
# Pinned on the last version which Kent's commits can be cleany rebased up.
|
|
||||||
kernel = linux_6_5;
|
|
||||||
kernelPatches = linux_6_5.kernelPatches;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Using zenKernels like this due lqx&zen came from one source, but may have different base kernel version
|
# Using zenKernels like this due lqx&zen came from one source, but may have different base kernel version
|
||||||
# https://github.com/NixOS/nixpkgs/pull/161773#discussion_r820134708
|
# https://github.com/NixOS/nixpkgs/pull/161773#discussion_r820134708
|
||||||
zenKernels = callPackage ../os-specific/linux/kernel/zen-kernels.nix;
|
zenKernels = callPackage ../os-specific/linux/kernel/zen-kernels.nix;
|
||||||
|
@ -616,8 +609,6 @@ in {
|
||||||
|
|
||||||
# Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds.
|
# Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds.
|
||||||
linux_testing = packagesFor kernels.linux_testing;
|
linux_testing = packagesFor kernels.linux_testing;
|
||||||
# FIXME: Remove after 23.11 is released
|
|
||||||
linux_testing_bcachefs = recurseIntoAttrs (packagesFor kernels.linux_testing_bcachefs);
|
|
||||||
|
|
||||||
linux_hardened = recurseIntoAttrs (packagesFor kernels.linux_hardened);
|
linux_hardened = recurseIntoAttrs (packagesFor kernels.linux_hardened);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue