From patchwork Mon Oct 25 22:06:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 34049 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 3E24127BBE3; Mon, 25 Oct 2021 23:08:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 041FD27BBE1 for ; Mon, 25 Oct 2021 23:08:26 +0100 (BST) Received: from localhost ([::1]:35630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mf88n-0001QC-3s for patchwork@mira.cbaines.net; Mon, 25 Oct 2021 18:08:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mf87T-0000Ju-5n for guix-patches@gnu.org; Mon, 25 Oct 2021 18:07:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32991) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mf87S-0004Ug-T7 for guix-patches@gnu.org; Mon, 25 Oct 2021 18:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mf87S-0004VW-Nn for guix-patches@gnu.org; Mon, 25 Oct 2021 18:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51358] [PATCH 2/4] gnu: Add ocaml-fftw3. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Oct 2021 22:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51358 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51358@debbugs.gnu.org Received: via spool by 51358-submit@debbugs.gnu.org id=B51358.163519961717291 (code B ref 51358); Mon, 25 Oct 2021 22:07:02 +0000 Received: (at 51358) by debbugs.gnu.org; 25 Oct 2021 22:06:57 +0000 Received: from localhost ([127.0.0.1]:44532 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mf87M-0004Uo-HA for submit@debbugs.gnu.org; Mon, 25 Oct 2021 18:06:56 -0400 Received: from lepiller.eu ([89.234.186.109]:36704) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mf87G-0004UG-TR for 51358@debbugs.gnu.org; Mon, 25 Oct 2021 18:06:51 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id ac001309 for <51358@debbugs.gnu.org>; Mon, 25 Oct 2021 22:06:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=TOotlhFp8SEia4f2RcOCOO2Uj KWUyNWYYl2iroSs9h8=; b=VYha6U6CoKtSntOdW0IIYu8ZDI9eV4wAovcaymmwm 2rxOaiOhr0gp10gzWxwXvh+zKXPma+rEuzm/reH3W2NqnXJ4HnWbL8LNwEFN8e48 8Y8rw2MdTDu8SVCOJcK2cYwjOE2PYjRwqmVs9Ue80l+yzlkxMbespiMTEMIxxOZn HMhUt1h0g+4+v7H4Pj6v5QjdpUufyYZN24NwuGH4yPC3cUPns03ovPpAvRMyLI59 uGS/iWBM2AW73yfet10nW73msMv4kHc2CjJw9hG9/Y+TH5ZC0GuLaRddYL7lxOrK 3472xruK3JmOwo4qAMc3evK1ZuajZ8mC0wmXQmLIcL+uQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 1f183042 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <51358@debbugs.gnu.org>; Mon, 25 Oct 2021 22:06:49 +0000 (UTC) From: Julien Lepiller Date: Tue, 26 Oct 2021 00:06:40 +0200 Message-Id: X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211026000536.1b19cf19@tachikoma.lepiller.eu> References: <20211026000536.1b19cf19@tachikoma.lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml4.07-fftw3): Replace with... (ocaml-fftw3) ...this. Use latest ocaml package. --- gnu/packages/ocaml.scm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 65f311f9bf..f0469940aa 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6731,9 +6731,9 @@ (define-public ocaml4.07-odoc ("ocaml-uutf" ,ocaml-uutf))) (properties '())))) -(define-public ocaml4.07-fftw3 +(define-public ocaml-fftw3 (package - (name "ocaml4.07-fftw3") + (name "ocaml-fftw3") (version "0.8.4") (source (origin @@ -6747,17 +6747,13 @@ (define-public ocaml4.07-fftw3 "0l66yagjkwdcib6q55wd8wiap50vi23qiahkghlvm28z7nvbclfk")))) (build-system dune-build-system) (arguments - `(#:tests? #t - #:test-target "tests" - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:test-target "tests")) (propagated-inputs `(("fftw" ,fftw) ("fftwf" ,fftwf))) (native-inputs - `(("ocaml-cppo" ,(package-with-ocaml4.07 ocaml-cppo)) - ("ocaml-lacaml" ,(package-with-ocaml4.07 ocaml-lacaml)))) + `(("ocaml-cppo" ,ocaml-cppo) + ("ocaml-lacaml" ,ocaml-lacaml))) (home-page "https://github.com/Chris00/fftw-ocaml") (synopsis