From 53fbc163fef711ec3bc5f631760c4b0faabd8f74 Mon Sep 17 00:00:00 2001 From: Armel Cloarec Date: Wed, 22 Apr 2026 16:15:24 +0200 Subject: [PATCH 1/5] phoc: 0.53.0 -> 0.54.0 --- pkgs/by-name/ph/phoc/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ph/phoc/package.nix b/pkgs/by-name/ph/phoc/package.nix index 069b10d4f281..a2b75c128f72 100644 --- a/pkgs/by-name/ph/phoc/package.nix +++ b/pkgs/by-name/ph/phoc/package.nix @@ -36,11 +36,13 @@ let repo = "gvdb"; rev = "4758f6fb7f889e074e13df3f914328f3eecb1fd3"; hash = "sha256-4mqoHPlrMPenoGPwDqbtv4/rJ/uq9Skcm82pRvOxNIk="; + # Workaround for https://github.com/NixOS/nixpkgs/issues/485701 + forceFetchGit = true; }; in stdenv.mkDerivation (finalAttrs: { pname = "phoc"; - version = "0.53.0"; + version = "0.54.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -48,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "Phosh"; repo = "phoc"; tag = "v${finalAttrs.version}"; - hash = "sha256-qBeOsHxdcJjAx/KGJEQKuqkexp1lGWeEaJPBjAy1Yxw="; + hash = "sha256-P81D3gCC4Q1JQPUlAtLbMZdlVOPpJJ1/rLX7zijFcc0="; # Workaround for https://github.com/NixOS/nixpkgs/issues/485701 forceFetchGit = true; }; From d48d890bf6b4e0eed535918a9b6b72b0af0f2685 Mon Sep 17 00:00:00 2001 From: Armel Cloarec Date: Wed, 22 Apr 2026 16:30:30 +0200 Subject: [PATCH 2/5] stevia: 0.52.1 -> 0.54.0 --- pkgs/by-name/st/stevia/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stevia/package.nix b/pkgs/by-name/st/stevia/package.nix index 04cc43d48785..7b06e656e1ff 100644 --- a/pkgs/by-name/st/stevia/package.nix +++ b/pkgs/by-name/st/stevia/package.nix @@ -22,17 +22,20 @@ libxkbcommon, systemd, nix-update-script, + dconf, }: stdenv.mkDerivation (finalAttrs: { pname = "stevia"; - version = "0.52.1"; + version = "0.54.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World/Phosh"; repo = "stevia"; tag = "v${finalAttrs.version}"; - hash = "sha256-GdAKy7F8SRGtfmN6as6AAg6p/WJrcDPp338OHUXoORM="; + hash = "sha256-eCM2PSn0sDnL7iDbgt6phQsGmdeBfkVjOkxt42WxyXo="; + # Workaround for https://github.com/NixOS/nixpkgs/issues/485701 + forceFetchGit = true; }; mesonFlags = [ @@ -67,6 +70,7 @@ stdenv.mkDerivation (finalAttrs: { libhandy libxkbcommon systemd + dconf ]; passthru.updateScript = nix-update-script { }; From 5ff7c23b89207439af3baa14001ab9a4edf57d5e Mon Sep 17 00:00:00 2001 From: Armel Cloarec Date: Wed, 22 Apr 2026 16:50:17 +0200 Subject: [PATCH 3/5] phosh-mobile-settings: 0.51.0 -> 0.54.0 --- .../phosh/phosh-mobile-settings.nix | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix index 18bc6927040c..fe228d20af6c 100644 --- a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix +++ b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix @@ -28,16 +28,21 @@ libyaml, mobile-broadband-provider-info, modemmanager, + gobject-introspection, + appstream, + gst_all_1, }: let # Derived from subprojects/gvc.wrap gvc = fetchFromGitLab { domain = "gitlab.gnome.org"; - owner = "GNOME"; + owner = "guidog"; repo = "libgnome-volume-control"; - rev = "5f9768a2eac29c1ed56f1fbb449a77a3523683b6"; - hash = "sha256-gdgTnxzH8BeYQAsvv++Yq/8wHi7ISk2LTBfU8hk12NM="; + rev = "d2442f455844e5292cb4a74ffc66ecc8d7595a9f"; + hash = "sha256-10n441b7m/mvQRdrmEsxGxqjKUWzjGvnzJy256NZN5s="; + # Workaround for https://github.com/NixOS/nixpkgs/issues/485701 + forceFetchGit = true; }; # Derived from subprojects/glibcellbroadcast.wrap libcellbroadcast = fetchFromGitLab { @@ -46,6 +51,8 @@ let repo = "cellbroadcastd"; tag = "v0.0.2"; hash = "sha256-rs9MoC54sVrs3HK0cbX4msYWA63y+DlDOZ5LboVtW9Y="; + # Workaround for https://github.com/NixOS/nixpkgs/issues/485701 + forceFetchGit = true; }; # Derived from subprojects/libcellbroadcast/subprojects/gvdb.wrap gvdb = fetchFromGitLab { @@ -54,11 +61,13 @@ let repo = "gvdb"; rev = "4758f6fb7f889e074e13df3f914328f3eecb1fd3"; hash = "sha256-4mqoHPlrMPenoGPwDqbtv4/rJ/uq9Skcm82pRvOxNIk="; + # Workaround for https://github.com/NixOS/nixpkgs/issues/485701 + forceFetchGit = true; }; in stdenv.mkDerivation rec { pname = "phosh-mobile-settings"; - version = "0.51.0"; + version = "0.54.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -66,7 +75,9 @@ stdenv.mkDerivation rec { owner = "Phosh"; repo = "phosh-mobile-settings"; rev = "v${version}"; - hash = "sha256-eIRhxhU+u4cocqyw7ab5BefTp9om5UaiqrJWwN+RtoQ="; + hash = "sha256-TuwxzzalNhNJwPmmPJmxsHebzksPYv8jV6K0vYntQIw="; + # Workaround for https://github.com/NixOS/nixpkgs/issues/485701 + forceFetchGit = true; }; nativeBuildInputs = [ @@ -77,6 +88,8 @@ stdenv.mkDerivation rec { wayland-scanner wrapGAppsHook4 glib.dev + gobject-introspection + appstream ]; buildInputs = [ @@ -97,6 +110,7 @@ stdenv.mkDerivation rec { libyaml mobile-broadband-provider-info modemmanager + gst_all_1.gst-plugins-base ]; postPatch = '' From 70a9cd660b984ee062384221124d9be1f482e9a4 Mon Sep 17 00:00:00 2001 From: Armel Cloarec Date: Wed, 22 Apr 2026 16:53:18 +0200 Subject: [PATCH 4/5] qrcodegen: add pkg-config .pc file --- pkgs/by-name/qr/qrcodegen/package.nix | 6 ++++++ pkgs/by-name/qr/qrcodegen/qrcodegen.pc | 9 +++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/by-name/qr/qrcodegen/qrcodegen.pc diff --git a/pkgs/by-name/qr/qrcodegen/package.nix b/pkgs/by-name/qr/qrcodegen/package.nix index 09c176cb98e8..67cd166ca256 100644 --- a/pkgs/by-name/qr/qrcodegen/package.nix +++ b/pkgs/by-name/qr/qrcodegen/package.nix @@ -38,6 +38,12 @@ stdenv.mkDerivation (finalAttrs: { install -Dt $out/lib/ libqrcodegen.a install -Dt $out/include/qrcodegen/ qrcodegen.h + mkdir -p $out/lib/pkgconfig + substitute ${./qrcodegen.pc} $out/lib/pkgconfig/qrcodegen.pc \ + --subst-var out \ + --subst-var pname \ + --subst-var version + runHook postInstall ''; diff --git a/pkgs/by-name/qr/qrcodegen/qrcodegen.pc b/pkgs/by-name/qr/qrcodegen/qrcodegen.pc new file mode 100644 index 000000000000..d59dd0945b2d --- /dev/null +++ b/pkgs/by-name/qr/qrcodegen/qrcodegen.pc @@ -0,0 +1,9 @@ +prefix=@out@ +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: @pname@ +Description: High-quality QR Code generator library in many languages +Version: @version@ +Cflags: -I${includedir}/qrcodegen +Libs: -L${libdir} -lqrcodegen From 9ba420f4f894676e202b5ab1a8741e5976766a1b Mon Sep 17 00:00:00 2001 From: Armel Cloarec Date: Wed, 22 Apr 2026 19:48:00 +0200 Subject: [PATCH 5/5] phosh: 0.51.0 -> 0.54.0 --- .../window-managers/phosh/default.nix | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index cb482e0b577f..d1e466f63464 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -40,6 +40,10 @@ nixosTests, gmobile, appstream, + qrcodegen, + gobject-introspection, + docutils, + gi-docgen, }: let @@ -51,6 +55,8 @@ let repo = "libcall-ui"; tag = "v0.1.5"; hash = "sha256-4lSTwSRZditK51N/4s3tmIOgffe5+WyKxVq2IGqWRn4="; + # Workaround for https://github.com/NixOS/nixpkgs/issues/485701 + forceFetchGit = true; }; # Derived from subprojects/gvc.wrap @@ -58,13 +64,15 @@ let domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "libgnome-volume-control"; - rev = "5f9768a2eac29c1ed56f1fbb449a77a3523683b6"; - hash = "sha256-gdgTnxzH8BeYQAsvv++Yq/8wHi7ISk2LTBfU8hk12NM="; + rev = "d2442f455844e5292cb4a74ffc66ecc8d7595a9f"; + hash = "sha256-10n441b7m/mvQRdrmEsxGxqjKUWzjGvnzJy256NZN5s="; + # Workaround for https://github.com/NixOS/nixpkgs/issues/485701 + forceFetchGit = true; }; in stdenv.mkDerivation (finalAttrs: { pname = "phosh"; - version = "0.51.0"; + version = "0.54.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -72,7 +80,9 @@ stdenv.mkDerivation (finalAttrs: { owner = "Phosh"; repo = "phosh"; tag = "v${finalAttrs.version}"; - hash = "sha256-bM1eKa5/aBjAHOFYyqjs6pLmr3R/WoK3590yGiLVNM4="; + hash = "sha256-gByZRyUe17JY5imgtRdubJl1VH1JxlzmDQkHOtEIvj8="; + # Workaround for https://github.com/NixOS/nixpkgs/issues/485701 + forceFetchGit = true; }; nativeBuildInputs = [ @@ -83,6 +93,8 @@ stdenv.mkDerivation (finalAttrs: { python3 wayland-scanner wrapGAppsHook4 + docutils + gi-docgen ]; buildInputs = [ @@ -111,6 +123,8 @@ stdenv.mkDerivation (finalAttrs: { wayland feedbackd appstream + qrcodegen + gobject-introspection ]; nativeCheckInputs = [ @@ -131,6 +145,10 @@ stdenv.mkDerivation (finalAttrs: { # Save some time building if tests are disabled "-Dtests=${lib.boolToString finalAttrs.finalPackage.doCheck}" "-Dc_args=-I${glib.dev}/include/gio-unix-2.0/" + "-Dsearchd=true" + "-Dbindings-lib=true" + "-Dgtk_doc=true" + "-Dman=true" ]; checkPhase = '' @@ -157,7 +175,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - description = "Pure Wayland shell prototype for GNOME on mobile devices"; + description = "Pure Wayland shell for mobile devices"; homepage = "https://gitlab.gnome.org/World/Phosh/phosh"; changelog = "https://gitlab.gnome.org/World/Phosh/phosh/-/blob/v${finalAttrs.version}/debian/changelog"; license = lib.licenses.gpl3Plus;