[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
82/87: gnu: lib3mf: Remove bundled ACT.
From: |
guix-commits |
Subject: |
82/87: gnu: lib3mf: Remove bundled ACT. |
Date: |
Mon, 9 Jan 2023 18:27:40 -0500 (EST) |
mbakke pushed a commit to branch staging
in repository guix.
commit 5e101ab56f9d882a7927126d976b2edd65775566
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Mon Jan 9 10:49:26 2023 +0100
gnu: lib3mf: Remove bundled ACT.
* gnu/packages/engineering.scm (lib3mf)[source](modules, snippet): New
fields.
[arguments]: Add phase to provide act binary.
[native-inputs]: Add AUTOMATIC-COMPONENT-TOOLKIT.
---
gnu/packages/engineering.scm | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 99ae61973d..6c1e388d22 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -16,7 +16,7 @@
;;; Copyright © 2019 John Soo <jsoo1@asu.edu>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2020,2021 Vincent Legoll <vincent.legoll@gmail.com>
-;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2020, 2023 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020, 2021 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
;;; Copyright © 2020, 2021, 2022 Vinicius Monego <monego@posteo.net>
@@ -81,6 +81,7 @@
#:use-module (gnu packages c)
#:use-module (gnu packages check)
#:use-module (gnu packages cmake)
+ #:use-module (gnu packages code)
#:use-module (gnu packages commencement)
#:use-module (gnu packages compression)
#:use-module (gnu packages cpp)
@@ -2299,15 +2300,28 @@ engineers for reverse engineers.")
(file-name (git-file-name name version))
(sha256
(base32
- "1417xlxc1y5jnipixhbjfrrjgkrprbbraj8647sff9051m3hpxc3"))))
+ "1417xlxc1y5jnipixhbjfrrjgkrprbbraj8647sff9051m3hpxc3"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Delete pre-compiled ACT.
+ (delete-file-recursively "AutomaticComponentToolkit/bin")))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags (list "-DUSE_INCLUDED_ZLIB=0"
"-DUSE_INCLUDED_LIBZIP=0"
"-DUSE_INCLUDED_GTEST=0"
- "-DUSE_INCLUDED_SSL=0")))
+ "-DUSE_INCLUDED_SSL=0")
+ #:phases (modify-phases %standard-phases
+ (add-after 'unpack 'provide-act
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ (let ((act (search-input-file (or native-inputs inputs)
+ "bin/act"))
+ (dir "AutomaticComponentToolkit/bin"))
+ (mkdir-p dir)
+ (symlink act (string-append dir "/act.linux"))))))))
(native-inputs
- (list googletest pkg-config))
+ (list automatic-component-toolkit googletest pkg-config))
(inputs
`(("libuuid" ,util-linux "lib")
("libzip" ,libzip)
- 60/87: gnu: r-tidytext: Update to 0.4.1., (continued)
- 60/87: gnu: r-tidytext: Update to 0.4.1., guix-commits, 2023/01/09
- 65/87: gnu: r-sendmailr: Update to 1.3-2., guix-commits, 2023/01/09
- 67/87: gnu: r-fpc: Update to 2.2-10., guix-commits, 2023/01/09
- 68/87: import/cran: Fix Bioconductor updater., guix-commits, 2023/01/09
- 69/87: gnu: Update copyright header., guix-commits, 2023/01/09
- 70/87: gnu: Add r-clustergeneration., guix-commits, 2023/01/09
- 71/87: gnu: Add r-remacor., guix-commits, 2023/01/09
- 73/87: gnu: r-bsgenome: Update to 1.66.2., guix-commits, 2023/01/09
- 76/87: gnu: r-batchelor: Update to 1.14.1., guix-commits, 2023/01/09
- 78/87: gnu: r-variancepartition: Update to 1.28.1., guix-commits, 2023/01/09
- 82/87: gnu: lib3mf: Remove bundled ACT.,
guix-commits <=
- 83/87: gnu: lib3mf: Remove input labels., guix-commits, 2023/01/09
- 84/87: gnu: lib3mf: Remove bundled software., guix-commits, 2023/01/09
- 85/87: gnu: lib3mf: Update to 2.2.0., guix-commits, 2023/01/09
- 87/87: Merge branch 'master' into staging, guix-commits, 2023/01/09
- 86/87: gnu: perftest: Update to 4.5-0.20., guix-commits, 2023/01/09
- 40/87: gnu: r-expm: Update to 0.999-7., guix-commits, 2023/01/09
- 43/87: gnu: r-reticulate: Update to 1.27., guix-commits, 2023/01/09
- 44/87: gnu: r-billboarder: Update to 0.4.0., guix-commits, 2023/01/09
- 45/87: gnu: r-officer: Update to 0.5.1., guix-commits, 2023/01/09
- 48/87: gnu: r-netrep: Update to 1.2.6., guix-commits, 2023/01/09