diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-10-07 11:27:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-07 11:27:07 +0200 |
| commit | e24b9566d4b1c1d5d059be0a2aa96eef21ca004d (patch) | |
| tree | b5572ad4a22000c8658c9097519af7beb94ee1e1 /pkgs/os-specific | |
| parent | 7e5b689f69fa15e3ed3aa355d1751c9b6e4cea78 (diff) | |
| parent | a4a5d27b2b87ee5cd409cb7fb292229593858fc3 (diff) | |
Merge pull request #179396 from Madouura/dev/bcachefs
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index a1748156d098a..6c3e739e27dde 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,9 +1,9 @@ { lib , fetchpatch , kernel -, date ? "2022-04-25" -, commit ? "bdf6d7c1350497bc7b0be6027a51d9330645672d" -, diffHash ? "09bcbklvfj9i9czjdpix2iz7fvjksmavaljx8l92ay1i9fapjmhc" +, commitDate ? "2022-09-28" +, currentCommit ? "24c6361e202cc09de0159505eb3ab3ca265520d8" +, diffHash ? "sha256-Y3uKkVMCaLGJpYb27ef3FfbqEQ32mgCVpWtYzvYamr8=" , kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage , argsOverride ? {} , ... @@ -12,21 +12,20 @@ # NOTE: bcachefs-tools should be updated simultaneously to preserve compatibility (kernel.override ( args // { argsOverride = { - version = "${kernel.version}-bcachefs-unstable-${date}"; + version = "${kernel.version}-bcachefs-unstable-${commitDate}"; extraMeta = { branch = "master"; maintainers = with lib.maintainers; [ davidak Madouura ]; - broken = true; }; } // argsOverride; kernelPatches = [ { - name = "bcachefs-${commit}"; + name = "bcachefs-${currentCommit}"; patch = fetchpatch { - name = "bcachefs-${commit}.diff"; - url = "https://evilpiepirate.org/git/bcachefs.git/rawdiff/?id=${commit}&id2=v${lib.versions.majorMinor kernel.version}"; + name = "bcachefs-${currentCommit}.diff"; + url = "https://evilpiepirate.org/git/bcachefs.git/rawdiff/?id=${currentCommit}&id2=v${lib.versions.majorMinor kernel.version}"; sha256 = diffHash; }; |