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

Merge master into staging-next

parents cdcf3b61 6a6c1f41

maintainers/maintainer-list.nix

+5 −0
Original line number Diff line number Diff line
@@ -27146,6 +27146,11 @@ 
    githubId = 120451;

    name = "Urban Skudnik";

  };

  usovalx = {

    name = "Oleksandr Usov";

    github = "usovalx";

    githubId = 1041626;

  };

  usrfriendly = {

    name = "Arin Lares";

    email = "arinlares@gmail.com";

nixos/tests/lomiri-music-app.nix

+3 −3
Original line number Diff line number Diff line
@@ -148,10 +148,9 @@ in 
        machine.wait_for_text("Albums")

        machine.succeed("xdotool mousemove 25 45 click 1") # Open categories

        machine.sleep(2)

        machine.wait_for_text("Tracks")

        machine.succeed("xdotool mousemove 25 240 click 1") # Switch to Tracks category

        machine.sleep(2)

        machine.wait_for_text("${musicFileName}") # the test file

        machine.wait_for_text("Tracks") # Written in larger text now, easier for OCR

        machine.screenshot("lomiri-music_listing")



        # Ensure pause colours isn't present already
@@ -180,8 +179,9 @@ in 


        machine.screenshot("lomiri-music_paused")



        # Lastly, check if generated cover image got extracted properly

        # Lastly, check if song details like title & generated cover image got extracted properly

        # if not, indicates an issue with mediascanner / lomiri-thumbnailer

        machine.wait_for_text("${musicFileName}")

        machine.wait_for_text("${ocrContent}")



    machine.succeed("pkill -f lomiri-music-app")

nixos/tests/nix-config.nix

+3 −2
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 
    start_all()

    machine.wait_for_unit("nix-daemon.socket")

    # regression test for the workaround for https://github.com/NixOS/nix/issues/9487

    print(machine.succeed("nix-instantiate --find-file extra"))

    print(machine.succeed("nix-instantiate --find-file nonextra"))

    # unset NIX_PATH because environtment overrides the config

    print(machine.succeed("env -u NIX_PATH nix-instantiate --find-file extra"))

    print(machine.succeed("env -u NIX_PATH nix-instantiate --find-file nonextra"))

  '';

}

pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ vscode-utils.buildVscodeMarketplaceExtension { 
    name = "harper";

    publisher = "elijah-potter";

    version = harper.version;

    hash = "sha256-KyN3WXJIZVgMe4zoxI6ijmltDLLvHOeYbuxLAYX+x0k=";

    hash = "sha256-ldXQKAJX8YQVjtGjKRom14fNuA6ZwDwpPusbjS+4G+I=";

  };



  nativeBuildInputs = [

pkgs/applications/science/physics/crystfel/default.nix

+6 −0
Original line number Diff line number Diff line
@@ -185,6 +185,12 @@ let 
      })

    ];



    postPatch = ''

      substituteInPlace CMakeLists.txt \

        --replace-fail "cmake_minimum_required(VERSION 3.0.0)" \

                       "cmake_minimum_required(VERSION 3.10)"

    '';



    nativeBuildInputs = [ cmake ];

    buildInputs = [

      hdf5