Unverified Commit a42f75c6 authored by Colin's avatar Colin Committed by GitHub
Browse files

phosh: 0.48.0 -> 0.50.0 (#450287)

parents 8d2da8ae 6889c709

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

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ let 
in

stdenv.mkDerivation (finalAttrs: {

  pname = "phosh";

  version = "0.48.0";

  version = "0.50.0";



  src = fetchFromGitLab {

    domain = "gitlab.gnome.org";
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { 
    owner = "Phosh";

    repo = "phosh";

    tag = "v${finalAttrs.version}";

    hash = "sha256-HnjR0hVjkGfoD8RYCJqpGjRhl0W+QO8tYwSo71XFL6A=";

    hash = "sha256-AvnMiLapHKSObz6x/fkLxqreksBkwLbcG6myj5xMuwc=";

  };



  nativeBuildInputs = [

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

+26 −2
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ 
  libportal,

  libportal-gtk4,

  glib,

  libyaml,

  mobile-broadband-provider-info,

  modemmanager,

}:



let
@@ -36,10 +39,26 @@ let 
    rev = "5f9768a2eac29c1ed56f1fbb449a77a3523683b6";

    hash = "sha256-gdgTnxzH8BeYQAsvv++Yq/8wHi7ISk2LTBfU8hk12NM=";

  };

  # Derived from subprojects/glibcellbroadcast.wrap

  libcellbroadcast = fetchFromGitLab {

    domain = "gitlab.freedesktop.org";

    owner = "devrtz";

    repo = "cellbroadcastd";

    tag = "v0.0.2";

    hash = "sha256-rs9MoC54sVrs3HK0cbX4msYWA63y+DlDOZ5LboVtW9Y=";

  };

  # Derived from subprojects/libcellbroadcast/subprojects/gvdb.wrap

  gvdb = fetchFromGitLab {

    domain = "gitlab.gnome.org";

    owner = "GNOME";

    repo = "gvdb";

    rev = "4758f6fb7f889e074e13df3f914328f3eecb1fd3";

    hash = "sha256-4mqoHPlrMPenoGPwDqbtv4/rJ/uq9Skcm82pRvOxNIk=";

  };

in

stdenv.mkDerivation rec {

  pname = "phosh-mobile-settings";

  version = "0.48.0";

  version = "0.50.0";



  src = fetchFromGitLab {

    domain = "gitlab.gnome.org";
@@ -47,7 +66,7 @@ stdenv.mkDerivation rec { 
    owner = "Phosh";

    repo = "phosh-mobile-settings";

    rev = "v${version}";

    hash = "sha256-XnXwTjZnPlGNUmqizcIQdJ6SmrQ0dq9jNEhNsmDPzyM=";

    hash = "sha256-hcq99ilfclZCviFhpQ9mQLcpf7wc+IvlUOb0duQM6fk=";

  };



  nativeBuildInputs = [
@@ -75,10 +94,15 @@ stdenv.mkDerivation rec { 
    libpulseaudio

    libportal

    libportal-gtk4

    libyaml

    mobile-broadband-provider-info

    modemmanager

  ];



  postPatch = ''

    ln -s ${gvc} subprojects/gvc

    ln -s ${libcellbroadcast} subprojects/libcellbroadcast

    ln -s ${gvdb} subprojects/gvdb

  '';



  postInstall = ''

pkgs/by-name/ph/phoc/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ let 
in

stdenv.mkDerivation (finalAttrs: {

  pname = "phoc";

  version = "0.48.0";

  version = "0.50.0";



  src = fetchFromGitLab {

    domain = "gitlab.gnome.org";
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { 
    owner = "Phosh";

    repo = "phoc";

    rev = "v${finalAttrs.version}";

    hash = "sha256-ve69Na6iZwsNM0y7AZ0p/CObUfE6uEbhOV4sb5NaCYg=";

    hash = "sha256-Fq/XinXdFerzuutjXUGbpvAvJBt/23ISHvY5KfVgbFI=";

  };



  nativeBuildInputs = [