Unverified Commit 7199efc0 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge staging-next into staging

parents ec35b86b 6d1eafeb

maintainers/maintainer-list.nix

+1 −7
Original line number Diff line number Diff line
@@ -4261,12 +4261,6 @@ 
    github = "carlthome";

    githubId = 1595907;

  };

  cartr = {

    email = "carter.sande@duodecima.technology";

    github = "cartr";

    githubId = 5241813;

    name = "Carter Sande";

  };

  casaca = {

    name = "J McNutt";

    email = "jmacasac@hotmail.com";
@@ -11612,7 +11606,7 @@ 
    name = "jasonxue";

    keys = [

      {

        fingerprint = "067A 9B58 DAC4 1C31 D688  81A9 EC23 DBDD B617 6861";

        fingerprint = "D6D8 A0A8 6FAC 3D8E D85C  523D F7BA 32A3 FCB0 260A";

      }

    ];

  };

nixos/tests/all-tests.nix

+1 −0
Original line number Diff line number Diff line
@@ -254,6 +254,7 @@ in 
  ayatana-indicators = runTest ./ayatana-indicators.nix;

  babeld = runTest ./babeld.nix;

  bazarr = runTest ./bazarr.nix;

  bcache = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./bcache.nix;

  bcachefs = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./bcachefs.nix;

  beanstalkd = runTest ./beanstalkd.nix;

  bees = runTest ./bees.nix;

nixos/tests/bcache.nix

0 → 100644
+40 −0
Original line number Diff line number Diff line 
{ pkgs, ... }:

{

  name = "bcache";

  meta.maintainers = with pkgs.lib.maintainers; [ pineapplehunter ];



  nodes.machine =

    { pkgs, ... }:

    {

      virtualisation.emptyDiskImages = [ 4096 ];

      networking.hostId = "deadbeef";

      boot.supportedFilesystems = [ "ext4" ];

      environment.systemPackages = [ pkgs.parted ];

    };



  testScript = ''

    machine.succeed("modprobe bcache")

    machine.succeed("bcache version")

    machine.succeed("ls /dev")



    machine.succeed(

        "mkdir /tmp/mnt",

        "udevadm settle",

        "parted --script /dev/vdb mklabel gpt",

        "parted --script /dev/vdb mkpart primary 0% 50% mkpart primary 50% 100%",

        "udevadm settle",

        "bcache make -C /dev/vdb1",

        "bcache make -B /dev/vdb2",

        "udevadm settle",

        "bcache attach /dev/vdb1 /dev/vdb2",

        "bcache set-cachemode /dev/vdb2 writeback",

        "udevadm settle",

        "bcache show",

        "ls /sys/fs/bcache",

        "mkfs.ext4 /dev/bcache0",

        "mount /dev/bcache0 /tmp/mnt",

        "umount /tmp/mnt",

        "udevadm settle",

    )

  '';

}

nixos/tests/installer.nix

+1 −1
Original line number Diff line number Diff line
@@ -1096,7 +1096,7 @@ let 
          ${

            if systemdStage1 then

              ''

                target.wait_for_text("Enter key for rpool/root")

                target.wait_for_text("Enter key for rpool${optionalString (!parentDataset) "/root"}")

              ''

            else

              ''

pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -18,18 +18,18 @@ 
  nix-update-script,

}:

let

  version = "1.3.18";

  version = "1.3.19";

  src = fetchFromGitHub {

    owner = "michaelb";

    repo = "sniprun";

    tag = "v${version}";

    hash = "sha256-2Q7Jnt7pVCuNne442KPh2cSjA6V6WSZkgUj99UpmnOM=";

    hash = "sha256-a2hEV83NOnt+9BwDk94Ns+rIC9DeHFdu2dZG1XPtdnY=";

  };

  sniprun-bin = rustPlatform.buildRustPackage {

    pname = "sniprun-bin";

    inherit version src;



    cargoHash = "sha256-cu7wn75rQcwPLjFl4v05kVMsiCD0mAlIBt49mvIaPPU=";

    cargoHash = "sha256-Ps9Ugq8ISbuXO3Dxo1WQUVPCxf24oSHvem2Xg0sIgOQ=";



    nativeBuildInputs = [ makeWrapper ];