From patchwork Wed Sep 20 12:39:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54074 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 A620C27BBEA; Wed, 20 Sep 2023 13:40:16 +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=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 0F8B427BBE2 for ; Wed, 20 Sep 2023 13:40:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiwUp-0006cw-5v; Wed, 20 Sep 2023 08:39:59 -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 1qiwUk-0006b8-QN for guix-patches@gnu.org; Wed, 20 Sep 2023 08:39:55 -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 1qiwUj-000237-Ll for guix-patches@gnu.org; Wed, 20 Sep 2023 08:39:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiwUs-00031t-Mh for guix-patches@gnu.org; Wed, 20 Sep 2023 08:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66120] [PATCH 1/3] gnu: Add robin-hood-hashing. References: <20230920123738.1241364-1-jean@foundationdevices.com> In-Reply-To: <20230920123738.1241364-1-jean@foundationdevices.com> Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Sep 2023 12:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66120@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ Received: via spool by 66120-submit@debbugs.gnu.org id=B66120.169521359511600 (code B ref 66120); Wed, 20 Sep 2023 12:40:02 +0000 Received: (at 66120) by debbugs.gnu.org; 20 Sep 2023 12:39:55 +0000 Received: from localhost ([127.0.0.1]:58521 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiwUk-000312-KE for submit@debbugs.gnu.org; Wed, 20 Sep 2023 08:39:54 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:47434) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiwUi-00030m-Dr for 66120@debbugs.gnu.org; Wed, 20 Sep 2023 08:39:53 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-403004a96eeso71345965e9.3 for <66120@debbugs.gnu.org>; Wed, 20 Sep 2023 05:39:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695213577; x=1695818377; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=0NpwypFrx2eTVDaLNmft5m8WNSKnUZBp8CFvCNyx0TA=; b=ZLEv8YNRCnjdu8ivKul+AuX+wVAo7PwZbAlU8yeovIUQCDUXfDz4hM9o8qyfs9Y3mi u9DECJ+Sf4gMzCt1cbQM77ktrixERWJQ/HFO//6KLazKSmkNTj0aQ/QSBqQADHjQTM/c 77XxXZqrpeq5oEvJtat8Xrl5E5ALlsIdLaBNnlpNR+ag16gsm9B67MLHDscUwC0qtWhZ 1CQBjuNJTcxzuAquWI0tlqJR7IvMHEUgOpgLKJBZQI9hhIQpyrLxIcBFpVYx/h/zMYhe IK0zX8uzJWh4VrT2yIzGb2JxP1Si7bDmLWW74oy2iyoxPdp/z0eD1TlG+xn/vIw00zsZ gfIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695213577; x=1695818377; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0NpwypFrx2eTVDaLNmft5m8WNSKnUZBp8CFvCNyx0TA=; b=cYeMNC1vlsTcmlIYybzsOp+S1fCVhmXEaz8M0HG/pFH8frEK8il083tz9qXYHKVpWM ahlJObTGK1SvFNwBMoCgaHg3+3Sl7wgJNYt3c4dJoHWOJHWciGTjzzGCgCWM17jeGS2G AjXkuDsbLZrPpbf8lto57umxP+RTfXmXTsVo0c5HmuCHum9po1cmJ79+D1f/9xzb1RHx ucHsc26T49Wa3X/Kh+U4xlBEK7dTlfkQ3za0GPU2E+jdY7AI/LoWOWROGzSlKx2j3GSu ke+3uxlmSWvXUWl6+0t2xZ0HbI4pO1S/VWULbPet3sFYxf7wRGRDYpmp50gpDZvVtopc HaMg== X-Gm-Message-State: AOJu0Ywq7NMsA/q2j30Zu1y3CcZDPs44w7aCeFWUOimVQgRySSNUOFB9 8RUPawhNj+2dh1M/N2BvZw/v1ErrvAKiZ0+VbloCyA== X-Google-Smtp-Source: AGHT+IEnJcWxzKwwNWCzK5yl3wKp+yHSrZIW1Sy4ChgdT98eOfp5h/Kpj5ynMLngQEKdjh3chJQ9Uw== X-Received: by 2002:a05:600c:21c1:b0:3fe:1cac:37d5 with SMTP id x1-20020a05600c21c100b003fe1cac37d5mr2347476wmj.4.1695213576927; Wed, 20 Sep 2023 05:39:36 -0700 (PDT) Received: from omen15.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id m13-20020a7bcb8d000000b003ff3b964a9asm1864650wmi.39.2023.09.20.05.39.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 05:39:36 -0700 (PDT) Date: Wed, 20 Sep 2023 14:39:31 +0200 Message-Id: <20230920123933.1241422-1-jean@foundationdevices.com> X-Mailer: git-send-email 2.34.1 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: , Reply-to: Jean-Pierre De Jesus DIAZ X-ACL-Warn: , Jean-Pierre De Jesus DIAZ via Guix-patches X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ 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/cpp.scm (robin-hood-hashing): New variable. Signed-off-by: Jean-Pierre De Jesus DIAZ --- gnu/packages/cpp.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 4ee7f375d7..7117ada000 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -37,6 +37,7 @@ ;;; Copyright © 2023 Artyom V. Poptsov ;;; Copyright © 2023 Liliana Marie Prikler ;;; Copyright © 2023 Denis 'GNUtoo' Carikli +;;; Copyright © 2023 Foundation Devices, Inc. ;;; ;;; This file is part of GNU Guix. ;;; @@ -223,6 +224,34 @@ (define-public range-v3 ;; Others license:boost1.0)))) +(define-public robin-hood-hashing + (package + (name "robin-hood-hashing") + (version "3.11.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/martinus/robin-hood-hashing") + (commit version))) + (modules '((guix build utils))) + (snippet #~(delete-file-recursively "src/test/thirdparty")) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qx6i09sp8c3l89mhyaql144nzh2h26ky9ms3n5l85qplx1vv2r7")))) + (build-system cmake-build-system) + (arguments + (list #:tests? #f ;; Needs bundled libraries for tests. + ;; By default this option is set to ON and removes the ability to + ;; install the library. + #:configure-flags + #~(list "-DRH_STANDALONE_PROJECT=OFF"))) + (home-page "https://github.com/martinus/robin-hood-hashing") + (synopsis "Unordered set and map data structures library") + (description "This library provides a header-only unordered set and map +data structures for C++.") + (license license:expat))) + (define-public c++-gsl (package (name "c++-gsl") From patchwork Wed Sep 20 12:39:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54075 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 BC57F27BBEC; Wed, 20 Sep 2023 13:40:29 +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=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 18B7527BBE2 for ; Wed, 20 Sep 2023 13:40:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiwUm-0006bv-SB; Wed, 20 Sep 2023 08:39:56 -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 1qiwUk-0006b9-WC for guix-patches@gnu.org; Wed, 20 Sep 2023 08:39:55 -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 1qiwUj-00023C-TR for guix-patches@gnu.org; Wed, 20 Sep 2023 08:39:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiwUt-000321-8F for guix-patches@gnu.org; Wed, 20 Sep 2023 08:40:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66120] [PATCH 2/3] gnu: Add simdjson 0.6. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Sep 2023 12:40:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66120@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ Received: via spool by 66120-submit@debbugs.gnu.org id=B66120.169521359911626 (code B ref 66120); Wed, 20 Sep 2023 12:40:03 +0000 Received: (at 66120) by debbugs.gnu.org; 20 Sep 2023 12:39:59 +0000 Received: from localhost ([127.0.0.1]:58524 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiwUp-00031R-0K for submit@debbugs.gnu.org; Wed, 20 Sep 2023 08:39:59 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:52461) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiwUk-00030p-A6 for 66120@debbugs.gnu.org; Wed, 20 Sep 2023 08:39:55 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-404539209ffso71354625e9.0 for <66120@debbugs.gnu.org>; Wed, 20 Sep 2023 05:39:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695213579; x=1695818379; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZCRORBC8+t+TojDLH4uDCy7839eJJ5MN8Qx/kFRa5OI=; b=XsHWU+XAbTgXpo9C7UXHL344/YGrUPboSrxKg/nlfrbWrZpFiKAbF8CbGf0MSROabf opi8OuTo9F1OgEDlDd3fEfmiGqcKQhdrHaspxfw+ij3MdEPpaQATQoSwHuGJ7J9MAKX2 WnbRGkHVPuZDc4Y0l7tci4jxu4avC+yKVn3tucNpLdFxr7v6RaDLY6AITb6xjA2ZLVhB P/SJ5nYOl/0pxZBLTF7fVkvz789EifZFEOfs+oSPu2lUjmzLRkUH1QxSqPPmJgGbV8nJ y1LXVecoMgu78diqmNzoy9qQ21nBk7nRjxk8SavZxqXBOVrR46HRXLz/wx65E1dIVH0s L+Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695213579; x=1695818379; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZCRORBC8+t+TojDLH4uDCy7839eJJ5MN8Qx/kFRa5OI=; b=XW+TOIDR+8AkkvVj3fNuPb/UIeE2UlhizJdTHk0OxYq8sAIonIJru688Yw4mCWcOlS jAzVDPUvu6pJLSTuPKzHLkBHKLu1LHJBwy3R73VEuDD0fq1+SlSEjVmyk6FYmgPClsFw 23GU3w8at2UGfKsfyr8lRUPz+4Yhqddz2fmbvx8tlh0SwxSyj7aMkN7CWBPtRV14egVD LB6DG4kX/2wEeKgaKjD8AhMHzJj5OKp+0I6wJiYz0kqNjwyL0UALzkwUbyGKmJ/SdxCQ bWTuqTQ62Y+tQpKWIlJDRi8Efo+UvwHAvs5wjqArv8nzwMlavz0thw41bNiadonyZ10L v46w== X-Gm-Message-State: AOJu0Yz7f+LDEaa/MxdjSPxvlmmwWyt1/xM/Bk47ReeQdlpB7Xn8m5sl Z+VUYVVi8uDcONOKgWdWD6YU3yDo00ihbawnlGEGTw== X-Google-Smtp-Source: AGHT+IFYGxiaW72/6MubxkObtBf2IF1T2UdLKhFkp7sutTAsvAln8d3TzvdLcjYohBqhHaNMMZnLEA== X-Received: by 2002:a05:600c:206:b0:3fe:d852:7ff9 with SMTP id 6-20020a05600c020600b003fed8527ff9mr2366750wmi.5.1695213578850; Wed, 20 Sep 2023 05:39:38 -0700 (PDT) Received: from omen15.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id m13-20020a7bcb8d000000b003ff3b964a9asm1864650wmi.39.2023.09.20.05.39.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 05:39:38 -0700 (PDT) Date: Wed, 20 Sep 2023 14:39:32 +0200 Message-Id: <20230920123933.1241422-2-jean@foundationdevices.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230920123933.1241422-1-jean@foundationdevices.com> References: <20230920123933.1241422-1-jean@foundationdevices.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: , Reply-to: Jean-Pierre De Jesus DIAZ X-ACL-Warn: , Jean-Pierre De Jesus DIAZ via Guix-patches X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ 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/cpp.scm (simdjson-0.6): New variable. Signed-off-by: Jean-Pierre De Jesus DIAZ --- gnu/packages/cpp.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 7117ada000..7d9eb2a264 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2048,6 +2048,20 @@ (define-public simdjson (home-page "https://github.com/simdjson/simdjson") (license license:asl2.0))) +(define-public simdjson-0.6 + (package + (inherit simdjson) + (version "0.6.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/simdjson/simdjson") + (commit (string-append "v" version)))) + (file-name (git-file-name (package-name simdjson) version)) + (sha256 + (base32 + "038i9nmk85vpxvs546w6cyci0ppdrrp5wnlv1kffxw29x71a3g5l")))))) + (define-public bloomberg-bde-tools (let ((commit "f63dfe9114cd7df29623bd01f644b9f654253972")) (package From patchwork Wed Sep 20 12:39:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54076 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 2849727BBE2; Wed, 20 Sep 2023 13:40:32 +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,T_PDS_PRO_TLD, 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 18F7727BBE9 for ; Wed, 20 Sep 2023 13:40:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiwUn-0006bx-B2; Wed, 20 Sep 2023 08:39:57 -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 1qiwUl-0006bK-C9 for guix-patches@gnu.org; Wed, 20 Sep 2023 08:39:55 -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 1qiwUk-00023F-L0 for guix-patches@gnu.org; Wed, 20 Sep 2023 08:39:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiwUt-000329-WF for guix-patches@gnu.org; Wed, 20 Sep 2023 08:40:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66120] [PATCH 3/3] gnu: fulcrum: Update to 1.9.1. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Sep 2023 12:40:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66120@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ Received: via spool by 66120-submit@debbugs.gnu.org id=B66120.169521360011633 (code B ref 66120); Wed, 20 Sep 2023 12:40:03 +0000 Received: (at 66120) by debbugs.gnu.org; 20 Sep 2023 12:40:00 +0000 Received: from localhost ([127.0.0.1]:58526 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiwUp-00031T-C9 for submit@debbugs.gnu.org; Wed, 20 Sep 2023 08:40:00 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:51636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiwUl-00030s-TK for 66120@debbugs.gnu.org; Wed, 20 Sep 2023 08:39:57 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-403012f27e3so76700135e9.3 for <66120@debbugs.gnu.org>; Wed, 20 Sep 2023 05:39:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695213580; x=1695818380; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=K2z1w5OpQDGnKPzWvpXd17QloiTfTZ9PUahwLdx1Ks0=; b=L0yXyxHpZgCWL0wW5M8RQUT8LQYBPwa9iGfFgwsrtHeQ0M2b4ovYvfX7DRqRxKPKM8 03JimaHY+4x20c0GsvYxBCSYwm6Q0Ak7J5UUhyekD5suj/WMpPXIxBpMxjebMK0ce8pQ WfuFB+Sc0/SDwv8ngPM7WAJ8ZcHDDGDawVMEGbaF0cJpfpIQx7306rjOHWQdBrP56Gfd 0BvMseYht2xZUIn4AE4lNkBphI5poVvMg0v0+mCLuhGxr7PXb7RW9BJh9VuzH79O1GFn OtL0AAF7pA3IgwiY2uxAMaZ2Vd8DJZMUy8SWP+iwEIfWEsvSesqGclguw7gjidW+wSQy ep2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695213580; x=1695818380; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=K2z1w5OpQDGnKPzWvpXd17QloiTfTZ9PUahwLdx1Ks0=; b=WX5QBVecQb5tfK8IX40SnlrDLTmK2VFYgZYf/sbxBSG+XPycIhQ8pQGZ1vjTCXfAP5 abzKrC+QyoNUgW1zdf4hxOt3IDnqbmUHbit9NDDcTVrFG6vlAzlMU0umFdNY17MAWJBq y4k3POUjWshNbRM1U7MFIHOP6ivZhNfUIXCcTCedKKlrT53Zlz8649Btuqo5Oa1W3c6B tYQlazr3QcGjcx74u/rFev81KPTXXUZGHf9VgPb1oBGjsgMPnHoEgpncwK0o3p3K/XU3 5KA6DV8tkSMfZcotZa0iImzEIqijf18/1Y+lBhevPCu13iE7D7WSPHcMYFp34odWYgDV X8PQ== X-Gm-Message-State: AOJu0YxS8Y0DHpmGvqdGeyFS0dBJinokVvkeW5zPaGGQto4b31fKtXkC e6PV50lJpz5350GnoDFttYAA78j/NiZ579MQmc9QFQ== X-Google-Smtp-Source: AGHT+IFlSVNyqH2VqrHJWkfTrgtCnTBt9xdbakHfzmqiUPMezeCe2quaE5zr9Uopz6nXIe6eVyYDlA== X-Received: by 2002:a7b:ce88:0:b0:400:57d1:4910 with SMTP id q8-20020a7bce88000000b0040057d14910mr2507536wmj.17.1695213580481; Wed, 20 Sep 2023 05:39:40 -0700 (PDT) Received: from omen15.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id m13-20020a7bcb8d000000b003ff3b964a9asm1864650wmi.39.2023.09.20.05.39.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 05:39:40 -0700 (PDT) Date: Wed, 20 Sep 2023 14:39:33 +0200 Message-Id: <20230920123933.1241422-3-jean@foundationdevices.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230920123933.1241422-1-jean@foundationdevices.com> References: <20230920123933.1241422-1-jean@foundationdevices.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: , Reply-to: Jean-Pierre De Jesus DIAZ X-ACL-Warn: , Jean-Pierre De Jesus DIAZ via Guix-patches X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ 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/finance.scm (fulcrum): Use the upstream origin instead of the Flowee's fork of it, updates and expands the synopsis and description. Updates the package to 1.9.1 and build without any bundled libraries with the help of a patch. * gnu/packages/patches/fulcrum-1.9.1-unbundled-libraries.patch: New patch. Signed-off-by: Jean-Pierre De Jesus DIAZ --- gnu/packages/finance.scm | 88 +++++--- .../fulcrum-1.9.1-unbundled-libraries.patch | 210 ++++++++++++++++++ 2 files changed, 272 insertions(+), 26 deletions(-) create mode 100644 gnu/packages/patches/fulcrum-1.9.1-unbundled-libraries.patch diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index a1e2216ae0..63de983472 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2022 Justin Veilleux ;;; Copyright © 2023 Frank Pursel ;;; Copyright © 2023 Skylar Hill +;;; Copyright © 2023 Foundation Devices, Inc. ;;; ;;; This file is part of GNU Guix. ;;; @@ -76,6 +77,7 @@ (define-module (gnu packages finance) #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages databases) @@ -1795,36 +1797,70 @@ (define-public bitcoin-unlimited (define-public fulcrum (package (name "fulcrum") - (version "1.1.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/FloweeTheHub/fulcrum/-/archive/v" - version "/fulcrum-v" version ".tar.gz")) - (sha256 - (base32 "04w5gw02d39caa8a0l6wkn87kc43zzad2prqsyrcq97vlbkdx6x6")))) + (version "1.9.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cculianu/Fulcrum") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet + #~(for-each delete-file-recursively + '("src/Json/simdjson" + "src/bitcoin/secp256k1" + "src/robin_hood" + "src/zmq" + "staticlibs"))) + (sha256 + (base32 + "1110vanl6aczlq25i4ck9j4vr81in5icw4z383wyhjpcy6rwxsw2")) + (patches + (search-patches "fulcrum-1.9.1-unbundled-libraries.patch")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - ;; Call qmake instead of configure to create a Makefile. - (replace 'configure - (lambda _ - (invoke - "qmake" - (string-append "PREFIX=" %output) - "features=")))))) - (native-inputs - (list qttools-5)) + (list #:configure-flags + #~(list "CONFIG+=config_without_bundled_cppzmq" + "CONFIG+=config_without_bundled_robin_hood" + "CONFIG+=config_without_bundled_secp256k1" + "LIBS+=-lrocksdb" + #$@(if (target-64bit?) '("LIBS+=-lsimdjson") '()) + (format #f "DEFINES+=GIT_COMMIT=\"\\\\\\~s\\\\\\\"" + #$version) + (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (replace 'configure + (lambda* (#:key configure-flags #:allow-other-keys) + (apply invoke "qmake" configure-flags)))))) + (native-inputs (list pkg-config qttools-5)) (inputs - (list python qtbase-5 rocksdb zlib)) - (home-page "https://gitlab.com/FloweeTheHub/fulcrum/") - (synopsis "Fast and nimble SPV server for Bitcoin Cash") + (append (list cppzmq + jemalloc + python + qtbase-5 + robin-hood-hashing + rocksdb + zeromq + zlib) + (if (target-64bit?) + (list simdjson-0.6) + '()))) + (home-page "https://github.com/cculianu/Fulcrum") + (synopsis "Payment verification server for Bitcoin-like crypto-currencies") (description - "Flowee Fulcrum is a server that is the back-end for @acronym{SPV, -Simplified Payment Verification} wallets, it provides the full API for those -walets in a fast and small server. The full data is stored in a full node, -like Flowee the Hub, which Fulcrum connects to over RPC.") + "Fulcrum is a @acronym{SPV, Simplified Payment Verification} server for +Bitcoin-like crypto-currencies. The server indexes the blockchain of the +crypto-currency used, and the resulting index can be used by wallets to +perform queries to keep real-time track of balances. + +Supported crypto-currencies: + +@itemize +@item Bitcoin Core. +@item Bitcoin Cash-like. +@item Litecoin. +@end itemize") (license license:gpl3+))) (define-public flowee diff --git a/gnu/packages/patches/fulcrum-1.9.1-unbundled-libraries.patch b/gnu/packages/patches/fulcrum-1.9.1-unbundled-libraries.patch new file mode 100644 index 0000000000..327846b7aa --- /dev/null +++ b/gnu/packages/patches/fulcrum-1.9.1-unbundled-libraries.patch @@ -0,0 +1,210 @@ +SPDX-FileCopyrightText: © 2023 Foundation Devices, Inc. +SPDX-License-Identifier: GPL-3.0-or-later + +These patch series allow to compile Fulcrum without using any bundled +libraries. + +From 141d590b4189908a88ca07ad8e3880e4933e6427 Mon Sep 17 00:00:00 2001 +From: Jean-Pierre De Jesus DIAZ +Date: Thu, 6 Jul 2023 14:56:53 +0200 +Subject: [PATCH 1/4] Add config to build without secp256k1 + +Signed-off-by: Jean-Pierre De Jesus DIAZ +--- + Fulcrum.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Fulcrum.pro b/Fulcrum.pro +index e7fdfde..2dad355 100644 +--- a/Fulcrum.pro ++++ b/Fulcrum.pro +@@ -480,7 +480,7 @@ HEADERS += \ + # Enable secp256k1 compilation on x86_64 only -- we don't actually use this lib + # yet in Fulcrum, so on platforms that aren't x86_64 it's ok to exclude it; it + # was included in case we wish to someday verify signatures in Fulcrum, etc. +-contains(QT_ARCH, x86_64):!win32-msvc { ++contains(QT_ARCH, x86_64):!contains(CONFIG, config_without_bundled_secp256k1):!win32-msvc { + message("Including embedded secp256k1") + + SOURCES += bitcoin/secp256k1/secp256k1.c +-- +2.34.1 + + +From 093a43d02dd14039ae8aed992223e5167f3fb866 Mon Sep 17 00:00:00 2001 +From: Jean-Pierre De Jesus DIAZ +Date: Thu, 6 Jul 2023 15:49:01 +0200 +Subject: [PATCH 2/4] Allow using system simdjson + +Signed-off-by: Jean-Pierre De Jesus DIAZ +--- + Fulcrum.pro | 7 +++++++ + src/Json/Json_Parser.cpp | 5 ++++- + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/Fulcrum.pro b/Fulcrum.pro +index 2dad355..c478af6 100644 +--- a/Fulcrum.pro ++++ b/Fulcrum.pro +@@ -149,6 +149,13 @@ contains(CONFIG, config_endian_big) { + } + # /GIT_COMMIT= + ++# simdjson ++contains(LIBS, -lsimdjson) { ++ message("simdjson: Using CLI override") ++ DEFINES += SYSTEM_SIMDJSON ++} ++# /simdjson ++ + # ZMQ + !contains(LIBS, -lzmq) { + # Test for ZMQ, and if found, add pkg-config which we will rely upon to find libs +diff --git a/src/Json/Json_Parser.cpp b/src/Json/Json_Parser.cpp +index c24fe94..eb42eec 100644 +--- a/src/Json/Json_Parser.cpp ++++ b/src/Json/Json_Parser.cpp +@@ -56,7 +56,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + // embed simdjson here, if we are on a known 64-bit platform and the header & sources are available + #if defined(__x86_64__) || defined(_M_AMD64) || defined(__aarch64__) || defined(_M_ARM64) +-#if __has_include("simdjson/simdjson.h") && __has_include("simdjson/simdjson.cpp") ++#if defined(SYSTEM_SIMDJSON) ++#include ++#define HAVE_SIMDJSON 1 ++#elif __has_include("simdjson/simdjson.h") && __has_include("simdjson/simdjson.cpp") + #include "simdjson/simdjson.h" + #include "simdjson/simdjson.cpp" + #define HAVE_SIMDJSON 1 +-- +2.34.1 + + +From 4c609cb1467478cb669b5ca2290606128543a48c Mon Sep 17 00:00:00 2001 +From: Jean-Pierre De Jesus DIAZ +Date: Thu, 6 Jul 2023 15:56:01 +0200 +Subject: [PATCH 3/4] Allow using system robin-hood-hashing + +Signed-off-by: Jean-Pierre De Jesus DIAZ +--- + Fulcrum.pro | 13 ++++++++++--- + src/Controller.cpp | 2 +- + src/Storage.cpp | 4 ++-- + 3 files changed, 13 insertions(+), 6 deletions(-) + +diff --git a/Fulcrum.pro b/Fulcrum.pro +index c478af6..99c7659 100644 +--- a/Fulcrum.pro ++++ b/Fulcrum.pro +@@ -149,6 +149,16 @@ contains(CONFIG, config_endian_big) { + } + # /GIT_COMMIT= + ++# robin-hood-hashing ++!contains(CONFIG, config_without_bundled_robin_hood) { ++ # Robin Hood unordered_flat_map implememntation (single header and MUCH more efficient than unordered_map!) ++ HEADERS += robin_hood/robin_hood.h ++ INCLUDEPATH += src/robin_hood/ ++} else { ++ message("robin-hood-hashing: Using CLI override") ++} ++# /robin-hood-hashing ++ + # simdjson + contains(LIBS, -lsimdjson) { + message("simdjson: Using CLI override") +@@ -402,9 +412,6 @@ HEADERS += \ + WebSocket.h \ + ZmqSubNotifier.h + +-# Robin Hood unordered_flat_map implememntation (single header and MUCH more efficient than unordered_map!) +-HEADERS += robin_hood/robin_hood.h +- + RESOURCES += \ + resources.qrc + +diff --git a/src/Controller.cpp b/src/Controller.cpp +index 918c1f2..d0cab56 100644 +--- a/src/Controller.cpp ++++ b/src/Controller.cpp +@@ -33,7 +33,7 @@ + #include "bitcoin/crypto/common.h" // ReadLE32 + #include "bitcoin/rpc/protocol.h" // for RPC_INVALID_ADDRESS_OR_KEY + #include "bitcoin/transaction.h" +-#include "robin_hood/robin_hood.h" ++#include + + #include + #include +diff --git a/src/Storage.cpp b/src/Storage.cpp +index e74278c..0f0b91e 100644 +--- a/src/Storage.cpp ++++ b/src/Storage.cpp +@@ -31,7 +31,7 @@ + + #include "bitcoin/hash.h" + +-#include "robin_hood/robin_hood.h" ++#include + + #if __has_include() + // Newer rocksdb 8.1 defines the `Cache` class in this header. :/ +@@ -4537,7 +4537,7 @@ namespace { + } // end anon namespace + + #ifdef ENABLE_TESTS +-#include "robin_hood/robin_hood.h" ++#include + namespace { + + template +-- +2.34.1 + + +From 0e3888b12f62553b032a56b71d2c1545add080b6 Mon Sep 17 00:00:00 2001 +From: Jean-Pierre De Jesus DIAZ +Date: Thu, 6 Jul 2023 16:04:57 +0200 +Subject: [PATCH 4/4] Allow using system cppzmq + +Signed-off-by: Jean-Pierre De Jesus DIAZ +--- + Fulcrum.pro | 8 ++++++++ + src/ZmqSubNotifier.cpp | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Fulcrum.pro b/Fulcrum.pro +index 99c7659..0948834 100644 +--- a/Fulcrum.pro ++++ b/Fulcrum.pro +@@ -186,6 +186,14 @@ contains(LIBS, -lsimdjson) { + } + # /ZMQ + ++# cppzmq ++!contains(CONFIG, config_without_bundled_cppzmq) { ++ INCLUDEPATH += src/zmq ++} else { ++ message("cppzmq: Using CLI override") ++} ++# /cppzmq ++ + # - Try and detect rocksdb and if not, fall back to the staticlib. + # - User can suppress this behavior by specifying a "LIBS+=-lrocksdb..." on the + # CLI when they invoked qmake. In that case, they must set-up the LIBS+= and +diff --git a/src/ZmqSubNotifier.cpp b/src/ZmqSubNotifier.cpp +index 6b03784..48a41be 100644 +--- a/src/ZmqSubNotifier.cpp ++++ b/src/ZmqSubNotifier.cpp +@@ -23,7 +23,7 @@ + #if defined(ENABLE_ZMQ) + // real implementation + #define ZMQ_CPP11 +-#include "zmq/zmq.hpp" ++#include + + #include + +-- +2.34.1 +