diff options
author | Henk Kalkwater <chris@netsoj.nl> | 2020-07-01 18:51:27 +0200 |
---|---|---|
committer | Henk Kalkwater <chris@netsoj.nl> | 2020-07-02 11:40:33 +0200 |
commit | e2c742329f5d9d91c0bfd059452af92be3bb9016 (patch) | |
tree | 85548a6a98430dca7715fcd612d9ec71d11829c1 /pkgs/development/libraries/telepathy | |
parent | 5bb1198cccb1a161e982dce84e18678ccec65529 (diff) | |
download | nixpkgs-e2c742329f5d9d91c0bfd059452af92be3bb9016.tar nixpkgs-e2c742329f5d9d91c0bfd059452af92be3bb9016.tar.gz nixpkgs-e2c742329f5d9d91c0bfd059452af92be3bb9016.tar.bz2 nixpkgs-e2c742329f5d9d91c0bfd059452af92be3bb9016.tar.lz nixpkgs-e2c742329f5d9d91c0bfd059452af92be3bb9016.tar.xz nixpkgs-e2c742329f5d9d91c0bfd059452af92be3bb9016.tar.zst nixpkgs-e2c742329f5d9d91c0bfd059452af92be3bb9016.zip |
telepathy-qt: 0.9.7 -> 0.9.8
* telepathy 0.9.8 no longer supports Qt 4, so telepathy-qt and telepathy_qt now throw an error suggesting to use the Qt 5 packages instead. * telepathy 0.9.8 uses Python 3 instead of Python 2, so that has been corrected in the package. * telepathy 0.9.8 includes the patch that was previously manually added, so therefore it is removed from the package.
Diffstat (limited to 'pkgs/development/libraries/telepathy')
-rw-r--r-- | pkgs/development/libraries/telepathy/qt/default.nix | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index b8e438819db..2addb86246d 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus-glib, dbus +{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python3Packages, dbus-glib, dbus , telepathy-farstream, telepathy-glib, fetchpatch }: let - inherit (python2Packages) python dbus-python; + inherit (python3Packages) python dbus-python; in stdenv.mkDerivation rec { - name = "telepathy-qt-0.9.7"; + name = "telepathy-qt-0.9.8"; src = fetchurl { url = "https://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz"; - sha256 = "0krxd4hhfx6r0ja19wh3848j7gn1rv8jrnakgmkbmi7bww5x7fi1"; + sha256 = "bf8e2a09060addb80475a4938105b9b41d9e6837999b7a00e5351783857e18ad"; }; nativeBuildInputs = [ cmake pkgconfig python ]; @@ -16,14 +16,6 @@ in stdenv.mkDerivation rec { buildInputs = [ dbus-glib ]; checkInputs = [ dbus.daemon dbus-python ]; - patches = [ - # https://github.com/TelepathyIM/telepathy-qt/issues/25 - (fetchpatch { - url = "https://github.com/TelepathyIM/telepathy-qt/commit/d654dc70dbec7097e96e6d96ca74ab1b5b00ef8c.patch"; - sha256 = "1jzd9b9rqh3c8xlq8dr7c0r8aabzf5ywv2gpkk6phh3xwngzrfbh"; - }) - ]; - # No point in building tests if they are not run # On 0.9.7, they do not even build with QT4 cmakeFlags = stdenv.lib.optional (!doCheck) "-DENABLE_TESTS=OFF"; |