From 119712f21ef9887bcc0afa53f60dcbeb2354480c Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 25 Jul 2024 11:38:47 -0400 Subject: [PATCH 1/7] gmobile: init at 0.2.1 --- pkgs/by-name/gm/gmobile/package.nix | 49 +++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/by-name/gm/gmobile/package.nix diff --git a/pkgs/by-name/gm/gmobile/package.nix b/pkgs/by-name/gm/gmobile/package.nix new file mode 100644 index 000000000000..da85a98db244 --- /dev/null +++ b/pkgs/by-name/gm/gmobile/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchFromGitLab, + gtk-doc, + meson, + ninja, + pkg-config, + glib, + json-glib, + libuev, + gobject-introspection, +}: + +stdenv.mkDerivation (finalAttrs: { + name = "gmobile"; + version = "0.2.1"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + group = "World"; + owner = "Phosh"; + repo = "gmobile"; + rev = "v${finalAttrs.version}"; + hash = "sha256-5OQ2JT7YeEYzKXafwgg0xJk2AvtFw2dtcH3mt+cm1bI="; + }; + + nativeBuildInputs = [ + gtk-doc + meson + ninja + pkg-config + gobject-introspection + ]; + + buildInputs = [ + glib + json-glib + libuev + ]; + + meta = { + description = "Functions useful in mobile related, glib based projects"; + homepage = "https://gitlab.gnome.org/World/Phosh/gmobile"; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ donovanglover ]; + platforms = lib.platforms.linux; + }; +}) From fffa43b03e4f1ddb2ad11151af7209709c804da6 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 25 Jul 2024 11:40:21 -0400 Subject: [PATCH 2/7] phoc: 0.38.0 -> 0.41.0 --- pkgs/applications/misc/phoc/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index 9d7664968757..3de975e12192 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , stdenvNoCC -, fetchurl +, fetchFromGitLab , meson , ninja , pkg-config @@ -22,16 +22,20 @@ , directoryListingUpdater , nixosTests , testers +, gmobile }: stdenv.mkDerivation (finalAttrs: { pname = "phoc"; - version = "0.38.0"; + version = "0.41.0"; - src = fetchurl { - # This tarball includes the meson wrapped subproject 'gmobile'. - url = with finalAttrs; "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-OcRUnw1Fck9bMSgfMMcWqqR6a6yzyKjY8P3nqcwVULc="; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + group = "World"; + owner = "Phosh"; + repo = "phoc"; + rev = "v${finalAttrs.version}"; + hash = "sha256-T2gKvP3WyrGNOiCwiX93UjMuSTnnZ+nykEAFhq0BF4U="; }; nativeBuildInputs = [ @@ -56,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: { wayland finalAttrs.wlroots xorg.xcbutilwm + gmobile ]; mesonFlags = ["-Dembed-wlroots=disabled"]; From f8fceac2de6fa57e8ae5fbff827f84511941cc7d Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 25 Jul 2024 11:41:21 -0400 Subject: [PATCH 3/7] phosh: 0.39.0 -> 0.41.0 --- pkgs/applications/window-managers/phosh/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 32ece77e4fb0..4c4f0bb54455 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -32,16 +32,17 @@ , libsecret , evolution-data-server , nixosTests +, gmobile }: stdenv.mkDerivation (finalAttrs: { pname = "phosh"; - version = "0.39.0"; + version = "0.41.0"; src = fetchurl { # Release tarball which includes subprojects gvc and libcall-ui url = with finalAttrs; "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-n1ZegSJAUr1Lbn0+Mx64vHhl4bwSJEdnO1xN/QdEKlw="; + hash = "sha256-HXuD9YC7gqGqAq2YmhXI3WRGsvyBc6PgSW3YSYTOdI4="; }; nativeBuildInputs = [ @@ -67,6 +68,8 @@ stdenv.mkDerivation (finalAttrs: { gcr networkmanager polkit + gmobile + gnome.gnome-bluetooth gnome.gnome-control-center gnome-desktop gnome.gnome-session @@ -87,11 +90,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = false; mesonFlags = [ - "-Dsystemd=true" "-Dcompositor=${phoc}/bin/phoc" - # https://github.com/NixOS/nixpkgs/issues/36468 - # https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1363 - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" # Save some time building if tests are disabled "-Dtests=${lib.boolToString finalAttrs.finalPackage.doCheck}" ]; From ef947512dd91692cef3e5e3e19dcb669a82f76c2 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 25 Jul 2024 11:42:03 -0400 Subject: [PATCH 4/7] phosh-mobile-settings: 0.39.0 -> 0.41.0 --- .../phosh/phosh-mobile-settings.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix index 3a563f9e1723..d0165fffbac0 100644 --- a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix +++ b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab , nixosTests , directoryListingUpdater , meson @@ -17,16 +17,20 @@ , wayland-protocols , json-glib , gsound +, gmobile }: stdenv.mkDerivation rec { pname = "phosh-mobile-settings"; - version = "0.39.0"; + version = "0.41.0"; - src = fetchurl { - # This tarball includes the meson wrapped subproject 'gmobile'. - url = "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-9vN4IqGoRHDJQYohycrrSj4ITJHHaSNgPjpEjRCCvUw="; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + group = "World"; + owner = "Phosh"; + repo = "phosh-mobile-settings"; + rev = "v${version}"; + hash = "sha256-t5qngjQcjPltUGbcZ+CF5FbZtZkV/cD3xUhuApQbKHo="; }; nativeBuildInputs = [ @@ -47,6 +51,7 @@ stdenv.mkDerivation rec { wayland-protocols json-glib gsound + gmobile ]; postPatch = '' From 10dfa86610c9a3b6b4a8f5756a8ddda7d33f5b57 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 25 Jul 2024 11:44:24 -0400 Subject: [PATCH 5/7] feedbackd: 0.2.0 -> 0.4.1 --- pkgs/applications/misc/feedbackd/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/applications/misc/feedbackd/default.nix index 813869496cb9..8cee3208171e 100644 --- a/pkgs/applications/misc/feedbackd/default.nix +++ b/pkgs/applications/misc/feedbackd/default.nix @@ -17,6 +17,8 @@ , json-glib , libgudev , dbus +, gmobile +, umockdev }: let @@ -28,9 +30,9 @@ let sha256 = "sha256-YK9fJ3awmhf1FAhdz95T/POivSO93jsNApm+u4OOZ80="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "feedbackd"; - version = "0.2.0"; + version = "0.4.1"; outputs = [ "out" "dev" "devdoc" ]; @@ -38,9 +40,8 @@ stdenv.mkDerivation rec { domain = "source.puri.sm"; owner = "Librem5"; repo = "feedbackd"; - rev = "v${version}"; - hash = "sha256-l5rfMx3ElW25A5WVqzfKBp57ebaNC9msqV7mvnwv10s="; - fetchSubmodules = true; + rev = "v${finalAttrs.version}"; + hash = "sha256-ta14DYqkid8Cp8fx9ZMGOOJroCBszN9/VrTN6mrpTZg="; }; depsBuildBuild = [ @@ -66,22 +67,26 @@ stdenv.mkDerivation rec { gsound json-glib libgudev + gmobile ]; mesonFlags = [ "-Dgtk_doc=true" "-Dman=true" + # Make compiling work when doCheck = false + "-Dtests=${lib.boolToString finalAttrs.finalPackage.doCheck}" ]; nativeCheckInputs = [ dbus + umockdev ]; doCheck = true; postInstall = '' mkdir -p $out/lib/udev/rules.d - sed "s|/usr/libexec/|$out/libexec/|" < $src/debian/feedbackd.udev > $out/lib/udev/rules.d/90-feedbackd.rules + sed "s|/usr/libexec/|$out/libexec/|" < $src/data/90-feedbackd.rules > $out/lib/udev/rules.d/90-feedbackd.rules cp ${themes}/data/* $out/share/feedbackd/themes/ ''; @@ -103,4 +108,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ pacman99 ]; platforms = platforms.linux; }; -} +}) From 2158e6a1b9971530af759ecbe918aa4bdc6105cd Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 25 Jul 2024 11:44:42 -0400 Subject: [PATCH 6/7] feedbackd-device-themes: 0.1.0 -> 0.4.0 --- pkgs/applications/misc/feedbackd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/applications/misc/feedbackd/default.nix index 8cee3208171e..256892aa0c99 100644 --- a/pkgs/applications/misc/feedbackd/default.nix +++ b/pkgs/applications/misc/feedbackd/default.nix @@ -26,8 +26,8 @@ let domain = "source.puri.sm"; owner = "Librem5"; repo = "feedbackd-device-themes"; - rev = "v0.1.0"; - sha256 = "sha256-YK9fJ3awmhf1FAhdz95T/POivSO93jsNApm+u4OOZ80="; + rev = "v0.4.0"; + hash = "sha256-kY/+DyRxKEUzq7ctl6Va14AKUCpWU7NRQhJOwhtkJp8="; }; in stdenv.mkDerivation (finalAttrs: { From 437f6e33c9a6c206ed2d187f052609931fb829d3 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 25 Jul 2024 11:46:01 -0400 Subject: [PATCH 7/7] squeekboard: 1.38.0 -> 1.41.0 --- pkgs/applications/accessibility/squeekboard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/applications/accessibility/squeekboard/default.nix index 05d8af554a05..6f04afebaca7 100644 --- a/pkgs/applications/accessibility/squeekboard/default.nix +++ b/pkgs/applications/accessibility/squeekboard/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { pname = "squeekboard"; - version = "1.38.0"; + version = "1.41.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { owner = "Phosh"; repo = pname; rev = "v${version}"; - hash = "sha256-ZVSnLH2wLPcOHkU2pO0BgIdGmULMNiacIYMRmhN+bZ8="; + hash = "sha256-WHGdA0cEB1nu7vJ+pwjdl8aZzccJ232vsbSGmZohFVo="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-tcn1tRuRlHVTYvc8T/ePfCEPNjih6B9lo/hdX+WwitQ="; + hash = "sha256-CRKaH8cA/EhXQna3zCU0Z06zkB9qu6QxPJ4No3NFcs0="; }; nativeBuildInputs = [