Merge pull request #146078 from LibreCybernetics/update-gnome-shell

GNOME Updates
This commit is contained in:
Jan Tojnar 2021-11-15 13:15:11 +01:00 committed by GitHub
commit bb61b6aaef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 21 deletions

View file

@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchurl
, fetchpatch
, gettext
, meson
, ninja
@ -31,13 +30,13 @@
stdenv.mkDerivation rec {
pname = "tracker";
version = "3.2.0";
version = "3.2.1";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-8RelKHXUpNCceqmT+Mio0GRo1dz7FT642qUesThEUTo=";
sha256 = "GEfgiznm5h2EhzWqH5f32WwDggFlP6DXy56Bs365wDo=";
};
patches = [
@ -45,13 +44,6 @@ stdenv.mkDerivation rec {
src = ./fix-paths.patch;
inherit asciidoc;
})
] ++ lib.optionals (stdenv.hostPlatform.isi686) [
# Upstream: https://gitlab.gnome.org/GNOME/tracker/-/issues/332
(fetchpatch {
name = "i686-test.patch";
url = "https://gitlab.gnome.org/GNOME/tracker/-/commit/af707181a2c492a794daec7ce3f3062d67ffd9dc.patch";
sha256 = "sha256-KOdkTy79w3oiQILrPG00UVrv+VBjAk4Y868I8jtifqk=";
})
];
nativeBuildInputs = [

View file

@ -2,7 +2,6 @@
, lib
, desktop-file-utils
, fetchurl
, fetchpatch
, gettext
, glib
, gtk3
@ -22,23 +21,15 @@
stdenv.mkDerivation rec {
pname = "sysprof";
version = "3.42.0";
version = "3.42.1";
outputs = [ "out" "lib" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "PBbgPv3+XT5xxNI5xndBrTf3LOiXHi9/rxaNvV6T6IY=";
sha256 = "F5a4FATudf0eus9URkrXr/6/YvKFHu9STZ+OrAxKIAE=";
};
patches = [
# Fix missing unistd.h include.
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/sysprof/commit/b113c89af1de2f87589175795a197f6384852a78.patch";
sha256 = "3Q8d6IZYNJl/vbyzRgoRR2sdl4aRkbcKPeVjSSqxb98=";
})
];
nativeBuildInputs = [
desktop-file-utils
gettext