From 58c4dc40b39905763e00348a57b342d05871c47d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 22 Apr 2019 14:42:14 -0500 Subject: [PATCH 1/6] libsForQt5.qca-qt5: touchup to use pname/version Helps update script :). --- pkgs/development/libraries/qca-qt5/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index 6e190a656f63..3c4868495dc7 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, cmake, openssl, pkgconfig, qtbase }: stdenv.mkDerivation rec { - name = "qca-qt5-2.1.3"; + pname = "qca-qt5"; + version = "2.1.3"; src = fetchurl { - url = "http://download.kde.org/stable/qca/2.1.3/src/qca-2.1.3.tar.xz"; + url = "http://download.kde.org/stable/qca/${version}/src/qca-${version}.tar.xz"; sha256 = "0lz3n652z208daxypdcxiybl0a9fnn6ida0q7fh5f42269mdhgq0"; }; From 2c7d5f6d8d452352c317c62660a139442b6ded3a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 22 Apr 2019 14:45:03 -0500 Subject: [PATCH 2/6] libsForQt5.qca-qt5: 2.1.3 -> 2.2.0, fix url --- pkgs/development/libraries/qca-qt5/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index 3c4868495dc7..3ad07b3c95fc 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "qca-qt5"; - version = "2.1.3"; + version = "2.2.0"; src = fetchurl { - url = "http://download.kde.org/stable/qca/${version}/src/qca-${version}.tar.xz"; - sha256 = "0lz3n652z208daxypdcxiybl0a9fnn6ida0q7fh5f42269mdhgq0"; + url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz"; + sha256 = "12iijbsvwwj3ph6r2cls9ml8vmhw5w72m6fp3fnck6c0hlk9hirv"; }; buildInputs = [ openssl qtbase ]; From 507d47bc30a41de43395a699c9293a0906e9d4ea Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 27 Apr 2019 16:46:47 -0500 Subject: [PATCH 3/6] libsForQt5.qca-qt5: 2.2.0 -> 2.2.1 --- pkgs/development/libraries/qca-qt5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index 3ad07b3c95fc..79b105a2d1c8 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "qca-qt5"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz"; - sha256 = "12iijbsvwwj3ph6r2cls9ml8vmhw5w72m6fp3fnck6c0hlk9hirv"; + sha256 = "00kv1vsrc8fp556hm8s6yw3240vx3l4067q6vfxrb3gdwgcd45np"; }; buildInputs = [ openssl qtbase ]; From a55efcb38991d19bdaa8f3674514eb1274de59e6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 25 Apr 2019 23:49:44 -0500 Subject: [PATCH 4/6] libsForQt5.qca-qt5: remove darwin patch, no longer needed --- .../development/libraries/qca-qt5/default.nix | 4 ---- .../libraries/qca-qt5/move-project.patch | 19 ------------------- 2 files changed, 23 deletions(-) delete mode 100644 pkgs/development/libraries/qca-qt5/move-project.patch diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index 79b105a2d1c8..9acea41da5cd 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -12,10 +12,6 @@ stdenv.mkDerivation rec { buildInputs = [ openssl qtbase ]; nativeBuildInputs = [ cmake pkgconfig ]; - # Without this patch cmake fails with a "No known features for CXX compiler" - # error on darwin - patches = stdenv.lib.optional stdenv.isDarwin ./move-project.patch ; - # tells CMake to use this CA bundle file if it is accessible preConfigure = ''export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt''; diff --git a/pkgs/development/libraries/qca-qt5/move-project.patch b/pkgs/development/libraries/qca-qt5/move-project.patch deleted file mode 100644 index 2a109a3aa3c7..000000000000 --- a/pkgs/development/libraries/qca-qt5/move-project.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 453fd8a..5f6ee11 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,13 +6,13 @@ if(NOT CMAKE_INSTALL_PREFIX) - unset(CMAKE_INSTALL_PREFIX CACHE) - endif(NOT CMAKE_INSTALL_PREFIX) - --project(qca) - - if(NOT APPLE) - cmake_minimum_required(VERSION 2.8.12) - else() - cmake_minimum_required(VERSION 3.0) - endif() -+project(qca) - - set(QCA_LIB_MAJOR_VERSION "2") - set(QCA_LIB_MINOR_VERSION "1") From 65d7b10250f0a4ba3be354fcfca8940a6f86f528 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 27 Apr 2019 16:52:54 -0500 Subject: [PATCH 5/6] Revert "libsForQt5.qca-qt5: remove darwin patch, no longer needed" This reverts commit 1ff3763ffad43ba66f31dabed9f2e8140f3381c0. --- .../development/libraries/qca-qt5/default.nix | 4 ++++ .../libraries/qca-qt5/move-project.patch | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/qca-qt5/move-project.patch diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index 9acea41da5cd..79b105a2d1c8 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation rec { buildInputs = [ openssl qtbase ]; nativeBuildInputs = [ cmake pkgconfig ]; + # Without this patch cmake fails with a "No known features for CXX compiler" + # error on darwin + patches = stdenv.lib.optional stdenv.isDarwin ./move-project.patch ; + # tells CMake to use this CA bundle file if it is accessible preConfigure = ''export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt''; diff --git a/pkgs/development/libraries/qca-qt5/move-project.patch b/pkgs/development/libraries/qca-qt5/move-project.patch new file mode 100644 index 000000000000..2a109a3aa3c7 --- /dev/null +++ b/pkgs/development/libraries/qca-qt5/move-project.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 453fd8a..5f6ee11 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,13 +6,13 @@ if(NOT CMAKE_INSTALL_PREFIX) + unset(CMAKE_INSTALL_PREFIX CACHE) + endif(NOT CMAKE_INSTALL_PREFIX) + +-project(qca) + + if(NOT APPLE) + cmake_minimum_required(VERSION 2.8.12) + else() + cmake_minimum_required(VERSION 3.0) + endif() ++project(qca) + + set(QCA_LIB_MAJOR_VERSION "2") + set(QCA_LIB_MINOR_VERSION "1") From fde69b6821ea7e5bbd2d1af5bc98faf8843275cc Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 27 Apr 2019 16:56:22 -0500 Subject: [PATCH 6/6] qca-qt5: tweak patch to apply, will see if works --- .../libraries/qca-qt5/move-project.patch | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/qca-qt5/move-project.patch b/pkgs/development/libraries/qca-qt5/move-project.patch index 2a109a3aa3c7..dcecb83d7db9 100644 --- a/pkgs/development/libraries/qca-qt5/move-project.patch +++ b/pkgs/development/libraries/qca-qt5/move-project.patch @@ -1,19 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 453fd8a..5f6ee11 100644 +index 2f2b5d0..971dee3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -6,13 +6,13 @@ if(NOT CMAKE_INSTALL_PREFIX) +@@ -6,10 +6,11 @@ if(NOT CMAKE_INSTALL_PREFIX) unset(CMAKE_INSTALL_PREFIX CACHE) endif(NOT CMAKE_INSTALL_PREFIX) - + -project(qca) - - if(NOT APPLE) - cmake_minimum_required(VERSION 2.8.12) - else() - cmake_minimum_required(VERSION 3.0) - endif() + + cmake_minimum_required(VERSION 3.4) + +project(qca) - ++ set(QCA_LIB_MAJOR_VERSION "2") - set(QCA_LIB_MINOR_VERSION "1") + set(QCA_LIB_MINOR_VERSION "2") + set(QCA_LIB_PATCH_VERSION "1")