alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #152398 from Madouura/dev/bcachefs

Browse source 
bcachefs: 2021-11 -> 2021-12
This commit is contained in:
davidak 2021-12-28 02:43:34 +01:00 committed by GitHub
parent 0d053608af 1595230f47
commit 8ad39e2058
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
View file

@ -1,9 +1,9 @@
{ lib
, fetchpatch
, kernel
, date ? "2021-11-06"
, commit ? "10669a2c540de3276c8d2fc0e43be62f2886f377"
, diffHash ? "1rn72wd8jg919j74x8banl70b2bdd6r9fgvnw693j20dq96j5cnw"
, date ? "2021-12-26"
, commit ? "b034dfb24fece43a7677b9a29781495aeb62767f"
, diffHash ? "0m7qrnfrcx3dki9lmsq3jk3mcrfm99djh83gwwjh401ql0cycx5p"
, kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage
, argsOverride ? {}
, ...
@ -13,6 +13,7 @@
(kernel.override ( args // {
argsOverride = {
version = "${kernel.version}-bcachefs-unstable-${date}";
extraMeta = {
branch = "master";
maintainers = with lib.maintainers; [ davidak chiiruno ];
@ -21,12 +22,13 @@
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;
}))

6
pkgs/tools/filesystems/bcachefs-tools/default.nix
View file

@ -22,13 +22,13 @@
stdenv.mkDerivation {
pname = "bcachefs-tools";
version = "unstable-2021-11-06";
version = "unstable-2021-12-25";
src = fetchFromGitHub {
owner = "koverstreet";
repo = "bcachefs-tools";
rev = "5b84952401146fec9a181a40877352f7faf9ee7b";
sha256 = "09zs2h3vzqn163v4i9lrvgy9gcjlw24lld7715j3kyyxnc5vav32";
rev = "07b18011cc885f0ef5cadc299d0321322f442388";
sha256 = "0yvdbjasl05w1afiszygrfv7hn39fxx7kcy42vk39rb6fb3xpvzy";
};
postPatch = ''