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

Merge pull request #62427 from worldofpeace/gnome-updates

Browse Source 
Some GNOME3 updates (again)
This commit is contained in:
Tor Hedin Brønner 2019-06-03 14:44:27 +02:00 committed by GitHub
commit ebd379e40c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 20 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

@ -5,13 +5,13 @@
let let
pname = "gnome-maps"; pname = "gnome-maps";
version = "3.32.2"; version = "3.32.2.1";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1yvwzdfxjdgx4478l2i240ssvbr8hm5sg4krc1gw2ps08sgap7yx"; sha256 = "1m191iq1gjaqz79ci3dkbmwrkxp7pzknngimlf5bqib5x8yairlb";
}; };
doCheck = true; doCheck = true;

2
pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = pname; packageName = pname;
attrPath = "gnom3.gnome-nettool"; attrPath = "gnome3.${pname}";
versionPolicy = "none"; versionPolicy = "none";
}; };
}; };

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

@ -13,11 +13,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-control-center"; pname = "gnome-control-center";
version = "3.32.1"; version = "3.32.2";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0xpcmwgnn29syi2kfxc8233a5f3j8cij5wcn76xmsmwxvxz5r85l"; sha256 = "03np0mhfl9kkdw4cb711pda0cli9zgh2bq2gqn2zwbdi3qnhk9gs";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

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

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnome-software-${version}"; name = "gnome-software-${version}";
version = "3.32.2"; version = "3.32.3";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "12kw5vyg8jy0xiq1shfh4ksar2dpyzcdxbyx8lrp9494d606nrlx"; sha256 = "1r24q2c0i5xwp7dahw4wzycrhijix0nl7bxq1x0za57qm62ysfl9";
}; };
patches = [ patches = [

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

@ -28,14 +28,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rygel"; pname = "rygel";
version = "0.38.0"; version = "0.38.1";
# TODO: split out lib # TODO: split out lib
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "03ky18hwcz362lbhqm1zm0ax2a075r69xms5cznchn9p9w8z5axc"; sha256 = "1w8bi2rw91qyfny1zxhy32k4qn62hdjl2m38f75cp7wv6494d7w0";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

25
pkgs/desktops/gnome-3/misc/gitg/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv { stdenv
, fetchurl , fetchurl
, fetchpatch , fetchpatch
, vala_0_42 , vala
, intltool , gettext
, pkgconfig , pkgconfig
, gtk3 , gtk3
, glib , glib
@ -24,34 +24,35 @@
, meson , meson
, ninja , ninja
, python3 , python3
, hicolor-icon-theme
, libdazzle
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gitg"; pname = "gitg";
version = "3.30.1"; version = "3.32.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1fz8q1aiql6k740savdjh0vzbyhcflgf94cfdhvzcrrvm929n2ss"; sha256 = "1wzsv7bh0a2w70f938hkpzbb9xkyrp3bil65c0q3yf2v72nbbn81";
}; };
patches = [ patches = [
# Fix build with latest libgit2-glib # https://gitlab.gnome.org/GNOME/gitg/issues/213
(fetchpatch { (fetchpatch {
url = https://gitlab.gnome.org/GNOME/gitg/commit/42bceea265f53fe7fd4a41037b936deed975fc6c.patch; url = "https://gitlab.gnome.org/GNOME/gitg/merge_requests/83.patch";
sha256 = "1xq245rsi1bi66lswk33pdiazfaagxf77836ds5q73900rx4r7fw"; sha256 = "1f7wx1d3k5pnp8zbrqssip57b9jxn3hc7a83psm7fny970qmd18z";
}) })
]; ];
postPatch = '' postPatch = ''
chmod +x meson_post_install.py chmod +x meson_post_install.py
patchShebangs 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" 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; enableParallelBuilding = true;
@ -63,6 +64,7 @@ stdenv.mkDerivation rec {
gtksourceview gtksourceview
gtkspell3 gtkspell3
json-glib json-glib
libdazzle
libgee libgee
libgit2-glib libgit2-glib
libpeas libpeas
@ -72,12 +74,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
gobject-introspection gobject-introspection
intltool hicolor-icon-theme
gettext
meson meson
ninja ninja
pkgconfig pkgconfig
python3 python3
vala_0_42 # fails build with 0.44, drop in >3.30.1 vala
wrapGAppsHook wrapGAppsHook
]; ];