diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-03-15 09:42:01 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-03-15 09:52:04 +0100 |
| commit | f48c1fda6b457520c1214b29992af0c0c9872b6c (patch) | |
| tree | 1bb43ae46bf2c035c48361c764ad4c5995881a10 /pkgs/os-specific/linux | |
| parent | 415d23fb4d2b2823a87d410da9beef8332d82d7b (diff) | |
| parent | aa6313a23d749f0d73f91af35a2fe15e74501451 (diff) | |
| download | nixpkgs-f48c1fda6b457520c1214b29992af0c0c9872b6c.tar nixpkgs-f48c1fda6b457520c1214b29992af0c0c9872b6c.tar.gz nixpkgs-f48c1fda6b457520c1214b29992af0c0c9872b6c.tar.bz2 nixpkgs-f48c1fda6b457520c1214b29992af0c0c9872b6c.tar.lz nixpkgs-f48c1fda6b457520c1214b29992af0c0c9872b6c.tar.xz nixpkgs-f48c1fda6b457520c1214b29992af0c0c9872b6c.tar.zst nixpkgs-f48c1fda6b457520c1214b29992af0c0c9872b6c.zip | |
Merge branch 'master' into staging-next
Conflict in pkgs/development/libraries/libvirt/default.nix required manual adjustments. The fetched patch is already in src. I checked that libvirt builds.
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 52fc24e101e..63d47dd8a38 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-01-12" -, commit ? "0e6eb60f8be14b02e0a76cb330f4b22c80ec82e9" -, diffHash ? "091w4r7h93s5rv8hk65aix7l0rr4bd504mv998j7x360bqlb7vpi" +, date ? "2022-03-09" +, commit ? "2280551cebc1735f74eef75d650dd5e175461657" +, diffHash ? "1mrrydidbapdq0fs0vpqhs88k6ghdrvmjpk2zi7xlwj7j32h0nwp" , kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage , argsOverride ? {} , ... @@ -16,7 +16,7 @@ extraMeta = { branch = "master"; - maintainers = with lib.maintainers; [ davidak chiiruno ]; + maintainers = with lib.maintainers; [ davidak Madouura ]; }; } // argsOverride; |