From patchwork Wed Jul 17 10:01:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chris X-Patchwork-Id: 29353 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 0BBE627BBE9; Wed, 17 Jul 2024 11:04:23 +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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 C44C427BBE2 for ; Wed, 17 Jul 2024 11:04:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sU1Vx-0007kA-RX; Wed, 17 Jul 2024 06:04:01 -0400 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 1sU1Vv-0007aU-4i for guix-patches@gnu.org; Wed, 17 Jul 2024 06:03:59 -0400 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 1sU1Vu-0000iu-SG for guix-patches@gnu.org; Wed, 17 Jul 2024 06:03:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sU1Vx-0001fi-Nn for guix-patches@gnu.org; Wed, 17 Jul 2024 06:04:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72152] [PATCH] gnu: highlight: Use correct location for default configuration files. Resent-From: chris Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Jul 2024 10:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72152 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72152@debbugs.gnu.org Cc: chris X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17212106376414 (code B ref -1); Wed, 17 Jul 2024 10:04:01 +0000 Received: (at submit) by debbugs.gnu.org; 17 Jul 2024 10:03:57 +0000 Received: from localhost ([127.0.0.1]:35115 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sU1Vt-0001fO-0j for submit@debbugs.gnu.org; Wed, 17 Jul 2024 06:03:57 -0400 Received: from lists.gnu.org ([209.51.188.17]:37052) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sU1Vq-0001fE-76 for submit@debbugs.gnu.org; Wed, 17 Jul 2024 06:03:55 -0400 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 1sU1Vm-000757-QY for guix-patches@gnu.org; Wed, 17 Jul 2024 06:03:50 -0400 Received: from mx.kolabnow.com ([212.103.80.155]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sU1Vj-0000hO-Qt for guix-patches@gnu.org; Wed, 17 Jul 2024 06:03:50 -0400 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id 35E9422302C1 for ; Wed, 17 Jul 2024 12:03:34 +0200 (CEST) Authentication-Results: ext-mx-out011.mykolab.com (amavis); dkim=pass (2048-bit key) reason="pass (just generated, assumed good)" header.d=kolabnow.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:mime-version:message-id:date:date :subject:subject:from:from:received:received:received; s= dkim20240523; t=1721210612; x=1723025013; bh=n2bVG6Nvquy0mAdE6EA yQ+/yI/fk9iSkSVKiiZGWojM=; b=S5tdZrjSpOb1RMAoy/N0Y5DxcZn0rX9zzua ab5CRRfGLZKkJe26aix2+enbBVZ65tSfEh/VD1X+dttrQuD3q8/r/JM5L0/xStxU C6UMZ1YHo567dausGcSqe/IvxZRbTfxWNqtON/uhMADwtctc/MqMHbTg/GxxEOYO dbWmOMCJwtyivzgUA9kBN9y3zKNeGswnmfX7GvAlhQhPnUNguRzQv67ZUyreZQVj cde6UgUpG/K/WkyADx+AxyM8cOOYinnDV7KD1EPMtHB0Hbr3g0bITVHr8A9xNsId OoZWCWkXCxloDsEg7eQQP294yaRoSWig1dZwV+RBcYnJS3Dsjsw== X-Virus-Scanned: amavis at mykolab.com Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out011.mykolab.com [127.0.0.1]) (amavis, port 10024) with ESMTP id 2eHrVaI8Nwwy for ; Wed, 17 Jul 2024 12:03:32 +0200 (CEST) Received: from int-mx011.mykolab.com (unknown [10.9.13.11]) by mx.kolabnow.com (Postfix) with ESMTPS id 7F8FF25F919B for ; Wed, 17 Jul 2024 12:03:31 +0200 (CEST) Received: from ext-subm010.mykolab.com (unknown [10.9.6.10]) by int-mx011.mykolab.com (Postfix) with ESMTPS id 2A24F30758EE for ; Wed, 17 Jul 2024 12:03:31 +0200 (CEST) From: chris Date: Wed, 17 Jul 2024 03:01:51 -0700 Message-ID: <2879046cb3a25f854aef5f3e2c8c6528bfb3b484.1721210511.git.chris@bumblehead.com> MIME-Version: 1.0 Received-SPF: pass client-ip=212.103.80.155; envelope-from=chris@bumblehead.com; helo=mx.kolabnow.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, SPF_HELO_NONE=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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/pretty-print.scm (highlight): Use correct location for default configuration files. Resolves missing filetypes.conf warnings. [arguments]: Output default configurations to etc. Change-Id: Ic9404cfb3490e5a212d46dfc483ee5eacbb906aa --- gnu/packages/pretty-print.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) base-commit: a800c49fb767f549fbc0eefe8dce6daa5da8604c diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index 220761fc07..e754b31668 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -369,11 +369,9 @@ (define-public highlight (arguments (list #:tests? #f ;no tests - #:make-flags #~(let ((confdir (string-append #$output - "/share/highlight/config/"))) - (list (string-append "PREFIX=" #$output) - (string-append "HL_CONFIG_DIR=" confdir) - (string-append "conf_dir=" confdir))) + #:make-flags #~(list (string-append "PREFIX=" #$output) + (string-append "HL_CONFIG_DIR=" #$output "/etc/") + (string-append "conf_dir=" #$output "/etc/")) #:phases #~(modify-phases %standard-phases (delete 'configure) ;no configure script (add-after 'unpack 'fix-search-for-lua