Merge pull request #174102 from jtojnar/gnome-updates

GNOME updates

authored by Jan Tojnar and committed by GitHub 485d323a 8dc951af

+22 -13
+2 -2
pkgs/applications/graphics/shotwell/default.nix
··· 41 42 stdenv.mkDerivation rec { 43 pname = "shotwell"; 44 - version = "0.30.15"; 45 46 src = fetchurl { 47 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 48 - sha256 = "sha256-OlKtYLEC2g31902wMcRdTM8mNRPJVGFu4WZL9PTpvck="; 49 }; 50 51 nativeBuildInputs = [
··· 41 42 stdenv.mkDerivation rec { 43 pname = "shotwell"; 44 + version = "0.30.16"; 45 46 src = fetchurl { 47 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 48 + sha256 = "sha256-yYgs+9rTA8uBYbFJrLtMYX++fKn2q24i0XTiRH51GPo="; 49 }; 50 51 nativeBuildInputs = [
+2 -2
pkgs/applications/misc/orca/default.nix
··· 34 35 buildPythonApplication rec { 36 pname = "orca"; 37 - version = "42.0"; 38 39 format = "other"; 40 41 src = fetchurl { 42 url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; 43 - sha256 = "LCUXmrQbJgsY8f+Jm+uv5olDi0nf/SEd78l2olCT9zo="; 44 }; 45 46 patches = [
··· 34 35 buildPythonApplication rec { 36 pname = "orca"; 37 + version = "42.1"; 38 39 format = "other"; 40 41 src = fetchurl { 42 url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; 43 + sha256 = "6p6dLehwg4ewUqe+FqXmnOqfZ2jfrrRee9meRmNxYt4="; 44 }; 45 46 patches = [
+9 -3
pkgs/desktops/gnome/apps/seahorse/default.nix
··· 27 28 stdenv.mkDerivation rec { 29 pname = "seahorse"; 30 - version = "41.0"; 31 32 src = fetchurl { 33 url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; 34 - hash = "sha256-5u7AnoEESClfVH8YwdV3K2XD7cHZ5aJZXxC13eaJKfU="; 35 }; 36 37 nativeBuildInputs = [ ··· 51 gcr 52 gsettings-desktop-schemas 53 gnupg 54 - gnome.adwaita-icon-theme 55 gpgme 56 libsecret 57 avahi ··· 76 addToSearchPath XDG_DATA_DIRS "${glib.getSchemaDataDirPath gcr}" 77 # The same test also requires home directory so that it can store settings. 78 export HOME=$TMPDIR 79 ''; 80 81 passthru = {
··· 27 28 stdenv.mkDerivation rec { 29 pname = "seahorse"; 30 + version = "42.0"; 31 32 src = fetchurl { 33 url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; 34 + hash = "sha256-xQys6/jeen4uXx2uC5gjIRR0Epar6NVD45I9YqFT1jA="; 35 }; 36 37 nativeBuildInputs = [ ··· 51 gcr 52 gsettings-desktop-schemas 53 gnupg 54 gpgme 55 libsecret 56 avahi ··· 75 addToSearchPath XDG_DATA_DIRS "${glib.getSchemaDataDirPath gcr}" 76 # The same test also requires home directory so that it can store settings. 77 export HOME=$TMPDIR 78 + ''; 79 + 80 + preFixup = '' 81 + gappsWrapperArgs+=( 82 + # Pick up icons from Gcr 83 + --prefix XDG_DATA_DIRS : "${gcr}/share" 84 + ) 85 ''; 86 87 passthru = {
+2 -2
pkgs/desktops/gnome/core/evince/default.nix
··· 43 44 stdenv.mkDerivation rec { 45 pname = "evince"; 46 - version = "42.2"; 47 48 outputs = [ "out" "dev" "devdoc" ]; 49 50 src = fetchurl { 51 url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; 52 - sha256 = "/3+B8wjPjUlW7Zf7ckp+SUSMIUvuq5mIEu+e+7ON+K4="; 53 }; 54 55 postPatch = ''
··· 43 44 stdenv.mkDerivation rec { 45 pname = "evince"; 46 + version = "42.3"; 47 48 outputs = [ "out" "dev" "devdoc" ]; 49 50 src = fetchurl { 51 url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; 52 + sha256 = "Sa7PhFyUbJbbF7qJ11yAAsWuiWP1BKmwYm0SZ1kUZF4="; 53 }; 54 55 postPatch = ''
+5 -2
pkgs/desktops/gnome/core/gnome-keyring/default.nix
··· 10 , libxslt 11 , gettext 12 , gcr 13 , libcap_ng 14 , libselinux 15 , p11-kit ··· 22 23 stdenv.mkDerivation rec { 24 pname = "gnome-keyring"; 25 - version = "40.0"; 26 27 outputs = [ "out" "dev" ]; 28 29 src = fetchurl { 30 url = "mirror://gnome/sources/gnome-keyring/${lib.versions.major version}/${pname}-${version}.tar.xz"; 31 - sha256 = "0cdrlcw814zayhvlaxqs1sm9bqlfijlp22dzzd0g5zg2isq4vlm3"; 32 }; 33 34 nativeBuildInputs = [ 35 pkg-config 36 gettext 37 libxslt 38 docbook-xsl-nons 39 docbook_xml_dtd_43 40 wrapGAppsHook
··· 10 , libxslt 11 , gettext 12 , gcr 13 + , autoreconfHook 14 , libcap_ng 15 , libselinux 16 , p11-kit ··· 23 24 stdenv.mkDerivation rec { 25 pname = "gnome-keyring"; 26 + version = "42.1"; 27 28 outputs = [ "out" "dev" ]; 29 30 src = fetchurl { 31 url = "mirror://gnome/sources/gnome-keyring/${lib.versions.major version}/${pname}-${version}.tar.xz"; 32 + sha256 = "x/TQQMx2prf+Z+CO+RBpEcPIDUD8iMv8jiaEpMlG4+Y="; 33 }; 34 35 nativeBuildInputs = [ 36 pkg-config 37 gettext 38 libxslt 39 + # Upstream uses ancient autotools to pre-generate the scripts. 40 + autoreconfHook 41 docbook-xsl-nons 42 docbook_xml_dtd_43 43 wrapGAppsHook
+2 -2
pkgs/tools/networking/gupnp-tools/default.nix
··· 17 18 stdenv.mkDerivation rec { 19 pname = "gupnp-tools"; 20 - version = "0.10.2"; 21 22 src = fetchurl { 23 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 24 - sha256 = "beSe9LN1uKFk90t2YWixGE4NKBlrawek9TQfCN/YXWw="; 25 }; 26 27 nativeBuildInputs = [
··· 17 18 stdenv.mkDerivation rec { 19 pname = "gupnp-tools"; 20 + version = "0.10.3"; 21 22 src = fetchurl { 23 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 24 + sha256 = "RX9Nkjk1sHhBXNK6iNeNtgB5tyWSa37hBuRWXv4yBN4="; 25 }; 26 27 nativeBuildInputs = [