diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-23 12:01:27 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-23 12:01:27 +0000 |
commit | 55a4a2d60a420ca83f31e3f659beb295fd6b8626 (patch) | |
tree | 9cc208b4782113ac800c2b80221e0dd7c3fe52fa /pkgs/desktops | |
parent | 42481e7440dbc78a08bc8d1995d512c011515d7f (diff) | |
parent | 5c96c4d2845fd6224a2a8709d67b21369a4206c8 (diff) | |
download | nixpkgs-55a4a2d60a420ca83f31e3f659beb295fd6b8626.tar nixpkgs-55a4a2d60a420ca83f31e3f659beb295fd6b8626.tar.gz nixpkgs-55a4a2d60a420ca83f31e3f659beb295fd6b8626.tar.bz2 nixpkgs-55a4a2d60a420ca83f31e3f659beb295fd6b8626.tar.lz nixpkgs-55a4a2d60a420ca83f31e3f659beb295fd6b8626.tar.xz nixpkgs-55a4a2d60a420ca83f31e3f659beb295fd6b8626.tar.zst nixpkgs-55a4a2d60a420ca83f31e3f659beb295fd6b8626.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/pantheon/apps/appcenter/default.nix | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index a3e75d231f1..556b67aeafe 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -7,7 +7,6 @@ , elementary-gtk-theme , elementary-icon-theme , fetchFromGitHub -, fetchpatch , flatpak , gettext , glib @@ -15,6 +14,7 @@ , gtk3 , json-glib , libgee +, libhandy , libsoup , libxml2 , meson @@ -25,30 +25,20 @@ , python3 , vala , polkit -, libhandy_0 , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "appcenter"; - version = "3.5.1"; + version = "3.6.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "MsaXdmL+M+NYAJrrwluleeNxqQg0soFbO/G/FqibBFI="; + sha256 = "0kwqgilhyrj2nbvw5y34nzch5h9jnrg1a1n333qdsx4ax6yrxh4j"; }; - patches = [ - # Allow build with appstream 0.14.x - # https://github.com/elementary/appcenter/pull/1493 - (fetchpatch { - url = "https://github.com/elementary/appcenter/commit/5807dd13fe3c715f26225aed8d7a0abdea0c2a64.patch"; - sha256 = "BvEahG9lU9ZdgooFDFhm5evRvnKVcmcHLdmZPb85gbo="; - }) - ]; - passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -78,7 +68,7 @@ stdenv.mkDerivation rec { gtk3 json-glib libgee - libhandy_0 # doesn't support libhandy-1 yet + libhandy libsoup libxml2 packagekit |