From 258257acb02732897aacc73afa4f2392e429ad96 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Jun 2019 16:14:32 +0200 Subject: gnu: znc: Update to 1.7.4. * gnu/packages/messaging.scm (znc): Update to 1.7.4. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 7d036ad473..8aeefa64e1 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -490,14 +490,14 @@ compromised.") (define-public znc (package (name "znc") - (version "1.7.3") + (version "1.7.4") (source (origin (method url-fetch) (uri (string-append "http://znc.in/releases/archive/znc-" version ".tar.gz")) (sha256 (base32 - "0g8i5hsl4kinpz1wp0a2zniidv3w2sd6awq8676fds516wcc6k0y")))) + "0wcvqkpin8w4i72alnn0nxnrc9ih543qs34hqpk9xmz6m0hjk8xi")))) ;; TODO: autotools support has been deprecated, and new features like i18n ;; are only supported when building with cmake. (build-system gnu-build-system) -- cgit v1.2.3 From 57945dd70c7acd5b7e14db75df101e1978ab4a00 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Jun 2019 00:25:57 +0200 Subject: gnu: znc: Switch back to Guix's googletest package. * gnu/packages/messaging.scm (znc)[native-inputs]: Use the packaged googletest's sources. --- gnu/packages/check.scm | 2 -- gnu/packages/messaging.scm | 16 +--------------- 2 files changed, 1 insertion(+), 17 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index e19c3d4659..9bc5036cf6 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -478,8 +478,6 @@ test coverage and has a web user interface that will refresh automatically.") (home-page "https://github.com/smartystreets/goconvey") (license license:expat))) -;; XXX When updating, check whether ZNC's GOOGLETEST-SOURCES can be -;; switched back to simply using (PACKAGE-SOURCE ...). (define-public googletest (package (name "googletest") diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 8aeefa64e1..e4f150c817 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -517,21 +517,7 @@ compromised.") "--with-gtest=googletest/googletest") #:test-target "test")) (native-inputs - `(("googletest-source" - ;; ZNC 1.7 needs a newer, unreleased googletest (a release is planned - ;; , so don't update - ;; the public GOOGLETEST to an unstable version). The commit is taken - ;; from ‘third_party/googletest’ in the ZNC git repository. - ,(let ((commit "9737e63c69e94ac5777caa0bc77c77d5206467f3")) - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/google/googletest") - (commit commit))) - (file-name (git-file-name "googletest-for-znc" commit)) - (sha256 - (base32 - "0ya36n8d62zbxk6p22yffgx43mqhx2fz41gqqwbpdshjryf3wvxj"))))) + `(("googletest-source" ,(package-source googletest)) ("pkg-config" ,pkg-config) ("perl" ,perl) ("python" ,python))) -- cgit v1.2.3 From d7463e012555047615193afcfd8294381f050825 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Jun 2019 14:20:02 +0200 Subject: gnu: znc: Don't refer to native-inputs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/messaging.scm (znc)[native-inputs]: Move run-time perl & python… [inputs]: …here, in alphabetical order. --- gnu/packages/messaging.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index e4f150c817..c4fd1f535f 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -518,14 +518,14 @@ compromised.") #:test-target "test")) (native-inputs `(("googletest-source" ,(package-source googletest)) - ("pkg-config" ,pkg-config) - ("perl" ,perl) - ("python" ,python))) + ("pkg-config" ,pkg-config))) (inputs - `(("openssl" ,openssl) - ("zlib" ,zlib) + `(("cyrus-sasl" ,cyrus-sasl) ("icu4c" ,icu4c) - ("cyrus-sasl" ,cyrus-sasl))) + ("openssl" ,openssl) + ("perl" ,perl) + ("python" ,python) + ("zlib" ,zlib))) (home-page "https://znc.in") (synopsis "IRC network bouncer") (description "ZNC is an @dfn{IRC network bouncer} or @dfn{BNC}. It can -- cgit v1.2.3 From 2b0f32937e502b868d70e8e9dc5b533fa9e4ebd6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Jun 2019 14:34:09 +0200 Subject: gnu: znc: Build with CMake. * gnu/packages/messaging.scm (znc)[build-system]: Use the CMAKE-BUILD-SYSTEM. [arguments]: Adjust #:configure-flags and where the googletest sources are unpacked. --- gnu/packages/messaging.scm | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index c4fd1f535f..86df992791 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -498,24 +498,22 @@ compromised.") (sha256 (base32 "0wcvqkpin8w4i72alnn0nxnrc9ih543qs34hqpk9xmz6m0hjk8xi")))) - ;; TODO: autotools support has been deprecated, and new features like i18n - ;; are only supported when building with cmake. - (build-system gnu-build-system) + (build-system cmake-build-system) (arguments - `(#:phases + `(#:configure-flags + (list "-DWANT_CYRUS=ON" + "-DWANT_PERL=ON" + "-DWANT_PYTHON=ON") + #:phases (modify-phases %standard-phases (add-after 'unpack 'unpack-googletest + ;; Copy the googletest sources to where the CMake build expects them. (lambda* (#:key inputs #:allow-other-keys) - (mkdir-p "googletest") - (copy-recursively (assoc-ref inputs "googletest-source") - "googletest") - #t))) - #:configure-flags '("--enable-python" - "--enable-perl" - "--enable-cyrus" - "--with-gmock=googletest/googlemock" - "--with-gtest=googletest/googletest") - #:test-target "test")) + (let ((source (assoc-ref inputs "googletest-source")) + (target "third_party/googletest")) + (mkdir-p target) + (copy-recursively source target) + #t)))))) (native-inputs `(("googletest-source" ,(package-source googletest)) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 44ddf0f13e00e94745f759facfcca20fe415501c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Jun 2019 15:24:10 +0200 Subject: gnu: znc: Enable internationalisation. * gnu/packages/messaging.scm (znc)[arguments]: Want i18n. [native-inputs]: Add the required boost and gettext-minimal packages. --- gnu/packages/messaging.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 86df992791..503781a9eb 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -42,6 +42,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) + #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) @@ -502,6 +503,7 @@ compromised.") (arguments `(#:configure-flags (list "-DWANT_CYRUS=ON" + "-DWANT_I18N=ON" "-DWANT_PERL=ON" "-DWANT_PYTHON=ON") #:phases @@ -515,7 +517,9 @@ compromised.") (copy-recursively source target) #t)))))) (native-inputs - `(("googletest-source" ,(package-source googletest)) + `(("boost" ,boost) + ("gettext" ,gettext-minimal) + ("googletest-source" ,(package-source googletest)) ("pkg-config" ,pkg-config))) (inputs `(("cyrus-sasl" ,cyrus-sasl) -- cgit v1.2.3