From 1c99a90525df47d224026ad4a01702e8a59197db Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 2 Dec 2017 23:28:34 +0100 Subject: [PATCH 01/29] gnome3.totem-pl-parser: update hash --- pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix index 58e2ad07532e..2935111df27d 100644 --- a/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix +++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix @@ -5,6 +5,6 @@ fetchurl: { src = fetchurl { url = mirror://gnome/sources/totem-pl-parser/3.26/totem-pl-parser-3.26.0.tar.xz; - sha256 = "1jzvq7s6qdsdpbc58jpcwvyj7qsq58r65kmnbknjzd79j4rsalzi"; + sha256 = "f153a53391e9b42fed5cb6ce62322a58e323fde6ec4a54d8ba4d376cf4c1fbcb"; }; } From 825540708e3ed30228643eb1c6a8da835d15bd5d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Dec 2017 00:30:25 +0100 Subject: [PATCH 02/29] =?UTF-8?q?gnome3.tracker:=202.0.1=20=E2=86=92=202.0?= =?UTF-8?q?.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/tracker/default.nix | 2 +- pkgs/desktops/gnome-3/core/tracker/src.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix index bf3438db338a..59455f320b53 100644 --- a/pkgs/desktops/gnome-3/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, intltool, pkgconfig +{ stdenv, fetchurl, intltool, pkgconfig , libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt , gnome3, icu, libuuid, networkmanager, libsoup, json_glib }: diff --git a/pkgs/desktops/gnome-3/core/tracker/src.nix b/pkgs/desktops/gnome-3/core/tracker/src.nix index afec65a4f633..887ae9a865a9 100644 --- a/pkgs/desktops/gnome-3/core/tracker/src.nix +++ b/pkgs/desktops/gnome-3/core/tracker/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "tracker-2.0.1"; + name = "tracker-2.0.2"; src = fetchurl { - url = mirror://gnome/sources/tracker/2.0/tracker-2.0.1.tar.xz; - sha256 = "ac5c9f4dbb0741af5877ae2818d8c053aa9a431477a924a17976bb7e44411e47"; + url = mirror://gnome/sources/tracker/2.0/tracker-2.0.2.tar.xz; + sha256 = "ece71a56c29151a76fc1b6e43c15dd1b657b37162dc948fa2487faf5ddb47fda"; }; } From 952e4dbee34697119b190cc3a702d6e2e2a4b683 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Dec 2017 01:51:18 +0100 Subject: [PATCH 03/29] =?UTF-8?q?gnome3.gedit:=203.22.0=20=E2=86=92=203.22?= =?UTF-8?q?.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/apps/gedit/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gedit/src.nix b/pkgs/desktops/gnome-3/apps/gedit/src.nix index 3fdc6cfaa685..7a68b75eb2a7 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/src.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gedit-3.22.0"; + name = "gedit-3.22.1"; src = fetchurl { - url = mirror://gnome/sources/gedit/3.22/gedit-3.22.0.tar.xz; - sha256 = "063b5a0b5dcc8f540f6e8c3ea1c22cf8a3a19edffc25315a1b6bc51d462b3f45"; + url = mirror://gnome/sources/gedit/3.22/gedit-3.22.1.tar.xz; + sha256 = "aa7bc3618fffa92fdb7daf2f57152e1eb7962e68561a9c92813d7bbb7fc9492b"; }; } From dc206ce033df17fd4ffcbc761d3efcab6491005a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Dec 2017 01:51:52 +0100 Subject: [PATCH 04/29] =?UTF-8?q?gnome3.glade:=203.20.0=20=E2=86=92=203.20?= =?UTF-8?q?.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/apps/glade/default.nix | 20 +------------------- pkgs/desktops/gnome-3/apps/glade/src.nix | 6 +++--- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix index e48d15e6abfe..accd66933aad 100644 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -1,4 +1,4 @@ -{ stdenv, intltool, fetchurl, python, autoreconfHook +{ stdenv, intltool, fetchurl, python , pkgconfig, gtk3, glib, gobjectIntrospection , wrapGAppsHook, itstool, libxml2, docbook_xsl , gnome3, gdk_pixbuf, libxslt }: @@ -6,12 +6,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook docbook_xsl libxslt gobjectIntrospection - # reconfiguration - autoreconfHook gnome3.gnome_common gnome3.yelp_tools ]; buildInputs = [ gtk3 glib libxml2 python gnome3.gsettings_desktop_schemas @@ -19,20 +15,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = [ - # https://bugzilla.gnome.org/show_bug.cgi?id=782161 - (fetchurl { - url = https://bugzilla.gnome.org/attachment.cgi?id=351054; - sha256 = "093wjjj40027pkqqnm14jb2dp2i2m8p1bayqx1lw18pq66c8fahn"; - }) - ]; - - preFixup = '' - wrapProgram "$out/bin/glade" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Glade; description = "User interface designer for GTK+ applications"; diff --git a/pkgs/desktops/gnome-3/apps/glade/src.nix b/pkgs/desktops/gnome-3/apps/glade/src.nix index d32dbd94d059..b244d2434c9e 100644 --- a/pkgs/desktops/gnome-3/apps/glade/src.nix +++ b/pkgs/desktops/gnome-3/apps/glade/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "glade-3.20.0"; + name = "glade-3.20.2"; src = fetchurl { - url = mirror://gnome/sources/glade/3.20/glade-3.20.0.tar.xz; - sha256 = "82d96dca5dec40ee34e2f41d49c13b4ea50da8f32a3a49ca2da802ff14dc18fe"; + url = mirror://gnome/sources/glade/3.20/glade-3.20.2.tar.xz; + sha256 = "07d1545570951aeded20e9fdc6d3d8a56aeefe2538734568c5335be336c6abed"; }; } From 9e19fb96d1263addf5d084e33989219fa21eaa80 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Dec 2017 01:52:32 +0100 Subject: [PATCH 05/29] =?UTF-8?q?gnome3.adwaita-icon-theme:=203.26.0=20?= =?UTF-8?q?=E2=86=92=203.26.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix index 1a388505674c..24f0955659ec 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "adwaita-icon-theme-3.26.0"; + name = "adwaita-icon-theme-3.26.1"; src = fetchurl { - url = mirror://gnome/sources/adwaita-icon-theme/3.26/adwaita-icon-theme-3.26.0.tar.xz; - sha256 = "9cad85de19313f5885497aceab0acbb3f08c60fcd5fa5610aeafff37a1d12212"; + url = mirror://gnome/sources/adwaita-icon-theme/3.26/adwaita-icon-theme-3.26.1.tar.xz; + sha256 = "28ba7392c7761996efd780779167ea6c940eedfb1bf37cfe9bccb7021f54d79d"; }; } From 5fc25a7d427980d10b46cd3558ba58bed0b581c9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Dec 2017 01:53:13 +0100 Subject: [PATCH 06/29] =?UTF-8?q?gnome3.gsettings=5Fdesktop=5Fschemas:=203?= =?UTF-8?q?.24.0=20=E2=86=92=203.24.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desktops/gnome-3/core/gsettings-desktop-schemas/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/src.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/src.nix index 22760d2be113..1eca56c509bf 100644 --- a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/src.nix +++ b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gsettings-desktop-schemas-3.24.0"; + name = "gsettings-desktop-schemas-3.24.1"; src = fetchurl { - url = mirror://gnome/sources/gsettings-desktop-schemas/3.24/gsettings-desktop-schemas-3.24.0.tar.xz; - sha256 = "f6573a3f661d22ff8a001cc2421d8647717f1c0e697e342d03c6102f29bbbb90"; + url = mirror://gnome/sources/gsettings-desktop-schemas/3.24/gsettings-desktop-schemas-3.24.1.tar.xz; + sha256 = "76a3fa309f9de6074d66848987214f0b128124ba7184c958c15ac78a8ac7eea7"; }; } From c8b91d98168ca51a1e27acb7831e60c61dca7521 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Dec 2017 01:53:53 +0100 Subject: [PATCH 07/29] =?UTF-8?q?gnome3.gtksourceview:=203.24.3=20?= =?UTF-8?q?=E2=86=92=203.24.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/gtksourceview/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/src.nix b/pkgs/desktops/gnome-3/core/gtksourceview/src.nix index 8648c595bb96..a8cdf8906d45 100644 --- a/pkgs/desktops/gnome-3/core/gtksourceview/src.nix +++ b/pkgs/desktops/gnome-3/core/gtksourceview/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gtksourceview-3.24.3"; + name = "gtksourceview-3.24.5"; src = fetchurl { - url = mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.3.tar.xz; - sha256 = "3eed05486a6420c3e2fdda0bbb19a0d905ed09ebf442302a026ab7e574204cbd"; + url = mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.5.tar.xz; + sha256 = "0246185fcc20c4734d01419a83f58f251a82e2a902fe60bb0335187fcf658181"; }; } From cca690feaaeacae2077a766d4f7b2af1e8c1c93b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Dec 2017 01:55:28 +0100 Subject: [PATCH 08/29] =?UTF-8?q?gnome3.gucharmap:=2010.0.1=20=E2=86=92=20?= =?UTF-8?q?10.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/gucharmap/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gucharmap/src.nix b/pkgs/desktops/gnome-3/core/gucharmap/src.nix index 67d00c269f53..fb38e3bf386b 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/src.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gucharmap-10.0.1"; + name = "gucharmap-10.0.3"; src = fetchurl { - url = mirror://gnome/sources/gucharmap/10.0/gucharmap-10.0.1.tar.xz; - sha256 = "51a2bf91c4590ea2159f828156864f088a0bd4c12e7a1c396002a23d48b2d5e2"; + url = mirror://gnome/sources/gucharmap/10.0/gucharmap-10.0.3.tar.xz; + sha256 = "ac07d75924e2d8f436d9492e8f7d54cf109404d34de06886a3967563cd1726a4"; }; } From 309d11e2f9373fa3e7b42a281f1973ef98cfac94 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Dec 2017 01:56:16 +0100 Subject: [PATCH 09/29] =?UTF-8?q?gnome3.libgweather:=203.26.0=20=E2=86=92?= =?UTF-8?q?=203.26.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/libgweather/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/libgweather/src.nix b/pkgs/desktops/gnome-3/core/libgweather/src.nix index f2cb4c310afc..799713c28a4a 100644 --- a/pkgs/desktops/gnome-3/core/libgweather/src.nix +++ b/pkgs/desktops/gnome-3/core/libgweather/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "libgweather-3.26.0"; + name = "libgweather-3.26.1"; src = fetchurl { - url = mirror://gnome/sources/libgweather/3.26/libgweather-3.26.0.tar.xz; - sha256 = "5b84badc0b3ecffff5db1bb9a7cc4dd4e400a8eb3f1282348f8ee6ba33626b6e"; + url = mirror://gnome/sources/libgweather/3.26/libgweather-3.26.1.tar.xz; + sha256 = "fca78470b345bce948e0333cab0a7c52c32562fc4a75de37061248a64e8fc4b8"; }; } From 59de08885ba9caf44cd16a0789f0463d1e5a3e0c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Dec 2017 01:56:49 +0100 Subject: [PATCH 10/29] =?UTF-8?q?gnome3.tracker-miners:=202.0.2=20?= =?UTF-8?q?=E2=86=92=202.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/tracker-miners/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/src.nix b/pkgs/desktops/gnome-3/core/tracker-miners/src.nix index 2b309161fd19..1c5ee9b35fa1 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/src.nix +++ b/pkgs/desktops/gnome-3/core/tracker-miners/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "tracker-miners-2.0.2"; + name = "tracker-miners-2.0.3"; src = fetchurl { - url = mirror://gnome/sources/tracker-miners/2.0/tracker-miners-2.0.2.tar.xz; - sha256 = "cf417ece944c997f630dda41a7f5c449d609fa53dbb34fae7caa4c7af1e0e8ef"; + url = mirror://gnome/sources/tracker-miners/2.0/tracker-miners-2.0.3.tar.xz; + sha256 = "12413a9f8dfa705a48a2697dcbb3eef12ee91bb98f392a23ba4bda7813e41d1b"; }; } From 679184b8c427f13b7aafe7a253803c19956642a7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Dec 2017 01:57:06 +0100 Subject: [PATCH 11/29] =?UTF-8?q?gnome3.aisleriot:=203.22.0=20=E2=86=92=20?= =?UTF-8?q?3.22.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/games/aisleriot/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/aisleriot/src.nix b/pkgs/desktops/gnome-3/games/aisleriot/src.nix index fbe6505b9a06..7fee97bae1df 100644 --- a/pkgs/desktops/gnome-3/games/aisleriot/src.nix +++ b/pkgs/desktops/gnome-3/games/aisleriot/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "aisleriot-3.22.0"; + name = "aisleriot-3.22.4"; src = fetchurl { - url = mirror://gnome/sources/aisleriot/3.22/aisleriot-3.22.0.tar.xz; - sha256 = "e7b603df0a482bdd0ab8083efc096a24a46aea1b36cc8608846e568b7a353eb7"; + url = mirror://gnome/sources/aisleriot/3.22/aisleriot-3.22.4.tar.xz; + sha256 = "fe8dee3ad771ab778d37740a26410778aa5c61e8eb75dd42b9a5e5719c6e34fb"; }; } From 2e2131d20a5f10d2da69e617d4ecf7a2081bc4ba Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Dec 2017 01:57:46 +0100 Subject: [PATCH 12/29] =?UTF-8?q?gnome3.four-in-a-row:=203.22.0=20?= =?UTF-8?q?=E2=86=92=203.22.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/games/four-in-a-row/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/src.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/src.nix index e0e11bc2124c..9e2b23f3996b 100644 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/src.nix +++ b/pkgs/desktops/gnome-3/games/four-in-a-row/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "four-in-a-row-3.22.0"; + name = "four-in-a-row-3.22.2"; src = fetchurl { - url = mirror://gnome/sources/four-in-a-row/3.22/four-in-a-row-3.22.0.tar.xz; - sha256 = "c2e26630f7b4e81cff087314edc0f39cd645dfbf4b31f826232bd8e9d57a7ff7"; + url = mirror://gnome/sources/four-in-a-row/3.22/four-in-a-row-3.22.2.tar.xz; + sha256 = "bc4194e8ab6d1d2a6a63a2e91945cd5465f49ebf0dae2eecacc66e69db56a420"; }; } From 8f3fdc89af3217abb641f0541d37cd4e0b0e039b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Dec 2017 01:58:19 +0100 Subject: [PATCH 13/29] =?UTF-8?q?gnome3.gnome-robots:=203.22.0=20=E2=86=92?= =?UTF-8?q?=203.22.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/games/gnome-robots/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/src.nix b/pkgs/desktops/gnome-3/games/gnome-robots/src.nix index 17fabe2de26b..09e4ad6c9673 100644 --- a/pkgs/desktops/gnome-3/games/gnome-robots/src.nix +++ b/pkgs/desktops/gnome-3/games/gnome-robots/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-robots-3.22.0"; + name = "gnome-robots-3.22.2"; src = fetchurl { - url = mirror://gnome/sources/gnome-robots/3.22/gnome-robots-3.22.0.tar.xz; - sha256 = "ddb02f9d04c970354d1836813f8c0d9ffc3ff509091d2580384e2275663e6f73"; + url = mirror://gnome/sources/gnome-robots/3.22/gnome-robots-3.22.2.tar.xz; + sha256 = "c5d63f0fcae66d0df9b10e39387d09875555909f0aa7e57ef8552621d852082f"; }; } From 5be578a02e03bd7f436f76ffc18e86bc8662db6c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Dec 2017 01:59:28 +0100 Subject: [PATCH 14/29] =?UTF-8?q?gnome3.hitori:=203.22.0=20=E2=86=92=203.2?= =?UTF-8?q?2.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/games/hitori/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/hitori/src.nix b/pkgs/desktops/gnome-3/games/hitori/src.nix index 47989cf2eae5..93dcd5de62e3 100644 --- a/pkgs/desktops/gnome-3/games/hitori/src.nix +++ b/pkgs/desktops/gnome-3/games/hitori/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "hitori-3.22.0"; + name = "hitori-3.22.4"; src = fetchurl { - url = mirror://gnome/sources/hitori/3.22/hitori-3.22.0.tar.xz; - sha256 = "f70521c9a7a7c3e16b3951b64780eb0c5bce1bb1bb29de4482be06fb5e41adaa"; + url = mirror://gnome/sources/hitori/3.22/hitori-3.22.4.tar.xz; + sha256 = "dcac6909b6007857ee425ac8c65fed179f2c71da138d5e5300cd62c8b9ea15d3"; }; } From 59e222eaba06e599171c44e8cafd258a42f81c99 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Dec 2017 03:08:37 +0100 Subject: [PATCH 15/29] =?UTF-8?q?gnome3.libgit2-glib:=200.26.0=20=E2=86=92?= =?UTF-8?q?=200.26.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix b/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix index 00e747500c61..d233dc3a4015 100644 --- a/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix +++ b/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "libgit2-glib-0.26.0"; + name = "libgit2-glib-0.26.2"; src = fetchurl { - url = mirror://gnome/sources/libgit2-glib/0.26/libgit2-glib-0.26.0.tar.xz; - sha256 = "06b16cfcc3a53d9804858618d690e5509e9af2e2245b75f0479cadbbe39745c3"; + url = mirror://gnome/sources/libgit2-glib/0.26/libgit2-glib-0.26.2.tar.xz; + sha256 = "2ad6f20db2e38bbfdb6cb452704fe8a911036b86de82dc75bb0f3b20db40ce9c"; }; } From 66c5f850e03b83134414acd114a7f6063958b9fb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Dec 2017 03:15:46 +0100 Subject: [PATCH 16/29] =?UTF-8?q?libaccounts-glib:=201.18=20=E2=86=92=201.?= =?UTF-8?q?23?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/libaccounts-glib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix index e410b6d4aa52..70d0e9faf845 100644 --- a/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/pkgs/development/libraries/libaccounts-glib/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitLab, autoconf, automake, glib , gtk_doc, libtool, libxml2, libxslt, pkgconfig, sqlite }: -let version = "1.18"; in +let version = "1.23"; in stdenv.mkDerivation rec { name = "libaccounts-glib-${version}"; src = fetchFromGitLab { - sha256 = "02p23vrqhw2l2w6nrwlk4bqxf7z9kplkc2d43716x9xakxr291km"; - rev = version; + sha256 = "11cvl3ch0y93756k90mw1swqv0ylr8qgalmvcn5yari8z4sg6cgg"; + rev = "VERSION_${version}"; repo = "libaccounts-glib"; owner = "accounts-sso"; }; From 2754d63cec04449f4b21c784e21a4baa202288db Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Dec 2017 03:20:51 +0100 Subject: [PATCH 17/29] =?UTF-8?q?glib=5Fnetworking:=202.54.0=20=E2=86=92?= =?UTF-8?q?=202.54.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/glib-networking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index fd8055fd0b39..87f3c78a82e8 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -3,14 +3,14 @@ let ver_maj = "2.54"; - ver_min = "0"; + ver_min = "1"; in stdenv.mkDerivation rec { name = "glib-networking-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/glib-networking/${ver_maj}/${name}.tar.xz"; - sha256 = "5961b3779080b72314b373ff5d4790eb7e41b75ca91816ad7a81ef32922f7096"; + sha256 = "0bq16m9nh3gcz9x2fvygr0iwxd2pxcbrm3lj3kihsnh1afv8g9za"; }; outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs From 77a8e8e16748defc8f2c17551e8cf83b5fd07dde Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Dec 2017 20:45:30 +0100 Subject: [PATCH 18/29] =?UTF-8?q?atk:=202.26.0=20=E2=86=92=202.26.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/atk/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 1574d8d037c7..61c18837782d 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -2,14 +2,14 @@ let ver_maj = "2.26"; - ver_min = "0"; + ver_min = "1"; in stdenv.mkDerivation rec { name = "atk-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/atk/${ver_maj}/${name}.tar.xz"; - sha256 = "eafe49d5c4546cb723ec98053290d7e0b8d85b3fdb123938213acb7bb4178827"; + sha256 = "1jwpx8az0iifw176dc2hl4mmg6gvxzxdkd1qvg4ds7c5hdmzy07g"; }; enableParallelBuilding = true; @@ -20,9 +20,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig perl ]; - propagatedBuildInputs = [ glib gobjectIntrospection /*ToDo: why propagate*/ ]; + propagatedBuildInputs = [ + # Required by atk.pc + glib + # TODO: Why propagate? + gobjectIntrospection + ]; - #doCheck = true; # no checks in there (2.22.0) + doCheck = true; meta = { description = "Accessibility toolkit"; From 562687401bc018f6b2046654e26c3f73333645ac Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Dec 2017 20:56:09 +0100 Subject: [PATCH 19/29] =?UTF-8?q?at=5Fspi2=5Fcore:=202.26.0=20=E2=86=92=20?= =?UTF-8?q?2.26.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/at-spi2-core/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 95de186a29a3..1743faafa687 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -1,24 +1,23 @@ -{ stdenv, fetchurl, python, pkgconfig, popt, intltool, dbus_glib +{ stdenv, fetchurl, python, pkgconfig, popt, gettext, dbus_glib , libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }: stdenv.mkDerivation rec { versionMajor = "2.26"; - versionMinor = "0"; + versionMinor = "2"; moduleName = "at-spi2-core"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "511568a65fda11fdd5ba5d4adfd48d5d76810d0e6ba4f7460f1b2ec0dbbbc337"; + sha256 = "0596ghkamkxgv08r4a1pdhm06qd5zzgcfqsv64038w9xbvghq3n8"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection ]; buildInputs = [ - python popt intltool dbus_glib + python popt dbus_glib libX11 xextproto libSM libICE libXtst libXi - gobjectIntrospection ]; # ToDo: on non-NixOS we create a symlink from there? From 9c62cc74b9e03861cd764c8ce23ca864134f73b6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Dec 2017 21:09:34 +0100 Subject: [PATCH 20/29] =?UTF-8?q?at=5Fspi2=5Fatk:=202.26.0=20=E2=86=92=202?= =?UTF-8?q?.26.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/at-spi2-atk/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index e2350cf2cd13..52c3a5f8c076 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -3,18 +3,18 @@ stdenv.mkDerivation rec { versionMajor = "2.26"; - versionMinor = "0"; + versionMinor = "1"; moduleName = "at-spi2-atk"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "d25e528e1406a10c7d9b675aa15e638bcbf0a122ca3681f655a30cce83272fb9"; + sha256 = "0x9vc99ni46fg5dzlx67vbw0zqffr24gz8jvbdxbmzyvc5xw5w5l"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ python popt atk libX11 libICE xorg.libXtst libXi - intltool dbus_glib at_spi2_core libSM ]; + dbus_glib at_spi2_core libSM ]; meta = with stdenv.lib; { platforms = platforms.unix; From 2b405ac3cfe2a819eef4c2005c5603dba23b8bde Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Dec 2017 21:17:32 +0100 Subject: [PATCH 21/29] =?UTF-8?q?desktop=5Ffile=5Futils:=200.22=20?= =?UTF-8?q?=E2=86=92=200.23?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/misc/desktop-file-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index e5e3815481f1..6e2f6548722e 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "desktop-file-utils-0.22"; + name = "desktop-file-utils-0.23"; src = fetchurl { url = "http://www.freedesktop.org/software/desktop-file-utils/releases/${name}.tar.xz"; - sha256 = "1ianvr2a69yjv4rpyv30w7yjsmnsb23crrka5ndqxycj4rkk4dc4"; + sha256 = "119kj2w0rrxkhg4f9cf5waa55jz1hj8933vh47vcjipcplql02bc"; }; nativeBuildInputs = [ pkgconfig ]; From b303e5fe74144c2d657ec5185b8a91bb8e985a3d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Dec 2017 21:30:40 +0100 Subject: [PATCH 22/29] =?UTF-8?q?cairomm:=201.12.0=20=E2=86=92=201.12.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/cairomm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index b1ee0b8d2736..09d162db8532 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -1,16 +1,16 @@ { fetchurl, stdenv, pkgconfig, darwin, cairo, xlibsWrapper, fontconfig, freetype, libsigcxx }: let ver_maj = "1.12"; - ver_min = "0"; + ver_min = "2"; in stdenv.mkDerivation rec { name = "cairomm-${ver_maj}.${ver_min}"; src = fetchurl { - #url = "http://www.cairographics.org/releases/${name}.tar.gz"; + url = "http://www.cairographics.org/releases/${name}.tar.gz"; # gnome doesn't have the latest version ATM; beware: same name but different hash - url = "mirror://gnome/sources/cairomm/${ver_maj}/${name}.tar.xz"; - sha256 = "a54ada8394a86182525c0762e6f50db6b9212a2109280d13ec6a0b29bfd1afe6"; + # url = "mirror://gnome/sources/cairomm/${ver_maj}/${name}.tar.xz"; + sha256 = "16fmigxsaz85c3lgcls7biwyz8zy8c8h3jndfm54cxxas3a7zi25"; }; outputs = [ "out" "dev" ]; From c03896e0aeaf6da349037cbbcd0a929f6160998a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Dec 2017 23:49:15 +0100 Subject: [PATCH 23/29] =?UTF-8?q?libinput:=201.9.2=20=E2=86=92=201.9.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/libinput/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 9bf54a115ffd..db4c0c7738de 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -16,11 +16,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.9.2"; + version = "1.9.3"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "0fyy050hzk47g7305lx5pgyh2abvq7qs4xd3nn1is7zy3wj56s6x"; + sha256 = "09wkc5qqk1k2a68cwfy4x853z8z35wf2qkijh66kacsvc2fjq394"; }; outputs = [ "out" "dev" ]; From d6c705a41d14eebc842af9446a7531e1b4f90c20 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 4 Dec 2017 00:03:55 +0100 Subject: [PATCH 24/29] =?UTF-8?q?gnome3.rest:=200.8.0=20=E2=86=92=200.8.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/rest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/rest/default.nix b/pkgs/desktops/gnome-3/core/rest/default.nix index 154e7221cc20..59f7a53e3e3e 100644 --- a/pkgs/desktops/gnome-3/core/rest/default.nix +++ b/pkgs/desktops/gnome-3/core/rest/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "rest-${version}"; major = "0.8"; - version = "${major}.0"; + version = "${major}.1"; src = fetchurl { url = "mirror://gnome/sources/rest/${major}/${name}.tar.xz"; - sha256 = "e7b89b200c1417073aef739e8a27ff2ab578056c27796ec74f5886a5e0dff647"; + sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9"; }; nativeBuildInputs = [ pkgconfig ]; From fc913f5dbf0ddd950416cd7973ef8a0d1d9f8358 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 4 Dec 2017 00:27:25 +0100 Subject: [PATCH 25/29] =?UTF-8?q?gnome3.libmediaart:=201.9.1=20=E2=86=92?= =?UTF-8?q?=201.9.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/misc/libmediaart/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/misc/libmediaart/default.nix index abdcdef99379..2ea7a58ab665 100644 --- a/pkgs/desktops/gnome-3/misc/libmediaart/default.nix +++ b/pkgs/desktops/gnome-3/misc/libmediaart/default.nix @@ -4,15 +4,15 @@ let majorVersion = "1.9"; in stdenv.mkDerivation rec { - name = "libmediaart-${majorVersion}.1"; + name = "libmediaart-${majorVersion}.4"; src = fetchurl { url = "mirror://gnome/sources/libmediaart/${majorVersion}/${name}.tar.xz"; - sha256 = "0jg9gwxmhdxcbwb5svgkxkd3yl1d14wqzckcgg2swkn81i7al52v"; + sha256 = "a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gdk_pixbuf gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; + buildInputs = [ glib gdk_pixbuf ]; meta = with stdenv.lib; { description = "Library tasked with managing, extracting and handling media art caches"; From 8d737f5c58627b6140168caf79ef85e33afe6c93 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 4 Dec 2017 00:29:18 +0100 Subject: [PATCH 26/29] =?UTF-8?q?gnome3.dconf:=200.26.0=20=E2=86=92=200.26?= =?UTF-8?q?.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/dconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix index 130e8255edca..9a836869ec6e 100644 --- a/pkgs/desktops/gnome-3/core/dconf/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation rec { name = "dconf-${version}"; - version = "${majorVersion}.0"; + version = "${majorVersion}.1"; src = fetchurl { url = "mirror://gnome/sources/dconf/${majorVersion}/${name}.tar.xz"; - sha256 = "1jaqsr1r0grpd25rbsc2v3vb0sc51lia9w31wlqswgqsncp2k0w6"; + sha256 = "0da587hpiqy8h3pswn1102h4b905x8k6mk3ajpi7kf4kzkvv30ym"; }; outputs = [ "out" "lib" "dev" ]; From 062a2847701e35516fe1ea2cbe318b75b540a9c4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 6 Dec 2017 00:14:27 +0100 Subject: [PATCH 27/29] =?UTF-8?q?babl:=200.1.34=20=E2=86=92=200.1.38?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/babl/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 133b39d07974..04e714f886ef 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,17 +1,20 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babl-0.1.34"; + name = "babl-0.1.38"; src = fetchurl { url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "0nwakj313l2dh5npx18avkg4z17i2prkxbl6vj547a08n6ry1gsy"; + sha256 = "11pfbyzq20596p9sgwraxspg3djg1jzz6wvz4bapf0yyr97jiyd0"; }; - meta = with stdenv.lib; { + doCheck = true; + + meta = with stdenv.lib; { description = "Image pixel format conversion library"; homepage = http://gegl.org/babl/; license = licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ jtojnar ]; platforms = platforms.unix; }; } From 884376e7a882695ae868a75dca19d62111a87745 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 6 Dec 2017 00:14:59 +0100 Subject: [PATCH 28/29] =?UTF-8?q?gegl=5F0=5F3:=200.3.18=C2=A0=E2=86=92=200?= =?UTF-8?q?.3.24?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/gegl/3.0.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix index 48b1e47e0edc..4acb6047f8a1 100644 --- a/pkgs/development/libraries/gegl/3.0.nix +++ b/pkgs/development/libraries/gegl/3.0.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which -, librsvg, pango, gtk, bzip2, json_glib, intltool, autoreconfHook, libraw }: +, librsvg, pango, gtk, bzip2, json_glib, intltool, autoreconfHook, libraw +, libwebp, gnome3 }: stdenv.mkDerivation rec { - name = "gegl-0.3.18"; + name = "gegl-0.3.24"; src = fetchurl { url = "http://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2"; - sha256 = "1ywihjav9yhmsvbrdyx9c5q71rqdkjg8l66ywca6s4yydvr8x1fp"; + sha256 = "0x4xjca05fbncy49vjs5nq3ria6j8wlpiq6yldkv0r6qcb18p80s"; }; hardeningDisable = [ "format" ]; @@ -14,17 +15,22 @@ stdenv.mkDerivation rec { # needs fonts otherwise don't know how to pass them configureFlags = "--disable-docs"; + enableParallelBuilding = true; + + doCheck = true; + buildInputs = [ - babl libpng cairo libjpeg librsvg pango gtk bzip2 which json_glib intltool - libraw + babl libpng cairo libjpeg librsvg pango gtk bzip2 json_glib + libraw libwebp gnome3.gexiv2 ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkgconfig intltool which autoreconfHook ]; meta = { description = "Graph-based image processing framework"; homepage = http://www.gegl.org; license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ jtojnar ]; platforms = stdenv.lib.platforms.linux; }; } From 2184a92619c42fed1104c53ff48aca6b4a6beacd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 6 Dec 2017 00:31:14 +0100 Subject: [PATCH 29/29] =?UTF-8?q?gnome3.gspell:=201.4.1=20=E2=86=92=201.6.?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/misc/gspell/default.nix | 4 ++-- pkgs/desktops/gnome-3/misc/gspell/src.nix | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gspell/default.nix b/pkgs/desktops/gnome-3/misc/gspell/default.nix index 71e3ff19dc3f..e8c299685f70 100644 --- a/pkgs/desktops/gnome-3/misc/gspell/default.nix +++ b/pkgs/desktops/gnome-3/misc/gspell/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ enchant ]; # required for pkgconfig - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gtk3 isocodes vala ]; + nativeBuildInputs = [ pkgconfig vala ]; + buildInputs = [ glib gtk3 isocodes ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/misc/gspell/src.nix b/pkgs/desktops/gnome-3/misc/gspell/src.nix index fd55e654d551..9ae78f39e4e1 100644 --- a/pkgs/desktops/gnome-3/misc/gspell/src.nix +++ b/pkgs/desktops/gnome-3/misc/gspell/src.nix @@ -1,10 +1,10 @@ -fetchurl: rec { - major = "1.4"; - minor = "1"; - name = "gspell-${major}.${minor}"; +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gspell-1.6.1"; src = fetchurl { - url = "mirror://gnome/sources/gspell/${major}/${name}.tar.xz"; - sha256 = "1ghh1xdzf04mfgb13zqpj88krpa44xv2vbyhm6k017kzrpz8hbs4"; + url = mirror://gnome/sources/gspell/1.6/gspell-1.6.1.tar.xz; + sha256 = "f4d329348775374eec18158f8dcbbacf76f85be5ce002a92d93054ece70ec4de"; }; }