diff options
| author | davidak <davidak@users.noreply.github.com> | 2022-05-03 11:05:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-03 11:05:54 +0200 |
| commit | 4819473fb2f7e09f551463e8f1d2cdf3c564a215 (patch) | |
| tree | 4696aee1b1f321ac90c712626cbb4e75e6989e55 | |
| parent | 5114d91cd82f9530eda759097c4496835b0df47f (diff) | |
| parent | 58d1bd206bdfc398694a4a1fa60ada3a838db6db (diff) | |
Merge pull request #171347 from Madouura/dev/bcachefs
bcachefs: 2022-04 -> 2022-05
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 7 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/bcachefs-tools/default.nix | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 83bd92f44f71..51f47cea2c45 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-08" -, commit ? "6ddf061e68560a2bb263b126af7e894a6c1afb5f" -, diffHash ? "1nkrr1cxavw0rqxlyiz7pf9igvqay0d5kk7194v9ph3fcp9rz5kc" +, date ? "2022-04-25" +, commit ? "bdf6d7c1350497bc7b0be6027a51d9330645672d" +, diffHash ? "09bcbklvfj9i9czjdpix2iz7fvjksmavaljx8l92ay1i9fapjmhc" , kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage , argsOverride ? {} , ... @@ -17,7 +17,6 @@ extraMeta = { branch = "master"; maintainers = with lib.maintainers; [ davidak Madouura ]; - broken = true; }; } // argsOverride; diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index b94f1d83394b..bd8bf1adb9fc 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "unstable-2022-04-08"; + version = "unstable-2022-05-02"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; - rev = "986533d8d5b21c8eb512bbb3f0496d3d2a087c5d"; - sha256 = "1qvb5l937nnls5j82ipgrdh6q5fk923z752rzzqqcms6fz7rrjs4"; + rev = "6f5afc0c12bbf56ffdabe5b2c5297aef255c4baa"; + sha256 = "0483zhm3gmk6fd1pn815i3fixwlwsnks3817gn7n3idbbw0kg5ng"; }; postPatch = '' |