diff options
author | Jonas Heinrich <onny@project-insanity.org> | 2023-01-22 10:02:39 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-22 10:02:39 +0100 |
commit | ee1da203e7de1fd30f8215a741d22eb629c523ca (patch) | |
tree | bc407d6cdf1155e1a10e50bfd438030c51fddd19 /pkgs/applications/window-managers/phosh | |
parent | 6f878f0da71e89925c9f57d83b5babbd8b26d917 (diff) | |
parent | bed9c9319f9b0c7bef1b70fc47cc5e8fd25107f9 (diff) |
Merge pull request #211877 from uninsane/pr/phosh-0.23.0
phosh: 0.22.0 -> 0.23.0
Diffstat (limited to 'pkgs/applications/window-managers/phosh')
-rw-r--r-- | pkgs/applications/window-managers/phosh/default.nix | 16 | ||||
-rw-r--r-- | pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix | 12 |
2 files changed, 21 insertions, 7 deletions
diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 586b82cc059c1..5b4480499d95d 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -1,11 +1,13 @@ { lib , stdenv , fetchFromGitLab +, gitUpdater , meson , ninja , pkg-config , python3 , wrapGAppsHook +, libadwaita , libhandy , libxkbcommon , libgudev @@ -13,7 +15,7 @@ , pulseaudio , evince , glib -, gtk3 +, gtk4 , gnome , gnome-desktop , gcr @@ -34,7 +36,7 @@ stdenv.mkDerivation rec { pname = "phosh"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -43,10 +45,11 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects - sha256 = "sha256-q2AYm+zbL4/pRG1wn+MT6IYM8CZt15o48U9+piMPf74="; + sha256 = "sha256-EMPqBKrtlwI9SJlqZjyAN5CtV4/BNwc5LapfeCEIYxc="; }; nativeBuildInputs = [ + libadwaita meson ninja pkg-config @@ -71,7 +74,7 @@ stdenv.mkDerivation rec { gnome.gnome-control-center gnome-desktop gnome.gnome-session - gtk3 + gtk4 pam systemd upower @@ -127,11 +130,16 @@ stdenv.mkDerivation rec { ]; tests.phosh = nixosTests.phosh; + + updateScript = gitUpdater { + rev-prefix = "v"; + }; }; meta = with lib; { description = "A pure Wayland shell prototype for GNOME on mobile devices"; homepage = "https://gitlab.gnome.org/World/Phosh/phosh"; + changelog = "https://gitlab.gnome.org/World/Phosh/phosh/-/blob/v${version}/debian/changelog"; license = licenses.gpl3Plus; maintainers = with maintainers; [ masipcat zhaofengli ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix index 6786576e6edc4..c09df0065ef44 100644 --- a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix +++ b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, gitUpdater , meson , ninja , pkg-config @@ -17,19 +18,20 @@ stdenv.mkDerivation rec { pname = "phosh-mobile-settings"; - version = "0.21.1"; + version = "0.23.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "guidog"; repo = "phosh-mobile-settings"; rev = "v${version}"; - sha256 = "sha256-60AXaKSF8bY+Z3TNlIIa7jZwQ2IkHqCbZ3uIlhkx6i0="; + sha256 = "sha256-D605efn25Dl3Bj92DZiagcx+MMcRz0GRaWxplBRcZhA="; }; nativeBuildInputs = [ meson ninja + phosh pkg-config wrapGAppsHook ]; @@ -41,7 +43,6 @@ stdenv.mkDerivation rec { libadwaita lm_sensors phoc - phosh wayland-protocols ]; @@ -56,9 +57,14 @@ stdenv.mkDerivation rec { --replace 'Exec=phosh-mobile-settings' "Exec=$out/bin/phosh-mobile-settings" ''; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + meta = with lib; { description = "A settings app for mobile specific things"; homepage = "https://gitlab.gnome.org/guidog/phosh-mobile-settings"; + changelog = "https://gitlab.gnome.org/guidog/phosh-mobile-settings/-/blob/v${version}/debian/changelog"; license = licenses.gpl3Plus; maintainers = with maintainers; [ colinsane ]; platforms = platforms.linux; |