From patchwork Sat Oct 26 17:28:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?No=C3=A9_Lopez?= X-Patchwork-Id: 69471 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2435F27BBEA; Sat, 26 Oct 2024 18:49:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 793D327BBE2 for ; Sat, 26 Oct 2024 18:49:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t4kuI-0007NF-EJ; Sat, 26 Oct 2024 13:48:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t4ktr-0007At-H3 for guix-patches@gnu.org; Sat, 26 Oct 2024 13:48:34 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t4ktq-000330-VU for guix-patches@gnu.org; Sat, 26 Oct 2024 13:48:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=rFRLlazcl8D1dbhCt0CCMqEDA9/MJAmb0SkPIaBAHz8=; b=EuvvDWxncJwjeuQT71Q+a5IAgaboA9mF3gVPGet+QIkngFlMFAfOcxjXNYGTgVG0lqsquTuQGqtVJP9mMYHR9EShb1vaB7V65/ecS/9b/hTCBoYvJbtlCjW2UDmLTS3621TX4QFquEIs1L6b5kK/ePyMh3XrVPA5kSPqobE1kR/CFIwlSW+UdmsfxPYmGFsYIPjeWD6NqNg57qQ3DIO0fpW/OBC6xDo0+/kWHjX6wq/ZldHlv9EeieRNNC1HtuJztkSTB8OcyDHOb6KapXor7gM+DTBoUW8ovyYrKOmUrlcuZa7m72Dku1LY7HSndpi3xKVFYjurBkJD9UQiVuUvqA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t4kuN-0001RD-Ko for guix-patches@gnu.org; Sat, 26 Oct 2024 13:49:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73842] [PATCH v2 1/3] gnu: appimage: New packages for the appimage runtime. Resent-From: =?utf-8?q?No=C3=A9?= Lopez Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Oct 2024 17:49:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73842 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73842@debbugs.gnu.org Cc: =?utf-8?q?No=C3=A9?= Lopez Received: via spool by 73842-submit@debbugs.gnu.org id=B73842.17299649095446 (code B ref 73842); Sat, 26 Oct 2024 17:49:03 +0000 Received: (at 73842) by debbugs.gnu.org; 26 Oct 2024 17:48:29 +0000 Received: from localhost ([127.0.0.1]:42498 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4ktp-0001Pm-4K for submit@debbugs.gnu.org; Sat, 26 Oct 2024 13:48:29 -0400 Received: from smtp1-g21.free.fr ([212.27.42.1]:40286) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4ktn-0001Pe-L6 for 73842@debbugs.gnu.org; Sat, 26 Oct 2024 13:48:28 -0400 Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:990:a960:b4f3:8f44:ec4:5af5]) by smtp1-g21.free.fr (Postfix) with ESMTP id 5F427B00565; Sat, 26 Oct 2024 19:47:21 +0200 (CEST) From: =?utf-8?q?No=C3=A9?= Lopez Date: Sat, 26 Oct 2024 19:28:09 +0200 Message-ID: <0f3279bf893470c70bdd535b81cd95fd108d5d5f.1729963690.git.noelopez@free.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/appimage.scm (gnu packages appimage): New module. (fuse-for-appimage, squashfuse-for-appimage) (appimage-type2-runtime): New variables. Change-Id: I857a8eb5399a6a493e52db70b6c8cf0c71360930 --- gnu/packages/appimage.scm | 133 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 gnu/packages/appimage.scm diff --git a/gnu/packages/appimage.scm b/gnu/packages/appimage.scm new file mode 100644 index 0000000000..028b59ab30 --- /dev/null +++ b/gnu/packages/appimage.scm @@ -0,0 +1,133 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2024 Noé Lopez +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages appimage) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages base) + #:use-module (gnu packages compression) + #:use-module (gnu packages file-systems) + #:use-module (gnu packages linux) + #:use-module (gnu packages) + #:use-module (guix build-system gnu) + #:use-module (guix download) + #:use-module (guix gexp) + #:use-module (guix git-download) + #:use-module (guix packages) + #:use-module (guix utils)) + +(define fuse-for-appimage + (package + (inherit fuse) + (name "fuse") + (version "3.16.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/libfuse/libfuse/releases/" + "download/fuse-" + version + "/fuse-" + version + ".tar.gz")) + (sha256 + (base32 "11yfl2w2a445hllyzlakq97n32g06972vxpmh7lpbclnj9fhb5zp")))) + (arguments + (substitute-keyword-arguments (package-arguments fuse) + ((#:configure-flags original-flags #~(list)) + #~(append #$original-flags '("--default-library=static"))))))) + +(define squashfuse-for-appimage + (package + (inherit squashfuse) + (arguments + (list + #:configure-flags #~'("CFLAGS=-ffunction-sections -fdata-sections -Os -no-pie" + "LDFLAGS=-static") + #:phases #~(modify-phases %standard-phases + (add-after 'install 'install-private-headers + (lambda _ + (install-file "fuseprivate.h" + (string-append #$output + "/include/squashfuse/"))))))) + (inputs (list fuse-for-appimage + `(,zstd "lib") + `(,zstd "static") + `(,zlib "out") + `(,zlib "static"))))) + +(define-public appimage-type2-runtime + (let ((revision "0") + ;; No releases, just the latest commit. + (commit "47b665594856b4e8928f8932adcf6d13061d8c30")) + (package + (name "appimage-type2-runtime") + (version (git-version "continuous" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AppImage/type2-runtime") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0954crhlbapxis96g1s0vfpf78ybr64zvjalak387ksxj560g44x")))) + (arguments + (list + #:make-flags #~(list "-Csrc/runtime" "runtime-fuse3" + (string-append "CFLAGS=" + "-I" + #$fuse-2 + "/include/fuse/" + " -DGIT_COMMIT='\"" + "guix-" + #$version + "\"'" + " -D_FILE_OFFSET_BITS=64" + " -static")) + #:modules + `((guix build gnu-build-system) + (guix build utils) + (ice-9 binary-ports)) + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (delete 'check) ; No tests. + (replace 'install + (lambda _ + (install-file "src/runtime/runtime-fuse3" + (string-append #$output "/bin")))) + ;; must be after all elf reliant phases + (add-after 'make-dynamic-linker-cache 'set-magic-bytes + (lambda _ + (let ((port (open (string-append #$output + "/bin/runtime-fuse3") + (logior O_WRONLY)))) + (seek port 8 SEEK_SET) + (put-bytevector port #vu8(#x41 #x49 #x02)) + (close-port port))))) + #:disallowed-references (list squashfuse-for-appimage + fuse-for-appimage zstd zlib))) + ;; only needed at build time + (inputs (list squashfuse-for-appimage fuse-for-appimage + `(,zstd "static") + `(,zlib "static"))) + (build-system gnu-build-system) + (home-page "https://github.com/AppImage/type2-runtime") + (synopsis "Runtime for executing AppImages") + (description "The runtime is the executable part of every AppImage, it mounts +the payload via FUSE and executes the entrypoint.") + (license license:expat)))) From patchwork Sat Oct 26 17:28:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?No=C3=A9_Lopez?= X-Patchwork-Id: 69472 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6F17F27BBE2; Sat, 26 Oct 2024 18:49:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8130A27BBE9 for ; Sat, 26 Oct 2024 18:49:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t4ku3-0007G7-FH; Sat, 26 Oct 2024 13:48:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t4ktr-0007Au-HK for guix-patches@gnu.org; Sat, 26 Oct 2024 13:48:34 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t4ktq-000333-VW; Sat, 26 Oct 2024 13:48:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=jsXShJKKSyOBUBmWbxgJwe6QafXk+ILaVxVj3N1Xjjw=; b=RDHFa+fkOn6Fi55Ateld5G185co6cMqu+aoSYZ8HoUIOa15I7UDZRxY9wrAGW8dWleZXI/crPcjMwsTXNOY4agSBxL9ZMadDoTM55iT0Gl5KNE4eSmihQx+gM8CuWQmE2N1CLfi3FeduhW0eIAxW5Tf/qAatFa4XoaUAd0LsDrKvu/KFcGHCIV2DdczAzIwgMgjRDKbPLCrYjcWMGdQcAVh55kvisicOy4/pKExTygUKKE0q/Ji5R5AU/vKOQxVRWWlwQ/94+w/7+8XkDlP/0NKgBY08aqpAmTthKhJtzUYOtaqIt1za3eN4uc3HM5mLnPZRHAKjgfGkflEMXZEeag==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t4kuM-0001Qy-Kb; Sat, 26 Oct 2024 13:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73842] [PATCH v2 2/3] pack: Add support for AppImage pack format. Resent-From: =?utf-8?q?No=C3=A9?= Lopez Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, maxim.cournoyer@gmail.com, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sat, 26 Oct 2024 17:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73842 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73842@debbugs.gnu.org Cc: =?utf-8?q?No=C3=A9?= Lopez , Sebastian =?utf-8?q?D?= =?utf-8?q?=C3=BCmcke?= , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Maxim Cournoyer , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Maxim Cournoyer , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 73842-submit@debbugs.gnu.org id=B73842.17299648935402 (code B ref 73842); Sat, 26 Oct 2024 17:49:02 +0000 Received: (at 73842) by debbugs.gnu.org; 26 Oct 2024 17:48:13 +0000 Received: from localhost ([127.0.0.1]:42492 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4ktY-0001P0-Qv for submit@debbugs.gnu.org; Sat, 26 Oct 2024 13:48:13 -0400 Received: from smtp1-g21.free.fr ([212.27.42.1]:38392) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4ktV-0001Oo-W4 for 73842@debbugs.gnu.org; Sat, 26 Oct 2024 13:48:11 -0400 Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:990:a960:b4f3:8f44:ec4:5af5]) by smtp1-g21.free.fr (Postfix) with ESMTP id E5429B00572; Sat, 26 Oct 2024 19:47:31 +0200 (CEST) From: =?utf-8?q?No=C3=A9?= Lopez Date: Sat, 26 Oct 2024 19:28:10 +0200 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Sebastian Dümcke * guix/scripts/pack.scm: Add Appimage format. * doc/guix.texi: Document AppImage pack. Co-authored-by: Noé Lopez Change-Id: I33ebfec623cff1cfcd6f029d2d3054c23ab1949a --- doc/guix.texi | 55 +++++++++++++++++++++- guix/scripts/pack.scm | 104 +++++++++++++++++++++++++++++++++++++++++- tests/pack.scm | 41 ++++++++++++++++- 3 files changed, 197 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index ac3a7adef0..18edf8e550 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -6949,6 +6949,18 @@ Invoking guix pack environment}, using commands like @command{singularity shell} or @command{singularity exec}. +@cindex AppImage, create an AppImage file with @command{guix pack} +Another format internally based on SquashFS is +@uref{https://appimage.org/, AppImage}. An AppImage file can be made +executable and run without any special privileges: + +@example +guix pack -f appimage --entry-point=bin/guile guile +cp @var{file} . && chmod u+x $(basename @var{file}) +./$(basename @var{file}) --help +@end example +where @var{file} is the image returned by @command{guix pack}. + Several command-line options allow you to customize your pack: @table @code @@ -7065,6 +7077,47 @@ Invoking guix pack installation or other, non-rpm packs. @end quotation +@item appimage +@cindex AppImage, create an AppImage file with @command{guix pack} +This produces an AppImage file with the @samp{.AppImage} extension. +AppImage is a SquashFS volume prefixed with a runtime that mounts the +SquashFS file system and executes the binary provided with +@option{--entry-point}. This results in a self-contained archive that +bundles the software and all its requirements into a single file. When +the file is made executable it runs the packaged software. + +@example +guix pack -f appimage --entry-point=bin/vlc vlc +@end example + +The runtime used by AppImages makes use of libfuse to mount the image +quickly. If libfuse is not available, the AppImage can still be started +using the @option{--appimage-extract-and-run} flag. + +@quotation Warning + When building an AppImage, always @emph{pass} the +@option{--relocatable} option (or @option{-R}, or @option{-RR}) to make +sure the image can be used on systems where Guix is not installed. A +warning is printed when this option is not used. +@end quotation + +@example +guix pack -f appimage --entry-point=bin/hello --relocatable hello +@end example + +@quotation Note +The resulting AppImage does not conform to the complete standard as it +currently does not contain a @file{.DirIcon} file. This does not impact +functionality of the AppImage itself, but possibly that of software used +to manage AppImages. +@end quotation + +@quotation Note +As the generated AppImage packages the complete dependency graph, it +will be larger than comparable AppImage files found online, which depend +on host system libraries. +@end quotation + @end table @cindex relocatable binaries @@ -7155,7 +7208,7 @@ Invoking guix pack @cindex entry point, for Docker and Singularity images @item --entry-point=@var{command} Use @var{command} as the @dfn{entry point} of the resulting pack, if the pack -format supports it---currently @code{docker} and @code{squashfs} (Singularity) +format supports it---currently @code{docker}, @code{appimage} and @code{squashfs} (Singularity) support it. @var{command} must be relative to the profile contained in the pack. diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index 7c5fe76fe0..95b40a743b 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -10,6 +10,8 @@ ;;; Copyright © 2022 Alex Griffin ;;; Copyright © 2023 Graham James Addis ;;; Copyright © 2023 Oleg Pykhalov +;;; Copyright © 2024 Sebastian Dümcke +;;; Copyright © 2024 Noé Lopez ;;; ;;; This file is part of GNU Guix. ;;; @@ -56,6 +58,7 @@ (define-module (guix scripts pack) #:use-module ((gnu packages compression) #:hide (zip)) #:use-module (gnu packages guile) #:use-module (gnu packages base) + #:autoload (gnu packages appimage) (appimage-type2-runtime) #:autoload (gnu packages gnupg) (guile-gcrypt) #:autoload (gnu packages guile) (guile2.0-json guile-json) #:use-module (srfi srfi-1) @@ -64,6 +67,7 @@ (define-module (guix scripts pack) #:use-module (srfi srfi-35) #:use-module (srfi srfi-37) #:use-module (ice-9 match) + #:use-module (ice-9 optargs) #:export (symlink-spec-option-parser self-contained-tarball @@ -71,6 +75,7 @@ (define-module (guix scripts pack) rpm-archive docker-image squashfs-image + self-contained-appimage %formats guix-pack)) @@ -974,8 +979,100 @@ (define* (rpm-archive name profile (gexp->derivation (string-append name ".rpm") build #:target target #:references-graphs `(("profile" ,profile)))) + +;;; +;;; AppImage format +;;; +(define* (self-contained-appimage name profile + #:key target + (profile-name "guix-profile") + entry-point + (compressor (lookup-compressor "zstd")) + localstatedir? + (symlinks '()) + (archiver tar) + (extra-options '())) + "Return a self-contained AppImage containing a store initialized with the +closure of PROFILE, a derivation. The AppImage contains /gnu/store unless +RELOCATABLE option is used; if LOCALSTATEDIR? is true, it also contains +/var/guix, including /var/guix/db with a properly initialized store database. + +SYMLINKS must be a list of (SOURCE -> TARGET) tuples denoting symlinks to be +added to the pack." + (unless entry-point + (leave (G_ "entry-point must be provided in the '~a' format~%") + 'appimage)) + (let-keywords extra-options #f ((relocatable? #f)) + (unless relocatable? + (warning (G_ "AppImages should be built with the --relocatable flag~%")))) + + (define runtime-package appimage-type2-runtime) + (define runtime-path "bin/runtime-fuse3") + (define %valid-compressors '("gzip" "zstd")) + + (let ((compressor-name (compressor-name compressor))) + (unless (member compressor-name %valid-compressors) + (leave (G_ "~a is not a valid squashfs archive compressor used in +generating the AppImage. Valid compressors are: ~a~%") + compressor-name + %valid-compressors))) - + (define builder + (with-extensions (list guile-gcrypt) + (with-imported-modules (source-module-closure + '((guix build store-copy) + (guix build utils)) + #:select? not-config?) + #~(begin + (use-modules (guix build utils) + (guix build store-copy) + (rnrs io ports) + (srfi srfi-1) + (srfi srfi-26)) + + (define (concatenate-files result file1 file2) + "Creates a new file RESULT containing FILE1 followed by FILE2." + (call-with-output-file result + (lambda (output) + (call-with-input-file file1 + (lambda (input) + (dump-port input output))) + (call-with-input-file file2 + (lambda (input) + (dump-port input output)))))) + + (let* ((appdir "AppDir") + (squashfs "squashfs") + (profile-items (map store-info-item + (call-with-input-file "profile" read-reference-graph))) + (profile (find (lambda (item) + (string-suffix? "-profile" item)) + profile-items))) + (mkdir-p appdir) + ;; copy all store items from the profile to the AppDir + (populate-store '("profile") appdir) + ;; symlink the provided entry-point to AppDir/AppRun + (symlink (string-append "." profile "/" #$entry-point) + (string-append appdir "/AppRun")) + ;; create .desktop file as required by the spec + (make-desktop-entry-file + (string-append appdir "/" #$name ".desktop") + #:name #$name + #:exec #$entry-point) + ;; compress the AppDir + (invoke #+(file-append squashfs-tools "/bin/mksquashfs") appdir + squashfs "-root-owned" "-noappend" + "-comp" #+(compressor-name compressor)) + ;; append runtime and squashFS into file AppImage + (concatenate-files #$output + #$(file-append runtime-package "/" runtime-path) + squashfs) + ;; add execution permission + (chmod #$output #o555)))))) + (gexp->derivation (string-append name ".AppImage") builder + #:target target + #:references-graphs `(("profile" ,profile)))) + ;;; ;;; Compiling C programs. ;;; @@ -1311,6 +1408,7 @@ (define %formats (squashfs . ,squashfs-image) (docker . ,docker-image) (deb . ,debian-archive) + (appimage . ,self-contained-appimage) (rpm . ,rpm-archive))) (define (show-formats) @@ -1327,6 +1425,8 @@ (define (show-formats) deb Debian archive installable via dpkg/apt")) (display (G_ " rpm RPM archive installable via rpm/yum")) + (display (G_ " + appimage AppImage self-contained and executable format")) (newline)) (define (required-option symbol) @@ -1694,6 +1794,8 @@ (define-command (guix-pack . args) (process-file-arg opts 'preun-file) #:postun-file (process-file-arg opts 'postun-file))) + ('appimage + (list #:relocatable? relocatable?)) (_ '()))) (target (assoc-ref opts 'target)) (bootstrap? (assoc-ref opts 'bootstrap?)) diff --git a/tests/pack.scm b/tests/pack.scm index f8a9e09c28..6ac9a966af 100644 --- a/tests/pack.scm +++ b/tests/pack.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2021, 2023 Maxim Cournoyer ;;; Copyright © 2023 Oleg Pykhalov +;;; Copyright © 2024 Noé Lopez ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,7 +33,8 @@ (define-module (test-pack) #:use-module (guix utils) #:use-module ((guix build utils) #:select (%store-directory)) #:use-module (gnu packages) - #:use-module ((gnu packages base) #:select (libc-utf8-locales-for-target)) + #:use-module ((gnu packages base) #:select (libc-utf8-locales-for-target + hello)) #:use-module (gnu packages bootstrap) #:use-module ((gnu packages package-management) #:select (rpm)) #:use-module ((gnu packages compression) #:select (squashfs-tools)) @@ -340,6 +342,43 @@ (define rpm-for-tests (mkdir #$output)))))))) (built-derivations (list check)))) + (unless store (test-skip 1)) + (test-assertm "appimage" + (mlet* %store-monad + ((guile (set-guile-for-build (default-guile))) + (profile -> (profile + (content (packages->manifest (list %bootstrap-guile hello))) + (hooks '()) + (locales? #f))) + (image (self-contained-appimage "hello-appimage" profile + #:entry-point "bin/hello" + #:extra-options + (list #:relocatable? #t))) + (check (gexp->derivation + "check-appimage" + #~(begin + (invoke #$image))))) + (built-derivations (list check)))) + + (unless store (test-skip 1)) + (test-assertm "appimage + localstatedir" + (mlet* %store-monad + ((guile (set-guile-for-build (default-guile))) + (profile -> (profile + (content (packages->manifest (list %bootstrap-guile hello))) + (hooks '()) + (locales? #f))) + (image (self-contained-appimage "hello-appimage" profile + #:entry-point "bin/hello" + #:localstatedir? #t + #:extra-options + (list #:relocatable? #t))) + (check (gexp->derivation + "check-appimage" + #~(begin + (invoke #$image))))) + (built-derivations (list check)))) + (unless store (test-skip 1)) (test-assertm "deb archive with symlinks and control files" (mlet* %store-monad From patchwork Sat Oct 26 17:28:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?No=C3=A9_Lopez?= X-Patchwork-Id: 69470 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 55DBA27BBE2; Sat, 26 Oct 2024 18:49:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EE0DC27BBE9 for ; Sat, 26 Oct 2024 18:49:09 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t4ku7-0007J0-62; Sat, 26 Oct 2024 13:48:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t4ktr-0007As-HJ for guix-patches@gnu.org; Sat, 26 Oct 2024 13:48:34 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t4ktr-000334-3d for guix-patches@gnu.org; Sat, 26 Oct 2024 13:48:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=RRoJ+5+bGEQlFOL1JtC6KbR/NbEwP7qP3in39VAD7PQ=; b=RBf7nNX8MA4QJTGDuB4IfSOdz3IfBTjplHrg61gDSQkizaupFqg5T/JdCnPmraomVJB7pFYpn3rGOjxds9L48P1qTFrwRQtdmJAL/Eoj6Eb42iCUpWjWCGeCUs6B2G+beRzfKwHESuTFYQkxlnau9zMSs5VbiKHlsICFMHwjRZfEN8uyH5GLjcJ4aQC4trnDhK/ZJoSSnZ5GT1VvJbbPNjMHXDGkJSphBcFsSc1YDc8OURZf36MwgPp6k1TkdKgi5hUmiTk2i4MnMevEWH7yQZB+PLSY4wSuin1fnBcHl78UkrBo4Yh7WO0RAMYS7qihsLN1VCzvWbGpnJIXuzlh4g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t4kuO-0001RK-5C; Sat, 26 Oct 2024 13:49:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73842] [PATCH v2 3/3] news: Add entry for guix =?utf-8?b?cGFj?= =?utf-8?b?a+KAmXM=?= AppImage format Resent-From: =?utf-8?q?No=C3=A9?= Lopez Original-Sender: "Debbugs-submit" Resent-CC: pelzflorian@pelzflorian.de, julien@lepiller.eu, guix-patches@gnu.org Resent-Date: Sat, 26 Oct 2024 17:49:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73842 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73842@debbugs.gnu.org Cc: Sebastian =?utf-8?q?D=C3=BCmcke?= , Florian Pelz , Julien Lepiller X-Debbugs-Original-Xcc: Florian Pelz , Julien Lepiller Received: via spool by 73842-submit@debbugs.gnu.org id=B73842.17299649255482 (code B ref 73842); Sat, 26 Oct 2024 17:49:04 +0000 Received: (at 73842) by debbugs.gnu.org; 26 Oct 2024 17:48:45 +0000 Received: from localhost ([127.0.0.1]:42501 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4ku4-0001QM-NV for submit@debbugs.gnu.org; Sat, 26 Oct 2024 13:48:45 -0400 Received: from smtp1-g21.free.fr ([212.27.42.1]:42698) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4ku2-0001QC-9o for 73842@debbugs.gnu.org; Sat, 26 Oct 2024 13:48:43 -0400 Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:990:a960:b4f3:8f44:ec4:5af5]) by smtp1-g21.free.fr (Postfix) with ESMTP id 0DA98B00563; Sat, 26 Oct 2024 19:47:36 +0200 (CEST) From: =?utf-8?q?No=C3=A9?= Lopez Date: Sat, 26 Oct 2024 19:28:11 +0200 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Sebastian Dümcke * etc/news.scm: Add entry. Change-Id: If37b3b578517c15c2868239998975f7718f7d689 --- etc/news.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/etc/news.scm b/etc/news.scm index 4929fa2a9a..59fdd94dd8 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -25,6 +25,7 @@ ;; Copyright © 2024 Vivien Kraus ;; Copyright © 2024 Guillaume Le Vaillant ;; Copyright © 2024 Zheng Junjie <873216071@qq.com> +;; Copyright © 2024 Sebastian Dümcke ;; ;; Copying and distribution of this file, with or without modification, are ;; permitted in any medium without royalty provided the copyright notice and @@ -32,6 +33,43 @@ (channel-news (version 0) + (entry (commit "ea1fe6e106f2abc9fce5cf7e686227c0c1f9e9e1") + (title + (de "Neues Format @samp{AppImage} für den Befehl @command{guix pack}") + (en "New @samp{AppImage} format for the @command{guix pack} command") + (fr "Nouveau format @samp{AppImage} pour la commande @command{guix pack}")) + (body + (de "@command{guix pack} kann nun AppImage Dateien erstellen. Das +AppImage Dateiformat erlaubt es in einer einzelnen Datei Software zu verteilen. Die +AppImage Datei lässt sich ohne besondere Benutzerrechte ausführen. Hier ist +ein Beispiel: + +@example +guix pack --format=appimage --entry-point=bin/hello hello +@end example + +Siehe @command{info \"(guix.de) Aufruf von guix pack\"} für mehr +Informationen.") + (en "@command{guix pack} can now produce AppImage a single file, +self-contained software archive. AppImage files are easily distributed and can +be run with user privileges. Here is an example for the @code{hello} package: + +@example +guix pack --format=appimage --entry-point=bin/hello hello +@end example + +See @command{info \"(guix) Invoking guix pack\"} for more information.") + (fr "@command{guix pack} peut désormais produire un fichier +AppImage. AppImage est une manière de distribuer les logiciels en un seul +fichier, qui peut être executer avec des droits d’utilisateur. Voici un +exemple pour le paquet @code{hello} : + +@example +guix pack --format=appimage --entry-point=bin/hello hello +@end example + +Consultez @command{info \"(guix.fr) Invoquer guix pack\"} pour plus +d’informations."))) (entry (commit "5966e0fdc78771c562e0f484a22f381a77908be0") (title