max/config
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

packages/*bcachefs*: introduce flag for switching between upstream and custom bcachefs kernel and tools

Browse source
This commit is contained in:
Max Headroom 2023-02-10 18:29:23 +01:00
parent f5bfd50e69
commit 9dd8d021ff
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
packages/packages.nix
View file

@ -15,11 +15,17 @@ let
}; };
sandbox = path: extra: (pkgs.callPackage path ({ inherit mkNixPak; } // extra)).config.env; sandbox = path: extra: (pkgs.callPackage path ({ inherit mkNixPak; } // extra)).config.env;
useUpstreamBcachefs = true;
in in
{ {
amberol = sandbox ./nixpak/amberol { }; amberol = sandbox ./nixpak/amberol { };
bcachefs-tools = pkgs.callPackage ./tools/bcachefs-tools { }; bcachefs-tools = if useUpstreamBcachefs
then
pkgs.bcachefs-tools
else
pkgs.callPackage ./tools/bcachefs-tools { };
brig = pkgs.callPackage ./tools/brig { }; brig = pkgs.callPackage ./tools/brig { };
@ -49,7 +55,11 @@ in
identity = pkgs.callPackage ./apps/identity { }; identity = pkgs.callPackage ./apps/identity { };
linux-bcachefs = pkgs.callPackage ./kernels/linux-bcachefs rec { linux-bcachefs = if useUpstreamBcachefs
then
pkgs.linuxKernel.kernels.linux_testing_bcachefs
else
pkgs.callPackage ./kernels/linux-bcachefs rec {
kernel = pkgs.linux_6_0; kernel = pkgs.linux_6_0;
inherit (kernel) kernelPatches; inherit (kernel) kernelPatches;
}; };