From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id CIMYDMj44WFreQEAgWs5BA (envelope-from ) for ; Fri, 14 Jan 2022 23:27:20 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id iHm5CMj44WF/PwEAauVa8A (envelope-from ) for ; Fri, 14 Jan 2022 23:27:20 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C708F31839 for ; Fri, 14 Jan 2022 23:27:19 +0100 (CET) Received: from localhost ([::1]:54180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n8V2R-0001mf-0v for larch@yhetil.org; Fri, 14 Jan 2022 17:27:18 -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 Content-Type: multipart/mixed; boundary="----=_Part_166953_1302214080.1642199174316" 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: kiasoc5@tutanota.com X-ACL-Warn: , kiasoc5--- via Guix-patches From: kiasoc5--- via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1642199239; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=D9BYHbNQN3ougfE72PL2o0ZnsWfklE15GdWnrVRS5co=; b=ONIywMtumodZ/e2ZP406VNbKb3z7Klr0ngRkYuRVenw11Zv5w5CBGSW9eoJek+xX4tj5Oq dH/L9p7CkA8wqUvSWxlJAqIM937Z+50PRjbA/y+sKZvQWlOHyIy9RW6ZMLBaXZPyMZx10D 60WgRBbjNnxnyY7j9H4XOKs6lZJX4tOlbwkaXGHfAPfnYaZzEwF5iHqnbMju//H9niCaJR pn9zyb229QXmb/uGQl67ZtClPxB5O8M1RqBkRIZt7S8g9tsAI+2P+JJnDO2PBZr+TvJbIo dWjyMjQwOUHALASvw8is3UdEH0RVovahB3xOEMvoUC3hn5kftZVbQem08XMe0g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1642199239; a=rsa-sha256; cv=none; b=HSlkpi/QMpL/Kh3YkdXUAk7ibzvbTPjA2+4damNetUP+u/5NoH7JDvj5n3oGc0FfdC123f mbjnxEG3MAjOHxmSzXlxEDGoC7Z47dcTGkAx/flg4AXFeqgVA4MxeCRZvBWrbooJ33e26n NGER34/b0nG+ORooNCyEbL+6mH2TWggCmzPncKgjK3OU6ibNB0DeKSfD135l4CBiW03lkX JlUpYTpXeOxqxrvDkMThlPWWUHDQs1pE31q7yr7wMTcRHD6lzLC4gqEWKGsFAB9Gy7bNLE Fgwsn/Uk5OvX9xABAXrpOXDP7hr4LzvlqL2qyc9QAiFCFvrBFStK/D611ikp1Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tutanota.com header.s=s1 header.b=xM+Wpqhg; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -5.22 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tutanota.com header.s=s1 header.b=xM+Wpqhg; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: C708F31839 X-Spam-Score: -5.22 X-Migadu-Scanner: scn0.migadu.com X-TUID: m9HhEz9Qheya ------=_Part_166953_1302214080.1642199174316 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit ------=_Part_166953_1302214080.1642199174316 Content-Type: text/x-patch; charset=us-ascii; name=0001-gnu-libostree-Update-to-2022.1.patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-gnu-libostree-Update-to-2022.1.patch >From 1d45930b362cac3d7d136bcaa8d5130b985add2c Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Fri, 14 Jan 2022 17:04:06 -0500 Subject: [PATCH 1/2] gnu: libostree: Update to 2022.1. * gnu/packages/package-management (libostree): Update to 2022.1. [native-inputs, inputs]: Remove labels --- gnu/packages/package-management.scm | 36 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index ba5736f851..9e37c44fdd 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1709,7 +1709,7 @@ (define-public msitools (define-public libostree (package (name "libostree") - (version "2021.6") + (version "2022.1") (source (origin (method url-fetch) @@ -1717,7 +1717,7 @@ (define-public libostree "https://github.com/ostreedev/ostree/releases/download/v" (version-major+minor version) "/libostree-" version ".tar.xz")) (sha256 - (base32 "0cgmnjf4mr4wn4fliq6ncs0q9qwblrlizjfhx57p7m332g5k21p8")))) + (base32 "1mfakwm0sjvb1vvl3jhc451yyf723k7c4vv1yqs8law4arw0x823")))) (build-system gnu-build-system) (arguments '(#:phases @@ -1734,23 +1734,23 @@ (define-public libostree ;; tap-driver.sh: fatal: I/O or internal error #:tests? #f)) (native-inputs - `(("attr" ,attr) ; for tests - ("bison" ,bison) - ("glib:bin" ,glib "bin") ; for 'glib-mkenums' - ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config) - ("xsltproc" ,libxslt))) + (list attr ; for tests + bison + `(,glib "bin") ; for 'glib-mkenums' + gobject-introspection + pkg-config + libxslt)) (inputs - `(("avahi" ,avahi) - ("docbook-xml" ,docbook-xml-4.2) - ("docbook-xsl" ,docbook-xsl) - ("e2fsprogs" ,e2fsprogs) - ("fuse" ,fuse) - ("glib" ,glib) - ("gpgme" ,gpgme) - ("libarchive" ,libarchive) - ("libsoup" ,libsoup-minimal-2) ; needs libsoup-2.4 - ("util-linux" ,util-linux))) + (list avahi + docbook-xml + docbook-xsl + e2fsprogs + fuse + glib + gpgme + libarchive + libsoup-minimal-2 ; needs libsoup-2.4 + util-linux)) (home-page "https://ostree.readthedocs.io/en/latest/") (synopsis "Operating system and container binary deployment and upgrades") (description base-commit: a9e45262465bffae8e9b5c58dca77b18b2962521 -- 2.34.1 ------=_Part_166953_1302214080.1642199174316 Content-Type: text/x-patch; charset=us-ascii; name=0002-gnu-flatpak-Simplify-inputs.patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0002-gnu-flatpak-Simplify-inputs.patch >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 ------=_Part_166953_1302214080.1642199174316--