cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #65113 from worldofpeace/gnome-updates

Browse source 
GNOME3 updates
This commit is contained in:
worldofpeace 2019-07-22 14:46:03 -04:00 committed by GitHub
commit d8d85aef04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 102 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/desktops/gnome-3/apps/evolution/default.nix
View file

@ -42,11 +42,11 @@
stdenv.mkDerivation rec {
pname = "evolution";
version = "3.32.3";
version = "3.32.4";
src = fetchurl {
url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0ghwi4mmx6l28dkjx7ayiqcrvmfakqfiyvdg6946v5dcimgsclxn";
sha256 = "00hmmg4hfns8rq9rcilmy0gi1xkksld27lfbd9zmw2xw37wjmbqh";
};
nativeBuildInputs = [

76
pkgs/desktops/gnome-3/apps/ghex/default.nix
View file

@ -1,30 +1,86 @@
{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, libxml2, gtk3,
wrapGAppsHook }:
{ stdenv
, fetchurl
, fetchpatch
, pkgconfig
, meson
, ninja
, python3
, gnome3
, hicolor-icon-theme
, desktop-file-utils
, appstream-glib
, gettext
, itstool
, libxml2
, gtk3
, glib
, atk
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
name = "ghex-${version}";
version = "3.18.3";
pname = "ghex";
version = "3.18.4";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/ghex/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "c67450f86f9c09c20768f1af36c11a66faf460ea00fbba628a9089a6804808d3";
url = "mirror://gnome/sources/ghex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1h1pjrr9wynclfykizqd78dbi785wjz6b63p31k87kjvzy8w3nf2";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
nativeBuildInputs = [
desktop-file-utils
gettext
hicolor-icon-theme # for setup-hook
itstool
meson
ninja
pkgconfig
python3
wrapGAppsHook
];
buildInputs = [ gtk3 intltool itstool libxml2 ];
buildInputs = [
gtk3
atk
glib
];
checkInputs = [
appstream-glib
desktop-file-utils
];
patches = [
# Fixes for darwin. Drop in next release.
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/ghex/commit/b0af26666cd990d99076c242b2abb3efc6e98671.patch";
sha256 = "1zwdkgr2nqrn9q3ydyvrrpn5x55cdi747fhbq6mh6blp9cbrk9b5";
})
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/ghex/commit/cc8ef9e67b23604c402460010dc0b5dccb85391b.patch";
sha256 = "0j2165rfhlbrlzhmcnirqd5m89ljpz0n3nz20sxbwlc8h42zv36s";
})
];
postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
'';
passthru = {
updateScript = gnome3.updateScript {
packageName = "ghex";
attrPath = "gnome3.ghex";
attrPath = "gnome3.${pname}";
};
};
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Ghex;
description = "Hex editor for GNOME desktop environment";
platforms = platforms.linux;
platforms = platforms.unix;
license = licenses.gpl2Plus;
maintainers = gnome3.maintainers;
};
}

4
pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
View file

