Merge pull request #233519 from hall/phosh-0.27.0

phosh: 0.25.1 -> 0.27.0
This commit is contained in:
Weijia Wang 2023-06-14 14:12:22 +03:00 committed by GitHub
commit 731c00a128
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 13 deletions

View file

@ -31,7 +31,7 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "feedbackd"; pname = "feedbackd";
version = "0.1.0"; version = "0.2.0";
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
@ -40,17 +40,10 @@ stdenv.mkDerivation rec {
owner = "Librem5"; owner = "Librem5";
repo = "feedbackd"; repo = "feedbackd";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-7H5Ah4zo+wLKd0WoKoOgtIm7HcUSw8PTf/KzBlY75oc="; hash = "sha256-l5rfMx3ElW25A5WVqzfKBp57ebaNC9msqV7mvnwv10s=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
patches = [
(fetchpatch2 {
url = "https://source.puri.sm/Librem5/feedbackd/-/merge_requests/109.patch";
hash = "sha256-z3Ud6P2GHYOaGA2vJDD3Sz47+M8p0VcYZ5gbYcGydMk=";
})
];
depsBuildBuild = [ depsBuildBuild = [
pkg-config pkg-config
]; ];

View file

@ -52,7 +52,7 @@ let
}); });
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "phoc"; pname = "phoc";
version = "0.25.0"; version = "0.27.0";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
@ -60,7 +60,7 @@ in stdenv.mkDerivation rec {
owner = "Phosh"; owner = "Phosh";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-1cbv4vzQ+RcRoT1pOT8Q0nxuZzKUlec38KCNMYaceeE="; sha256 = "sha256-4/Fxo72KXLy3gxXMS+PrTUbZl0EFt2GPMXg8+/fE7MY=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View file

@ -36,7 +36,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "phosh"; pname = "phosh";
version = "0.25.1"; version = "0.27.0";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
@ -45,7 +45,7 @@ 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-ysAZdmkFEuqJDTPe246F2I4Qp+fjtomia42PS8BuMM8="; sha256 = "sha256-dnSYeXn3aPwvxeIjjk+PsnOVKyuGlxXMXGWDdrRrIM0=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [