Merge pull request #329938 from donovanglover/phosh-0.40.0 (965ba5d5) · Commits · mdf / nixpkgs

pkgs/applications/accessibility/squeekboard/default.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -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 = [

pkgs/applications/misc/feedbackd/default.nix

+14 −9

Original line number	Diff line number	Diff line
		@@ -17,6 +17,8 @@
		, json-glib
		, libgudev
		, dbus
		, gmobile
		, umockdev
		}:

		let
		@@ -24,13 +26,13 @@ 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 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;
		};
		}
		})

pkgs/applications/misc/phoc/default.nix

+11 −6

Original line number	Diff line number	Diff line
		{ 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"];

pkgs/applications/window-managers/phosh/default.nix

+5 −6

Original line number	Diff line number	Diff line
		@@ -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}"
		];

pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix

+11 −6

Original line number	Diff line number	Diff line
		{ 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 = ''

Admin message