diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-03-11 19:35:34 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-11 19:35:34 +0100 |
commit | 3d92c78160c997d2df32f2ada91375d8e57095a6 (patch) | |
tree | 7181520c83dfccc2c54c4c7871cd09052bdb5c48 | |
parent | f5c01cf9d4e744426c938b000e235011f7076929 (diff) | |
parent | 5285e5b72c0468371b82f939218c2f081424936e (diff) | |
download | nixpkgs-3d92c78160c997d2df32f2ada91375d8e57095a6.tar nixpkgs-3d92c78160c997d2df32f2ada91375d8e57095a6.tar.gz nixpkgs-3d92c78160c997d2df32f2ada91375d8e57095a6.tar.bz2 nixpkgs-3d92c78160c997d2df32f2ada91375d8e57095a6.tar.lz nixpkgs-3d92c78160c997d2df32f2ada91375d8e57095a6.tar.xz nixpkgs-3d92c78160c997d2df32f2ada91375d8e57095a6.tar.zst nixpkgs-3d92c78160c997d2df32f2ada91375d8e57095a6.zip |
Merge pull request #115620 from r-ryantm/auto-update/telepathy-glib
telepathy-glib: 0.24.1 -> 0.24.2
6 files changed, 44 insertions, 21 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 3fe88c287c5..deb01f1ef22 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, libxml2, dbus-glib, dbus +{ lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, python2, libxml2, dbus-glib, dbus , sqlite, libsoup, libnice, gnutls}: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config libxslt ]; - buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ]; + buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls python2 ]; checkInputs = [ dbus.daemon ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index 74e4d1039e7..11acf05c19e 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, glib, dbus-glib, pkg-config, libxslt }: +{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, python2, glib, dbus-glib, pkg-config, libxslt }: stdenv.mkDerivation rec { pname = "telepathy-haze"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy"; }; - buildInputs = [ glib telepathy-glib dbus-glib pidgin telepathy-glib.python ]; + buildInputs = [ glib telepathy-glib dbus-glib pidgin python2 ]; nativeBuildInputs = [ pkg-config libxslt ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index 041ec5e7c5b..fe7ef49cd0d 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glib, dconf, pkg-config, dbus-glib, telepathy-glib, libxslt, makeWrapper }: +{ lib, stdenv, fetchurl, glib, dconf, pkg-config, dbus-glib, telepathy-glib, python2, libxslt, makeWrapper }: stdenv.mkDerivation rec { pname = "telepathy-idle"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (lib.getLib dconf) ]; + buildInputs = [ glib telepathy-glib dbus-glib libxslt python2 (lib.getLib dconf) ]; preFixup = '' wrapProgram "$out/libexec/telepathy-idle" \ diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index bae29f4b31f..a6b1a5256f4 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkg-config +{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, python2, pkg-config , dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ dbus-glib libxml2 sqlite telepathy-glib - dbus telepathy-glib.python + dbus python2 ]; configureFlags = [ "--enable-call" ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index cf166f7e2d3..99465cc7971 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, avahi, libsoup +{ lib, stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, python2, avahi, libsoup , libuuid, openssl, pcre, sqlite, pkg-config }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # pcre needed because https://github.com/NixOS/nixpkgs/pull/15046 buildInputs = [ glib libxml2 telepathy-glib avahi libsoup libuuid openssl - sqlite pcre telepathy-glib.python ]; + sqlite pcre python2 ]; nativeBuildInputs = [ libxslt pkg-config ]; diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index 8bb7522b197..9ab269aaacf 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -1,24 +1,49 @@ -{ lib, stdenv, fetchurl, dbus-glib, glib, python2, pkg-config, libxslt -, gobject-introspection, vala, glibcLocales }: +{ lib +, stdenv +, fetchurl +, dbus-glib +, glib +, python3 +, pkg-config +, libxslt +, gobject-introspection +, vala +, glibcLocales +}: stdenv.mkDerivation rec { - name = "telepathy-glib-0.24.1"; + pname = "telepathy-glib"; + version = "0.24.2"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz"; - sha256 = "1symyzbjmxvksn2ifdkk50lafjm2llf2sbmky062gq2pz3cg23cy"; + url = "${meta.homepage}/releases/telepathy-glib/${pname}-${version}.tar.gz"; + sha256 = "sKN013HN0IESXzjDq9B5ZXZCMBxxpUPVVeK/IZGSc/A="; }; + nativeBuildInputs = [ + pkg-config + libxslt + gobject-introspection + vala + ]; + + buildInputs = [ + glibcLocales + python3 + ]; + + propagatedBuildInputs = [ + dbus-glib + glib + ]; + configureFlags = [ "--enable-vala-bindings" ]; - LC_ALL = "en_US.UTF-8"; - propagatedBuildInputs = [ dbus-glib glib ]; - nativeBuildInputs = [ pkg-config libxslt gobject-introspection vala ]; - buildInputs = [ glibcLocales python2 ]; + LC_ALL = "en_US.UTF-8"; enableParallelBuilding = true; @@ -26,8 +51,6 @@ stdenv.mkDerivation rec { substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires ''; - passthru.python = python2; - meta = with lib; { homepage = "https://telepathy.freedesktop.org"; platforms = platforms.unix; |