From patchwork Sat Oct 19 07:56:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dariqq X-Patchwork-Id: 69101 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 ED7E427BBE2; Sat, 19 Oct 2024 08:57:57 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 9C60027BBE2 for ; Sat, 19 Oct 2024 08:57:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t24LF-0000nt-VK; Sat, 19 Oct 2024 03:57:41 -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 1t24LD-0000e7-NI for guix-patches@gnu.org; Sat, 19 Oct 2024 03:57:39 -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 1t24LD-000877-E7 for guix-patches@gnu.org; Sat, 19 Oct 2024 03:57:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=PdjtfghgWDu+sN/oYHz2pGdUq0izani7GitoLmgwRwU=; b=NZJKNg3xGBgphlr/rxL5IFGyZd1rnywF0wQf3MyTNNmVarCelmbYAlKxyfOulYoD25lzYa2ubqx/hp4+JgZ0zQM2w5E0BvGWY50uwh+1dWByHWEd2OxohjQ6TJ/12E9JR53iYG96zjG6x3+C6SiOASvyDjTPZXqBDSRnynaqsSQxuqG/2Z3oTDaUvteLXFG3237raRzTmRRJIHbeNHYt4lNr2AHN9ChrFcQ+ryUN6ew1TwAZRyfSzXeXz6cf8XOGIct3F+TSKgrx/luiNYPqDb39sijQr1quJMipFIqsmH9SXk3Q7putsigEb+sj53o/T24WxdOmJf6icug+J0Qriw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t24La-00018V-4o for guix-patches@gnu.org; Sat, 19 Oct 2024 03:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71968] [PATCH v6 1/5] gnu: Add yyjson. References: In-Reply-To: Resent-From: Dariqq Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Oct 2024 07:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71968 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71968@debbugs.gnu.org Cc: Dariqq Received: via spool by 71968-submit@debbugs.gnu.org id=B71968.17293246504272 (code B ref 71968); Sat, 19 Oct 2024 07:58:02 +0000 Received: (at 71968) by debbugs.gnu.org; 19 Oct 2024 07:57:30 +0000 Received: from localhost ([127.0.0.1]:41214 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t24L3-00016p-8y for submit@debbugs.gnu.org; Sat, 19 Oct 2024 03:57:29 -0400 Received: from mout01.posteo.de ([185.67.36.65]:37239) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t24L0-00016V-6q for 71968@debbugs.gnu.org; Sat, 19 Oct 2024 03:57:27 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 40F48240027 for <71968@debbugs.gnu.org>; Sat, 19 Oct 2024 09:56:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1729324616; bh=Vp6LIzrx5FgDsVsQLfahso4y2XNyjdr2SiiENk/d20A=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=R/P47h19ncwqyf+XUT6/8SSdxTs2nsTaX+a1E90QljbOSu+MJ/v7AJpFIB7Lhg6/W hjLhu/JPjLMG3HoVqPUGV4po+Q3Qfr7Fua+NGItvmveVFZc82BtCi9/Yo+15/K2wgs VmqEmo5mTI6PKGJzvnoHZLUOdzogeke+i629ysDlYvS8FQzDywYPZdWduDtmNKBVb4 TwNQjPu2VkZk407EgKuxYGNIOrr6smuuNm0eXKtv8pdQaRtAvqGRYOlWx7/2I/7VPG jZicDOqfm+xPHDlwDZvxLOU4J/nSd30G7Iy08rjoMsL8lwtdq5li9eQ4Hyzsatitn7 peyJVD7FR56gQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4XVv6Z1tXLz9rxP; Sat, 19 Oct 2024 09:56:53 +0200 (CEST) From: Dariqq Date: Sat, 19 Oct 2024 07:56:36 +0000 Message-ID: <0f29d3c61209681e684687686cf650e309aa63b8.1729324600.git.dariqq@posteo.net> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/c.scm (yyjson): New variable. Change-Id: Ica9ff2e1b6676aa8761eb33cbab76154f17e443f --- gnu/packages/c.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) base-commit: 48097f511929053468ce6f09e0a24644c90fe670 diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 13fdb99424..2e46b7a10d 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -1764,3 +1764,41 @@ (define-public pcg-c Linear Congruential Generator (LCG) with a permutation function to increase output randomness while retaining speed, simplicity, and conciseness.") (license (list license:expat license:asl2.0))))) ; dual licensed + +(define-public yyjson + (package + (name "yyjson") + (version "0.9.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ibireme/yyjson") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "169rqh7mh01g5j4qkqjgfmgnyqjf9r8qxiywf4jkgcb7ln4j64w9")))) + (arguments + (list + #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON" + "-DYYJSON_BUILD_TESTS=ON"))) + (build-system cmake-build-system) + (home-page "https://github.com/ibireme/yyjson") + (synopsis "High performance JSON library written in ANSI C") + (description + "Yyjson is a high performance JSON library written in ANSI C. Some features include +@itemize +@item Fast: can read or write gigabytes per second JSON data on modern CPUs. +@item Portable: complies with ANSI C (C89) for cross-platform compatibility. +@item Strict: complies with RFC 8259 JSON standard, ensuring strict +number format and UTF-8 validation. +@item Extendable: offers options to allow comments, trailing commas, NaN/Inf, + and custom memory allocator. +@item Accuracy: can accurately read and write int64, uint64, and double numbers. +@item Flexible: supports unlimited JSON nesting levels, \u0000 characters, +and non null-terminated strings. +@item Manipulation: supports querying and modifying using JSON Pointer, +JSON Patch and JSON Merge Patch. +@item Developer-Friendly: easy integration with only one .h and one .c file. +@end itemize") + (license license:expat))) From patchwork Sat Oct 19 07:56:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dariqq X-Patchwork-Id: 69103 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 4DF0427BBEA; Sat, 19 Oct 2024 08:58:03 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 1260E27BBE2 for ; Sat, 19 Oct 2024 08:58:03 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t24LF-0000iy-31; Sat, 19 Oct 2024 03:57:41 -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 1t24LD-0000e8-NL for guix-patches@gnu.org; Sat, 19 Oct 2024 03:57:39 -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 1t24LD-000879-Dt for guix-patches@gnu.org; Sat, 19 Oct 2024 03:57:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=wyo0BV3L5iAFDasd/sw8xv3EdG/ekkUs0ubCuMD66o8=; b=QMPORHNmUwMdpICsn/g938wTaOEKN2lIRcd5uhP3nJrF8i5rA2yVNgF6cO5N3NIDGA60wbXMFDpFU6h1wN95NrfIiTPrczMOj4rpOFd2aJNiEP3Pd/FkX89jro4ClJoQpGa1gmqxwG6vTCmt4oRuatR4G0aVGmbijfK90nk5t/SRNu0HxTd2xwnl6iIM2OTz0oJoWNXIGyiVw933hlr+KDYHKSQ+ENzhW2AR6rUdJz5N5xnbaVxkWZmhO54rV2OobjVyI5YNafs0NUEkcdpXt2QqP87w5sExeyo2+01rIVc1+Un2wDAadcQofArthkbBpudHwNgb/729/OpTOKopNA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t24La-00018c-Jf for guix-patches@gnu.org; Sat, 19 Oct 2024 03:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71968] [PATCH v6 2/5] gnu: fastfetch: Unbundle yyjson. Resent-From: Dariqq Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Oct 2024 07:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71968 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71968@debbugs.gnu.org Cc: Dariqq Received: via spool by 71968-submit@debbugs.gnu.org id=B71968.17293246534288 (code B ref 71968); Sat, 19 Oct 2024 07:58:02 +0000 Received: (at 71968) by debbugs.gnu.org; 19 Oct 2024 07:57:33 +0000 Received: from localhost ([127.0.0.1]:41218 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t24L6-000174-R9 for submit@debbugs.gnu.org; Sat, 19 Oct 2024 03:57:33 -0400 Received: from mout01.posteo.de ([185.67.36.65]:57045) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t24L3-00016b-Ow for 71968@debbugs.gnu.org; Sat, 19 Oct 2024 03:57:30 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id B873F240027 for <71968@debbugs.gnu.org>; Sat, 19 Oct 2024 09:57:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1729324620; bh=Rl+O+NbczxEaGnQXCtAckgUGkOaed9J7IRL81gmclwo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=gIwI9UPkQsSmaEdqQjBP3hlHygC4xhlLeOGYOrwE7Ohv4nGevx0RapiXIRmS4KZXG yBBEcmf1hhY6rjxzDFGeBl/njty/FJAAeCCRdKmjpNSMG+zWi24R43ol1fRQosbt7u PWfe4GL/zZI5/7mYmmWprvcfvCubFKdgJ3EBdtUjkP4S9cvO8jOgysnxIXzc8YmiIr GmODc2kR4JLx+xbmzyS/0RTnsclEBx7nadG7/xmhVTNkQu1thQIOTw2l3J091z9moL 2USBGoXVxlqGGTthuDq57QIcSWw8gBGP4kCA2Mf6Jww44fTp5rcFGYKANpA1C9EXXm LwQMagznLS+nw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4XVv6h2ggmz9rxD; Sat, 19 Oct 2024 09:57:00 +0200 (CEST) From: Dariqq Date: Sat, 19 Oct 2024 07:56:37 +0000 Message-ID: <67c7a01f7d5c1be6dba6a134dca28f416b453972.1729324600.git.dariqq@posteo.net> In-Reply-To: <0f29d3c61209681e684687686cf650e309aa63b8.1729324600.git.dariqq@posteo.net> References: <0f29d3c61209681e684687686cf650e309aa63b8.1729324600.git.dariqq@posteo.net> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/admin.scm (fastftech) [origin]: Add snippet to remove third party code. [#:configure-flags]: Add "-DENABLE_SYSTEM_YYJSON=ON" [inputs]: Add yyjson. Change-Id: I8175b8f4a8d55ff3b9d5fa4cb99f1fc1ad15fd97 --- gnu/packages/admin.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 2cb50ed4a8..bbea957a87 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4289,7 +4289,10 @@ (define-public fastfetch (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "112dvfx7gvp6n20i1lkd0jbh897jf7bxjxq96bj4099j3x313y3m")))) + (base32 "112dvfx7gvp6n20i1lkd0jbh897jf7bxjxq96bj4099j3x313y3m")) + (modules '((guix build utils))) + (snippet '(begin + (delete-file-recursively "src/3rdparty"))))) (build-system cmake-build-system) (inputs (list dbus glib @@ -4297,9 +4300,12 @@ (define-public fastfetch libxcb mesa wayland + yyjson zlib)) ;for imagemagick and an #ifdef (native-inputs (list pkg-config)) - (arguments (list #:tests? #f)) ; no test target + (arguments + (list #:tests? #f ; no test target + #:configure-flags #~(list "-DENABLE_SYSTEM_YYJSON=ON"))) (home-page "https://github.com/fastfetch-cli/fastfetch") (synopsis "Display system information in a stylized manner") (description From patchwork Sat Oct 19 07:56:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dariqq X-Patchwork-Id: 69102 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 7BA0527BBEA; Sat, 19 Oct 2024 08:58:00 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 3052D27BBE2 for ; Sat, 19 Oct 2024 08:58:00 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t24LI-0000tD-Cb; Sat, 19 Oct 2024 03:57:44 -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 1t24LE-0000eB-23 for guix-patches@gnu.org; Sat, 19 Oct 2024 03:57:40 -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 1t24LD-00087I-Mz for guix-patches@gnu.org; Sat, 19 Oct 2024 03:57:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=ziFzadx8EkSILr8BTwOp4TndemJAPOoklahgZNf8gaw=; b=rimkVtvxv1jPNmQFTLmGTsB3zaIYeuXFqgUEskml+K06flc3Ofib/1gKHq78NNJrF8d/0aff/6keRyLzg6ABqIXIuRYaCvchOkP7nH99m63OpzTYrJL0+qrOLEIFmCBOJ4N6sYz1OZk62JP3TgOpP3VJ24Gc9CQAloD8azj+v2/2CxqMQe1dUqqzO1xnKzuADUc4l5aIf/KneCdVDlLJ5ENOAIRtqvll4VisWcR1OGQCA8Ahb1oo+gHX+GMlSZTvIs+YGVlAevZO0GXJzOsMCWVgM1XQDjkbICBYs9G4ID8R/gIxa1X2iho0QLKlsMB8golnikWYssk/peqLZLAt4A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t24Lb-00018j-42 for guix-patches@gnu.org; Sat, 19 Oct 2024 03:58:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71968] [PATCH v6 3/5] gnu: fastfetch: Add more configure flags. Resent-From: Dariqq Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Oct 2024 07:58:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71968 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71968@debbugs.gnu.org Cc: Dariqq Received: via spool by 71968-submit@debbugs.gnu.org id=B71968.17293246574307 (code B ref 71968); Sat, 19 Oct 2024 07:58:03 +0000 Received: (at 71968) by debbugs.gnu.org; 19 Oct 2024 07:57:37 +0000 Received: from localhost ([127.0.0.1]:41222 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t24LB-00017M-8A for submit@debbugs.gnu.org; Sat, 19 Oct 2024 03:57:37 -0400 Received: from mout02.posteo.de ([185.67.36.66]:47197) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t24L8-00016o-M9 for 71968@debbugs.gnu.org; Sat, 19 Oct 2024 03:57:35 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id BF2BE240101 for <71968@debbugs.gnu.org>; Sat, 19 Oct 2024 09:57:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1729324624; bh=+a0runpuny73p0yY1mNLZ5gkfK6taJmZ+zANuRIC0Jg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=A4uRjq2nAOQPyBNAmHXi/q3DlJ+i/I8jGADIMNN1HkxI0sPYuLfKuSTq5UxZg74G6 XlTk/MtIJI0CzgxqhIeoN2sYS5zDiMKDza7rMgu4m1DWASy4qHwJIAoGx4ZqDCUGoP iWaHbSWWb7eAoip/KocalcpwfzR+9jpsoe4Wv+X0UiB53i+D8VooV/j9bUZrcF/yVl WM1vkORkXpodshOTFCh7jj/km+56OKNvb1K/qqx7zOR+CTXWqTK98mXpluZtG6m2U3 1RUw6l5pefYKgSevLcemDaEblNiIMxImHLETk7Oex2w5CEYzrjZ9n6e8cablxrnDlE Jau/l5tKqV2ew== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4XVv6m0b6nz9rxQ; Sat, 19 Oct 2024 09:57:04 +0200 (CEST) From: Dariqq Date: Sat, 19 Oct 2024 07:56:38 +0000 Message-ID: <951b3e902e8584d12af678c624e7bc3e808facdc.1729324600.git.dariqq@posteo.net> In-Reply-To: <0f29d3c61209681e684687686cf650e309aa63b8.1729324600.git.dariqq@posteo.net> References: <0f29d3c61209681e684687686cf650e309aa63b8.1729324600.git.dariqq@posteo.net> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Most importantly the dependencies are now linked dynamically to avoid writing out a LD_LIBRARY_PATH wrapper. Also build the tests and skip installing the license file. Additionally provide custom paths to pci-ids and amdgpu-ids. * gnu/packages/admin.scm (fastfetch) (arguments): Move above inputs. [#:configure-flags]: Add -DBUILD_TESTS=ON, -DINSTALL_LICENSE=OFF, -DBINARY_LINK_TYPE=dynamic and set -DCUSTOM_PCI_IDS_PATH and -DCUSTOM_AMDGPU_IDS_PATH. [#:tests]: Remove as now there are tests available. [inputs]: Add hwdata and libdrm for the custom paths. Change-Id: I9f86b49f0a116bcee91ca15b6e77cfbb3867e290 --- gnu/packages/admin.scm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index bbea957a87..ed6cd7de95 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4294,18 +4294,29 @@ (define-public fastfetch (snippet '(begin (delete-file-recursively "src/3rdparty"))))) (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DENABLE_SYSTEM_YYJSON=ON" + "-DBINARY_LINK_TYPE=dynamic" + "-DBUILD_TESTS=ON" + "-DINSTALL_LICENSE=OFF" + (string-append "-DCUSTOM_PCI_IDS_PATH=" + #$(this-package-input "hwdata") + "/share/hwdata/pci.ids") + (string-append "-DCUSTOM_AMDGPU_IDS_PATH=" + #$(this-package-input "libdrm") + "share/libdrm/amdgpu.ids")))) (inputs (list dbus glib + hwdata imagemagick + libdrm libxcb mesa wayland yyjson zlib)) ;for imagemagick and an #ifdef (native-inputs (list pkg-config)) - (arguments - (list #:tests? #f ; no test target - #:configure-flags #~(list "-DENABLE_SYSTEM_YYJSON=ON"))) (home-page "https://github.com/fastfetch-cli/fastfetch") (synopsis "Display system information in a stylized manner") (description From patchwork Sat Oct 19 07:56:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dariqq X-Patchwork-Id: 69100 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 7846C27BBE9; Sat, 19 Oct 2024 08:57:53 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 CFC6E27BBE2 for ; Sat, 19 Oct 2024 08:57:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t24LG-0000pq-Uv; Sat, 19 Oct 2024 03:57:42 -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 1t24LE-0000i9-Lt for guix-patches@gnu.org; Sat, 19 Oct 2024 03:57:40 -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 1t24LE-00087R-7n for guix-patches@gnu.org; Sat, 19 Oct 2024 03:57:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=0zv2g0mNiZ9N73SzuOyizu9vVhzCa41GNYcYy3XVlTw=; b=ZoL/7s6XXZjEc1FuwMnnBhbLsmdP+FZd/zC0vfTLZjBj90KczRGpa391kQshj0QfS5Hn3mQU8ykwP8lh3HOsuWUOD/LtBxxS5uLmaJG2CC9i6BUrGWDaMNqc/OoAxtqpx92Te+Nx/7pmBmphro7IPUcDcTRj/xmSL235ilOJcTzJqO7lxHh9xtcnjQXn4ALUluQplJwEgj2oKUy+zGexd8+N2cfdUGLgGC2hFNFAWzjCnxqSTEDIaVC7dOXVZ0pn6EYHvNhWF/HJo3+VxUSXqB25MdzhTDTPbz3s5seQCplom3GARPyGjBoqpO3+oa6TYFPlmP9h2RzM1T/fpNn/Og==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t24Lb-00018r-Ko for guix-patches@gnu.org; Sat, 19 Oct 2024 03:58:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71968] [PATCH v6 4/5] gnu: yyjson: Update to 0.10.0. Resent-From: Dariqq Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Oct 2024 07:58:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71968 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71968@debbugs.gnu.org Cc: Dariqq Received: via spool by 71968-submit@debbugs.gnu.org id=B71968.17293246614328 (code B ref 71968); Sat, 19 Oct 2024 07:58:03 +0000 Received: (at 71968) by debbugs.gnu.org; 19 Oct 2024 07:57:41 +0000 Received: from localhost ([127.0.0.1]:41228 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t24LE-00017d-Mp for submit@debbugs.gnu.org; Sat, 19 Oct 2024 03:57:41 -0400 Received: from mout01.posteo.de ([185.67.36.65]:41363) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t24LC-000175-9G for 71968@debbugs.gnu.org; Sat, 19 Oct 2024 03:57:39 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 52B35240027 for <71968@debbugs.gnu.org>; Sat, 19 Oct 2024 09:57:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1729324629; bh=mEyXOIkyY3ri1UGL5V9f1DLdoGlQGgidM8hz1/BmjEc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=GJp9KRUIe4EMWsyCuwLur3jJEXwk1YZ1tP9xd4UnIG+T2oMAIaIGtusG4W4mMqej8 UEjvcl5Fg2wnJvK4eLX7SNgy7Xr6AlyShnbpKifRkaMvTAT0uYLr6I+qLhrX1fAr2v qOWZaE7D5kvlfpyIpZ+sSqv5XevyJiry3Jk8+wOGcI5YxwA8PfVAPHMLgLabEAI4Pb ULQ/wUgSBkneiQmDpeTFPKJ1BHmnG4+feu11hZWN9sbDJ+TDkEPVtyPP0EXaTAZhmD cfx1p0Da5M4HKXfWSS4LWUuvttGz1sdC0DsLuocObVZTgEueYUGrA61HZpVVYi2yEd kprFlIkHUmVSw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4XVv6r6hQRz9rxD; Sat, 19 Oct 2024 09:57:08 +0200 (CEST) From: Dariqq Date: Sat, 19 Oct 2024 07:56:39 +0000 Message-ID: <580e765e1ebbf0c90e4908d5d72a69e561ac66c4.1729324600.git.dariqq@posteo.net> In-Reply-To: <0f29d3c61209681e684687686cf650e309aa63b8.1729324600.git.dariqq@posteo.net> References: <0f29d3c61209681e684687686cf650e309aa63b8.1729324600.git.dariqq@posteo.net> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/c.scm (yyjson): Update to 0.10.0. Change-Id: Id8be82026eb0d102272b1128cce80a5609d309d0 --- gnu/packages/c.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 2e46b7a10d..2e368ad884 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -1768,7 +1768,7 @@ (define-public pcg-c (define-public yyjson (package (name "yyjson") - (version "0.9.0") + (version "0.10.0") (source (origin (method git-fetch) @@ -1777,7 +1777,7 @@ (define-public yyjson (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "169rqh7mh01g5j4qkqjgfmgnyqjf9r8qxiywf4jkgcb7ln4j64w9")))) + (base32 "0kmzgs24v0rxlibg4qwlm6yplzs96pgxb1gyviijhkra9z7lx7ws")))) (arguments (list #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON" From patchwork Sat Oct 19 07:56:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dariqq X-Patchwork-Id: 69104 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 A5EE127BBEA; Sat, 19 Oct 2024 08:58:13 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 60FE727BBE2 for ; Sat, 19 Oct 2024 08:58:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t24LI-0000sw-Ab; Sat, 19 Oct 2024 03:57:44 -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 1t24LE-0000jq-Vx for guix-patches@gnu.org; Sat, 19 Oct 2024 03:57:41 -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 1t24LE-00087Z-NF for guix-patches@gnu.org; Sat, 19 Oct 2024 03:57:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=uSjVqMNt5OuzPvJhBun92qNwtI8Ny/uiX84ivFOiU0Q=; b=Nis1R6KPnxTvsvGZUSOsJWa6Zirgs1bUMz954dwvSVLKbC9yvZBs8sjeaHIanu59Ox2JngkOfKtEeJMzcIG8hrtkbIPf/2M4hq6YsizoDZEnMFOKlW4r7MD1ataWhz6BAQe6WY2iQJXmeXJ66ZGtRqoWNgWALOpNuiI4FrJ/mwAIJTk8BLSlVGCx7G7koyrfPjPSrF8hF1HyRzgCqRaR8smp094pgq+hHh+zD22nrJIjPPxIXw7Nt2SlgtJMWxofyVpEtnHnh7HlCXZNImOYMiW5mEB/GNq3jrELY93//H7GOvSyu6nurk1dKifrCpTRE4+C97NYhRTwt+4jx1WSxw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t24Lc-00018y-4B for guix-patches@gnu.org; Sat, 19 Oct 2024 03:58:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71968] [PATCH v6 5/5] gnu: fastfetch: Update to 2.27.1. Resent-From: Dariqq Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Oct 2024 07:58:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71968 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71968@debbugs.gnu.org Cc: Dariqq Received: via spool by 71968-submit@debbugs.gnu.org id=B71968.17293246644338 (code B ref 71968); Sat, 19 Oct 2024 07:58:04 +0000 Received: (at 71968) by debbugs.gnu.org; 19 Oct 2024 07:57:44 +0000 Received: from localhost ([127.0.0.1]:41230 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t24LI-00017t-45 for submit@debbugs.gnu.org; Sat, 19 Oct 2024 03:57:44 -0400 Received: from mout02.posteo.de ([185.67.36.66]:37803) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t24LE-00017F-Hy for 71968@debbugs.gnu.org; Sat, 19 Oct 2024 03:57:41 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 1E25C240101 for <71968@debbugs.gnu.org>; Sat, 19 Oct 2024 09:57:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1729324631; bh=mhkKGpaP3nZ5nHjXvkrpGYlVsWUoZOldF/37UiKorqE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=n/q8nzbG9nHQgCFe41QLyqcrJuGiajNfiLESjjM93YMLeghlf/d3u1QhSw4eG8aLV sXsT4j4Oq3fC8dnArNnqK51bVk64kn7kcAni8gd/1A7a3ByxkZrFUs0MGIg4Deqflx WbPX92zftqIs1YkoynW8HJHZV24zI3iGrQVEI1HkkZBUNohuZOTjavRc7bbqF9DHXI qnZB4A0fD2eRFSeDv43YFMQ99zKkm3CGgOPlebZ9a9yv9ejlq4/2cUBkprQOlLyjsQ S2aUbKQrcALTFqhXozER8W8T+8X/OiA+ZP/1jbkIU2eqOcGcRJmwZ7mi0rYrRe6wlY 93B5GbES6bHPQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4XVv6t5GQpz9rxQ; Sat, 19 Oct 2024 09:57:10 +0200 (CEST) From: Dariqq Date: Sat, 19 Oct 2024 07:56:40 +0000 Message-ID: <867deba90ff9736a1c59b376a9915d6df125a882.1729324600.git.dariqq@posteo.net> In-Reply-To: <0f29d3c61209681e684687686cf650e309aa63b8.1729324600.git.dariqq@posteo.net> References: <0f29d3c61209681e684687686cf650e309aa63b8.1729324600.git.dariqq@posteo.net> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Also add python-minimal to minify the help.json file at build time. Disable DIRECTX_HEADERS. * gnu/packages/admin.scm (fastfetch): Update to 2.27.1. [#:configure-flags]: Add ENABLE_DIRECTX_HEADERS=OFF [native-inputs]: Add python-minimal. Change-Id: I52d5cf244726bf4362f658f818094a483e3b3d01 --- gnu/packages/admin.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index ed6cd7de95..5b2c7f1a6f 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4280,7 +4280,7 @@ (define-public pfetch (define-public fastfetch (package (name "fastfetch") - (version "2.16.0") + (version "2.27.1") (source (origin (method git-fetch) @@ -4289,7 +4289,7 @@ (define-public fastfetch (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "112dvfx7gvp6n20i1lkd0jbh897jf7bxjxq96bj4099j3x313y3m")) + (base32 "07k9lch7av7146m81h36grnwgasfl4yiqs8lwm8f2v2ycfybmw1p")) (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "src/3rdparty"))))) @@ -4300,6 +4300,7 @@ (define-public fastfetch "-DBINARY_LINK_TYPE=dynamic" "-DBUILD_TESTS=ON" "-DINSTALL_LICENSE=OFF" + "-DENABLE_DIRECTX_HEADERS=OFF" (string-append "-DCUSTOM_PCI_IDS_PATH=" #$(this-package-input "hwdata") "/share/hwdata/pci.ids") @@ -4316,7 +4317,7 @@ (define-public fastfetch wayland yyjson zlib)) ;for imagemagick and an #ifdef - (native-inputs (list pkg-config)) + (native-inputs (list pkg-config python-minimal)) (home-page "https://github.com/fastfetch-cli/fastfetch") (synopsis "Display system information in a stylized manner") (description