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

Merge master into staging-next

parents 0cae9080 c043dd9f

nixos/modules/services/monitoring/cockpit.nix

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ in { 


    systemd.packages = [ cfg.package ];

    systemd.sockets.cockpit.wantedBy = [ "multi-user.target" ];

    systemd.sockets.cockpit.listenStreams = [ "" (toString cfg.port) ];



    systemd.tmpfiles.rules = [ # From $out/lib/tmpfiles.d/cockpit-tmpfiles.conf

      "C /run/cockpit/inactive.motd 0640 root root - ${cfg.package}/share/cockpit/motd/inactive.motd"

nixos/tests/cockpit.nix

+6 −5
Original line number Diff line number Diff line
@@ -21,10 +21,11 @@ import ./make-test-python.nix ( 
          };

          services.cockpit = {

            enable = true;

            port = 7890;

            openFirewall = true;

            settings = {

              WebService = {

                Origins = "https://server:9090";

                Origins = "https://server:7890";

              };

            };

          };
@@ -65,7 +66,7 @@ import ./make-test-python.nix ( 
                    driver.implicitly_wait(10)



                    log("Opening homepage")

                    driver.get("https://server:9090")

                    driver.get("https://server:7890")





                    def wait_elem(by, query, timeout=10):
@@ -107,7 +108,7 @@ import ./make-test-python.nix ( 
                    driver.find_element(By.CSS_SELECTOR, 'button#login-button').click()



                    # driver.implicitly_wait(1)

                    # driver.get("https://server:9090/system")

                    # driver.get("https://server:7890/system")



                    log("Waiting dashboard to load")

                    wait_title_contains("${user}@server")
@@ -143,9 +144,9 @@ import ./make-test-python.nix ( 
      start_all()



      server.wait_for_unit("sockets.target")

      server.wait_for_open_port(9090)

      server.wait_for_open_port(7890)



      client.succeed("curl -k https://server:9090 -o /dev/stderr")

      client.succeed("curl -k https://server:7890 -o /dev/stderr")

      print(client.succeed("whoami"))

      client.succeed('PYTHONUNBUFFERED=1 selenium-script')

    '';

pkgs/applications/networking/cluster/nomad/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -120,9 +120,9 @@ rec { 


  nomad_1_9 = generic {

    buildGoModule = buildGo123Module;

    version = "1.9.4";

    sha256 = "sha256-yhOyHfD5099dCY7lIJzTb8tQrqQ86N8HVtSk5mB7saY=";

    vendorHash = "sha256-Cxjgs4Hmv0sq11OpvYLnNcc76ojwqwcxMmCZT5Or0f4=";

    version = "1.9.5";

    sha256 = "sha256-NIv3QPSYoYrDQxxtNDHc3DdBLb45oUdA5Jyjke+XzD8=";

    vendorHash = "sha256-y4WBOSfkRYNQRWu5B/j2JBLPAxJ1fyLD0DEAjB10Sl8=";

    license = lib.licenses.bsl11;

    passthru.tests.nomad = nixosTests.nomad;

    preCheck = ''

pkgs/by-name/al/alt-tab-macos/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -8,11 +8,11 @@ 


stdenvNoCC.mkDerivation (finalAttrs: {

  pname = "alt-tab-macos";

  version = "7.18.1";

  version = "7.19.1";



  src = fetchurl {

    url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip";

    hash = "sha256-PMnA0G/CuofKR7mlWkcbQ+JVdGf91yQf7q8znFCIujY=";

    hash = "sha256-eT/HZDBDtOh9uQEffLhlBXfWuPSM/bnpgp5OFnSuCBk=";

  };



  sourceRoot = ".";

pkgs/by-name/bi/bilibili/sources.nix

+3 −3
Original line number Diff line number Diff line 
# Generated by ./update.sh - do not update manually!

{

  version = "1.16.1-3";

  arm64-hash = "sha256-VUbBHt9MzHZdbWJ4ak8T3vf5ZEi/gVTU89tKsJb+iu4=";

  x86_64-hash = "sha256-BkSreYgz3d2/Hw5lmH5IMCKxzqPO+Lb2vv6OuOkQOL0=";

  version = "1.16.2-2";

  arm64-hash = "sha256-re+QOxuFEBmymJ4Cbsv+1UEDxWACudGoHOpha8PIAso=";

  x86_64-hash = "sha256-89I47II8g4Q7CIwxmt797SzeZlAvVu2cTh05puWZ8+8=";

}