Unverified Commit 38540416 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents b83c196e 59961875

.github/CODEOWNERS

+7 −0
Original line number Diff line number Diff line
@@ -305,3 +305,10 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt 
/pkgs/build-support/ocaml           @romildo @ulrikstrid

/pkgs/development/compilers/ocaml   @romildo @ulrikstrid

/pkgs/development/ocaml-modules     @romildo @ulrikstrid



# ZFS

pkgs/os-specific/linux/zfs                @raitobezarius

nixos/lib/make-single-disk-zfs-image.nix  @raitobezarius

nixos/lib/make-multi-disk-zfs-image.nix   @raitobezarius

nixos/modules/tasks/filesystems/zfs.nix   @raitobezarius

nixos/tests/zfs.nix                       @raitobezarius

maintainers/maintainer-list.nix

+12 −0
Original line number Diff line number Diff line
@@ -931,6 +931,12 @@ 
    githubId = 123550;

    name = "André Silva";

  };

  andresnav = {

    email = "nix@andresnav.com";

    github = "andres-nav";

    githubId = 118762770;

    name = "Andres Navarro";

  };

  andrestylianos = {

    email = "andre.stylianos@gmail.com";

    github = "andrestylianos";
@@ -7527,6 +7533,12 @@ 
    githubId = 8900;

    name = "Johan Magnus Jonsson";

  };

  jmbaur = {

    email = "jaredbaur@fastmail.com";

    github = "jmbaur";

    githubId = 45740526;

    name = "Jared Baur";

  };

  jmc-figueira = {

    email = "business+nixos@jmc-figueira.dev";

    github = "jmc-figueira";

nixos/lib/test-driver/test_driver/machine.py

+6 −5
Original line number Diff line number Diff line
@@ -867,6 +867,7 @@ class Machine: 
        # Buffer the console output, this is needed

        # to match multiline regexes.

        console = io.StringIO()



        def console_matches() -> bool:

            nonlocal console

            try:
@@ -877,7 +878,7 @@ class Machine: 
                pass

            console.seek(0)

            matches = re.search(regex, console.read())

            return (matches is not None)

            return matches is not None



        with self.nested(f"waiting for {regex} to appear on console"):

            if timeout is not None:

nixos/tests/public-inbox.nix

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ in 


      This is a testing mail.

    ''}")

    machine.sleep(5)

    machine.sleep(10)

    machine.succeed("curl -L 'https://machine.${domain}/inbox/repo1/repo1@root-1/T/#u' | grep 'This is a testing mail.'")



    # Read a mail through public-inbox-imapd

pkgs/applications/emulators/dolphin-emu/default.nix

+6 −5
Original line number Diff line number Diff line
@@ -55,13 +55,13 @@ 


stdenv.mkDerivation rec {

  pname = "dolphin-emu";

  version = "5.0-18498";

  version = "5.0-19368";



  src = fetchFromGitHub {

    owner = "dolphin-emu";

    repo = "dolphin";

    rev = "46b99671d9158e0ca840c1d8ef249db0f321ced7";

    sha256 = "sha256-K+OF8o8I1XDLQQcsWC8p8jUuWeb+RoHlBG3cEZ1aWIU=";

    rev = "dadbeb4bae7e7fa23af2b46e0add4143094dc107";

    sha256 = "sha256-XLtFn2liONPizvrKyySZx0mY7qC2fpwhAWaRZLlEzh8=";

    fetchSubmodules = true;

  };
@@ -101,7 +101,8 @@ stdenv.mkDerivation rec { 
    libevdev

    libXext

    libXrandr

    mgba # Derivation doesn't support Darwin

    # FIXME: Remove comment on next mgba version

    #mgba # Derivation doesn't support Darwin

    udev

    vulkan-loader

  ] ++ lib.optionals stdenv.isDarwin [
@@ -126,7 +127,7 @@ stdenv.mkDerivation rec { 
    # Bundles the application folder into a standalone executable, so we cannot devendor libraries

    "-DSKIP_POSTPROCESS_BUNDLE=ON"

    # Needs xcode so compilation fails with it enabled. We would want the version to be fixed anyways.

    # Note: The updater isn't available on linux, so we dont need to disable it there.

    # Note: The updater isn't available on linux, so we don't need to disable it there.

    "-DENABLE_AUTOUPDATE=OFF"

  ];