From patchwork Wed Dec 1 04:29:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 34898 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 BF81F27BBEA; Wed, 1 Dec 2021 04:31:43 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 731F327BBE9 for ; Wed, 1 Dec 2021 04:31:43 +0000 (GMT) Received: from localhost ([::1]:54442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1msHHS-00022T-JN for patchwork@mira.cbaines.net; Tue, 30 Nov 2021 23:31:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1msHGo-0001Yj-71 for guix-patches@gnu.org; Tue, 30 Nov 2021 23:31:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59663) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1msHGn-0005U8-TZ for guix-patches@gnu.org; Tue, 30 Nov 2021 23:31:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1msHGn-0006sw-Q4 for guix-patches@gnu.org; Tue, 30 Nov 2021 23:31:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51885] [PATCH 1/4] gnu: Add asmjit. References: In-Reply-To: Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Dec 2021 04:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51885@debbugs.gnu.org Cc: Raghav Gururajan , Julien Lepiller , Disseminate Dissent , jgart Received: via spool by 51885-submit@debbugs.gnu.org id=B51885.163833300622994 (code B ref 51885); Wed, 01 Dec 2021 04:31:01 +0000 Received: (at 51885) by debbugs.gnu.org; 1 Dec 2021 04:30:06 +0000 Received: from localhost ([127.0.0.1]:42972 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msHFt-0005yL-71 for submit@debbugs.gnu.org; Tue, 30 Nov 2021 23:30:05 -0500 Received: from out0.migadu.com ([94.23.1.103]:27053) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msHFk-0005vK-Vq for 51885@debbugs.gnu.org; Tue, 30 Nov 2021 23:29:58 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1638332995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=/KZls/OxpN+bL3ukMtrmoKvw4S0thtYB/s1q+q+I7+4=; b=EcTMW0kRAXMgiZ/L3c9qDTLtm9PjNr4EYZ4MneSQKlxvHWWVY/kDpKece6P+Br5O5uATR1 uXZblfgLFdYECJwrjsA/G30iTkfYH87+OD1LV4TVNdnYoaCmDYVKrswAH7NQI/61SUpq32 ttG/5p/A4txKfD3qnt8T9Gt5J1ftYmjdm348lhZaPb21H0Za62pkmFd+sxICbP7grZjOm/ B3boLueoFyCt08ZPvJorGp21qdj45SN/yGVtQdiX6uQ4rfkgIAiK6F1yAll1MT0J3HiWu2 OYpjjOcwmCOExl+FGPbmD0bbpqxBLHSixZVvrdJ/zpZrLsJChe7Jr3RC6uV0GA== Date: Tue, 30 Nov 2021 23:29:24 -0500 Message-Id: <20211201042927.18454-1-rg@raghavgururajan.name> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: raghavgururajan.name 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" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches X-Patchwork-Original-From: Raghav Gururajan via Guix-patches via From: Raghav Gururajan X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cpp.scm (asmjit): New variable. Co-authored-by: jgart Co-authored-by: Julien Lepiller Co-authored-by: Disseminate Dissent --- gnu/packages/cpp.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index e2f2279418..b8741a9be7 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -74,6 +74,38 @@ (define-module (gnu packages cpp) #:use-module (gnu packages web) #:use-module (gnu packages xml)) +(define-public asmjit + (let ((commit "4ec760a3d1f69e32ba460ecd2513f29b8428700b") + (revision "0")) + (package + (name "asmjit") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/asmjit/asmjit") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0skgccbpamcbg1byawfq5n6jzxgj64hnc7jznvk35nkskaaz1nlb")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (list + "-DASMJIT_TEST=TRUE"))) + (home-page "https://asmjit.com/") + (synopsis "Machine code generation for C++") + (description "AsmJit is a lightweight library for machine code generation +written in C++ language. It can generate machine code for X86 and X86_64 +architectures with the support for the whole instruction set from legacy MMX to +the newest AVX-512 and AMX. It has a type-safe API that allows C++ compiler to +do semantic checks at compile-time even before the assembled code is generated +or executed. It also provides an optional register allocator that makes it easy +to generate complex code without a significant development effort.") + (license license:zlib)))) + (define-public range-v3 (package (name "range-v3") From patchwork Wed Dec 1 04:29:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 34896 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 0D2EB27BBEA; Wed, 1 Dec 2021 04:31:31 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 BAC6B27BBE9 for ; Wed, 1 Dec 2021 04:31:30 +0000 (GMT) Received: from localhost ([::1]:53782 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1msHHF-0001bA-Sr for patchwork@mira.cbaines.net; Tue, 30 Nov 2021 23:31:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34288) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1msHGo-0001ZF-IN for guix-patches@gnu.org; Tue, 30 Nov 2021 23:31:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59664) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1msHGo-0005UF-9I for guix-patches@gnu.org; Tue, 30 Nov 2021 23:31:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1msHGo-0006tW-6l for guix-patches@gnu.org; Tue, 30 Nov 2021 23:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51885] [PATCH 2/4] gnu: Add argagg. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Dec 2021 04:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51885@debbugs.gnu.org Cc: Raghav Gururajan , Julien Lepiller , Disseminate Dissent , jgart Received: via spool by 51885-submit@debbugs.gnu.org id=B51885.163833300623028 (code B ref 51885); Wed, 01 Dec 2021 04:31:02 +0000 Received: (at 51885) by debbugs.gnu.org; 1 Dec 2021 04:30:06 +0000 Received: from localhost ([127.0.0.1]:42974 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msHFt-0005yn-Ok for submit@debbugs.gnu.org; Tue, 30 Nov 2021 23:30:06 -0500 Received: from out0.migadu.com ([94.23.1.103]:27060) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msHFl-0005vM-06 for 51885@debbugs.gnu.org; Tue, 30 Nov 2021 23:29:59 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1638332996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zCHjtpdWPe31ErnL3C/98NEkJy9+Nbaq8+bekhfHAlM=; b=oi/zrEN+1uvVOKmiPqUdIKpbIkr6HFVA+fu0onWrsNpxZ23WqbOvyF/f069TB3h/lXT/n7 xDvxplYloDnRb0MqYD9eYj4V96jH8t5fSSO4QLmNvZGdFLJEBMkaSyqoql1tyuUH4aWkxZ IPWPrhL0/HjKnpv0nO401M0UmMmlVv25QOYKHAzpFOQRpeOYzZIPwsHYyn6Ekn+q8gi8OC yVvcpwFKc9TXheyOQAd/SxoLzljOFcWXlsp35cFxN1DPSwUShefI1s9dudvsu+1zKBthXO YgAUejBKGWzC7GefE8GaMX/tNHILlIwe/f4RRk2xcAPtcsLCJ0NVzi2Edrkqww== Date: Tue, 30 Nov 2021 23:29:25 -0500 Message-Id: <20211201042927.18454-2-rg@raghavgururajan.name> In-Reply-To: <20211201042927.18454-1-rg@raghavgururajan.name> References: <20211201042927.18454-1-rg@raghavgururajan.name> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: raghavgururajan.name 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" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches X-Patchwork-Original-From: Raghav Gururajan via Guix-patches via From: Raghav Gururajan X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cpp.scm (argagg): New variable. Co-authored-by: jgart Co-authored-by: Julien Lepiller Co-authored-by: Disseminate Dissent --- gnu/packages/cpp.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index b8741a9be7..2fe0d70a60 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -74,6 +74,46 @@ (define-module (gnu packages cpp) #:use-module (gnu packages web) #:use-module (gnu packages xml)) +(define-public argagg + (let ((commit "79e4adfa2c6e2bfbe63da05cc668eb9ad5596748") + (revision "0")) + (package + (name "argagg") + (version (git-version "0.4.6" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/vietjtnguyen/argagg") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1flkgh524lq3024p7ld5lg743s1v7qnbmgv77578rzmn2rjzr77n")))) + (build-system cmake-build-system) + (outputs '("out" "doc")) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'move-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((name ,(package-name argagg)) + (out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share/doc")) + (rename-file + (string-append out "/share/doc/" name) + (string-append doc "/share/doc/" name)))))))) + (native-inputs + `(("doxygen" ,doxygen))) + (home-page "https://github.com/vietjtnguyen/argagg") + (synopsis "Simple C++11 command line argument parser") + (description "ArgAgg is yet another C++ command line argument/option parser. +It was written as a simple and idiomatic alternative to other frameworks like +getopt, Boost program options, TCLAP, and others. The goal is to achieve the +majority of argument parsing needs in a simple manner with an easy to use API.") + (license license:expat)))) + (define-public asmjit (let ((commit "4ec760a3d1f69e32ba460ecd2513f29b8428700b") (revision "0")) From patchwork Wed Dec 1 04:29:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 34895 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 46FF027BBE9; Wed, 1 Dec 2021 04:30:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 DA1D527BBEA for ; Wed, 1 Dec 2021 04:30:16 +0000 (GMT) Received: from localhost ([::1]:52282 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1msHG3-0000Tt-Uf for patchwork@mira.cbaines.net; Tue, 30 Nov 2021 23:30:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34052) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1msHFr-0000RW-EL for guix-patches@gnu.org; Tue, 30 Nov 2021 23:30:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59656) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1msHFr-0005MC-74 for guix-patches@gnu.org; Tue, 30 Nov 2021 23:30:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1msHFr-0005wO-0a for guix-patches@gnu.org; Tue, 30 Nov 2021 23:30:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51885] [PATCH 3/4] gnu: Add json. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Dec 2021 04:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51885@debbugs.gnu.org Cc: Raghav Gururajan , jgart Received: via spool by 51885-submit@debbugs.gnu.org id=B51885.163833300022807 (code B ref 51885); Wed, 01 Dec 2021 04:30:02 +0000 Received: (at 51885) by debbugs.gnu.org; 1 Dec 2021 04:30:00 +0000 Received: from localhost ([127.0.0.1]:42969 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msHFn-0005vi-Of for submit@debbugs.gnu.org; Tue, 30 Nov 2021 23:30:00 -0500 Received: from out0.migadu.com ([94.23.1.103]:27077) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msHFl-0005vN-Nl for 51885@debbugs.gnu.org; Tue, 30 Nov 2021 23:29:58 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1638332997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3uXtbpFUUZhmivb/WAfTvqPlxY4+DByElYg7GAeNhm8=; b=fnEzoDUop+Q6hvvLfb1cZdoZCYyalliAvqZinQV2lTpQt1mDxN3Z4SMAE3Ml2gC9qJF6e2 JzgjbVh63sShBHdKxJEVjZfxb4Sn8dGPEgEoG3szg1p7bKp9K7dfpk6dbYto2daXwS8yxi W5b5+FWOf/t14mHlS4Yb85LpXjTFdGodzqvFVvZP3Ql6Vs9fFf7PSEYQGRz5G93kEvn7lB 00NeT1Dv5WkpUYdwE6UK07RV2DGwO5G42Gv+27pxdxbEMs75sCJ3vdLLFh3ntS50eks1fW ZXmuR35oML1NqdvVUy2dEjPUJk+kVfHQR2JUsxiOMq2iU9q6dXfahT45OI2yLw== Date: Tue, 30 Nov 2021 23:29:26 -0500 Message-Id: <20211201042927.18454-3-rg@raghavgururajan.name> In-Reply-To: <20211201042927.18454-1-rg@raghavgururajan.name> References: <20211201042927.18454-1-rg@raghavgururajan.name> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: raghavgururajan.name 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" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches X-Patchwork-Original-From: Raghav Gururajan via Guix-patches via From: Raghav Gururajan X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cpp.scm (json): New variable. Co-authored-by: jgart --- gnu/packages/cpp.scm | 63 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 2fe0d70a60..4b0f839b2a 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -74,6 +74,69 @@ (define-module (gnu packages cpp) #:use-module (gnu packages web) #:use-module (gnu packages xml)) +(define-public json + (package + (name "json") + (version "3.10.4") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/nlohmann/json") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "17kxwxl6515s8nb5x7zy69c8qy4gswac66fp15261x1g6sa2jnkx")) + (modules '((guix build utils) + (ice-9 ftw) + (srfi srfi-1))) + (snippet + `(begin + (delete-file-recursively "third_party") + (let ((keep + ;; Custom forks which are incompatible with the ones in Guix. + '("doctest" "fifo_map"))) + (with-directory-excursion "test/thirdparty" + (for-each delete-file-recursively + (lset-difference string=? + (scandir ".") + (cons* "." ".." keep))))) + #t)))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (list + (string-append "-DJSON_TestDataDirectory=" + (assoc-ref %build-inputs "json_test_data"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda _ + (substitute* "test/CMakeLists.txt" + ;; Requires network connection. + (("add_subdirectory\\(cmake_fetch_content\\)") ""))))))) + (native-inputs + `(("json_test_data" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/nlohmann/json_test_data") + (commit "v3.0.0"))) + (file-name + (git-file-name "json_test_data" "3.0.0")) + (sha256 + (base32 "0nzsjzlvk14dazwh7k2jb1dinb0pv9jbx5jsyn264wvva0y7daiv")))) + ("python" ,python-wrapper))) + (home-page "https://json.nlohmann.me/") + (synopsis "JSON for C++") + (description "@code{json} is a C++ json library for converting to and from +C++ data structures. It's design goals emphasize intuitive syntax, trivial +integration via a single header file, and serious test coverage involving all of +the codebase.") + (license license:expat))) + (define-public argagg (let ((commit "79e4adfa2c6e2bfbe63da05cc668eb9ad5596748") (revision "0")) From patchwork Wed Dec 1 04:29:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 34897 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 903F827BBEA; Wed, 1 Dec 2021 04:31:39 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 0BF8527BBE9 for ; Wed, 1 Dec 2021 04:31:39 +0000 (GMT) Received: from localhost ([::1]:54262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1msHHO-0001vd-4i for patchwork@mira.cbaines.net; Tue, 30 Nov 2021 23:31:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1msHGo-0001Zw-Th for guix-patches@gnu.org; Tue, 30 Nov 2021 23:31:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59665) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1msHGo-0005UN-LU for guix-patches@gnu.org; Tue, 30 Nov 2021 23:31:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1msHGo-0006u2-Iz for guix-patches@gnu.org; Tue, 30 Nov 2021 23:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51885] [PATCH 4/4] gnu: Add blacksmith. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Dec 2021 04:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51885@debbugs.gnu.org Cc: Raghav Gururajan Received: via spool by 51885-submit@debbugs.gnu.org id=B51885.163833300723058 (code B ref 51885); Wed, 01 Dec 2021 04:31:02 +0000 Received: (at 51885) by debbugs.gnu.org; 1 Dec 2021 04:30:07 +0000 Received: from localhost ([127.0.0.1]:42976 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msHFu-0005zL-Lz for submit@debbugs.gnu.org; Tue, 30 Nov 2021 23:30:07 -0500 Received: from out0.migadu.com ([94.23.1.103]:27089) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msHFm-0005vP-Mh for 51885@debbugs.gnu.org; Tue, 30 Nov 2021 23:29:59 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1638332997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nU9d4wIsQhzVH0gI0kyLYbRCVxn3U3dW10YG8H5otJM=; b=sbrNB9I5HI/9k7svUgH/ixBSJuEUAl2Nhw8yt3icsJ42z7foE6YNE/DQM+rxPRRqWqaZ16 Dxgr4B3e4x76FKdd6LymCkopV/+BeH2s+5//wnxeJQg1yJecV1QcK9bjVJrLefi7Ym7sMA O1V49K8ecU8xryLTdODjZEDkcoaae9w5WTleSTktRvVeYHQRP/ZeYXjTACK+P9OzcA13kI 4mgVqUORHVGO5uzOHB+notZqd8xRY3+TCeAl50+6S+fLlyhJDb1A00RrYaoBL24oCWkxt4 CdyXA+WttjPDj+u0wmLJiuzS6Xqub1sKyIi9mBiYx31LQkMuoFv+D7KElumKDQ== Date: Tue, 30 Nov 2021 23:29:27 -0500 Message-Id: <20211201042927.18454-4-rg@raghavgururajan.name> In-Reply-To: <20211201042927.18454-1-rg@raghavgururajan.name> References: <20211201042927.18454-1-rg@raghavgururajan.name> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: raghavgururajan.name 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" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches X-Patchwork-Original-From: Raghav Gururajan via Guix-patches via From: Raghav Gururajan X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cybersecurity.scm (blacksmith): New variable. --- gnu/packages/cybersecurity.scm | 78 ++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/gnu/packages/cybersecurity.scm b/gnu/packages/cybersecurity.scm index e4614e908e..e096c41fd6 100644 --- a/gnu/packages/cybersecurity.scm +++ b/gnu/packages/cybersecurity.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2021 c4droid +;;; Copyright © 2021 Raghav Gururajan ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,10 +21,14 @@ (define-module (gnu packages cybersecurity) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix packages) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system cmake) #:use-module (guix build-system python) + #:use-module (gnu packages cpp) #:use-module (gnu packages engineering) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages python-crypto) @@ -32,6 +37,79 @@ (define-module (gnu packages cybersecurity) #:use-module (gnu packages bioinformatics) ;python-intervaltree #:use-module (gnu packages emulators)) +(define-public blacksmith + (let ((commit "c8e65b709a83665f9528efdedcf064abdb04859f") + (revision "0")) + (package + (name "blacksmith") + (version + (git-version "0.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/comsec-group/blacksmith") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0kyp71wndf527dgza5iks5m5vj543mvxp5w7cjd8x0pilmd1xrls")) + (modules '((guix build utils))) + (snippet + `(begin + (delete-file-recursively "external") + (substitute* "CMakeLists.txt" + (("add_subdirectory\\(external\\)") "") + (("[ \t]*FetchContent_MakeAvailable\\(asmjit\\)") + (string-append "find_package(asmjit)\n" + "find_package(nlohmann_json)"))) + #t)))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ;no test-suite + #:imported-modules + ((guix build copy-build-system) + ,@%cmake-build-system-modules) + #:modules + (((guix build copy-build-system) + #:prefix copy:) + (guix build cmake-build-system) + (guix build utils)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-build + (lambda _ + (substitute* "CMakeLists.txt" + ;; Use default C++ standard instead. + (("cxx_std_17") "") + ;; This project tries to link argagg library, + ;; which doesn't exist, as argagg project + ;; is a single header file. + (("argagg") "")))) + (replace 'install + (lambda args + (apply (assoc-ref copy:%standard-phases 'install) + #:install-plan + '(("." "bin" + #:include ("blacksmith")) + ("." "lib" + #:include-regexp ("\\.a$"))) + args)))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("argagg" ,argagg) + ("asmjit" ,asmjit) + ("json" ,json))) + (home-page "https://comsec.ethz.ch/research/dram/blacksmith") + (synopsis "Rowhammer fuzzer with non-uniform and frequency-based patterns") + (description "Blacksmith is an implementation of Rowhammer fuzzer that +crafts novel non-uniform Rowhammer access patterns based on the concepts of +frequency, phase, and amplitude. It is able to bypass recent +@acronym{TRR, Target Row Refresh}in-DRAM mitigations effectively and as such can +could trigger bit flips.") + (license license:expat)))) + (define-public ropgadget (package (name "ropgadget")