Unverified Commit 275843fb authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

phoc: 0.51.0 -> 0.53.0 (#504120)

parents d77020f9 88d71f8c

nixos/tests/phosh.nix

+8 −7
Original line number Diff line number Diff line
@@ -54,11 +54,16 @@ in 
    import time



    start_all()



    # Prevent the RTC from setting the time to an undesired value after we already set it to a different value

    phone.wait_for_file("/dev/rtc0")

    phone.succeed("hwclock --set --date '2022-01-01 07:00'")



    phone.wait_for_unit("phosh.service")



    with subtest("Check that we can see the lock screen info page"):

        # Saturday, January 1

        phone.succeed("timedatectl set-time '2022-01-01 07:00'")

        phone.succeed("date -s '2022-01-01 07:00'")



        phone.wait_for_text("Saturday")

        phone.screenshot("01lockinfo")
@@ -73,14 +78,10 @@ in 
        phone.wait_for_text("All Apps")

        phone.screenshot("03launcher")



    with subtest("Check the on-screen keyboard shows"):

        phone.send_chars("mobile setting", delay=0.2)

        phone.wait_for_text("123") # A button on the OSK

        phone.screenshot("04osk")



    with subtest("Check mobile-phosh-settings starts"):

       phone.send_chars("mobile setting", delay=0.2)

       phone.send_chars("\n")

       phone.wait_for_text("Tweak advanced mobile settings");

       phone.screenshot("05settings")

       phone.screenshot("04settings")

  '';

}

pkgs/by-name/ph/phoc/package.nix

+7 −3
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
  stdenv,

  stdenvNoCC,

  fetchFromGitLab,

  callPackage,

  meson,

  ninja,

  pkg-config,
@@ -39,15 +40,17 @@ let 
in

stdenv.mkDerivation (finalAttrs: {

  pname = "phoc";

  version = "0.51.0";

  version = "0.53.0";



  src = fetchFromGitLab {

    domain = "gitlab.gnome.org";

    group = "World";

    owner = "Phosh";

    repo = "phoc";

    rev = "v${finalAttrs.version}";

    hash = "sha256-6glG5QvphanjBvf9xKiXjkVceWBQ8EjFkRywdfYc7E4=";

    tag = "v${finalAttrs.version}";

    hash = "sha256-qBeOsHxdcJjAx/KGJEQKuqkexp1lGWeEaJPBjAy1Yxw=";

    # Workaround for https://github.com/NixOS/nixpkgs/issues/485701

    forceFetchGit = true;

  };



  nativeBuildInputs = [
@@ -101,6 +104,7 @@ stdenv.mkDerivation (finalAttrs: { 
    tests.version = testers.testVersion {

      package = finalAttrs.finalPackage;

    };

    tests.dependency-versions = callPackage ./test-dependency-versions.nix { inherit gvdb; };

    updateScript = nix-update-script { };

  };

pkgs/by-name/ph/phoc/test-dependency-versions.nix

0 → 100644
+18 −0
Original line number Diff line number Diff line 
{

  lib,

  runCommand,

  yq-go,

  phoc,

  gvdb,

}:



runCommand "phoc-test-dependency-versions" { } ''

  phoc_wants_gvdb_revision="$('${lib.getExe yq-go}' --input-format ini --output-format ini '.wrap-git.revision' '${phoc.src}/subprojects/gvdb.wrap')"

  phoc_gets_gvdb_revision='${gvdb.rev}'



  if [ "$phoc_wants_gvdb_revision" != "$phoc_gets_gvdb_revision" ]; then

    echo "Wrong GVDB version! Phoc wants GVDB Git revision $phoc_wants_gvdb_revision but we're providing $phoc_gets_gvdb_revision."

    exit 1

  fi

  touch "$out"

''