From patchwork Fri Jan 14 22:26:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "vasilii.smirnov--- via Guix-patches\" via" X-Patchwork-Id: 36349 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 3CF5627BBEA; Fri, 14 Jan 2022 22:27:15 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, 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 A15A927BBE9 for ; Fri, 14 Jan 2022 22:27:14 +0000 (GMT) Received: from localhost ([::1]:54180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n8V2P-0001mf-Nw for patchwork@mira.cbaines.net; Fri, 14 Jan 2022 17:27:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37254) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n8V2E-0001kn-8l for guix-patches@gnu.org; Fri, 14 Jan 2022 17:27:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45585) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n8V2D-0003Ra-VX for guix-patches@gnu.org; Fri, 14 Jan 2022 17:27:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n8V2D-0007fr-QR for guix-patches@gnu.org; Fri, 14 Jan 2022 17:27:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53273] [PATCH] Update libostree, simplify inputs for flatpak/libostree Resent-From: kiasoc5@tutanota.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 14 Jan 2022 22:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53273 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53273@debbugs.gnu.org X-Debbugs-Original-To: Guix Patches Received: via spool by submit@debbugs.gnu.org id=B.164219920129469 (code B ref -1); Fri, 14 Jan 2022 22:27:01 +0000 Received: (at submit) by debbugs.gnu.org; 14 Jan 2022 22:26:41 +0000 Received: from localhost ([127.0.0.1]:38488 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8V1p-0007f9-EL for submit@debbugs.gnu.org; Fri, 14 Jan 2022 17:26:41 -0500 Received: from lists.gnu.org ([209.51.188.17]:55276) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8V1l-0007ex-7M for submit@debbugs.gnu.org; Fri, 14 Jan 2022 17:26:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n8V1k-0001Ps-Rw for guix-patches@gnu.org; Fri, 14 Jan 2022 17:26:32 -0500 Received: from w1.tutanota.de ([81.3.6.162]:47158) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n8V1W-0003JE-Iu for guix-patches@gnu.org; Fri, 14 Jan 2022 17:26:32 -0500 Received: from w3.tutanota.de (unknown [192.168.1.164]) by w1.tutanota.de (Postfix) with ESMTP id 50592FBF5FB for ; Fri, 14 Jan 2022 22:26:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1642199174; s=s1; d=tutanota.com; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Cc:Date:Date:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:Sender; bh=D9BYHbNQN3ougfE72PL2o0ZnsWfklE15GdWnrVRS5co=; b=xM+WpqhgvHtEsiI0AzBmWGif+VXApiTYVtaaaUK+dywo/PHVx0jhEpOGl2ima7oc Y3F8PShhpWGzigzq02iIWGeXlSefom5dgn/CqRuokcRje5X15j87ujReLWIG+T7df6s vlbivFoeCD2ou4GlqchaLFmPL8u8shtVgz7PrULemoW7DLipcd7TG9p9uvGwni21GO5 6pE0JDcPr2tF8IYaZwX69DmDl2myV1gxttQhVUzwsLB8jCYInfNEBigSrKOGb4IhMyH 84CdoPSG9/NEYTF8mzMvSwftLkbgFk323CmEKBQz53+3MHcraLH76c1LQATay7YRjqc LQLRPpnQSA== Date: Fri, 14 Jan 2022 23:26:14 +0100 (CET) Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=81.3.6.162; envelope-from=kiasoc5@tutanota.com; helo=w1.tutanota.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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" Reply-to: kiasoc5@tutanota.com X-ACL-Warn: , kiasoc5--- via Guix-patches X-Patchwork-Original-From: kiasoc5--- via Guix-patches via From: "vasilii.smirnov--- via Guix-patches\" via" X-getmail-retrieved-from-mailbox: Patches From 01e12448b31bf54bebc473605ca4b38e179e7730 Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Fri, 14 Jan 2022 17:05:19 -0500 Subject: [PATCH 2/2] gnu: flatpak: Simplify inputs. * gnu/packages/package-management.scm (flatpak)[native-inputs, inputs]: Remove labels. [arguments]<#:phases>: Edit 'p11-kit-fix to use p11-kit instead of p11-kit-next. --- gnu/packages/package-management.scm | 58 ++++++++++++++--------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 9e37c44fdd..0cf6344cab 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1808,7 +1808,7 @@ (define-public flatpak #t)) (add-after 'unpack 'p11-kit-fix (lambda* (#:key inputs #:allow-other-keys) - (let ((p11-path (string-append (assoc-ref inputs "p11-kit-next") + (let ((p11-path (string-append (assoc-ref inputs "p11-kit") "/bin/p11-kit"))) (substitute* "session-helper/flatpak-session-helper.c" (("\"p11-kit\",") @@ -1824,37 +1824,37 @@ (define-public flatpak (invoke "make" "check" "TESTS=tests/test-basic.sh tests/test-config.sh testcommon")))))) (native-inputs - `(("bison" ,bison) - ("dbus" ,dbus) ; for dbus-daemon - ("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") ; for glib-mkenums + gdbus-codegen - ("glibc-utf8-locales" ,glibc-utf8-locales) - ("gobject-introspection" ,gobject-introspection) - ("libcap" ,libcap) - ("pkg-config" ,pkg-config) - ("python" ,python) - ("python-pyparsing" ,python-pyparsing) - ("socat" ,socat) - ("which" ,which))) + (list bison + dbus ; for dbus-daemon + gettext-minimal + `(,glib "bin") ; for glib-mkenums + gdbus-codegen + glibc-utf8-locales + gobject-introspection + libcap + pkg-config + python + python-pyparsing + socat + which)) (propagated-inputs (list glib-networking gnupg-2.2.32 gsettings-desktop-schemas)) (inputs - `(("appstream-glib" ,appstream-glib) - ("bubblewrap" ,bubblewrap) - ("dconf" ,dconf) - ("fuse" ,fuse) - ("gdk-pixbuf" ,gdk-pixbuf) - ("gpgme" ,gpgme) - ("json-glib" ,json-glib) - ("libarchive" ,libarchive) - ("libostree" ,libostree) - ("libseccomp" ,libseccomp) - ("libsoup" ,libsoup-minimal-2) - ("libxau" ,libxau) - ("libxml2" ,libxml2) - ("p11-kit-next" ,p11-kit-next) - ("util-linux" ,util-linux) - ("xdg-dbus-proxy" ,xdg-dbus-proxy))) + (list appstream-glib + bubblewrap + dconf + fuse + gdk-pixbuf + gpgme + json-glib + libarchive + libostree + libseccomp + libsoup-minimal-2 + libxau + libxml2 + p11-kit-next + util-linux + xdg-dbus-proxy)) (home-page "https://flatpak.org") (synopsis "System for building, distributing, and running sandboxed desktop applications") -- 2.34.1