From patchwork Thu Nov 7 16:50:03 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: 70050 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 DDC6227BBE2; Thu, 7 Nov 2024 16:52:50 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 787A827BBE9 for ; Thu, 7 Nov 2024 16:52:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t95jz-0005Lv-MZ; Thu, 07 Nov 2024 11:52:15 -0500 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 1t95jx-0005LN-GY for guix-patches@gnu.org; Thu, 07 Nov 2024 11:52:13 -0500 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 1t95jx-0007I0-7W; Thu, 07 Nov 2024 11:52:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=QU5zlWTpVbok833TCkSLp0wrG7uQScPm+kixCECKjXY=; b=fomVpsVLZF1WW2UIneJnr9NcvinNaA9vhRHe4RkoQuYDUIW3yQcNY+u8/eFcLRTpwV5CSMNj1u4gSsBzvrCQQwf9D0+bZ5juroVcQ76oZUJfkDMQujnef88xC7ZxpEwTKeMtiyXU29ngsO3M0/zfMwrhNX/zKLwvsRl/EvsRLArPF5wlW3NO0wq1RA/GVIw6mhFU40dd91QJ0Vq74my9vLZW4o/XMJoatUZAmU/QW6PTN3rgdvW8rniY1GSSI0wxVgn9ZIXQmtMUU2VdNTw60Qs2QRSan0QOL098fLJue3BRwnqR0Q3TGYMbtuP9sdk1w1ciKOHSQjC8XYPZBP+o5Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t95jm-0000Nk-6S; Thu, 07 Nov 2024 11:52:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#73842] [PATCH v5 1/3] gnu: appimage: New packages for the appimage runtime. References: In-Reply-To: Resent-From: =?utf-8?q?No=C3=A9?= Lopez Original-Sender: "Debbugs-submit" Resent-CC: noelopez@free.fr, ludo@gnu.org, pelzflorian@pelzflorian.de, maxim.cournoyer@gmail.com, noe@xn--no-cja.eu, noe@xn--no-cja.eu, leo@famulari.name, w@wmeyer.eu, guix-patches@gnu.org Resent-Date: Thu, 07 Nov 2024 16:52: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 , =?utf-8?q?No=C3=A9?= Lopez , Ludovic =?utf-8?q?Court?= =?utf-8?q?=C3=A8s?= , pelzflorian , Maxim Cournoyer , =?utf-8?q?No=C3=A9?= Lopez , noe@xn--no-cja.eu, Leo Famulari , Wilko Meyer X-Debbugs-Original-Xcc: =?utf-8?q?No=C3=A9?= Lopez , Ludovic =?utf-8?q?Court=C3=A8s?= , pelzflorian , Maxim Cournoyer , =?utf-8?q?No=C3=A9?= Lopez , noe@xn--no-cja.eu, Leo Famulari , Wilko Meyer Received: via spool by 73842-submit@debbugs.gnu.org id=B73842.17309982891397 (code B ref 73842); Thu, 07 Nov 2024 16:52:02 +0000 Received: (at 73842) by debbugs.gnu.org; 7 Nov 2024 16:51:29 +0000 Received: from localhost ([127.0.0.1]:49382 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t95jE-0000MS-UF for submit@debbugs.gnu.org; Thu, 07 Nov 2024 11:51:29 -0500 Received: from smtp.domeneshop.no ([194.63.252.55]:52325) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t95jA-0000M9-Ss for 73842@debbugs.gnu.org; Thu, 07 Nov 2024 11:51:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xn--no-cja.eu; s=ds202402; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-ID:Date:Subject:Cc:To:From:From:Sender:Reply-To:Subject: Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=QU5zlWTpVbok833TCkSLp0wrG7uQScPm+kixCECKjXY=; b=tBkyrsNnJFFhVPwHBnAtv56lCj X0laWlXqAWwBUsq+RdghbMKCzBOCI1PKjZNUUMHc/7nSXdM8zG2EnECaoBjxIWswULrzU6vL5aydP 1hMIp+gc3omLdf/6Ms9QJs3b1a6OxfaYsvEZnknQC3A2DNgDnFS4oiY4ZijeS0T0k2uOvv+OwhFLl 3j8dxM12LQfavUs5jwjOm4KTXxJDrHG8BNlEHqVYO7BH3C2cxSm0YC6kgDE3e6BW8UIYlwbtD1+iK L+BYyJ0rKMLQTUZlLC3vCmdqsc3FZIuTzHJXx3IDjSlXqxtTyzCwvjyxE4kxPgJcxJMnTq7IaCmCq T2HmfjNA==; Received: from smtp by smtp.domeneshop.no with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) id 1t95gy-006LVO-R4; Thu, 07 Nov 2024 17:49:08 +0100 Date: Thu, 7 Nov 2024 17:50:03 +0100 Message-ID: <4a7795be82c20d9476dbefcbaf3c380dcb61581e.1730998051.git.noelopez@free.fr> 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: , Reply-to: =?utf-8?q?No=C3=A9?= Lopez X-ACL-Warn: , =?utf-8?q?No=C3=A9_Lopez_via_Guix-patches?= X-Patchwork-Original-From: =?utf-8?q?No=C3=A9_Lopez_via_Guix-patches?= via From: =?utf-8?q?No=C3=A9_Lopez?= 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: Noé Lopez * gnu/packages/appimage.scm (gnu packages appimage): New module. (appimage-type2-runtime): New variable. * gnu/packages/file-systems.scm (squashfuse-for-appimage): New variable. * gnu/packages/linux.scm (fuse-for-appimage): New variable. Change-Id: I857a8eb5399a6a493e52db70b6c8cf0c71360930 --- gnu/local.mk | 2 + gnu/packages/appimage.scm | 97 +++++++++++++++++++++++++++++++++++ gnu/packages/file-systems.scm | 21 ++++++++ gnu/packages/linux.scm | 17 ++++++ 4 files changed, 137 insertions(+) create mode 100644 gnu/packages/appimage.scm base-commit: ba9466481d10992d35f09d010166d616fdb6a637 diff --git a/gnu/local.mk b/gnu/local.mk index 945d89d550..0deab9065f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -67,6 +67,7 @@ # Copyright © 2024 David Elsing # Copyright © 2024 Ashish SHUKLA # Copyright © 2024 Fabio Natali +# Copyright © 2024 Noé Lopez # # This file is part of GNU Guix. # @@ -139,6 +140,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/apl.scm \ %D%/packages/apple.scm \ %D%/packages/apparmor.scm \ + %D%/packages/appimage.scm \ %D%/packages/apr.scm \ %D%/packages/arcan.scm \ %D%/packages/aspell.scm \ diff --git a/gnu/packages/appimage.scm b/gnu/packages/appimage.scm new file mode 100644 index 0000000000..1d0caada46 --- /dev/null +++ b/gnu/packages/appimage.scm @@ -0,0 +1,97 @@ +;;; 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 gexp) + #:use-module (guix git-download) + #:use-module (guix packages) + #:use-module (guix utils)) + +(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" #$(this-package-input "fuse") "/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. Used to identify the + ;; executable as an AppImage as per the specification. + (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 + (gexp-input zstd "static") + (gexp-input zlib "static")))) + ;; 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 @acronym{FUSE} and executes the entrypoint, allowing users to run +applications in a portable manner without the need for installation. This runtime +ensures that the AppImage can access its bundled libraries and resources seamlessly, +providing a consistent environment across different Linux distributions. In the +absence of @acronym{FUSE}, the AppImage can still be started using the +@option{--appimage-extract-and-run} flag.") + (license license:expat)))) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 059bdf67a9..e36751e774 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -2059,6 +2059,27 @@ (define-public squashfuse memory-efficient.") (license license:bsd-2))) +(define-public 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 tmsu (package (name "tmsu") diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 992790188a..58403c5b17 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4100,6 +4100,23 @@ (define-public fuse-2 (("-DFUSERMOUNT_DIR=[[:graph:]]+") "-DFUSERMOUNT_DIR=\\\"/var/empty\\\""))))))))) +(define-public 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-public unionfs-fuse (package (name "unionfs-fuse")