BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #211877 from uninsane/pr/phosh-0.23.0

Browse source 
phosh: 0.22.0 -> 0.23.0
This commit is contained in:
Jonas Heinrich 2023-01-22 10:02:39 +01:00 committed by GitHub
commit ee1da203e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/applications/window-managers/phosh/default.nix
View file

@ -1,11 +1,13 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitLab , fetchFromGitLab
, gitUpdater
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
, python3 , python3
, wrapGAppsHook , wrapGAppsHook
, libadwaita
, libhandy , libhandy
, libxkbcommon , libxkbcommon
, libgudev , libgudev
@ -13,7 +15,7 @@
, pulseaudio , pulseaudio
, evince , evince
, glib , glib
, gtk3 , gtk4
, gnome , gnome
, gnome-desktop , gnome-desktop
, gcr , gcr
@ -34,7 +36,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "phosh"; pname = "phosh";
version = "0.22.0"; version = "0.23.0";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
@ -43,10 +45,11 @@ stdenv.mkDerivation rec {
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects
sha256 = "sha256-q2AYm+zbL4/pRG1wn+MT6IYM8CZt15o48U9+piMPf74="; sha256 = "sha256-EMPqBKrtlwI9SJlqZjyAN5CtV4/BNwc5LapfeCEIYxc=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
libadwaita
meson meson
ninja ninja
pkg-config pkg-config
@ -71,7 +74,7 @@ stdenv.mkDerivation rec {
gnome.gnome-control-center gnome.gnome-control-center
gnome-desktop gnome-desktop
gnome.gnome-session gnome.gnome-session
gtk3 gtk4
pam pam
systemd systemd
upower upower
@ -127,11 +130,16 @@ stdenv.mkDerivation rec {
]; ];
tests.phosh = nixosTests.phosh; tests.phosh = nixosTests.phosh;
updateScript = gitUpdater {
rev-prefix = "v";
};
}; };
meta = with lib; { meta = with lib; {
description = "A pure Wayland shell prototype for GNOME on mobile devices"; description = "A pure Wayland shell prototype for GNOME on mobile devices";
homepage = "https://gitlab.gnome.org/World/Phosh/phosh"; homepage = "https://gitlab.gnome.org/World/Phosh/phosh";
changelog = "https://gitlab.gnome.org/World/Phosh/phosh/-/blob/v${version}/debian/changelog";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ masipcat zhaofengli ]; maintainers = with maintainers; [ masipcat zhaofengli ];
platforms = platforms.linux; platforms = platforms.linux;

12
pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix
View file

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitLab , fetchFromGitLab
, gitUpdater
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
@ -17,19 +18,20 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "phosh-mobile-settings"; pname = "phosh-mobile-settings";
version = "0.21.1"; version = "0.23.1";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
owner = "guidog"; owner = "guidog";
repo = "phosh-mobile-settings"; repo = "phosh-mobile-settings";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-60AXaKSF8bY+Z3TNlIIa7jZwQ2IkHqCbZ3uIlhkx6i0="; sha256 = "sha256-D605efn25Dl3Bj92DZiagcx+MMcRz0GRaWxplBRcZhA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
meson meson
ninja ninja
phosh
pkg-config pkg-config
wrapGAppsHook wrapGAppsHook
]; ];
@ -41,7 +43,6 @@ stdenv.mkDerivation rec {
libadwaita libadwaita
lm_sensors lm_sensors
phoc phoc
phosh
wayland-protocols wayland-protocols
]; ];
@ -56,9 +57,14 @@ stdenv.mkDerivation rec {
--replace 'Exec=phosh-mobile-settings' "Exec=$out/bin/phosh-mobile-settings" --replace 'Exec=phosh-mobile-settings' "Exec=$out/bin/phosh-mobile-settings"
''; '';
passthru.updateScript = gitUpdater {
rev-prefix = "v";
};
meta = with lib; { meta = with lib; {
description = "A settings app for mobile specific things"; description = "A settings app for mobile specific things";
homepage = "https://gitlab.gnome.org/guidog/phosh-mobile-settings"; 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; license = licenses.gpl3Plus;
maintainers = with maintainers; [ colinsane ]; maintainers = with maintainers; [ colinsane ];
platforms = platforms.linux; platforms = platforms.linux;