From patchwork Sat May 14 22:10:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 39263 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 A469427BBEB; Sat, 14 May 2022 23:34:01 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS 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 6CFF427BBEA for ; Sat, 14 May 2022 23:34:01 +0100 (BST) Received: from localhost ([::1]:59266 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nq0Km-0006WU-Kt for patchwork@mira.cbaines.net; Sat, 14 May 2022 18:34:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56936) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nq0Jq-0004tb-VD for guix-patches@gnu.org; Sat, 14 May 2022 18:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53771) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nq0Jq-0008Mi-MH for guix-patches@gnu.org; Sat, 14 May 2022 18:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nq0Jq-0001np-JN for guix-patches@gnu.org; Sat, 14 May 2022 18:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55419] [PATCH 3/5] gnu: emacs-no-x: Use new package style. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 14 May 2022 22:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55419 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55419@debbugs.gnu.org Received: via spool by 55419-submit@debbugs.gnu.org id=B55419.16525675706880 (code B ref 55419); Sat, 14 May 2022 22:33:02 +0000 Received: (at 55419) by debbugs.gnu.org; 14 May 2022 22:32:50 +0000 Received: from localhost ([127.0.0.1]:47662 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq0Je-0001mt-CO for submit@debbugs.gnu.org; Sat, 14 May 2022 18:32:50 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:39621) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq0Ja-0001lz-EC for 55419@debbugs.gnu.org; Sat, 14 May 2022 18:32:46 -0400 Received: by mail-ej1-f68.google.com with SMTP id bv19so22305829ejb.6 for <55419@debbugs.gnu.org>; Sat, 14 May 2022 15:32:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:content-transfer-encoding:message-id :mime-version; bh=K9BHyIFW5Q30k6EsP8nusleFZUDRNShJYifzzMDAbXQ=; b=hnoGO1NQdrGHxr/jRA3MoyVR5g8RthVT6hit/kNaMAR4Mj47s2GmGNCt/BMLNCoCbI fx325XtVNmqhZ30fzjwWCflqZFYl6a7P7fzHbAKrn3TYhKl1MaX2LQp2VoePFbNLg5tW zfCH7O5MbuenOtPzLl0S0rQepuxsmd+NNc3geaNz9MHkW6PmAbVOKeiToOcSEZhxy4R8 aEgwbevxoyTzpLaRBk0wfo7fwd7CQvneuR/co5Ln75fYHYrVHEWKir5xr+LYC0OnKSGr En1cv01U39T3IjlXRFIlKUSZFrcJYX/wukuQii0Lytu4GEr6TGhD+EKaMoHSIAydmIl1 qTUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:content-transfer-encoding :message-id:mime-version; bh=K9BHyIFW5Q30k6EsP8nusleFZUDRNShJYifzzMDAbXQ=; b=4OcXYYd/42SJyVrhBSKAH++B4M0WQ09qXPTPjCbXeotiWEjN0g+gMMJFK3jJxs8gtY TgX8DvAyAUOm48nYtwGHgV5PNT3QI8ja9zPqPNrQqbbo1JqtjhABW/Z2vWVnQ/0rnhre DfzqCQiYGr8z0y1yGDru6XN27UGufEZlTtIWyl8+zYsvmqPVKFKNYiKtVxXjpV9kHq4e +4GgfWKjDJh4nBe1I3MG48WoELsSfQqAAAEDOLrUBkYMhflr4l5utdue6fkcnc6H4UE8 Vktuku5AM5bMhX7D/891BzR3pAofoKFpZIXa9KGS/eNEgGGpBKTfPPPz+wzlKCBOmPfi fVTw== X-Gm-Message-State: AOAM530w4DH6BNAggGoJCqzb7QcuMV4aVzHVuZxw1QcL6a+fOAbRk4hc fycTlW7Nq7npREv7RS6QCUEYXyck9JE= X-Google-Smtp-Source: ABdhPJw45Ydjiv+20w+InBPLM/WxSiNaMVsXDBXTE7tgb7Nv9uQesKls68v3buKsSWFommJWAQfm5A== X-Received: by 2002:a17:906:d54b:b0:6f4:d14b:bb91 with SMTP id cr11-20020a170906d54b00b006f4d14bbb91mr9671939ejc.314.1652567560677; Sat, 14 May 2022 15:32:40 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id qx16-20020a170907b59000b006f3ef214e53sm2064161ejc.185.2022.05.14.15.32.40 for <55419@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 15:32:40 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 15 May 2022 00:10:59 +0200 Message-ID: <45ccc5b1953f1388438d774e9de63b8ec6e4b6ee.camel@gmail.com> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs.scm (emacs-no-x)[arguments]: Convert to list of G-Expressions. [inputs]: Use modify-inputs. --- gnu/packages/emacs.scm | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index e3eba851ff..027afc811a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -407,22 +407,20 @@ (define-public emacs-no-x (synopsis "The extensible, customizable, self-documenting text editor (console only)") (build-system gnu-build-system) - (inputs (fold alist-delete - (package-inputs emacs) - '("libx11" "gtk+" "libxft" "libtiff" "giflib" "libjpeg" - "imagemagick" "libpng" "librsvg" "libxpm" "libice" - "libsm" "cairo" "pango" "harfbuzz" - - ;; These depend on libx11, so remove them as well. - "libotf" "m17n-lib" "dbus"))) + (inputs (modify-inputs (package-inputs emacs) + (delete "libx11" "gtk+" "libxft" "libtiff" "giflib" "libjpeg" + "imagemagick" "libpng" "librsvg" "libxpm" "libice" + "libsm" "cairo" "pango" "harfbuzz" + ;; These depend on libx11, so remove them as well. + "libotf" "m17n-lib" "dbus"))) (arguments (substitute-keyword-arguments (package-arguments emacs) - ((#:configure-flags flags ''()) - `(delete "--with-cairo" ,flags)) + ((#:configure-flags flags #~'()) + #~(delete "--with-cairo" #$flags)) ((#:phases phases) - `(modify-phases ,phases - (delete 'restore-emacs-pdmp) - (delete 'strip-double-wrap))))))) + #~(modify-phases #$phases + (delete 'restore-emacs-pdmp) + (delete 'strip-double-wrap))))))) (define-public emacs-no-x-toolkit (package/inherit emacs