cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #179396 from Madouura/dev/bcachefs

Browse source
This commit is contained in:
Sandro 2022-10-07 11:27:07 +02:00 committed by GitHub
commit e24b9566d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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;
};

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

@ -22,13 +22,13 @@
stdenv.mkDerivation {
pname = "bcachefs-tools";
version = "unstable-2022-05-02";
version = "unstable-2022-09-28";
src = fetchFromGitHub {
owner = "koverstreet";
repo = "bcachefs-tools";
rev = "6f5afc0c12bbf56ffdabe5b2c5297aef255c4baa";
sha256 = "0483zhm3gmk6fd1pn815i3fixwlwsnks3817gn7n3idbbw0kg5ng";
rev = "99caca2c70f312c4a2504a7e7a9c92a91426d885";
sha256 = "sha256-9bFTBFkQq8SvhYa9K4+MH2zvKZviNaq0sFWoeGgch7g=";
};
postPatch = ''