diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-07-09 16:30:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-09 16:30:43 +0200 |
| commit | df0d321258a9b35c36cd9d8688985502d464105f (patch) | |
| tree | e829558403b39f6adeb83cf6f8696de59a1f9e8b /pkgs/os-specific | |
| parent | 84eb0781aa54d647e6daca87e4c8e22fc5cbb957 (diff) | |
| parent | 12cee96e74b0021a3bc25a7d9531ea6576b1f6c3 (diff) | |
| download | nixpkgs-df0d321258a9b35c36cd9d8688985502d464105f.tar nixpkgs-df0d321258a9b35c36cd9d8688985502d464105f.tar.gz nixpkgs-df0d321258a9b35c36cd9d8688985502d464105f.tar.bz2 nixpkgs-df0d321258a9b35c36cd9d8688985502d464105f.tar.lz nixpkgs-df0d321258a9b35c36cd9d8688985502d464105f.tar.xz nixpkgs-df0d321258a9b35c36cd9d8688985502d464105f.tar.zst nixpkgs-df0d321258a9b35c36cd9d8688985502d464105f.zip | |
Merge pull request #123765 from hyperfekt/update-bcachefs
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 49 |
1 files changed, 29 insertions, 20 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 619bf48b736..a12633eb6d7 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,24 +1,33 @@ -{ lib, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args: +{ lib +, fetchpatch +, kernel +, date ? "2021-07-08" +, commit ? "3693b2ca83ff9eda49660b31299d2bebe3a1075f" +, diffHash ? "1sfq3vwc2kxa761s292f2cqrm0vvqvkdx6drpyn5yaxwnapwidcw" +, kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage +, argsOverride ? {} +, ... +} @ args: -buildLinux (args // { - version = "5.9.0-2020.11.20"; - modDirVersion = "5.9.0"; +kernel.override ( args // { - src = fetchFromGitHub { - owner = "koverstreet"; - repo = "bcachefs"; - # commit does not exist on any branch on the target repository - rev = "6a505b63ed3003faf5000f19fd08bbd477d93fbc"; - sha256 = "1rf34gzv9npafp1c3i6lymk3b0gnqp4rb0wl33pw6yrpgnsry3cc"; - }; + argsOverride = { + version = "${kernel.version}-bcachefs-unstable-${date}"; + extraMeta = { + branch = "master"; + maintainers = with lib.maintainers; [ davidak chiiruno ]; + platforms = [ "x86_64-linux" ]; + }; + } // argsOverride; - extraConfig = "BCACHEFS_FS m"; + kernelPatches = [ { + name = "bcachefs-${commit}"; + patch = fetchpatch { + name = "bcachefs-${commit}.diff"; + url = "https://evilpiepirate.org/git/bcachefs.git/rawdiff/?id=${commit}&id2=v${lib.versions.majorMinor kernel.version}"; + sha256 = diffHash; + }; + extraConfig = "BCACHEFS_FS m"; + } ] ++ kernelPatches; - extraMeta = { - branch = "master"; - hydraPlatforms = []; # Should the testing kernels ever be built on Hydra? - maintainers = with lib.maintainers; [ davidak chiiruno ]; - platforms = [ "x86_64-linux" ]; - }; - -} // (args.argsOverride or {})) +}) |