diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-11-06 13:00:15 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-11-06 13:00:15 +0100 |
commit | bc90fe1fbb74070450774cfe1645a02846761557 (patch) | |
tree | a8bc6b14bea0a25553ecb1577a32c5fac20ae0b7 /pkgs/development/libraries | |
parent | eece8755d1f5da1a5be319edf37c1a6244289010 (diff) | |
parent | 09bda3529d3c0be81ac9ce9d95c3e7e40c8e320d (diff) | |
download | nixlib-bc90fe1fbb74070450774cfe1645a02846761557.tar nixlib-bc90fe1fbb74070450774cfe1645a02846761557.tar.gz nixlib-bc90fe1fbb74070450774cfe1645a02846761557.tar.bz2 nixlib-bc90fe1fbb74070450774cfe1645a02846761557.tar.lz nixlib-bc90fe1fbb74070450774cfe1645a02846761557.tar.xz nixlib-bc90fe1fbb74070450774cfe1645a02846761557.tar.zst nixlib-bc90fe1fbb74070450774cfe1645a02846761557.zip |
Merge #30371: update misc. gnome3-related libraries
Diffstat (limited to 'pkgs/development/libraries')
42 files changed, 186 insertions, 163 deletions
diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 1c97b879a189..d177c3acfa71 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gettext, gtk3, intltool, glib -, gtk_doc, autoconf, automake, libtool, libarchive -, gobjectIntrospection, sqlite, libsoup, gcab, attr, acl, docbook_xsl -, libuuid, json_glib, autoconf-archive, meson, gperf, ninja, gdk_pixbuf +{ stdenv, fetchFromGitHub, pkgconfig, gettext, gtk3, glib +, gtk_doc, libarchive, gobjectIntrospection +, sqlite, libsoup, gcab, attr, acl, docbook_xsl +, libuuid, json_glib, meson, gperf, ninja }: stdenv.mkDerivation rec { name = "appstream-glib-0.7.2"; diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 39296f86d8e1..bada2c2c709c 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { major = "1.8"; - minor = "2"; + minor = "4"; name = "clutter-gtk-${major}.${minor}"; src = fetchurl { url = "mirror://gnome/sources/clutter-gtk/${major}/${name}.tar.xz"; - sha256 = "da27d486325490ad3f65d2abf9413aeb8b4a8f7b559e4b2f73567a5344a26b94"; + sha256 = "01ibniy4ich0fgpam53q252idm7f4fn5xg5qvizcfww90gn9652j"; }; propagatedBuildInputs = [ clutter gtk3 ]; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 422b7f4c58c6..fd8055fd0b39 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -2,7 +2,7 @@ , gsettings_desktop_schemas }: let - ver_maj = "2.50"; + ver_maj = "2.54"; ver_min = "0"; in stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib-networking/${ver_maj}/${name}.tar.xz"; - sha256 = "3f1a442f3c2a734946983532ce59ed49120319fdb10c938447c373d5e5286bee"; + sha256 = "5961b3779080b72314b373ff5d4790eb7e41b75ca91816ad7a81ef32922f7096"; }; outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 5c318c9b46a2..a3af96d51edc 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, gnum4, glib, libsigcxx }: let - ver_maj = "2.50"; - ver_min = "0"; + ver_maj = "2.54"; + ver_min = "1"; in stdenv.mkDerivation rec { name = "glibmm-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/glibmm/${ver_maj}/${name}.tar.xz"; - sha256 = "df726e3c6ef42b7621474b03b644a2e40ec4eef94a1c5a932c1e740a78f95e94"; + sha256 = "0jkapw18icz59cmlmsl00nwwz0wh291kb4hc9z9hxmq45drqrhkw"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index b26ae9c9d612..f629b9a8a3c3 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -7,7 +7,7 @@ # In that case its about 6MB which could be separated let - ver_maj = "1.52"; + ver_maj = "1.54"; ver_min = "1"; in with stdenv.lib; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz"; - sha256 = "1x5gkyrglv3dn9b4fsgw6asqgjw1wj7qc37g9pyac6pyaa6w7l1f"; + sha256 = "0zl7pfkzkm07733391b4f3cwjbnvb1nwvpmajf5bajh6bxgfv3dq"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 69378d95a301..2e0e711ce71d 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -17,11 +17,11 @@ let inherit (stdenv.lib) optional optionalString; in stdenv.mkDerivation rec { - name = "gst-plugins-bad-1.10.4"; + name = "gst-plugins-bad-1.12.2"; meta = with stdenv.lib; { description = "Gstreamer Bad Plugins"; - homepage = "http://gstreamer.freedesktop.org"; + homepage = "https://gstreamer.freedesktop.org"; longDescription = '' a set of plug-ins that aren't up to par compared to the rest. They might be close to being good quality, but they're missing @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"; - sha256 = "0rk9rlzf2b0hjw5hwbadz53yh4ls7vm3w3cshsa3n8isdd8axp93"; + sha256 = "0dwyq03g2m0p16dwx8q5qvjn5x9ia72h21sf87mp97gmwkfpwb4w"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 70aa9101ad8b..2ff429179642 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -4,18 +4,18 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-base-1.10.4"; + name = "gst-plugins-base-1.12.2"; meta = { description = "Base plugins and helper libraries"; - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; }; src = fetchurl { url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"; - sha256 = "1dsyjf6rncsbg4rfj40cvf1wwpjj9h3j3c7bh4zp7jylnfv4blpn"; + sha256 = "0x86a7aph0y6gyq178plvwvbbyhkfb3hf0gadx9sk5z1mzixqrsh"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 4bd7fb5396ac..67521e40daf6 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-1.10.4"; + name = "gstreamer-1.12.2"; meta = { description = "Open source multimedia framework"; - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.ttuegel ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer/${name}.tar.xz"; - sha256 = "062jidnw17hkpva6ddygp80gyasyigfkpm1y7w56rk56a2pzbhjh"; + sha256 = "1fllz7n58lavyy4nh64xc7izd4ffhl12a2ff0yg4z67al8wkzplz"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index cf69fa943a27..e206f317d4ba 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -3,18 +3,18 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-editing-services-1.10.4"; + name = "gstreamer-editing-services-1.12.2"; meta = with stdenv.lib; { description = "Library for creation of audio/video non-linear editors"; - homepage = "http://gstreamer.freedesktop.org"; + homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl2Plus; platforms = platforms.unix; }; src = fetchurl { url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz"; - sha256 = "0i11b1rwkjsy9gxrf9vk9lgg8qm60ggfi5lp0ncyh4lxvh16vbgj"; + sha256 = "0bi0f487949k9xnl1r6ngysgaibmmswwgdqcrchg0dixnnbm9isr"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix index 90d4ec458a93..c04b64ae3c6a 100644 --- a/pkgs/development/libraries/gstreamer/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/gnonlin/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Gstreamer Non-Linear Multimedia Editing Plugins"; - homepage = "http://gstreamer.freedesktop.org"; + homepage = "https://gstreamer.freedesktop.org"; longDescription = '' Gnonlin is a library built on top of GStreamer which provides support for writing non-linear audio and video editing diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index c18d8332b0c0..1c7f7951e916 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -11,11 +11,11 @@ let inherit (stdenv.lib) optionals optionalString; in stdenv.mkDerivation rec { - name = "gst-plugins-good-1.10.4"; + name = "gst-plugins-good-1.12.2"; meta = with stdenv.lib; { description = "Gstreamer Good Plugins"; - homepage = "http://gstreamer.freedesktop.org"; + homepage = "https://gstreamer.freedesktop.org"; longDescription = '' a set of plug-ins that we consider to have good quality code, correct functionality, our preferred license (LGPL for the plug-in @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"; - sha256 = "0zjdwxn83sp9wjp9rxjbyk8kf284g9av7l2v6rjldi586hacd1la"; + sha256 = "15pfw54fsh9s9xwrnbap4z4njwgqdfvq52k562d2hc5b11rfx4am"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index a41695655114..f6138fafaefc 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -12,6 +12,13 @@ stdenv.mkDerivation rec { sha256 = "0i4sk6ns4dyi4szk45bkm4kvl57l52lgm15p2wg2rhx2gr2w3qry"; }; + patches = [ + (fetchurl { + url = https://bug783628.bugzilla-attachments.gnome.org/attachment.cgi?id=354765; + sha256 = "082510a934bl05mz4cyakp8mfmd97cdj7vdrbvyqc4g58dcskvz0"; + }) + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig file ]; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix index 953f8900ade9..95b394a6d4b7 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ - "http://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2" + "https://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.bz2" ]; sha256 = "0qmvgwcfybci78sd73mhvm4bsb7l0xsk9yljrgik80g011ds1z3n"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix index fecc77b2a544..bdb1b6c7bb7a 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; description = "‘Bad’ (potentially low quality) plug-ins for GStreamer"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix index 5b2ba728f3a8..2c2e1b0da122 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/share/gtk-doc"; meta = with stdenv.lib; { - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; description = "Base plug-ins for GStreamer"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index 9339de3d9ed4..d533f798d999 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; description = "`Good' plug-ins for GStreamer"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix index 9863b3e01285..5c289fb39114 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; description = "‘Ugly’ (potentially patent-encumbered) plug-ins for GStreamer"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix index fd01aa5c1dce..c8414a7b681b 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ gstreamer python ]; meta = { - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; description = "Python bindings for GStreamer"; diff --git a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix index 74b1417e0694..9797f21c1685 100644 --- a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "qt-gstreamer"; src = fetchurl { - url = "http://gstreamer.freedesktop.org/src/${pname}/${name}.tar.bz2"; + url = "https://gstreamer.freedesktop.org/src/${pname}/${name}.tar.bz2"; sha256 = "1pqg9sxzk8sdrf7pazb5v21hasqai9i4l203gbdqz29w2ll1ybsl"; }; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index f312a14de24f..7c0a05f8202b 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -9,17 +9,17 @@ assert withSystemLibav -> libav != null; stdenv.mkDerivation rec { - name = "gst-libav-1.10.4"; + name = "gst-libav-1.12.2"; meta = { - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; }; src = fetchurl { url = "${meta.homepage}/src/gst-libav/${name}.tar.xz"; - sha256 = "12r68ri03mgbbwsxyn6yklgfsq32rwvyq83zw0aq7m73fp5gx83c"; + sha256 = "1crdahkjm23byg1awcrjkmgfbalfpvvac7h7whm6b2r1pfwkbdsv"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix index 72068bb1f7bc..a9e7f9fcff3e 100644 --- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "qt-gstreamer"; src = fetchurl { - url = "http://gstreamer.freedesktop.org/src/${pname}/${name}.tar.xz"; + url = "https://gstreamer.freedesktop.org/src/${pname}/${name}.tar.xz"; sha256 = "9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4"; }; diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index bd034ac13a15..610f10075a8d 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-1.10.4"; + name = "gst-plugins-ugly-1.12.2"; meta = with stdenv.lib; { description = "Gstreamer Ugly Plugins"; - homepage = "http://gstreamer.freedesktop.org"; + homepage = "https://gstreamer.freedesktop.org"; longDescription = '' a set of plug-ins that have good quality and correct functionality, but distributing them might pose problems. The license on either @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"; - sha256 = "0ngsiwcsz3jd08id4mc0qiy2q1n7h2kkvdnh3r1vm725m1ycg1k3"; + sha256 = "0rplyp1qk359c97ig9i2vc1v34g92khd8dslwfipva1ypwmr9hqw"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index caca54400841..becd4cf0d921 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gst-vaapi-${version}"; - version = "1.10.4"; + version = "1.12.2"; src = fetchurl { url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"; - sha256 = "0xfyf1mgcxnwf380wxv20hakl2srp34dmiw6bm4zkncl2mi91rh3"; + sha256 = "0fhncs27hcdcnb9a4prkxlyvr883hnzsx148zzk7lg2b8zh19ir3"; }; outputs = [ "out" "dev" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { configureFlags = "--disable-builtin-libvpx --with-gstreamer-api=1.0"; meta = { - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ tstrobel ]; diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index b537ad2897d7..9704ca1d743c 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -3,18 +3,18 @@ }: stdenv.mkDerivation rec { - name = "gst-validate-1.10.4"; + name = "gst-validate-1.12.2"; meta = { description = "Integration testing infrastructure for the GStreamer framework"; - homepage = http://gstreamer.freedesktop.org; + homepage = https://gstreamer.freedesktop.org; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; }; src = fetchurl { url = "${meta.homepage}/src/gst-validate/${name}.tar.xz"; - sha256 = "0g6px08x4kq5xqlbyxvxn6cm9b1s1gfvhkmlrmvw9afccjzh1775"; + sha256 = "1pgycs35bwmp4aicyxwyzlfy1i5l2rzmh2a8ivhgy21azp8jaykb"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index 93f24b0f7225..4da9db3ef047 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -1,24 +1,22 @@ {stdenv, fetchurl , automake, autoconf, libtool, which, gtkdoc, gettext, pkgconfig, gobjectIntrospection, libxslt -, glib, systemd, libusb1, vala_0_23 +, glib, systemd, libusb1, vala_0_38 }: stdenv.mkDerivation rec { name = "gusb-${version}"; - version = "0.2.9"; + version = "0.2.11"; enableParallelBuilding = true; src = fetchurl { - url = "http://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz"; - sha256 = "056yxlppgycsfw1l8c9j6givk1n15jylhvx89wqhsxdi1b6vs83k"; + url = "https://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz"; + sha256 = "1pppz17lw3khyz8by1dddxdqrv6qn4a23fpxs38c67db7x4l7ccw"; }; preConfigure = "./autogen.sh"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - autoconf automake libtool which gtkdoc gettext gobjectIntrospection libxslt - systemd vala_0_23 glib - ]; + nativeBuildInputs = [ pkgconfig autoconf automake libtool which gtkdoc gettext + gobjectIntrospection libxslt vala_0_38 ]; + buildInputs = [ systemd glib ]; propagatedBuildInputs = [ libusb1 ]; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 6eb341d66bce..78f507ca1465 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, libtool , glib, dbus, udev, libgudev, udisks2, libgcrypt, libcap, polkit -, libgphoto2, avahi, libarchive, fuse, libcdio +, libgphoto2, avahi, libarchive, fuse, libcdio, file, bzip2, lzma , libxml2, libxslt, docbook_xsl, samba, libmtp , gnomeSupport ? false, gnome, makeWrapper }: let - ver_maj = "1.30"; + ver_maj = "1.34"; version = "${ver_maj}.1"; in stdenv.mkDerivation rec { @@ -13,21 +13,21 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gvfs/${ver_maj}/${name}.tar.xz"; - sha256 = "e752e7bb46e64e4025f63428d4f5247e3e5c0d0b5eeb4f81dbf1cd7b75f59d7b"; + sha256 = "1d3j6f252mk316hrspwy63inrhxk6l78l4bmlmql401lqapb5yby"; }; nativeBuildInputs = [ - pkgconfig intltool libtool + pkgconfig intltool libtool file makeWrapper libxml2 libxslt docbook_xsl ]; buildInputs = - [ makeWrapper glib dbus udev libgudev udisks2 libgcrypt - libgphoto2 avahi libarchive fuse libcdio + [ glib dbus udev libgudev udisks2 libgcrypt + libgphoto2 avahi libarchive fuse libcdio lzma bzip2 samba libmtp libcap polkit # ToDo: a ligther version of libsoup to have FTP/HTTP support? ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [ - gtk libsoup libgnome_keyring gconf gcr + libsoup libgnome_keyring gconf gcr # ToDo: not working and probably useless until gnome3 from x-updates ]); diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 9d434c088bad..2414931e76aa 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,24 +1,34 @@ -{ stdenv, fetchurl, glib, pkgconfig, gobjectIntrospection, dbus, libintlOrEmpty }: +{ stdenv, fetchurl, fetchpatch, glib, meson, ninja, pkgconfig, gettext, gobjectIntrospection, dbus, libintlOrEmpty }: stdenv.mkDerivation rec { - name = "json-glib-${minVer}.0"; - minVer = "1.2"; + name = "json-glib-${minVer}.2"; + minVer = "1.4"; src = fetchurl { url = "mirror://gnome/sources/json-glib/${minVer}/${name}.tar.xz"; - sha256 = "1lx7p1c7cl21byvfgw92n8dhm09vi6qxrs0zkx9dg3y096zdzmlr"; + sha256 = "2d7709a44749c7318599a6829322e081915bdc73f5be5045882ed120bb686dc8"; }; - configureflags= "--with-introspection"; - - propagatedBuildInputs = [ glib gobjectIntrospection ]; - nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ glib ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ]; buildInputs = libintlOrEmpty; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + patches = [ + # https://gitlab.gnome.org/GNOME/json-glib/issues/27 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/json-glib/merge_requests/2.diff"; + sha256 = "0pf006jxj1ki7a0w4ykxm6b24m0wafrhpdcmixsw9x83m227156c"; + }) + ]; + outputs = [ "out" "dev" ]; + doCheck = true; + + checkPhase = "meson test"; + meta = with stdenv.lib; { homepage = http://live.gnome.org/JsonGlib; description = "A library providing (de)serialization support for the JavaScript Object Notation (JSON) format"; diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index f6d6c5b803eb..514a1fa85343 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { major = "0.12"; - version = "${major}.14"; + version = "${major}.16"; name = "libchamplain-${version}"; src = fetchurl { url = "mirror://gnome/sources/libchamplain/${major}/${name}.tar.xz"; - sha256 = "13snnka1jqc5qrgij8bm22xy02pncf3dn5ij3jh4rrpzq7g1sqpi"; + sha256 = "13chvc2n074i0jw5jlb8i7cysda4yqx58ca6y3mrlrl9g37k2zja"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index a91acb230525..090a12f63de1 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "libevdev-1.5.6"; + name = "libevdev-1.5.7"; src = fetchurl { url = "https://www.freedesktop.org/software/libevdev/${name}.tar.xz"; - sha256 = "1256ypz93039n6km4macg158fpmjgylhmcmk20pnklxicsfpxv7c"; + sha256 = "08nl3p6226k51zph52fhilxvi3b31spp6fz8szzrglzhl8vrxrd1"; }; buildInputs = [ python ]; diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index de72072e48be..49cd1d163a60 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, glib, pkgconfig, perl, intltool, gobjectIntrospection, libintlOrEmpty }: stdenv.mkDerivation rec { name = "libgtop-${version}"; - major = "2.34"; - version = "${major}.1"; + major = "2.38"; + version = "${major}.0"; src = fetchurl { url = "mirror://gnome/sources/libgtop/${major}/${name}.tar.xz"; - sha256 = "c89978a76662b18d392edbe0d1b794f5a9a399a5ccf22a02d5b9e28b5ed609e2"; + sha256 = "04mnxgzyb26wqk6qij4iw8cxwl82r8pcsna5dg8vz2j3pdi0wv2g"; }; propagatedBuildInputs = [ glib ]; diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index ef2a44bf183a..a5f8f5036d04 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libgudev-${version}"; - version = "231"; + version = "232"; src = fetchurl { - url = "https://download.gnome.org/sources/libgudev/${version}/${name}.tar.xz"; - sha256 = "15iz0qp57qy5pjrblsn36l0chlncqggqsg8h8i8c71499afzj7iv"; + url = "mirror://gnome/sources/libgudev/${version}/${name}.tar.xz"; + sha256 = "ee4cb2b9c573cdf354f6ed744f01b111d4b5bed3503ffa956cefff50489c7860"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index a91205e182c7..5ba8bb667845 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -2,18 +2,21 @@ stdenv.mkDerivation rec { name = "libical-${version}"; - version = "1.0.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "libical"; repo = "libical"; rev = "v${version}"; - sha256 = "1y6rbw24m133d984pyqzx2bi7f37dsw6f33l6arwn6yd4zlqdib9"; + sha256 = "0xsvqy1hzmwxn783wrb2k8p751544pzv39v9ynr9pj4yzkwjzsvb"; }; nativeBuildInputs = [ perl cmake ]; - patches = [ ./respect-env-tzdir.patch ]; + patches = [ + # TODO: upstream this patch + ./respect-env-tzdir.patch + ]; meta = with stdenv.lib; { homepage = https://github.com/libical/libical; diff --git a/pkgs/development/libraries/libical/respect-env-tzdir.patch b/pkgs/development/libraries/libical/respect-env-tzdir.patch index fad78c2fb8a0..715ba1fa8426 100644 --- a/pkgs/development/libraries/libical/respect-env-tzdir.patch +++ b/pkgs/development/libraries/libical/respect-env-tzdir.patch @@ -1,27 +1,29 @@ ---- a/src/libical/icaltz-util.c 2015-06-11 15:40:58.843138630 +0200 -+++ b/src/libical/icaltz-util.c 2015-06-11 15:43:12.722046252 +0200 -@@ -107,7 +107,7 @@ - char charcnt[4]; - } tzinfo; - --static char *search_paths [] = {"/usr/share/zoneinfo","/usr/lib/zoneinfo","/etc/zoneinfo","/usr/share/lib/zoneinfo"}; -+static char *search_paths [] = {"/etc/zoneinfo","/usr/share/zoneinfo","/usr/lib/zoneinfo","/usr/share/lib/zoneinfo"}; +--- a/src/libical/icaltz-util.c ++++ b/src/libical/icaltz-util.c +@@ -96,9 +96,9 @@ typedef struct static char *zdir = NULL; - #define NUM_SEARCH_PATHS (sizeof (search_paths)/ sizeof (search_paths [0])) -@@ -194,6 +194,15 @@ - const char *fname = ZONES_TAB_SYSTEM_FILENAME; - unsigned int i; + static char *search_paths[] = { ++ "/etc/zoneinfo", + "/usr/share/zoneinfo", + "/usr/lib/zoneinfo", +- "/etc/zoneinfo", + "/usr/share/lib/zoneinfo" + }; + +@@ -179,6 +179,15 @@ static void set_zonedir(void) + const char *fname = ZONES_TAB_SYSTEM_FILENAME; + size_t i, num_search_paths; -+ const char *env_tzdir = getenv ("TZDIR"); -+ if (env_tzdir) { -+ sprintf (file_path, "%s/%s", env_tzdir, fname); -+ if (!access (file_path, F_OK|R_OK)) { -+ zdir = env_tzdir; -+ return; -+ } -+ } ++ const char *env_tzdir = getenv ("TZDIR"); ++ if (env_tzdir) { ++ snprintf(file_path, MAXPATHLEN, "%s/%s", env_tzdir, fname); ++ if (!access (file_path, F_OK|R_OK)) { ++ zdir = env_tzdir; ++ return; ++ } ++ } + - for (i = 0; i < NUM_SEARCH_PATHS; i++) { - sprintf (file_path, "%s/%s", search_paths [i], fname); - if (!access (file_path, F_OK|R_OK)) { + num_search_paths = sizeof(search_paths) / sizeof(search_paths[0]); + for (i = 0; i < num_search_paths; i++) { + snprintf(file_path, MAXPATHLEN, "%s/%s", search_paths[i], fname); diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 1cc275b30480..d39a71e16da9 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -1,48 +1,56 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkgconfig, meson, ninja , libevdev, mtdev, udev, libwacom , documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support -, testsSupport ? false, check ? null, valgrind ? null -, autoconf, automake +, testsSupport ? false, check ? null, valgrind ? null, python3Packages ? null }: assert documentationSupport -> doxygen != null && graphviz != null; assert eventGUISupport -> cairo != null && glib != null && gtk3 != null; -assert testsSupport -> check != null && valgrind != null; +assert testsSupport -> check != null && valgrind != null && python3Packages != null; let - mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; + mkFlag = optSet: flag: "-D${flag}=${stdenv.lib.boolToString optSet}"; in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.7.3"; + version = "1.9.1"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "07fbzxddvhjcch43hdxb24sj7ri96zzpcjalvsicmw0i4wnn2v89"; + sha256 = "1y3559146zlfizncky1jlly226i66vwikxhpdkw0jg8v47j0sy7h"; }; outputs = [ "out" "dev" ]; - configureFlags = [ + mesonFlags = [ (mkFlag documentationSupport "documentation") - (mkFlag eventGUISupport "event-gui") + (mkFlag eventGUISupport "debug-gui") (mkFlag testsSupport "tests") ]; - nativeBuildInputs = [ pkgconfig ]; - - buildInputs = [ libevdev mtdev libwacom autoconf automake ] - ++ optionals eventGUISupport [ cairo glib gtk3 ] + nativeBuildInputs = [ pkgconfig meson ninja ] ++ optionals documentationSupport [ doxygen graphviz ] - ++ optionals testsSupport [ check valgrind ]; + ++ optionals testsSupport [ check valgrind python3Packages.pyparsing ]; + + buildInputs = [ libevdev mtdev libwacom ] + ++ optionals eventGUISupport [ cairo glib gtk3 ]; propagatedBuildInputs = [ udev ]; patches = [ ./udev-absolute-path.patch ]; - patchFlags = [ "-p0" ]; + + preBuild = '' + # meson setup-hook changes the directory so the files are located one level up + patchShebangs ../udev/parse_hwdb.py + patchShebangs ../test/symbols-leak-test.in + ''; + + doCheck = testsSupport; + + checkPhase = "meson test"; meta = { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; diff --git a/pkgs/development/libraries/libinput/udev-absolute-path.patch b/pkgs/development/libraries/libinput/udev-absolute-path.patch index 2d3fa966b299..fb22fea40e80 100644 --- a/pkgs/development/libraries/libinput/udev-absolute-path.patch +++ b/pkgs/development/libraries/libinput/udev-absolute-path.patch @@ -1,12 +1,11 @@ ---- configure.ac 2016-05-27 14:00:25.248388226 +0200 -+++ configure.ac 2016-05-27 14:01:28.228943416 +0200 -@@ -214,7 +214,8 @@ AM_CONDITIONAL(BUILD_DOCS, [test "x$buil - # Used by the udev rules so we can use callouts during testing without - # installing everything first. Default is the empty string so the installed - # rule will use udev's default path. Override is in udev/Makefile.am --AC_SUBST(UDEV_TEST_PATH, "") -+UDEV_TEST_PATH="${UDEV_DIR}/" -+AC_SUBST(UDEV_TEST_PATH) - AC_PATH_PROG(SED, [sed]) +--- a/meson.build ++++ b/meson.build +@@ -100,7 +100,7 @@ + args : model_quirks) - AC_CONFIG_FILES([Makefile + udev_rules_config = configuration_data() +-udev_rules_config.set('UDEV_TEST_PATH', '') ++udev_rules_config.set('UDEV_TEST_PATH', udev_dir + '/') + configure_file(input : 'udev/80-libinput-device-groups.rules.in', + output : '80-libinput-device-groups.rules', + install : true, diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 7845f28adc91..09a0f4444b54 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -6,11 +6,11 @@ # no introspection by default, it's too big stdenv.mkDerivation rec { - name = "librsvg-2.40.17"; + name = "librsvg-2.40.19"; src = fetchurl { - url = "mirror://gnome/sources/librsvg/2.40/${name}.tar.xz"; - sha256 = "1k39gyf7f5m9x0jvpcxvfcqswdb04xhm1lbwbjabn1f4xk5wbxp6"; + url = "mirror://gnome/sources/librsvg/2.40/librsvg-2.40.18.tar.xz"; + sha256 = "0k2nbd4g31qinkdfd8r5c5ih2ixl85fbkgkqqh9747lwr24c9j5z"; }; NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index ad3cbe119c55..1fb0605530d7 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libwacom-${version}"; - version = "0.22"; + version = "0.26"; src = fetchurl { url = "mirror://sourceforge/linuxwacom/libwacom/${name}.tar.bz2"; - sha256 = "1h10awwapj5v8nik220ga0raggv3lgaq0kzwlma2qjmzdhhrrhcp"; + sha256 = "0xpvkjvzaj9blcmw8ha46616bzfivj99kwzvr91clxd6iaf11r63"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index fd61ae840284..e730cc6eaabf 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb, libX11 }: stdenv.mkDerivation rec { - name = "libxkbcommon-0.7.1"; + name = "libxkbcommon-0.7.2"; src = fetchurl { url = "http://xkbcommon.org/download/${name}.tar.xz"; - sha256 = "ba59305d2e19e47c27ea065c2e0df96ebac6a3c6e97e28ae5620073b6084e68b"; + sha256 = "1n5rv5n210kjnkyrvbh04gfwaa7zrmzy1393p8nyqfw66lkxr918"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 240de378afc7..080dbc4510dd 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, spice_protocol, intltool, celt_0_5_1 +{ stdenv, fetchurl, pkgconfig, spice_protocol, gettext, celt_0_5_1 , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib , cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup , gtk3, epoxy }: @@ -8,11 +8,11 @@ with stdenv.lib; let inherit (python2Packages) python pygtk; in stdenv.mkDerivation rec { - name = "spice-gtk-0.33"; + name = "spice-gtk-0.34"; src = fetchurl { url = "http://www.spice-space.org/download/gtk/${name}.tar.bz2"; - sha256 = "0fdgx9k4vgmasp8i2n0swrkapq8f212igcg7wsgvr3mbhsvk7bvx"; + sha256 = "1vknp72pl6v6nf3dphhwp29hk6gv787db2pmyg4m312z2q0hwwp9"; }; buildInputs = [ @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy ]; - nativeBuildInputs = [ pkgconfig intltool libsoup autoreconfHook ]; + nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook ]; NIX_CFLAGS_COMPILE = "-fno-stack-protector"; @@ -29,10 +29,6 @@ in stdenv.mkDerivation rec { --replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0' ''; - preConfigure = '' - intltoolize -f - ''; - configureFlags = [ "--disable-maintainer-mode" "--with-gtk3" diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix index bd56d880f94a..56adea9ca82e 100644 --- a/pkgs/development/libraries/spice-protocol/default.nix +++ b/pkgs/development/libraries/spice-protocol/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "spice-protocol-0.12.12"; + name = "spice-protocol-0.12.13"; src = fetchurl { url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "00wx81f2ml62g3maw63jq9w217zym921rdi38h7lpm5m8ckxraqp"; + sha256 = "0cwrgkp558mblcf4vrhacb3iizz12khsrrl82w38w9nj0ar13vl9"; }; postInstall = '' diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index ec26c9f567b5..fffe677f6a71 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dbus_glib, glib, python2, pkgconfig, libxslt -, gobjectIntrospection, valaSupport ? true, vala_0_23, glibcLocales }: +, gobjectIntrospection, valaSupport ? true, vala_0_38, glibcLocales }: stdenv.mkDerivation rec { name = "telepathy-glib-0.24.1"; @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; propagatedBuildInputs = [dbus_glib glib gobjectIntrospection]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxslt glibcLocales python2 ] ++ stdenv.lib.optional valaSupport vala_0_23; + nativeBuildInputs = [ pkgconfig libxslt ] ++ stdenv.lib.optional valaSupport vala_0_38; + buildInputs = [ glibcLocales python2 ]; preConfigure = '' substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index e759e65dfc6b..ed84dec365e1 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, glib, sqlite, gnome3, vala_0_23 +{ stdenv, fetchgit, pkgconfig, glib, sqlite, gnome3, vala_0_38 , intltool, libtool, dbus_libs, telepathy_glib , gtk3, json_glib, librdf_raptor2, dbus_glib , pythonSupport ? true, python2Packages }: stdenv.mkDerivation rec { - version = "0.9.15"; + version = "1.0"; name = "zeitgeist-${version}"; - src = fetchurl { - url = "https://github.com/seiflotfy/zeitgeist/archive/v${version}.tar.gz"; - sha256 = "07pnc7kmjpd0ncm32z6s3ny5p4zl52v9lld0n0f8sp6cw87k12p0"; + src = fetchgit { + url = "git://anongit.freedesktop.org/git/zeitgeist/zeitgeist"; + rev = "v${version}"; + sha256 = "0vw6m0azycqabbz8f0fd8xsh5kf6j3ig4wpqlhw6sklvf44ii5b8"; }; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; @@ -19,9 +20,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib sqlite gnome3.gnome_common intltool - libtool dbus_libs telepathy_glib vala_0_23 dbus_glib + nativeBuildInputs = [ pkgconfig gnome3.gnome_common intltool libtool vala_0_38 ]; + buildInputs = [ glib sqlite dbus_libs telepathy_glib dbus_glib gtk3 json_glib librdf_raptor2 python2Packages.rdflib ]; prePatch = "patchShebangs ."; |