git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #115620 from r-ryantm/auto-update/telepathy-glib

telepathy-glib: 0.24.1 -> 0.24.2

commit3d92c78160c997d2df32f2ada91375d8e57095a6 authorJan Tojnar <jtojnar@gmail.com> dateThu 11 Mar 2021, 19:35 (6 years ago) parentf5c01cf5285e5b
6 files changed+44−21
pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix+2−2 pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix+2−2 pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix+2−2 pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix+2−2 pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix+2−2 pkgs/development/libraries/telepathy/glib/default.nix+34−11
pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, libxml2, dbus-glib, dbus
1+{ lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, python2, libxml2, dbus-glib, dbus
22, sqlite, libsoup, libnice, gnutls}:
33
44stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 };
1111
1212 nativeBuildInputs = [ pkg-config libxslt ];
13− buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ];
13+ buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls python2 ];
1414
1515 checkInputs = [ dbus.daemon ];
1616
pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, glib, dbus-glib, pkg-config, libxslt }:
1+{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, python2, glib, dbus-glib, pkg-config, libxslt }:
22
33stdenv.mkDerivation rec {
44 pname = "telepathy-haze";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy";
1010 };
1111
12− buildInputs = [ glib telepathy-glib dbus-glib pidgin telepathy-glib.python ];
12+ buildInputs = [ glib telepathy-glib dbus-glib pidgin python2 ];
1313
1414 nativeBuildInputs = [ pkg-config libxslt ];
1515
pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, glib, dconf, pkg-config, dbus-glib, telepathy-glib, libxslt, makeWrapper }:
1+{ lib, stdenv, fetchurl, glib, dconf, pkg-config, dbus-glib, telepathy-glib, python2, libxslt, makeWrapper }:
22
33stdenv.mkDerivation rec {
44 pname = "telepathy-idle";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 };
1111
1212 nativeBuildInputs = [ pkg-config makeWrapper ];
13− buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (lib.getLib dconf) ];
13+ buildInputs = [ glib telepathy-glib dbus-glib libxslt python2 (lib.getLib dconf) ];
1414
1515 preFixup = ''
1616 wrapProgram "$out/libexec/telepathy-idle" \
pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkg-config
1+{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, python2, pkg-config
22, dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus }:
33
44stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 ];
1616 buildInputs = [
1717 dbus-glib libxml2 sqlite telepathy-glib
18− dbus telepathy-glib.python
18+ dbus python2
1919 ];
2020
2121 configureFlags = [ "--enable-call" ];
pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, avahi, libsoup
1+{ lib, stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, python2, avahi, libsoup
22, libuuid, openssl, pcre, sqlite, pkg-config }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 # pcre needed because https://github.com/NixOS/nixpkgs/pull/15046
1414 buildInputs = [ glib libxml2 telepathy-glib avahi libsoup libuuid openssl
15− sqlite pcre telepathy-glib.python ];
15+ sqlite pcre python2 ];
1616
1717 nativeBuildInputs = [ libxslt pkg-config ];
1818
pkgs/development/libraries/telepathy/glib/default.nix+34−11
@@ -1,24 +1,49 @@
1−{ lib, stdenv, fetchurl, dbus-glib, glib, python2, pkg-config, libxslt
2−, gobject-introspection, vala, glibcLocales }:
1+{ lib
2+, stdenv
3+, fetchurl
4+, dbus-glib
5+, glib
6+, python3
7+, pkg-config
8+, libxslt
9+, gobject-introspection
10+, vala
11+, glibcLocales
12+}:
313
414stdenv.mkDerivation rec {
5− name = "telepathy-glib-0.24.1";
15+ pname = "telepathy-glib";
16+ version = "0.24.2";
617
718 outputs = [ "out" "dev" ];
819
920 src = fetchurl {
10− url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz";
11− sha256 = "1symyzbjmxvksn2ifdkk50lafjm2llf2sbmky062gq2pz3cg23cy";
21+ url = "${meta.homepage}/releases/telepathy-glib/${pname}-${version}.tar.gz";
22+ sha256 = "sKN013HN0IESXzjDq9B5ZXZCMBxxpUPVVeK/IZGSc/A=";
1223 };
1324
25+ nativeBuildInputs = [
26+ pkg-config
27+ libxslt
28+ gobject-introspection
29+ vala
30+ ];
31+
32+ buildInputs = [
33+ glibcLocales
34+ python3
35+ ];
36+
37+ propagatedBuildInputs = [
38+ dbus-glib
39+ glib
40+ ];
41+
1442 configureFlags = [
1543 "--enable-vala-bindings"
1644 ];
17− LC_ALL = "en_US.UTF-8";
18− propagatedBuildInputs = [ dbus-glib glib ];
1945
20− nativeBuildInputs = [ pkg-config libxslt gobject-introspection vala ];
21− buildInputs = [ glibcLocales python2 ];
46+ LC_ALL = "en_US.UTF-8";
2247
2348 enableParallelBuilding = true;
2449
@@ -26,8 +51,6 @@ stdenv.mkDerivation rec {
2651 substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires
2752 '';
2853
29− passthru.python = python2;
30−
3154 meta = with lib; {
3255 homepage = "https://telepathy.freedesktop.org";
3356 platforms = platforms.unix;