From 2a1c199e2937b8eba8b4513b3ba9a2b7757e4136 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 24 Dec 2018 03:10:01 +0100 Subject: [PATCH 1/6] =?UTF-8?q?gtk3:=203.24.1=20=E2=86=92=203.24.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also fixes language names. --- pkgs/development/libraries/gtk+/3.x.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 421029a9d55f..5c6cd2c7eda0 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info +{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info, isocodes , expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobject-introspection , xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3 , x11Support ? stdenv.isLinux @@ -13,14 +13,14 @@ assert cupsSupport -> cups != null; with stdenv.lib; let - version = "3.24.1"; + version = "3.24.2"; in stdenv.mkDerivation rec { name = "gtk+3-${version}"; src = fetchurl { url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "0bxhsp7cjph7szg1iyv16nwi60bz59x1smjkqv6sv6mr0zipnf38"; + sha256 = "14l8mimdm44r3h5pn5hzigl1z25jna8jxvb16l88v4nc4zj0afsv"; }; outputs = [ "out" "dev" ]; @@ -35,9 +35,14 @@ stdenv.mkDerivation rec { url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; }) + # https://gitlab.gnome.org/GNOME/gtk/issues/1521 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gtk/commit/2905fc861acda3d134a198e56ef2f6c962ad3061.patch; + sha256 = "0y8ljny59kgdhrcfpimi2r082bax60d5kflw1qj9k1mnzjcvjjwl"; + }) ]; - buildInputs = [ libxkbcommon epoxy json-glib ] + buildInputs = [ libxkbcommon epoxy json-glib isocodes ] ++ optional stdenv.isDarwin AppKit; propagatedBuildInputs = with xorg; with stdenv.lib; [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas From 4e1dd3ce7a36dc2048f1aae22163637ead2e03a9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 24 Dec 2018 03:45:34 +0100 Subject: [PATCH 2/6] =?UTF-8?q?gtkmm3:=203.22.2=20=E2=86=92=203.24.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/gtkmm/3.x.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 7845143ebeb5..ba20af1caf51 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -1,15 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy }: +{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }: -let - ver_maj = "3.22"; - ver_min = "2"; -in stdenv.mkDerivation rec { - name = "gtkmm-${ver_maj}.${ver_min}"; + pname = "gtkmm"; + version = "3.24.0"; src = fetchurl { - url = "mirror://gnome/sources/gtkmm/${ver_maj}/${name}.tar.xz"; - sha256 = "91afd98a31519536f5f397c2d79696e3d53143b80b75778521ca7b48cb280090"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0hxaq4x9jqj8vvnv3sb6nwapz83v8lclbm887qqci0g50llcjpyg"; }; outputs = [ "out" "dev" ]; @@ -24,6 +21,13 @@ stdenv.mkDerivation rec { # https://bugzilla.gnome.org/show_bug.cgi?id=764521 doCheck = false; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "${pname}3"; + }; + }; + meta = with stdenv.lib; { description = "C++ interface to the GTK+ graphical user interface library"; From d1e5f0060c5c857664ba6ca5e5804bf9f62de7e4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 24 Dec 2018 03:53:08 +0100 Subject: [PATCH 3/6] =?UTF-8?q?glibmm:=202.56.0=20=E2=86=92=202.58.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/glibmm/default.nix | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index ee77f4b498e4..10d5ee275006 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -1,27 +1,16 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gnum4, glib, libsigcxx }: +{ stdenv, fetchurl, pkgconfig, gnum4, glib, libsigcxx, gnome3 }: -let - ver_maj = "2.56"; - ver_min = "0"; -in stdenv.mkDerivation rec { - name = "glibmm-${ver_maj}.${ver_min}"; + pname = "glibmm"; + version = "2.58.0"; src = fetchurl { - url = "mirror://gnome/sources/glibmm/${ver_maj}/${name}.tar.xz"; - sha256 = "1abrkqhca5p8n6ly3vp1232rny03s7lrd8f8iz2m2m141nxgqx3f"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0idnaii4h3mdym2a55gkavipyxigwvbgfmzmwql85s4rgciqjhfk"; }; outputs = [ "out" "dev" ]; - patchFlags = "-p0"; - patches = [ - (fetchpatch { - url = "https://raw.githubusercontent.com/macports/macports-ports/e864b2340be9ef003d8ff4aef92e7151d06287dd/devel/glibmm/files/0001-ustring-Fix-wchar-conversion-on-macOS-with-libc.patch"; - sha256 = "02qvnailw1i59cjbj3cy7y02kfcivsvkdjrf4njkp4plarayyqp9"; - }) - ]; - nativeBuildInputs = [ pkgconfig gnum4 ]; propagatedBuildInputs = [ glib libsigcxx ]; @@ -29,6 +18,12 @@ stdenv.mkDerivation rec { doCheck = false; # fails. one test needs the net, another /etc/fstab + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "C++ interface to the GLib library"; From 426e6ee1836a89c51d7278cb5f31344ac476891c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 24 Dec 2018 04:14:37 +0100 Subject: [PATCH 4/6] =?UTF-8?q?pangomm:=202.40.1=20=E2=86=92=202.42.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../development/libraries/pangomm/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index 93c2501a6203..064ebf71cc32 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -1,16 +1,13 @@ -{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm +{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, gnome3 , ApplicationServices }: -let - ver_maj = "2.40"; - ver_min = "1"; -in stdenv.mkDerivation rec { - name = "pangomm-${ver_maj}.${ver_min}"; + pname = "pangomm"; + version= "2.42.0"; src = fetchurl { - url = "mirror://gnome/sources/pangomm/${ver_maj}/${name}.tar.xz"; - sha256 = "9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0mmzxp3wniaafkxr30sb22mq9x44xckb5d60h1bl99lkzxks0vfa"; }; outputs = [ "out" "dev" ]; @@ -22,6 +19,12 @@ stdenv.mkDerivation rec { doCheck = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "C++ interface to the Pango text rendering library"; homepage = https://www.pango.org/; From 4439234623502140b9596e4bf066574b89f718a1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 24 Dec 2018 04:22:07 +0100 Subject: [PATCH 5/6] =?UTF-8?q?libgsf:=201.14.44=20=E2=86=92=201.14.45?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/libgsf/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index bcd37396bf7f..4e7ff0314381 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,12 +1,13 @@ { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2 -, python, perl, gdk_pixbuf, libiconv, libintl }: +, python, perl, gdk_pixbuf, libiconv, libintl, gnome3 }: stdenv.mkDerivation rec { - name = "libgsf-1.14.44"; + pname = "libgsf"; + version = "1.14.45"; src = fetchurl { - url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz"; - sha256 = "1ppzfk3zmmgrg9jh8vc4dacddbfngjslq2wpj94pcr3i0c8dxgk8"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1yk91ccf7z9b8d8ac6vip3gc5c0pkwgabqy6l0pj0kf43l7jrg2w"; }; nativeBuildInputs = [ pkgconfig intltool libintl ]; @@ -21,6 +22,12 @@ stdenv.mkDerivation rec { doCheck = true; preCheck = "patchShebangs ./tests/"; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "GNOME's Structured File Library"; homepage = https://www.gnome.org/projects/libgsf; From 1feaf340784cd401105a2b5a085e0a55f7a7452a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 24 Dec 2018 04:27:53 +0100 Subject: [PATCH 6/6] =?UTF-8?q?atkmm:=202.24.2=20=E2=86=92=202.28.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/atkmm/default.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix index 9ec9e6284f83..5338aa683a7c 100644 --- a/pkgs/development/libraries/atkmm/default.nix +++ b/pkgs/development/libraries/atkmm/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, atk, glibmm, pkgconfig }: -let - ver_maj = "2.24"; - ver_min = "2"; -in +{ stdenv, fetchurl, atk, glibmm, pkgconfig, gnome3 }: + stdenv.mkDerivation rec { - name = "atkmm-${ver_maj}.${ver_min}"; + pname = "atkmm"; + version = "2.28.0"; src = fetchurl { - url = "mirror://gnome/sources/atkmm/${ver_maj}/${name}.tar.xz"; - sha256 = "ff95385759e2af23828d4056356f25376cfabc41e690ac1df055371537e458bd"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0fnxrspxkhhbrjphqrpvl3zjm66n50s4cywrrrwkhbflgy8zqk2c"; }; outputs = [ "out" "dev" ]; @@ -19,6 +17,12 @@ stdenv.mkDerivation rec { doCheck = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = { description = "C++ wrappers for ATK accessibility toolkit"; license = stdenv.lib.licenses.lgpl21Plus;