From patchwork Wed Aug 21 00:03:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 30238 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 22D6527BBEC; Wed, 21 Aug 2024 01:06:09 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 B246E27BBEA for ; Wed, 21 Aug 2024 01:06:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sgYqo-0001kd-Kw; Tue, 20 Aug 2024 20:05:23 -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 1sgYql-0001jj-Ck for guix-patches@gnu.org; Tue, 20 Aug 2024 20:05:19 -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 1sgYql-0004v7-3e for guix-patches@gnu.org; Tue, 20 Aug 2024 20:05:19 -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=gUKnVNgChoA8+WNUHn+Tr+nUHoZ5CSloj3FYz+brEaM=; b=mkDs+J7yf5nx4dXrZo1dYAT3S0kSBWAGL62mlnc1m5vh3j6qyScvj36+PH5DMNJl2lgVIJgcRLzyKYZc8WZbJoiHJRj5Ot7P/fdNmXcTCnEhDD1r7CSIPTslmgMTxx4SHG4TYrvqagzzPyYcV+9ykU0PLv6+6Qg8jARFCcWfuRHk4TqTBs77yZLVBmJePSUFP8NDoWuNp8ZotYLOPX+Z4yUV3CGF8yoIQqdwL2npNB0tu4WKcfc/xOl74vFiB8mNVhqMztVa3DqgKMqzgS1Y7JEQkRqyASY940E3Ybol59qFVatPE0MoadaUdHqM7wB0wm2ks7y35DCBSx8JRrxMIQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sgYrR-000367-N3; Tue, 20 Aug 2024 20:06:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72741] [PATCH 01/32] gnu: indi-2.0: Adjust package style. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2024 00:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72741 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72741@debbugs.gnu.org Cc: Sharlatan Hellseher , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by 72741-submit@debbugs.gnu.org id=B72741.172419873711554 (code B ref 72741); Wed, 21 Aug 2024 00:06:01 +0000 Received: (at 72741) by debbugs.gnu.org; 21 Aug 2024 00:05:37 +0000 Received: from localhost ([127.0.0.1]:34290 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sgYr2-00030A-Gu for submit@debbugs.gnu.org; Tue, 20 Aug 2024 20:05:37 -0400 Received: from mail-lj1-f174.google.com ([209.85.208.174]:56650) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sgYr0-0002zS-Lh for 72741@debbugs.gnu.org; Tue, 20 Aug 2024 20:05:35 -0400 Received: by mail-lj1-f174.google.com with SMTP id 38308e7fff4ca-2ef2c56da6cso67724981fa.1 for <72741@debbugs.gnu.org>; Tue, 20 Aug 2024 17:04:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724198625; x=1724803425; 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=gUKnVNgChoA8+WNUHn+Tr+nUHoZ5CSloj3FYz+brEaM=; b=K1QrJ338108d0Xq7Vp6TgYsPHiD7yzyOdmic7YbshrGp7awVRToJ4rm9kYBjJL/+K2 V2ydsQ9u8Mwy5PUNGxXBBy80LcJOTIw0Ps0MdxPOfHdjRdPr6UEJqt4vAgOWpS+VmtCO K6WHyLy8pYkCRE3siGNEPn7oTB/3UNcliiNWHm7AC/4c19lte1OIvgBoTXPj1vwwa/of q3RJTZuzkveueJExKjR6/rNCVI7Y0qyXC/xWo7Ogj0LYJaJKE9InWYu3HWBrH2ywrpn+ F1NIcebzDYyho47RG0RuInmqZ0UXiS7OVEFACtR36R7KOxQyDGhbxepto4iepSYW2s5J nxug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724198625; x=1724803425; 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=gUKnVNgChoA8+WNUHn+Tr+nUHoZ5CSloj3FYz+brEaM=; b=hGz3RcM+s9FnIULgG/8kjLCVukEp+S6S553B5N25QMI5y9018Uk/rF1uBW3LxZSwCq pcEHGhZF9SCt7DXN2RySDYmIovtfJv9j2MDrx8BVDG9PnSzohlY+DCj+3BvgU8wVyZpY e8IEBpj8koWlETAb0PTn7BJPkCQ3DmQ2DFAT3n4yHY0sl1/LyYaUHXC6+aZ8pc3WUX04 TlWGSvmDpBuBMZpl9XU0wBKb1ughI5PIvLMgj2LTvY3moHRJBvNNVJQGdCoUTK/tser7 ULLGuYk+UfiLVdHLeupY60QPSZ6URPmKDInMPOab0z9yb4fI8QobO1yYrIIKTMVMPLeI CpjA== X-Gm-Message-State: AOJu0Yz1OK7kP+aUQVAjS6Z20OwnvgFnCcax4p0pSZ2Pm71J9S8gsPsh TjkGp6RsF3j7e7OOSieOAo2mT777WjY4mDhAqnJOu/LAE+cwQyYO1M0OWAVQ X-Google-Smtp-Source: AGHT+IGjLqoIEpSyi6LM9tzrynY7HPYPiEOUrOjBK50nIGWtK/csUUDTecWfgiqoK3/o4X3BqyCnrg== X-Received: by 2002:a2e:711:0:b0:2ef:2dac:9076 with SMTP id 38308e7fff4ca-2f3f88329f8mr2447821fa.11.1724198624133; Tue, 20 Aug 2024 17:03:44 -0700 (PDT) Received: from guxtil.incerto.xyz (cpc100684-bagu15-2-0-cust967.1-3.cable.virginm.net. [86.8.111.200]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5bebc081cf5sm7314559a12.90.2024.08.20.17.03.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Aug 2024 17:03:43 -0700 (PDT) From: Sharlatan Hellseher Date: Wed, 21 Aug 2024 01:03:03 +0100 Message-ID: <3a9d3fd0764d810b84418f0e4d0cebc386b69d18.1724198118.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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/astronomy.scm (indi-2.0): Apply G-expressions. [arguments] : Enable tests on all architectures. : Disable it to make tests more stable. : Build all tests, do not set "Release" build type. : Add 'patch-udev-rule phase. Refresh custom 'check phase to include integration tests.' [inputs]: Add kmod. Change-Id: I46223344b042e2516065a4382fb0feb36645ebf9 --- gnu/packages/astronomy.scm | 46 +++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 212650630c..c7c244ed96 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -61,6 +61,7 @@ (define-module (gnu packages astronomy) #:use-module (gnu packages jupyter) #:use-module (gnu packages libevent) #:use-module (gnu packages libusb) + #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages machine-learning) #:use-module (gnu packages maths) @@ -4316,26 +4317,30 @@ (define-public indi-2.0 (base32 "1rsy6ihwl3fnv502pmycx0xry9qn1qfz13kwdifcf2075wqd1lx9")))) (build-system cmake-build-system) (arguments - ;; TODO: fix failing tests on aarch64-system. - `(#:tests? ,(not (or (%current-target-system) (target-aarch64?))) - #:configure-flags - (let ((out (assoc-ref %outputs "out"))) - (list - "-DINDI_BUILD_UNITTESTS=ON" - "-DCMAKE_BUILD_TYPE=Release" - (string-append "-DCMAKE_INSTALL_PREFIX=" out) - (string-append "-DUDEVRULES_INSTALL_DIR=" out "/lib/udev/rules.d"))) - #:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (with-directory-excursion "test" - (invoke "ctest"))))) - (add-before 'install 'set-install-directories - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p (string-append out "/lib/udev/rules.d")))))))) + (list + #:parallel-tests? #f ; Socket address collisions between tests + #:configure-flags + #~(list "-DINDI_BUILD_UNITTESTS=ON" + "-DINDI_BUILD_INTEGTESTS=ON" + "-DCMAKE_INSTALL_LIBDIR=lib" + (string-append "-DCMAKE_INSTALL_PREFIX=" #$output) + (string-append "-DUDEVRULES_INSTALL_DIR=" #$output "/lib/udev/rules.d")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-udev-rules + (lambda _ + (substitute* (list "drivers/auxiliary/99-indi_auxiliary.rules" + "drivers/video/80-dbk21-camera.rules") + (("/bin/sh") (which "sh")) + (("/sbin/modprobe") + (string-append #$(this-package-input "kmod") "/bin/modprobe"))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "integs" + (invoke "ctest" "-V" "--output-on-failure")) + (with-directory-excursion "test" + (invoke "ctest" "-V")))))))) (native-inputs (list googletest)) (inputs @@ -4343,6 +4348,7 @@ (define-public indi-2.0 curl fftw gsl + kmod libev libjpeg-turbo libnova