nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

telepathy-qt: 0.9.7 -> 0.9.8

Browse Source 
* 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.
This commit is contained in:
Henk Kalkwater 2020-07-01 18:51:27 +02:00
parent 5bb1198ccc
commit e2c742329f
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/libraries/telepathy/qt/default.nix
View File

@ -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";

1
pkgs/top-level/aliases.nix
View File

@ -566,6 +566,7 @@ mapAliases ({
telepathy_idle = telepathy-idle; # added 2018-02-25
telepathy_logger = telepathy-logger; # added 2018-02-25
telepathy_mission_control = telepathy-mission-control; # added 2018-02-25
telepathy-qt = throw "telepathy-qt no longer supports Qt 4. Please use libsForQt5.telepathy instead."; # added 2020-07-02
telepathy_qt = telepathy-qt; # added 2018-02-25
telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19
telepathy_salut = telepathy-salut; # added 2018-02-25

2
pkgs/top-level/all-packages.nix
View File

@ -14985,8 +14985,6 @@ in
telepathy-farstream = callPackage ../development/libraries/telepathy/farstream {};
telepathy-qt = callPackage ../development/libraries/telepathy/qt { qtbase = qt4; };
termbox = callPackage ../development/libraries/termbox { };
tevent = callPackage ../development/libraries/tevent { };