diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-07-04 05:45:04 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-04 05:45:04 -0400 |
commit | c609fa53eab3a1db44aabd2139e3bc384f3e3c08 (patch) | |
tree | 19d977aea65bf5ba61dffc50d73b381c50cd8e3e /pkgs | |
parent | dfb11090601b9f1a7ca986346b6eb734635e0b18 (diff) | |
parent | 9abf422d1a2486025c4c9b9e54c3494e4d0d8fb1 (diff) |
Merge pull request #63974 from worldofpeace/gnome3-updates
GNOME3 updates
Diffstat (limited to 'pkgs')
8 files changed, 108 insertions, 42 deletions
diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index b464167c34004..9a70319952cfc 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -17,13 +17,13 @@ python3.pkgs.buildPythonApplication rec { name = "accerciser-${version}"; - version = "3.32.2"; + version = "3.32.3"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "05ssj8whzhf98lpcaca7m45h03g0wx0i8jlsrh3yn943mshzidy8"; + sha256 = "0ark4qkfvdggz2mbksq12iq55izdsjnkjqkvfnnkf4k5vfpa95y5"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index 83202a75c2644..b82c1b2dfe58f 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -1,41 +1,111 @@ -{ stdenv, cmake, ninja, intltool, fetchurl, libxml2, webkitgtk, highlight -, pkgconfig, gtk3, glib, libnotify, gtkspell3, evolution-data-server -, adwaita-icon-theme, gnome-desktop, libgdata -, libgweather, glib-networking, gsettings-desktop-schemas -, wrapGAppsHook, itstool, shared-mime-info, libical, db, gcr, sqlite -, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu -, libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }: - -let - version = "3.32.2"; -in stdenv.mkDerivation rec { - name = "evolution-${version}"; +{ stdenv +, cmake +, ninja +, intltool +, fetchurl +, libxml2 +, webkitgtk +, highlight +, pkgconfig +, gtk3 +, glib +, libnotify +, gtkspell3 +, evolution-data-server +, adwaita-icon-theme +, gnome-desktop +, libgdata +, libgweather +, glib-networking +, gsettings-desktop-schemas +, wrapGAppsHook +, itstool +, shared-mime-info +, libical +, db +, gcr +, sqlite +, gnome3 +, librsvg +, gdk_pixbuf +, libsecret +, nss +, nspr +, icu +, libcanberra-gtk3 +, bogofilter +, gst_all_1 +, procps +, p11-kit +, openldap +}: + +stdenv.mkDerivation rec { + pname = "evolution"; + version = "3.32.3"; src = fetchurl { - url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1sb60zhdawza33zlp0n3hbd7mq43a4y09jmkphpnxdifypfkar55"; + url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0ghwi4mmx6l28dkjx7ayiqcrvmfakqfiyvdg6946v5dcimgsclxn"; }; - propagatedUserEnvPkgs = [ evolution-data-server ]; + nativeBuildInputs = [ + cmake + intltool + itstool + libxml2 + ninja + pkgconfig + wrapGAppsHook + ]; buildInputs = [ - gtk3 glib gdk_pixbuf adwaita-icon-theme librsvg db icu - evolution-data-server libsecret libical gcr - webkitgtk shared-mime-info gnome-desktop gtkspell3 - libcanberra-gtk3 bogofilter libgdata sqlite - gst_all_1.gstreamer gst_all_1.gst-plugins-base p11-kit - nss nspr libnotify procps highlight libgweather + adwaita-icon-theme + bogofilter + db + evolution-data-server + gcr + gdk_pixbuf + glib + glib-networking + gnome-desktop gsettings-desktop-schemas - glib-networking openldap + gst_all_1.gst-plugins-base + gst_all_1.gstreamer + gtk3 + gtkspell3 + highlight + icu + libcanberra-gtk3 + libgdata + libgweather + libical + libnotify + librsvg + libsecret + nspr + nss + openldap + p11-kit + procps + shared-mime-info + sqlite + webkitgtk ]; - nativeBuildInputs = [ cmake ninja intltool itstool libxml2 pkgconfig wrapGAppsHook ]; + propagatedUserEnvPkgs = [ + evolution-data-server + ]; cmakeFlags = [ "-DENABLE_AUTOAR=OFF" "-DENABLE_LIBCRYPTUI=OFF" - "-DENABLE_YTNEF=OFF" "-DENABLE_PST_IMPORT=OFF" + "-DENABLE_YTNEF=OFF" + ]; + + requiredSystemFeatures = [ + "big-parallel" ]; doCheck = true; @@ -49,8 +119,6 @@ in stdenv.mkDerivation rec { PKG_CONFIG_LIBEDATASERVERUI_1_2_UIMODULEDIR = "${placeholder "out"}/lib/evolution-data-server/ui-modules"; - requiredSystemFeatures = [ "big-parallel" ]; - meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Evolution; description = "Personal information management application that provides integrated mail, calendaring and address book functionality"; diff --git a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix index 64d8387c8f0ed..fbf80fc32e84a 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-sound-recorder"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0rchzap5mg9ach3jcf4sci5v2h5pgpdjafjfllfd09w9yg3brspp"; + sha256 = "0q83b6dabckmwj8mcw0wvhbxaszwdzzcf8ajx5bldll3lyl5yh2b"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 8920c40188212..8075d5d480594 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "evolution-data-server-${version}"; - version = "3.32.2"; + version = "3.32.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1jdk3az797kznkg40nbxb3ddyx8s6favzxlc4vr840zxcl84k9vy"; + sha256 = "1sx2ywvvwbmphrlqq62srd235ihsj8864d9g8kcbcxwrvn2z70b4"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index 5d980c3c347a3..9214aa0a9a79b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-calculator-${version}"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "121fyhrzdf7zf3iis0rlpag7hfg8jsan2zy83x5l00rq7abdpn8d"; + sha256 = "0fgpn3sc226s9fpzhik5rkkrf669037gc659ga2kn9jsyckj6p41"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index 466e1669e18c9..6929f821e379a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -39,11 +39,11 @@ stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "15w3sn9qf1zqlmk8c93kgrh2a20s62m5yfizkp21m5ylrrd07f63"; + sha256 = "02d0s0g2mmqfib44r3sf0499r08p61s8l2ndsjssbam1bi7x2dks"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index 478aac8c1731d..c0d5d2be26d46 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "sushi-${version}"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0f1i8qp39gq749h90f7nwgrj4q6y55jnyh62n1v8hxvlk0b2wqnx"; + sha256 = "02idvqjk76lii9xyg3b1yz4rw721709bdm5j8ikjym6amcghl0aj"; }; nativeBuildInputs = [ @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; - enableParallelBuilding = true; - passthru = { updateScript = gnome3.updateScript { packageName = "sushi"; diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix index d6ed0c22e4b7d..aac2162625847 100644 --- a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yelp-tools-${version}"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1qrn8ss3wc601w8j0ziicgmgic0yh01az6611n3jgd7wll9c79wr"; + sha256 = "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q"; }; passthru = { |