@ -5,13 +5,13 @@
, gnome3, libxml2, gsettings-desktop-schemas }:
let
version = "3.32.1";
version = "3.32.2";
in stdenv.mkDerivation rec {
name = "gnome-notes-${version}";
src = fetchurl {
url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz";
sha256 = "02b7afg3ps0hxp5dkb4kv6315ydc2r6bxgk1kamwp581lc7ghd67";
sha256 = "0chm2fks7cpx3mycxzddpj6v9by203c3m1y6zns5ra43bspwafy2";
};
doCheck = true;

4
pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
name = "evolution-data-server-${version}";
version = "3.32.3";
version = "3.32.4";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1sx2ywvvwbmphrlqq62srd235ihsj8864d9g8kcbcxwrvn2z70b4";
sha256 = "0zsc9xwy6ixk3x0dx69ax5isrdw8qxjdxg2i5fr95s40nss7rxl3";
};
patches = [

4
pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "gnome-user-docs-${version}";
version = "3.32.2";
version = "3.32.3";
src = fetchurl {
url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1ny7cwkyskrykzsrabjnlc9jsdl4kdk73smwxas6ddmca02hpm7c";
sha256 = "0dvsl0ldg8rf7yq0r4dv1pn41s7gjgcqp7agkbflkbmhrl6vbhig";
};
passthru = {

4
pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
View file

@ -28,11 +28,11 @@
stdenv.mkDerivation rec {
pname = "grilo-plugins";
version = "0.3.8";
version = "0.3.9";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0nync07gah3jkpb5ph5d3gwbygmabnih2m3hfz7lkvjl2l5pgpac";
sha256 = "1hv84b56qjic8vz8iz46ikhrxx31l29ilbr8dm5qcghbd8ikw8j1";
};
nativeBuildInputs = [

31
pkgs/desktops/gnome-3/core/grilo/default.nix
View file

@ -1,10 +1,10 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, vala, glib, liboauth, gtk3
, gtk-doc, docbook_xsl, docbook_xml_dtd_43
, gtk-doc, docbook_xsl, docbook_xml_dtd_43, fetchpatch
, libxml2, gnome3, gobject-introspection, libsoup, totem-pl-parser }:
let
pname = "grilo";
version = "0.3.7"; # if you change minor, also change ./setup-hook.sh
version = "0.3.9"; # if you change minor, also change ./setup-hook.sh
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -13,23 +13,32 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1dz965l743r4bhj78wij9k1mb6635gnkb1lnk9j7gw9dd5qsyfza";
sha256 = "1wnabc69730jsv8dljj5ik8g7p581nw60mw1mkgamkzjcb6821bk";
};
patches = [
# Fix meson build: https://gitlab.gnome.org/GNOME/grilo/merge_requests/34
(fetchurl {
url = "https://gitlab.gnome.org/GNOME/grilo/commit/166612aeff09e5fc2fec1f62185c84cbdcf8f889.diff";
sha256 = "07zamy927iaa7knrwq5yxz7ypl1i02pymkcdrg5l55alhdvb81pw";
})
];
setupHook = ./setup-hook.sh;
mesonFlags = [
"-Dgtk_doc=true"
];
patches = [
# https://gitlab.gnome.org/GNOME/grilo/merge_requests/45
# commits are from a separate branch so they shouldn't 404
(fetchpatch {
url = "https://gitlab.gnome.org/worldofpeace/grilo/commit/f6993c2a8a6c1a6246372569f9f7a9179955c95e.patch";
sha256 = "1x4s0ahs60dqyphgv2dy3x2sjnxv5ydd55kdlcjsys5870ijwbi8";
})
(fetchpatch {
url = "https://gitlab.gnome.org/worldofpeace/grilo/commit/61bca28b141162a33eb2fb575ef1daf0f21c7741.patch";
sha256 = "1147xbmaq61myfwxz0pagdv056krfmh1s78qjbiy5k7k203qrjz0";
})
(fetchpatch {
url = "https://gitlab.gnome.org/worldofpeace/grilo/commit/363b198a062eeb8aaa5489ea9720e69d428e885c.patch";
sha256 = "01w1bfzdbnxy5l37b2z7a9h2mrxziqkzdw02dybjphy85nb0hz5w";
})
];
nativeBuildInputs = [
meson ninja pkgconfig gettext gobject-introspection vala
gtk-doc docbook_xsl docbook_xml_dtd_43

4
pkgs/desktops/gnome-3/misc/nautilus-python/default.nix
View file

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "nautilus-python";
version = "1.2.2";
version = "1.2.3";
outputs = [ "out" "dev" "doc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "04pib6fan6cq8x0fhf5gll2f5d2dh5pxrhj79qhi5l1yc7ys7kch";
sha256 = "161050sx3sdxqcpjkjcpf6wl4kx0jydihga7mcvrj9c2f8ly0g07";
};
nativeBuildInputs = [

2
pkgs/development/libraries/appstream-glib/default.nix
View file

@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
description = "Objects and helper methods to read and write AppStream metadata";
homepage = https://people.freedesktop.org/~hughsient/appstream-glib/;
license = licenses.lgpl2Plus;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ lethalman matthewbauer ];
};
}

33
pkgs/development/libraries/gvfs/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, dbus
, glib, libgudev, udisks2, libgcrypt, libcap, polkit, fetchpatch
, glib, libgudev, udisks2, libgcrypt, libcap, polkit
, libgphoto2, avahi, libarchive, fuse, libcdio
, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp
, gnomeSupport ? false, gnome, gcr, wrapGAppsHook
@ -9,42 +9,15 @@
let
pname = "gvfs";
version = "1.40.1";
version = "1.40.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1cfnzamr4mvgpf6yhm28lh9cafy9z6842s8jpbqnfizfxybg8ylj";
sha256 = "07lpcfric3h0302n9b1pwa38mjb76r9s98kg2867y2d1qvzfivxx";
};
patches = [
# CVE-2019-12448
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gvfs/commit/464bbc7e4e7fdfc3cb426557562038408b6108c5.patch";
sha256 = "03fwlpj1vbi80661bbhzv8ddx3czkzv9i1q4h3gqyxi5f1i0xfz4";
})
# CVE-2019-12447
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gvfs/commit/cf2f9c4020bbdd895485244b70e9442a80062cbe.patch";
sha256 = "1p7c48nsx1lkv2qpkyrsm9qfa77xwd28gczwcpv2kbji3ws5qgj5";
})
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gvfs/commit/64156459a366d64ab19187455016929b1026189a.patch";
sha256 = "0zxbhmgqxxw987ag8fh6yjzjn9jl55fqbn814jh9kwrk7x4prx9x";
})
# CVE-2019-12449
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gvfs/commit/ec939a01c278d1aaa47153f51b5c5f0887738dd9.patch";
sha256 = "0hfybfaz2gfx3yyw5ymx6q0pqwkx2r1i7gzprfp80bplwslq0d4h";
})
# CVE-2019-12795
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gvfs/commit/d8c9138bf240975848b1c54db648ec4cd516a48f.patch";
sha256 = "1lx6yxykx24mnq5izijqk744zj6rgww6ba76z0qjal4y0z3gsdqp";
})
];
postPatch = ''
# patchShebangs requires executable file
chmod +x meson_post_install.py