Skip to content
Snippets Groups Projects
Commit dbe265ba authored by Jenkins's avatar Jenkins
Browse files

submodules: update nightly branch

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