MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 15:22:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #116050 from maxeaubrey/gnome_3.38.4

Browse source 
Gnome 3.38.4 updates
This commit is contained in:
Jan Tojnar 2021-03-15 02:50:09 +01:00 committed by GitHub
commit 0a35ec9f15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 47 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,11 +29,11 @@
stdenv.mkDerivation rec {
pname = "gnome-maps";
version = "3.38.2";
version = "3.38.4";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0pa6h3md688752l7cjggncnxv13c07nj584gbz9asdblljk3r9x1";
sha256 = "sha256-1WQekf/kePsqqcpIliJczxjsLqTZjjV2UXmBin2+RKM=";
};
doCheck = true;

10
pkgs/desktops/gnome-3/core/dconf-editor/default.nix
View file

@ -1,15 +1,13 @@
{ lib, stdenv, fetchurl, meson, ninja, vala, libxslt, pkg-config, glib, gtk3, gnome3, python3, dconf
, libxml2, gettext, docbook_xsl, wrapGAppsHook, gobject-introspection }:
let
stdenv.mkDerivation rec {
pname = "dconf-editor";
version = "3.38.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "3.38.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1d1y33c6fm86xz9xbh3bfz4y2pyas01a58lmirmdx0lh6yd292bd";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-ElPa2H5iE/vzE/+eydxDWKobECYfKAcsHcDgmXuS+DU=";
};
nativeBuildInputs = [

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

@ -28,11 +28,11 @@
stdenv.mkDerivation rec {
pname = "eog";
version = "3.38.1";
version = "3.38.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1xqcfil3b68clafnxg1migp54psqh5x6arnlvdqgmvvpq9hwj7dp";
sha256 = "sha256-ilT9+T4wag9khToYgxrIwEg4IEdxBqrgvcAKrDc4bw4=";
};
nativeBuildInputs = [

21
pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
View file

@ -1,6 +1,5 @@
{ fetchurl
, fetchFromGitLab
, fetchpatch
, lib, stdenv
, substituteAll
, accountsservice
@ -70,11 +69,11 @@
stdenv.mkDerivation rec {
pname = "gnome-control-center";
version = "3.38.1";
version = "3.38.4";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "09i011hf23s2i4wim43vjys7y4y43cxl3kyvrnrwqvqgc5n0144d";
sha256 = "sha256-SdxjeNTTXBxu1ZIk9WNpFsK2+km7+4tW6xmoTW6QzRk=";
};
# See https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html
@ -151,22 +150,6 @@ stdenv.mkDerivation rec {
inherit glibc libgnomekbd tzdata;
inherit cups networkmanagerapplet;
})
# Fix double free when leaving user accounts panel.
# https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/853
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-control-center/commit/e80b4b5f58f448c5a3d38721f7bba32c413d46e7.patch";
sha256 = "GffsSU/uNS0Fg2lXbOuD/BrWBT4D2VKgWNGifG0FBUw=";
})
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-control-center/commit/64686cfee330849945f6ff4dcc43393eb1a6e59c.patch";
sha256 = "4VJU0q6qOtGzd/hmDncckInfEjCkC8+lXmDgxwc4VJU=";
})
# https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1173
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/27e1140c9d4ad852b4dc6a132a14cd5532d52997.patch";
sha256 = "nU3szjKfXpRek8hhsxiCJNgMeDeIRK3QVo82D9R+kL4=";
})
];
postPatch = ''

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

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "gnome-desktop";
version = "3.38.2";
version = "3.38.4";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-desktop/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1m7iww1zk845szs9s3zc8a1s1wpd6kizndhq7gqy3575c0xgr2w9";
sha256 = "sha256-P2A+pb/UdyLJLPybiFRGtGJg6gnIz7Y/a92f7+NC5Iw=";
};
nativeBuildInputs = [

4
pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "gnome-disk-utility";
version = "3.38.1";
version = "3.38.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1TuF3BMDobXOHkIcH1xqwLMY4HzZqVk50uHwlZpe19k=";
sha256 = "sha256-EL7d5UlL6zTjoiDW8w2TIMiCUv7rhCa9mM760YNteOk=";
};
nativeBuildInputs = [

4
pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
View file

@ -37,11 +37,11 @@
stdenv.mkDerivation rec {
pname = "gnome-initial-setup";
version = "3.38.2";
version = "3.38.4";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
hash = "sha256-qliJJ0+LC23moFErR3Qrgqw0ANrsgt1O/+LuonRko7g=";
sha256 = "001jdzsvc541qracn68r609pr5qwymrh85xrqmvzzc1dbg5w3mlg";
};
nativeBuildInputs = [

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

@ -65,13 +65,13 @@ let
in
stdenv.mkDerivation rec {
pname = "gnome-shell";
version = "3.38.2";
version = "3.38.3";
outputs = [ "out" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "05fm7kxyvws2lbb156wfa2wf4xmkxr49rrjxg0yaxf68v000yq2k";
sha256 = "sha256-U0W0GMsSqXKVXOXM6u1mYkgAJzNrXFHa6lcwV1tiHO0=";
};
patches = [

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

@ -42,13 +42,13 @@
let self = stdenv.mkDerivation rec {
pname = "mutter";
version = "3.38.2";
version = "3.38.3";
outputs = [ "out" "dev" "man" ];
src = fetchurl {
url = "mirror://gnome/sources/mutter/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "03a612m0c7v6y72bs3ghmpyk49177fzq6gdy1jrz4608vnalx5yr";
sha256 = "sha256-sjIec9Hj/i6Q5jAfQrugf02UvGR1aivxPXWunW+qIB8=";
};
patches = [

4
pkgs/desktops/gnome-3/core/simple-scan/default.nix
View file

@ -24,11 +24,11 @@
stdenv.mkDerivation rec {
pname = "simple-scan";
version = "3.38.1";
version = "3.38.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0grscz96bwj79ka4qvxh8h75avdx6824k8k38ylmaj6xbl6gi0hy";
sha256 = "sha256-qI2AcpaCiIZJzfzfqGkrCjSs3ladwICIjyea/DqcTQs=";
};
nativeBuildInputs = [

4
pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
View file

@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "yelp-xsl";
version = "3.38.1";
version = "3.38.3";
src = fetchurl {
url = "mirror://gnome/sources/yelp-xsl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0ryzvkcgxp7xi0icmpdl2rinjn904s8imbxdi6wshzxblqymc8dk";
sha256 = "sha256-GTtqvUaXt7Qh6Yw21NMTXaCw/bUapT5gLtNo3YTR/QM=";
};
nativeBuildInputs = [

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

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "yelp";
version = "3.38.1";
version = "3.38.3";
src = fetchurl {
url = "mirror://gnome/sources/yelp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "102z8khj82vdp12c3y86hhxwm1x89xpkpc5zs63c7gg21cbrwdbl";
sha256 = "sha256-r9RqTQrrRrtCXFIAcdgY+LKzLmnnVqv9mXlodpphVJ0=";
};
nativeBuildInputs = [ pkg-config gettext itstool wrapGAppsHook ];

8
pkgs/development/libraries/glibmm/default.nix
View file

@ -1,18 +1,20 @@
{ lib, stdenv, fetchurl, pkg-config, gnum4, glib, libsigcxx, gnome3, darwin }:
{ lib, stdenv, fetchurl, pkg-config, gnum4, glib, libsigcxx, gnome3, darwin, meson, ninja }:
stdenv.mkDerivation rec {
pname = "glibmm";
version = "2.64.2";
version = "2.64.5";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1v6lp23fr2qh4zshcnm28sn29j3nzgsvcqj2nhmrnvamipjq4lm7";
sha256 = "sha256-UI/IbiyRQRmKoWwiWxb9a5EZF8DTgXYCZShE0Jc+o4Y=";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [
meson
pkg-config
ninja
gnum4
glib # for glib-compile-schemas
];

8
pkgs/development/libraries/gtkmm/3.x.nix
View file

@ -1,17 +1,17 @@
{ lib, stdenv, fetchurl, pkg-config, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }:
{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }:
stdenv.mkDerivation rec {
pname = "gtkmm";
version = "3.24.2";
version = "3.24.3";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1hxdnhavjyvbcpxhd5z17l9fj4182028s66lc0s16qqqrldhjwbd";
sha256 = "sha256-YEl8T381TDvSVXSF8CVPi3tM9L68n+4L4mp3dE6s1DU=";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config meson ninja python3 ];
buildInputs = [ epoxy ];
propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ];

26
pkgs/development/libraries/gupnp/default.nix
View file

@ -1,6 +1,5 @@
{ lib, stdenv
, fetchurl
, fetchpatch
, meson
, ninja
, pkg-config
@ -20,36 +19,15 @@
stdenv.mkDerivation rec {
pname = "gupnp";
version = "1.2.0";
version = "1.2.4";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0911lv1bivsyv9wwdxm0i1w4r89j0vyyqp200gsfdnzk6v1a4x7x";
sha256 = "sha256-96AwfqUfXkTRuDL0k92QRURKOk4hHvhd/Zql3W6up9E=";
};
patches = [
# Nix’s pkg-config ignores Requires.private
# https://github.com/NixOS/nixpkgs/commit/1e6622f4d5d500d6e701bd81dd4a22977d10637d
# We are essentialy reverting the following patch for now
# https://bugzilla.gnome.org/show_bug.cgi?id=685477
# at least until Requires.internal or something is implemented
# https://gitlab.freedesktop.org/pkg-config/pkg-config/issues/7
./fix-requires.patch
# fix deadlock in gupnp-igd tests
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gupnp/commit/d208562657f62b34759896ca9e974bd582d1f963.patch";
sha256 = "02kzsb4glxhgb1npf6qqgafiki0ws75sly5h470431mihc6sgp4f";
})
# fix breakage in gupnp-igd tests
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gupnp/commit/0648399acb989473119fe59d0b9f65c923e69483.patch";
sha256 = "0ba0rngk3a4n3z4dmq06wzgh0n3q9la1nr25qdxqbwlszmxfxpjf";
})
];
nativeBuildInputs = [
meson
ninja

26
pkgs/development/libraries/gupnp/fix-requires.patch
View file

@ -1,26 +0,0 @@
--- a/libgupnp/meson.build
+++ b/libgupnp/meson.build
@@ -110,6 +110,7 @@ pkg.generate(
libraries : libgupnp,
subdirs: 'gupnp-1.2',
name : 'gupnp-1.2',
+ requires: requires,
description : 'GObject-based UPnP library',
version : meson.project_version(),
filebase : 'gupnp-1.2'
--- a/meson.build
+++ a/meson.build
@@ -18,6 +18,13 @@ add_global_arguments('-DHAVE_CONFIG_H=1', language : 'c')
guul = subproject('guul', default_options : ['default_library=static'])
+requires = [
+ dependency('glib-2.0', version : '>= 2.44'),
+ dependency('gssdp-1.2', version : '>= 1.1'),
+ dependency('libsoup-2.4', version : '>= 2.48.0'),
+ dependency('libxml-2.0')
+]
+
dependencies = [
dependency('glib-2.0', version : '>= 2.44'),
dependency('gio-2.0', version : '>= 2.44'),

8
pkgs/development/libraries/pangomm/default.nix
View file

@ -1,18 +1,18 @@
{ lib, stdenv, fetchurl, pkg-config, pango, glibmm, cairomm, gnome3
{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, pango, glibmm, cairomm, gnome3
, ApplicationServices }:
stdenv.mkDerivation rec {
pname = "pangomm";
version= "2.42.1";
version= "2.42.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "03zli5amizhv9bfklwfq7xyf0b5dagchx1lnz9f0v1rhk69h9gql";
sha256 = "sha256-GyTJJiSuEnXMtXdYF10198Oa0zQtjAtLpg8NmEnS0Io=";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isDarwin [
nativeBuildInputs = [ pkg-config meson ninja python3 ] ++ lib.optional stdenv.isDarwin [
ApplicationServices
];
propagatedBuildInputs = [ pango glibmm cairomm ];

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

@ -48,11 +48,11 @@
stdenv.mkDerivation rec {
pname = "tracker-miners";
version = "3.0.1";
version = "3.0.4";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1kfi5d6pccqx28hbnja6k1mpwjd53k5zs704sg01rlzmbshz1zn6";
sha256 = "sha256-E877xx1S93RvPTfQQdjFvBM2pA/13ZK1Nw6GUMJqiY4=";
};
nativeBuildInputs = [

12
pkgs/development/libraries/tracker/default.nix
View file

@ -1,6 +1,5 @@
{ lib, stdenv
, fetchurl
, fetchpatch
, gettext
, meson
, ninja
@ -30,13 +29,13 @@
stdenv.mkDerivation rec {
pname = "tracker";
version = "3.0.1";
version = "3.0.3";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1rhcs75axga7p7hl37h6jzb2az89jddlcwc7ykrnb2khyhka78rr";
sha256 = "sha256-b1yEqzvh7aUgUBsq7XIhYWoM8VKRDFN3V7U4vAXv/KM=";
};
patches = [
@ -44,13 +43,6 @@ stdenv.mkDerivation rec {
src = ./fix-paths.patch;
inherit asciidoc;
})
# Fix consistency error with sqlite 3.34
# https://gitlab.gnome.org/GNOME/tracker/merge_requests/353
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/tracker/commit/040e22d005985a19a0dc435a7631f91700804ce4.patch";
sha256 = "5OZj17XY8ZnXfMMim25HvGfFKUlsVlVHOUjZKfBKHcs=";
})
];
nativeBuildInputs = [

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

@ -24,13 +24,13 @@
stdenv.mkDerivation rec {
pname = "vte";
version = "0.62.1";
version = "0.62.2";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "139had0zcggzrxx9rjy0a67mahzm474amafh168y11421iyfhsf3";
sha256 = "sha256-sDALvPDALfWBKhCjy45P/3I7q5LAjJegqQwWfPVDr/A=";
};
passthru = {