From 36ea03660e2ec6ef8a4b321e97d278bda211cc93 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 19 Dec 2015 20:05:19 -0600 Subject: [PATCH] qca-qt5: Qt 5 infrastructure update --- pkgs/development/libraries/qca-qt5/old.nix | 20 -------------------- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 pkgs/development/libraries/qca-qt5/old.nix diff --git a/pkgs/development/libraries/qca-qt5/old.nix b/pkgs/development/libraries/qca-qt5/old.nix deleted file mode 100644 index a3e9e9be6423..000000000000 --- a/pkgs/development/libraries/qca-qt5/old.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, cmake, openssl, pkgconfig, qt5 }: - -stdenv.mkDerivation rec { - name = "qca-qt5-2.1.1"; - - src = fetchurl { - url = "http://download.kde.org/stable/qca/2.1.1/src/qca-2.1.1.tar.xz"; - sha256 = "10z9icq28fww4qbzwra8d9z55ywbv74qk68nhiqfrydm21wkxplm"; - }; - - buildInputs = [ openssl qt5.base ]; - nativeBuildInputs = [ cmake pkgconfig ]; - - meta = with stdenv.lib; { - description = "Qt 5 Cryptographic Architecture"; - homepage = http://delta.affinix.com/qca; - maintainers = with maintainers; [ ttuegel ]; - license = licenses.lgpl21Plus; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5692f10f0216..77cc641a67ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8110,8 +8110,6 @@ let qca2 = callPackage ../development/libraries/qca2 { qt = qt4; }; - qca-qt5 = callPackage ../development/libraries/qca-qt5/old.nix { }; - qimageblitz = callPackage ../development/libraries/qimageblitz {}; qjson = callPackage ../development/libraries/qjson { }; @@ -15808,6 +15806,7 @@ aliases = with self; rec { mlt-qt5 = qt5.mlt; # added 2015-12-19 nfsUtils = nfs-utils; # added 2014-12-06 phonon_qt5_backend_gstreamer = qt5.phonon_backend_gstreamer; # added 2015-12-19 + qca-qt5 = qt5.qca-qt5; # added 2015-12-19 quassel_qt5 = kde5.quassel_qt5; # added 2015-09-30 quasselClient_qt5 = kde5.quasselClient_qt5; # added 2015-09-30 quasselDaemon_qt5 = kde5.quasselDaemon; # added 2015-09-30