From dab5667370f3a2882834fee31eeb892f7d0305e2 Mon Sep 17 00:00:00 2001 From: colin Date: Sat, 21 Jan 2023 02:59:45 +0000 Subject: [PATCH 1/2] phosh: 0.22.0 -> 0.23.0 also added `updateScript` to ease future updates: ```sh $ nix-shell maintainers/scripts/update.nix --argstr package phosh ``` changelog: abbreviated changelog (included inline below): > phosh 0.23.0 > ------------ > Released December 2022 > * New lockscreen plugin for personal/emergency information > * Allow plugins to have UI to set preferences > * Ease creating plugin by better examples, improved helpers > and less duplication. > * Switch docs to gi-docgen --- .../window-managers/phosh/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index f18ca995b14b..441f4f255f78 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; From bed9c9319f9b0c7bef1b70fc47cc5e8fd25107f9 Mon Sep 17 00:00:00 2001 From: colin Date: Sat, 21 Jan 2023 03:00:03 +0000 Subject: [PATCH 2/2] phosh-mobile-settings: 0.21.1 -> 0.23.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit also added `updateScript` to ease future updates: ```sh $ nix-shell maintainers/scripts/update.nix --argstr package phosh-mobile-settings ``` changelog: abbreviated changelog (included inline below): > phosh-mobile-settings 0.23.1 > ---------------------------- > Released: Junary 2023 > * Fix enabling plugins > > phosh-mobile-settings 0.23.0 > ---------------------------- > Released: December 2022 > * Allow lockscreen plugins to have preferences > > phosh-mobile-settings 0.22.0 > ---------------------------- > Released: September 2022 > * Avoid flicker on startup > * Minor fixes > * Sync version with phosh > * Contributors: > Guido Günther --- .../window-managers/phosh/phosh-mobile-settings.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix index 6786576e6edc..c09df0065ef4 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;