From 5624920de625f2d611f1c8990e62362752757dcc Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 1 Jun 2019 15:39:10 -0400 Subject: [PATCH 1/6] gnome3.gnome-maps: 3.32.2 -> 3.32.2.1 https://gitlab.gnome.org/GNOME/gnome-maps/blob/v3.32.2.1/NEWS --- pkgs/desktops/gnome-3/apps/gnome-maps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index a059ec3ac3c..25faf2676b8 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-maps"; - version = "3.32.2"; + version = "3.32.2.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1yvwzdfxjdgx4478l2i240ssvbr8hm5sg4krc1gw2ps08sgap7yx"; + sha256 = "1m191iq1gjaqz79ci3dkbmwrkxp7pzknngimlf5bqib5x8yairlb"; }; doCheck = true; From 8d1292a48377c28e432aaf77d55a7189a33b5e6b Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 1 Jun 2019 15:40:02 -0400 Subject: [PATCH 2/6] gnome3.gnome-control-center: 3.32.1 -> 3.32.2 https://gitlab.gnome.org/GNOME/gnome-control-center/blob/3.32.2/NEWS --- pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index cfd20044c6c..6331aa9eb14 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xpcmwgnn29syi2kfxc8233a5f3j8cij5wcn76xmsmwxvxz5r85l"; + sha256 = "03np0mhfl9kkdw4cb711pda0cli9zgh2bq2gqn2zwbdi3qnhk9gs"; }; nativeBuildInputs = [ From 6b01a3ca095d600559e783d3cadb095bb11340f2 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 1 Jun 2019 15:40:30 -0400 Subject: [PATCH 3/6] gnome3.gnome-software: 3.32.2 -> 3.32.3 https://gitlab.gnome.org/GNOME/gnome-software/blob/3.32.3/NEWS --- pkgs/desktops/gnome-3/core/gnome-software/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index ab4b360221e..4a5366a72e7 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gnome-software-${version}"; - version = "3.32.2"; + version = "3.32.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "12kw5vyg8jy0xiq1shfh4ksar2dpyzcdxbyx8lrp9494d606nrlx"; + sha256 = "1r24q2c0i5xwp7dahw4wzycrhijix0nl7bxq1x0za57qm62ysfl9"; }; patches = [ From 4f692b1682a26047328b501ab2b0decfa08814e4 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 1 Jun 2019 15:41:28 -0400 Subject: [PATCH 4/6] gnome3.rygel: 0.38.0 -> 0.38.1 https://gitlab.gnome.org/GNOME/rygel/blob/rygel-0.38.1/NEWS --- pkgs/desktops/gnome-3/core/rygel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix index 5e701e488f2..c38e677a421 100644 --- a/pkgs/desktops/gnome-3/core/rygel/default.nix +++ b/pkgs/desktops/gnome-3/core/rygel/default.nix @@ -28,14 +28,14 @@ stdenv.mkDerivation rec { pname = "rygel"; - version = "0.38.0"; + version = "0.38.1"; # TODO: split out lib outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "03ky18hwcz362lbhqm1zm0ax2a075r69xms5cznchn9p9w8z5axc"; + sha256 = "1w8bi2rw91qyfny1zxhy32k4qn62hdjl2m38f75cp7wv6494d7w0"; }; nativeBuildInputs = [ From 4c37b4ae9c94260ab8c425323d3f19b3b4126f63 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 1 Jun 2019 15:51:11 -0400 Subject: [PATCH 5/6] gitg: 3.30.1 -> 3.32.0 * adds libdazzle * intltool -> gettext * hicolor-icon-theme as native for setup-hook * re-enable tests https://gitlab.gnome.org/GNOME/gitg/blob/v3.32.0/NEWS --- pkgs/desktops/gnome-3/misc/gitg/default.nix | 25 ++++++++++++--------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index cb4c5c05cb0..94703f375b2 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -1,8 +1,8 @@ { stdenv , fetchurl , fetchpatch -, vala_0_42 -, intltool +, vala +, gettext , pkgconfig , gtk3 , glib @@ -24,34 +24,35 @@ , meson , ninja , python3 +, hicolor-icon-theme +, libdazzle }: stdenv.mkDerivation rec { pname = "gitg"; - version = "3.30.1"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1fz8q1aiql6k740savdjh0vzbyhcflgf94cfdhvzcrrvm929n2ss"; + sha256 = "1wzsv7bh0a2w70f938hkpzbb9xkyrp3bil65c0q3yf2v72nbbn81"; }; patches = [ - # Fix build with latest libgit2-glib + # https://gitlab.gnome.org/GNOME/gitg/issues/213 (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gitg/commit/42bceea265f53fe7fd4a41037b936deed975fc6c.patch; - sha256 = "1xq245rsi1bi66lswk33pdiazfaagxf77836ds5q73900rx4r7fw"; + url = "https://gitlab.gnome.org/GNOME/gitg/merge_requests/83.patch"; + sha256 = "1f7wx1d3k5pnp8zbrqssip57b9jxn3hc7a83psm7fny970qmd18z"; }) ]; postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py - sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py substituteInPlace tests/libgitg/test-commit.vala --replace "/bin/bash" "${bash}/bin/bash" ''; - doCheck = false; # FAIL: tests-gitg gtk_style_context_add_provider_for_screen: assertion 'GDK_IS_SCREEN (screen)' failed + doCheck = true; enableParallelBuilding = true; @@ -63,6 +64,7 @@ stdenv.mkDerivation rec { gtksourceview gtkspell3 json-glib + libdazzle libgee libgit2-glib libpeas @@ -72,12 +74,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gobject-introspection - intltool + hicolor-icon-theme + gettext meson ninja pkgconfig python3 - vala_0_42 # fails build with 0.44, drop in >3.30.1 + vala wrapGAppsHook ]; From 027ccb8344579727571840e53c23a190f9efa1ed Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 1 Jun 2019 15:54:03 -0400 Subject: [PATCH 6/6] gnome3.gnome-nettool: correct typo --- pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix index 00a76318b69..37401af3ce6 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnom3.gnome-nettool"; + attrPath = "gnome3.${pname}"; versionPolicy = "none"; }; };