commit 9b0649ae3ebcdbc67e81f1648dd7f52054301b86 · pyrox.dev/nixpkgs

+1

nixos/release.nix

···

       422
        
         tests.yabar = callTest tests/yabar.nix {};

     

       423
        
         tests.zookeeper = callTest tests/zookeeper.nix {};

     

       424
        
         tests.morty = callTest tests/morty.nix { };

     

       0
        
       
     

       425
        
       

     

       426
        
         /* Build a bunch of typical closures so that Hydra can keep track of

     

       427
        
            the evolution of closure sizes. */

···

       422
        
         tests.yabar = callTest tests/yabar.nix {};

     

       423
        
         tests.zookeeper = callTest tests/zookeeper.nix {};

     

       424
        
         tests.morty = callTest tests/morty.nix { };

     

       425
       +
         tests.bcachefs = callTest tests/bcachefs.nix { };

     

       426
        
       

     

       427
        
         /* Build a bunch of typical closures so that Hydra can keep track of

     

       428
        
            the evolution of closure sizes. */

+38

nixos/tests/bcachefs.nix

···

       1
       +
       import ./make-test.nix ({ pkgs, ... }: {

     

       2
       +
         name = "bcachefs";

     

       3
       +
         meta.maintainers = with pkgs.stdenv.lib.maintainers; [ chiiruno ];

     

       4
       +
       

     

       5
       +
         machine = { pkgs, ... }: {

     

       6
       +
           virtualisation.emptyDiskImages = [ 4096 ];

     

       7
       +
           networking.hostId = "deadbeef";

     

       8
       +
           boot.supportedFilesystems = [ "bcachefs" ];

     

       9
       +
           environment.systemPackages = with pkgs; [ parted ];

     

       10
       +
         };

     

       11
       +
       

     

       12
       +
         testScript = ''

     

       13
       +
           $machine->succeed("modprobe bcachefs");

     

       14
       +
           $machine->succeed("bcachefs version");

     

       15
       +
           $machine->succeed("ls /dev");

     

       16
       +
           

     

       17
       +
           $machine->succeed(

     

       18
       +
             "mkdir /tmp/mnt",

     

       19
       +
       

     

       20
       +
             "udevadm settle",

     

       21
       +
             "parted --script /dev/vdb mklabel msdos",

     

       22
       +
             "parted --script /dev/vdb -- mkpart primary 1024M -1s",

     

       23
       +
             "udevadm settle",

     

       24
       +
       

     

       25
       +
             # Due to #32279, we cannot use encryption for this test yet

     

       26
       +
             # "echo password | bcachefs format --encrypted /dev/vdb1",

     

       27
       +
             # "echo password | bcachefs unlock /dev/vdb1",

     

       28
       +
             "bcachefs format /dev/vdb1",

     

       29
       +
             "mount -t bcachefs /dev/vdb1 /tmp/mnt",

     

       30
       +
             "udevadm settle",

     

       31
       +
       

     

       32
       +
             "bcachefs fs usage /tmp/mnt",

     

       33
       +
       

     

       34
       +
             "umount /tmp/mnt",

     

       35
       +
             "udevadm settle"

     

       36
       +
           );

     

       37
       +
         '';

     

       38
       +
       })

+5 -4

pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix

···

       1
        
       { stdenv, buildPackages, fetchgit, perl, buildLinux, ... } @ args:

     

       2
        
       

     

       3
        
       buildLinux (args // rec {

     

       4
       -
         version = "4.16.2018.08.03";

     

       5
       -
         modDirVersion = "4.16.0";

     

       6
        
       

     

       7
        
         src = fetchgit {

     

       8
        
           url = "https://evilpiepirate.org/git/bcachefs.git";

     

       9
       -
           rev = "e7a00a52b57336c04d1043c6fa0a67a7c8301cfb";

     

       10
       -
           sha256 = "1a0kvpazvvh0rfb9hkyr4zw55ndh060j95fvhf2aaaj9qyc7p7wp";

     

       11
        
         };

     

       12
        
       

     

       13
        
         extraConfig = "BCACHEFS_FS m";

     
···

       16
        
           branch = "master";

     

       17
        
           hydraPlatforms = []; # Should the testing kernels ever be built on Hydra?

     

       18
        
           maintainers = with stdenv.lib.maintainers; [ davidak chiiruno ];

     

       0
        
       
     

       19
        
         };

     

       20
        
       

     

       21
        
       } // (args.argsOverride or {}))

···

       1
        
       { stdenv, buildPackages, fetchgit, perl, buildLinux, ... } @ args:

     

       2
        
       

     

       3
        
       buildLinux (args // rec {

     

       4
       +
         version = "4.18.2018.08.31";

     

       5
       +
         modDirVersion = "4.18.0";

     

       6
        
       

     

       7
        
         src = fetchgit {

     

       8
        
           url = "https://evilpiepirate.org/git/bcachefs.git";

     

       9
       +
           rev = "9c08efd02b827e6ee2a6e5a751045c6c6bd484d4";

     

       10
       +
           sha256 = "0xnkg0fpilmwckyb1drspggv3ibx8vkqic9ai53d5vx2rrnvvafw";

     

       11
        
         };

     

       12
        
       

     

       13
        
         extraConfig = "BCACHEFS_FS m";

     
···

       16
        
           branch = "master";

     

       17
        
           hydraPlatforms = []; # Should the testing kernels ever be built on Hydra?

     

       18
        
           maintainers = with stdenv.lib.maintainers; [ davidak chiiruno ];

     

       19
       +
           platforms = [ "x86_64-linux" ];

     

       20
        
         };

     

       21
        
       

     

       22
        
       } // (args.argsOverride or {}))

+3 -3

pkgs/tools/filesystems/bcachefs-tools/default.nix

···

       2
        
       , liburcu, zlib, libaio, zstd, lz4 }:

     

       3
        
       

     

       4
        
       stdenv.mkDerivation rec {

     

       5
       -
         name = "bcachefs-tools-unstable-2018-07-21";

     

       6
        
       

     

       7
        
         src = fetchgit {

     

       8
        
           url = "https://evilpiepirate.org/git/bcachefs-tools.git";

     

       9
       -
           rev = "cecf7e05e151499a3e96dc05f97f37c14162e94b";

     

       10
       -
           sha256 = "18vmyrjwza1iv0apkykbqsnnic5lrqlwfsrj85pgrpwzii36i8i0";

     

       11
        
         };

     

       12
        
       

     

       13
        
         enableParallelBuilding = true;

···

       2
        
       , liburcu, zlib, libaio, zstd, lz4 }:

     

       3
        
       

     

       4
        
       stdenv.mkDerivation rec {

     

       5
       +
         name = "bcachefs-tools-unstable-2018-08-22";

     

       6
        
       

     

       7
        
         src = fetchgit {

     

       8
        
           url = "https://evilpiepirate.org/git/bcachefs-tools.git";

     

       9
       +
           rev = "ebf97e8e01a8e76ff4bec23f29106430852c3081";

     

       10
       +
           sha256 = "0f2ycin0gmi1a4fm7qln0c10zn451gljfbc2piy1fm768xqqrmld";

     

       11
        
         };

     

       12
        
       

     

       13
        
         enableParallelBuilding = true;