From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 0FoHALkLNGCKJQAA0tVLHw (envelope-from ) for ; Mon, 22 Feb 2021 19:53:29 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id uEphN7gLNGAzWwAAB5/wlQ (envelope-from ) for ; Mon, 22 Feb 2021 19:53:28 +0000 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 0FD37266F0 for ; Mon, 22 Feb 2021 20:53:28 +0100 (CET) Received: from localhost ([::1]:42828 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEHGo-0004RY-F4 for larch@yhetil.org; Mon, 22 Feb 2021 14:53:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEHFS-0003R9-KS for bug-guix@gnu.org; Mon, 22 Feb 2021 14:52:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46074) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lEHFS-0007CA-6S for bug-guix@gnu.org; Mon, 22 Feb 2021 14:52:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lEHFS-0006sg-4U for bug-guix@gnu.org; Mon, 22 Feb 2021 14:52:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#36117: [PATCH 1/4] gnu: qemu: Fix indentation and remove trailing #t. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 22 Feb 2021 19:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36117 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 36117@debbugs.gnu.org Received: via spool by 36117-submit@debbugs.gnu.org id=B36117.161402346626329 (code B ref 36117); Mon, 22 Feb 2021 19:52:02 +0000 Received: (at 36117) by debbugs.gnu.org; 22 Feb 2021 19:51:06 +0000 Received: from localhost ([127.0.0.1]:57608 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lEHEU-0006qY-Jj for submit@debbugs.gnu.org; Mon, 22 Feb 2021 14:51:06 -0500 Received: from mail-qk1-f173.google.com ([209.85.222.173]:47048) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lEHES-0006q3-9d for 36117@debbugs.gnu.org; Mon, 22 Feb 2021 14:51:00 -0500 Received: by mail-qk1-f173.google.com with SMTP id w19so13831646qki.13 for <36117@debbugs.gnu.org>; Mon, 22 Feb 2021 11:51:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a4VQM3WsYqs4bNLmSEiVrhQmAjtopWYvC7KpIw48u98=; b=B8bY5qbaHtV/U+bNwMbctH/UnxZe9159Uvf8PFe4mpwOIcdSkDx3c225/+Ph4FwL1w 0yjvQbRWoLj6zeYEYC8rk09X5KoiPro1Upx6RJTodcMule5IMy8U1vXUoDEovtXBQ1A9 d6Yj1NST/7wS9xEAngoFxzomBmv8Xqx8UbwteiBuCQe4nhyDbqllU7uumdNV4P6KNIdC 2WDEoRc75PRPmRJOjYeOEuB18Kx8Ckee/1a75xoMVQcMi/9yLa99ITIlquRlyPwlrBbU 7+G+OxLRytMZVwaJH3XkoQaRr/8EjbjhSK/5Amr1yqtGXqSiUAnnJxw+Q5JpisZ1nzA2 27Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=a4VQM3WsYqs4bNLmSEiVrhQmAjtopWYvC7KpIw48u98=; b=gNqMA/AqEMek4CDwztjsv/jPSuTE80pNnlYTW0WIB0qzJf3fOegAKPaW5ZZW4XtASf xuZe9iD8vCDfxhoJDYP5NI5wUVfEuVDG9fpDW3httf1lOQ4y/eanDaz23OBhVADKBkj8 lsvTyrgbZ2DMjoR+nPKHPmHkIf3YphWCOS0rLk9oIaB0tvLymgBNnYheEXTg+DbTChCO eOXajKT/UYmuG4QMJgWhwkoCJy0PvE7sEimwii7UJDiV+O06VyRK+oU1Ef2mrqNOeGKB ZS4xwthadAsquLzD+3OM3AfLsLuPS+4wpQyfGp70iiHogXUPGRqDX2P3UDLzdgXfLz3+ Ajcg== X-Gm-Message-State: AOAM5318+mQAxGJrJW0tcgFVGmFxTGNHTRgoTozQwDCiMjO60kd2N7Uu CzxI2lPYHljMtf0FxnfnsnWvo5DcATlYMg== X-Google-Smtp-Source: ABdhPJwDF1v166Swfwi3WXg7gB2XZPi4Dt0fA53XBzPtDQXalxC6iVWIMgb0a8X6r4efX26fTztP1Q== X-Received: by 2002:a37:a0d3:: with SMTP id j202mr19717954qke.250.1614023453754; Mon, 22 Feb 2021 11:50:53 -0800 (PST) Received: from localhost.localdomain (dsl-154-25.b2b2c.ca. [66.158.154.25]) by smtp.gmail.com with ESMTPSA id e14sm11438619qte.18.2021.02.22.11.50.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Feb 2021 11:50:53 -0800 (PST) From: Maxim Cournoyer Date: Mon, 22 Feb 2021 14:50:03 -0500 Message-Id: <20210222195006.11357-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <87k1dbb260.fsf@gnu.org> References: <87k1dbb260.fsf@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vagrant Cascadian , Maxim Cournoyer Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 2.73 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=B8bY5qba; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: 0FD37266F0 X-Spam-Score: 2.73 X-Migadu-Scanner: scn0.migadu.com X-TUID: c01NEAmiOPVE * gnu/packages/virtualization.scm (qemu): Fix indentation and remove trailing #t. --- gnu/packages/virtualization.scm | 45 +++++++++++++++------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 8da57cf6ab..5d506cbf54 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -138,9 +138,9 @@ (method url-fetch) (uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz")) - (sha256 - (base32 - "1rd41wwlvp0vpialjp2czs6i3lsc338xc72l3zkbb7ixjfslw5y9")) + (sha256 + (base32 + "1rd41wwlvp0vpialjp2czs6i3lsc338xc72l3zkbb7ixjfslw5y9")) (patches (search-patches "qemu-build-info-manual.patch")) (modules '((guix build utils))) (snippet @@ -152,14 +152,16 @@ ;; https://lists.nongnu.org/archive/html/qemu-devel/2021-01/msg01545.html (substitute* '("linux-user/syscall.c") (("^([[:blank:]]*)const argtype ifreq_arg_type.*$" line indent) - (string-append line indent - "const argtype ifreq_max_type[] = { MK_STRUCT(STRUCT_ifmap_ifreq) };\n")) + (string-append + line indent + "const argtype ifreq_max_type[] = { MK_STRUCT(STRUCT_ifmap_ifreq) };\n")) (("^([[:blank:]]*)target_ifreq_size[[:blank:]]=.*$" _ indent) - (string-append indent "target_ifreq_size = thunk_type_size(ifreq_max_type, 0);"))) - #t)))) - (outputs '("out" "doc")) ;4.7 MiB of HTML docs - (build-system gnu-build-system) - (arguments + (string-append + indent + "target_ifreq_size = thunk_type_size(ifreq_max_type, 0);"))))))) + (outputs '("out" "doc")) ;4.7 MiB of HTML docs + (build-system gnu-build-system) + (arguments `(;; FIXME: Disable tests on i686 to work around ;; . #:tests? ,(or (%current-target-system) @@ -193,8 +195,7 @@ inputs))) (set-path-environment-variable "C_INCLUDE_PATH" '("include") - input-directories) - #t))) + input-directories)))) (add-after 'unpack 'extend-test-time-outs (lambda _ ;; These tests can time out on heavily-loaded and/or slow storage. @@ -218,16 +219,14 @@ ;; x86 CPUs (see https://issues.guix.info/43048 and ;; https://bugs.launchpad.net/qemu/+bug/1896263). (("check-qtest-i386-y \\+= bios-tables-test" all) - (string-append "# " all))) - #t)) + (string-append "# " all))))) (add-after 'patch-source-shebangs 'patch-/bin/sh-references (lambda _ ;; Ensure the executables created by these source files reference ;; /bin/sh from the store so they work inside the build container. (substitute* '("block/cloop.c" "migration/exec.c" "net/tap.c" "tests/qtest/libqtest.c") - (("/bin/sh") (which "sh"))) - #t)) + (("/bin/sh") (which "sh"))))) (replace 'configure (lambda* (#:key inputs outputs (configure-flags '()) #:allow-other-keys) @@ -272,8 +271,7 @@ (format port "#!/bin/sh exec smbd $@"))) (chmod "samba-wrapper" #o755) - (install-file "samba-wrapper" libexec)) - #t)) + (install-file "samba-wrapper" libexec)))) (add-after 'install 'move-html-doc (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -281,23 +279,22 @@ exec smbd $@"))) (qemu-doc (string-append doc "/share/doc/qemu-" ,version))) (mkdir-p qemu-doc) (rename-file (string-append out "/share/doc/qemu") - (string-append qemu-doc "/html"))) - #t))))) - (inputs ; TODO: Add optional inputs. + (string-append qemu-doc "/html")))))))) + (inputs ; TODO: Add optional inputs. `(("alsa-lib" ,alsa-lib) ("attr" ,attr) ("glib" ,glib) ("gtk+" ,gtk+) ("libaio" ,libaio) ("libattr" ,attr) - ("libcacard" ,libcacard) ; smartcard support - ("libcap-ng" ,libcap-ng) ; virtfs support requires libcap-ng & libattr + ("libcacard" ,libcacard) ; smartcard support + ("libcap-ng" ,libcap-ng) ; virtfs support requires libcap-ng & libattr ("libdrm" ,libdrm) ("libepoxy" ,libepoxy) ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libseccomp" ,libseccomp) - ("libusb" ,libusb) ;USB pass-through support + ("libusb" ,libusb) ;USB pass-through support ("mesa" ,mesa) ("ncurses" ,ncurses) ;; ("pciutils" ,pciutils) -- 2.30.1