JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #80594 from worldofpeace/gnome-3.34.4-staging

Browse Source 
Gnome updates staging
This commit is contained in:
worldofpeace 2020-02-22 23:51:54 -05:00 committed by GitHub
commit 83b7dc4469
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 35 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "gnome-desktop";
version = "3.34.2";
version = "3.34.4";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1v983xirwp1y6ggz97bh742ak6gff0hxb359dgn37nikjxhvm0a0";
sha256 = "1g0cvsx0gk65kfa91knkqg7l2isrnlpvqwjbzpr3a5f2girp4gn5";
};
nativeBuildInputs = [

4
pkgs/development/libraries/folks/default.nix
View File

@ -29,13 +29,13 @@
stdenv.mkDerivation rec {
pname = "folks";
version = "0.13.1";
version = "0.13.2";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0pda8sx4ap3lyri5fdrnakl29la1zkhwlc9bmnp13qigp1iwdw9x";
sha256 = "0wq14yjs7m3axziy679a854vc7r7fj1l38p9jnyapb21vswdcqq2";
};
mesonFlags = [

4
pkgs/development/libraries/gjs/default.nix
View File

@ -19,11 +19,11 @@
stdenv.mkDerivation rec {
pname = "gjs";
version = "1.58.4";
version = "1.58.5";
src = fetchurl {
url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0pxxgsb9gvymgr7qsglfdbaa7hy29y01prszjr27f7bpdik3y6i6";
sha256 = "0fm1szmhdawvgbf9fh6vvkv1fdvbn888fciyi2wkhx48kz09jvg7";
};
outputs = [ "out" "dev" "installedTests" ];

4
pkgs/development/libraries/glib/default.nix
View File

@ -48,11 +48,11 @@ in
stdenv.mkDerivation rec {
pname = "glib";
version = "2.62.4";
version = "2.62.5";
src = fetchurl {
url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1g2vj9lyh032kcwij7avx5d6a99rcsnkd07sbl9i55zsfw6h712c";
sha256 = "0bj5hagvfiqcjd20w543pvbnrlqvs8nbxvqjflyvcn36ljpwvldq";
};
patches = optionals stdenv.isDarwin [

22
pkgs/development/libraries/glib/split-dev-programs.patch
View File

@ -1,5 +1,5 @@
diff --git a/gio/gdbus-2.0/codegen/meson.build b/gio/gdbus-2.0/codegen/meson.build
index 121e9e6bb..b76fa0188 100644
index 5ea6bae2f..e0b584a86 100644
--- a/gio/gdbus-2.0/codegen/meson.build
+++ b/gio/gdbus-2.0/codegen/meson.build
@@ -16,7 +16,7 @@ gdbus_codegen_conf.set('DATADIR', glib_datadir)
@ -12,15 +12,15 @@ index 121e9e6bb..b76fa0188 100644
)
# Provide tools for others when we're a subproject and they use the Meson GNOME module
diff --git a/gio/meson.build b/gio/meson.build
index 9a9e621b3..12e1d146a 100644
index 3535788ab..99c3b48d6 100644
--- a/gio/meson.build
+++ b/gio/meson.build
@@ -830,14 +830,15 @@ pkg.generate(libgio,
@@ -831,14 +831,15 @@ pkg.generate(libgio,
variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')),
'schemasdir=' + join_paths('${datadir}', schemas_subdir),
'bindir=' + join_paths('${prefix}', get_option('bindir')),
+ 'devbindir=' + get_option('devbindir'),
'giomoduledir=' + giomodulesdir,
'giomoduledir=' + pkgconfig_giomodulesdir,
'gio=' + join_paths('${bindir}', 'gio'),
- 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'),
- 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'),
@ -36,7 +36,7 @@ index 9a9e621b3..12e1d146a 100644
'gsettings=' + join_paths('${bindir}', 'gsettings')],
version : glib_version,
install_dir : glib_pkgconfigreldir,
@@ -938,12 +939,14 @@ executable('gio', gio_tool_sources,
@@ -939,12 +940,14 @@ executable('gio', gio_tool_sources,
executable('gresource', 'gresource-tool.c',
install : true,
@ -51,7 +51,7 @@ index 9a9e621b3..12e1d146a 100644
c_args : gio_c_args,
# intl.lib is not compatible with SAFESEH
link_args : noseh_link_args,
@@ -952,6 +955,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu
@@ -953,6 +956,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu
glib_compile_schemas = executable('glib-compile-schemas',
[gconstructor_as_data_h, 'gvdb/gvdb-builder.c', 'glib-compile-schemas.c'],
install : true,
@ -59,7 +59,7 @@ index 9a9e621b3..12e1d146a 100644
# intl.lib is not compatible with SAFESEH
link_args : noseh_link_args,
dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
@@ -959,6 +963,7 @@ glib_compile_schemas = executable('glib-compile-schemas',
@@ -960,6 +964,7 @@ glib_compile_schemas = executable('glib-compile-schemas',
glib_compile_resources = executable('glib-compile-resources',
[gconstructor_as_data_h, 'gvdb/gvdb-builder.c', 'glib-compile-resources.c'],
install : true,
@ -68,7 +68,7 @@ index 9a9e621b3..12e1d146a 100644
# intl.lib is not compatible with SAFESEH
link_args : noseh_link_args,
diff --git a/glib/meson.build b/glib/meson.build
index 91a48f194..80472a06b 100644
index aaf5f00f5..09edd291a 100644
--- a/glib/meson.build
+++ b/glib/meson.build
@@ -375,9 +375,10 @@ pkg.generate(libglib,
@ -103,7 +103,7 @@ index 91a48f194..80472a06b 100644
install_mode: 'rwxr-xr-x'
)
diff --git a/gobject/meson.build b/gobject/meson.build
index c7805c556..22ec629a4 100644
index 85e283bab..386ad5e4e 100644
--- a/gobject/meson.build
+++ b/gobject/meson.build
@@ -75,7 +75,7 @@ foreach tool: python_tools
@ -124,10 +124,10 @@ index c7805c556..22ec629a4 100644
install_data('gobject_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb'))
diff --git a/meson.build b/meson.build
index 717d1bccb..fb0bee8a1 100644
index 484f4c750..c7f9327d9 100644
--- a/meson.build
+++ b/meson.build
@@ -2118,7 +2118,7 @@ if have_sh
@@ -2122,7 +2122,7 @@ if have_sh
gettextize_conf.set('datarootdir', glib_datadir)
gettextize_conf.set('datadir', glib_datadir)
configure_file(input : 'glib-gettextize.in',

4
pkgs/development/libraries/grilo-plugins/default.nix
View File

@ -31,11 +31,11 @@
stdenv.mkDerivation rec {
pname = "grilo-plugins";
version = "0.3.10";
version = "0.3.11";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0jldaixc4kzycn5v8ixkjld1n0z3dp0l1p3vchgdwpvdvc7kcfw0";
sha256 = "0wyd3n5mn7b77hxylkc3f62v01mlavh96901pz342hwrn42ydqnx";
};
patches = [

4
pkgs/development/libraries/grilo/default.nix
View File

@ -4,7 +4,7 @@
let
pname = "grilo";
version = "0.3.11"; # if you change minor, also change ./setup-hook.sh
version = "0.3.12"; # if you change minor, also change ./setup-hook.sh
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0s7b50nbyvi75x2l507q9pnpp4ynrx9qa0hm2bkw7wd2nl61r48g";
sha256 = "0w8sq5g6g1rg85h53vbll8va70fcp6082mlpmy98aa03444ddyyv";
};
setupHook = ./setup-hook.sh;

4
pkgs/development/libraries/gtk/3.x.nix
View File

@ -48,7 +48,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "gtk+3";
version = "3.24.13";
version = "3.24.14";
outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc";
outputBin = "dev";
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
sha256 = "1a9hi7k59q0kqx0n3xhsk1ly23w9g9ncllnay1756g0yrww5qxsc";
sha256 = "120yz5gxqbv7sgdbcy4i0b6ixm8jpjzialdrqs0gv15q7bwnjk8w";
};
patches = [

8
pkgs/development/libraries/libpeas/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "libpeas";
version = "1.24.0";
version = "1.24.1";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1yg6r0srz3knhgvplprl3pikrq5c02dmdxgfwcynd6hjih9h16hb";
sha256 = "1162dr7smmfb02czmhshr0f93hqj7w0nw29bys5lzfvwarxcyflw";
};
nativeBuildInputs = [ pkgconfig meson ninja gettext gobject-introspection ];
@ -20,10 +20,6 @@ stdenv.mkDerivation rec {
gobject-introspection
];
patches = [
./fix-libpeas-gtk-pc.patch
];
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;

22
pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch
View File

@ -1,22 +0,0 @@
diff --git a/libpeas-gtk/meson.build b/libpeas-gtk/meson.build
index bf590de..00def42 100644
--- a/libpeas-gtk/meson.build
+++ b/libpeas-gtk/meson.build
@@ -111,10 +111,17 @@ libpeas_gtk_test_dep = declare_dependency(
sources: libpeas_gtk_dep_sources,
)
+libpeas_gtk_pc_reqs = [
+ glib_dep,
+ gtk_dep,
+ package_string + ' >= @0@'.format(version)
+]
+
libpeas_gtk_pc = pkg.generate(
libpeas_gtk_sha,
name: package_gtk_string,
description: 'GObject plugins library widgetery',
+ requires: libpeas_gtk_pc_reqs,
subdirs: package_string,
install_dir: pkgconfigdir,
)

4
pkgs/development/libraries/libsecret/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "libsecret";
version = "0.20.0";
version = "0.20.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0hxfpm8f4rlx685igd4bv89wb80v2952h373g3w6l42kniq7667i";
sha256 = "0ir4ynpf8b64xss1azvsi5x6697lik7hkf3z0xxa2qv2xja3xxsp";
};
patches = [

4
pkgs/development/libraries/tracker-miners/default.nix
View File

@ -45,11 +45,11 @@
stdenv.mkDerivation rec {
pname = "tracker-miners";
version = "2.3.1";
version = "2.3.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1q4hlpl3nkr0y13rzkwryyajnpy5s661z8n82dw1rskrg9mf07bv";
sha256 = "1kizavw9gbdjkw4wykgv0fcl2y6fj788nycx9p4byn6ylb1277h6";
};
nativeBuildInputs = [

4
pkgs/development/libraries/tracker/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "tracker";
version = "2.3.1";
version = "2.3.2";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1888vyz2l5n46ywb70fryd0qipyh3x5n6q0mk56jzbb5whk8fx5n";
sha256 = "1nzbnvwwsk6kv6kqbxwlz8vk70l9ai6b4r9qypw51vp4qy72ny54";
};
nativeBuildInputs = [

4
pkgs/development/libraries/vte/default.nix
View File

@ -22,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "vte";
version = "0.58.2";
version = "0.58.3";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1h1bljr090cgnzim00q4pnsmjqblzn1sig3d87wv1hzjn796dj9k";
sha256 = "0xa9ipwic4jnhhbzlnqbhssz10xkzv61cpkl1ammc6mdq95bbp12";
};
passthru = {