diff --git a/Makefile b/Makefile index bdfdd2c92cb20bfe830d77c2318eb9ba0d175b03..b26e0a1c8f141c7bbdf718ebeaa47e2e7f83dfac 100644 --- a/Makefile +++ b/Makefile @@ -234,7 +234,7 @@ $(foreach target,$(DISTRIBUTIONS),\ # # Guix-generated Debian packages (deb packs) targets. # -SUPPORTED_GNU_ARCHS = x86_64 i686 +SUPPORTED_GNU_ARCHS = x86_64 DEB_PACK_TARGETS = define guix-pack-command @@ -256,7 +256,8 @@ deb-pack-$(subst _,-,$(1)): $$(deb-file-name) $$(deb-file-name): has-guix-p $(RELEASE_TARBALL_FILENAME) output=$$$$($(guix-pack-command) --system=$(1)-linux $$(GUIX_PACK_ARGS)) && \ mkdir -p "$$$$(dirname "$$@")" && \ - cp --reflink=auto "$$$$output" "$$@" + cp --reflink=auto "$$$$output" "$$@" && \ + guix gc --delete "$$$$output" chmod +w "$$@" endef diff --git a/client-android b/client-android index 5e185d1cdd520e5cc23a17f489deb922d2ea9bf2..d88db62c323d1629fea6cad320b38a9118ef5778 160000 --- a/client-android +++ b/client-android @@ -1 +1 @@ -Subproject commit 5e185d1cdd520e5cc23a17f489deb922d2ea9bf2 +Subproject commit d88db62c323d1629fea6cad320b38a9118ef5778 diff --git a/client-ios b/client-ios index 477c5fda04ccefc133d29da898c4dda49d308fe7..0c36051fe5fae7484f352a9eb61435740dc8a0f2 160000 --- a/client-ios +++ b/client-ios @@ -1 +1 @@ -Subproject commit 477c5fda04ccefc133d29da898c4dda49d308fe7 +Subproject commit 0c36051fe5fae7484f352a9eb61435740dc8a0f2 diff --git a/daemon b/daemon index a835266fbb637f64b60f2b71be420cc07377fa68..2b19b69f91a7b826ce3e9dfa7e97e1e3e45db799 160000 --- a/daemon +++ b/daemon @@ -1 +1 @@ -Subproject commit a835266fbb637f64b60f2b71be420cc07377fa68 +Subproject commit 2b19b69f91a7b826ce3e9dfa7e97e1e3e45db799 diff --git a/guix/guix-pack-manifest.scm b/guix/guix-pack-manifest.scm index ec3e6a237a425def5944925cc8c70ac904aaab74..c3278465e1fdca16fa4587a65650214c7b806646 100644 --- a/guix/guix-pack-manifest.scm +++ b/guix/guix-pack-manifest.scm @@ -22,6 +22,7 @@ (gnu packages jami) (gnu packages python) (guix base32) + (guix gexp) (guix packages) (guix transformations) (guix store) @@ -30,9 +31,8 @@ ;;; XXX: Below is a rather strenuous way to specify something that ;;; would have been nicer if it could have been specified via: ;;; -;;; --with-source=libring=$(RELEASE_TARBALL_FILENAME) \ -;;; --with-source=libringclient=$(RELEASE_TARBALL_FILENAME) \ -;;; --with-source=jami-qt=$(RELEASE_TARBALL_FILENAME) in the Makefile. +;;; --with-source=libjami=$(RELEASE_TARBALL_FILENAME) \ +;;; --with-source=jami=$(RELEASE_TARBALL_FILENAME) in the Makefile. ;;; ;;; The above doesn't currently rewrite the dependency graph ;;; recursively, hence why it is not sufficient. @@ -68,53 +68,31 @@ `((with-source . ,(format #f "~a@~a=~a" name %release-version %release-file-name))))) -(define libring/latest ((with-latest-sources "libring") libring)) +(define libjami/latest ((with-latest-sources "libjami") libjami)) -(define with-libring/latest - (package-input-rewriting `((,libring . ,libring/latest)))) - -(define libringclient/latest ((with-latest-sources "libringclient") - (with-libring/latest libringclient))) - -(define libringclient/latest+libwrap - (package/inherit libringclient/latest - (arguments - (substitute-keyword-arguments (package-arguments libringclient/latest) - ((#:configure-flags flags ''()) - `(cons "-DENABLE_LIBWRAP=true" - (delete "-DENABLE_LIBWRAP=false" ,flags))))))) - -(define with-libringclient/latest+libwrap - (package-input-rewriting - `((,libringclient . ,libringclient/latest+libwrap)))) +(define with-libjami/latest + (package-input-rewriting `((,libjami . ,libjami/latest)))) ;;; Bundling the TLS certificates with Jami enables a fully ;;; functional, configuration-free experience, useful in the context ;;; of Guix packs. -(define jami-qt-with-certs - (package/inherit jami-qt - (inputs (cons `("nss-certs" ,nss-certs) - (package-inputs jami-qt))) - (native-inputs (cons `("python" ,python) - (package-native-inputs jami-qt))) +(define jami-with-certs + (package/inherit jami + (inputs (modify-inputs (package-inputs jami) + (append nss-certs))) (arguments - (substitute-keyword-arguments (package-arguments jami-qt) + (substitute-keyword-arguments (package-arguments jami) ((#:phases phases '%standard-phases) - `(modify-phases ,phases - (add-after 'qt-wrap 'wrap-ssl-cert-dir - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (wrapper (string-append out "/bin/jami-qt")) - (nss-certs (assoc-ref inputs "nss-certs"))) - (substitute* wrapper - (("^exec.*" exec-line) - (string-append "export SSL_CERT_DIR=" - nss-certs - "/etc/ssl/certs\n" - exec-line)))))))))))) - -(define jami-qt-with-certs/latest - ((with-latest-sources "jami-qt") - (with-libringclient/latest+libwrap jami-qt-with-certs))) - -(packages->manifest (list jami-qt-with-certs/latest)) + #~(modify-phases #$phases + (add-after 'qt-wrap 'wrap-ssl-cert-dir + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* (search-input-file outputs "bin/jami-qt") + (("^exec.*" exec-line) + (format #f "export SSL_CERT_DIR=~a~%" + (search-input-directory inputs "etc/ssl/certs") + exec-line))))))))))) + +(define jami-with-certs/latest + ((with-latest-sources "jami") jami-with-certs)) + +(packages->manifest (list jami-with-certs/latest)) diff --git a/plugins b/plugins index fcb2be6a0a72ce43954fa6b6de20cdd758780e5f..607635b2be84430fb640cc9bddda943a301e9f68 160000 --- a/plugins +++ b/plugins @@ -1 +1 @@ -Subproject commit fcb2be6a0a72ce43954fa6b6de20cdd758780e5f +Subproject commit 607635b2be84430fb640cc9bddda943a301e9f68