* [bug#64566] [PATCH 0/3] gnu: Add glnemo2.
@ 2023-07-10 23:37 Sharlatan Hellseher
2023-07-10 23:39 ` [bug#64566] [PATCH 1/3] gnu: cfitsio: Download source over HTTPS Sharlatan Hellseher
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Sharlatan Hellseher @ 2023-07-10 23:37 UTC (permalink / raw)
To: 64566; +Cc: Sharlatan Hellseher, Andreas Enge, Efraim Flashner, Eric Bavier
Hi Guix!
2 more astro packages for this week, passed lint and build on x86_64 and
aarch64 systems:
> ./pre-inst-env guix build glnemo2 ccfits --system=aarch64-linux
> /gnu/store/rna5r8sw8wlzvf6xbv2k1kbw37m7jk3q-ccfits-2.6
> /gnu/store/4xh1yjaxhxlc87pdmv1ljlcyhz1vb18k-glnemo2-1.21.0
> ./pre-inst-env guix build glnemo2 ccfits
> /gnu/store/fwfwd0yz8zv36pcammcc1zanks5nzj8w-ccfits-2.6
> /gnu/store/w4k64walqdwy9zdz0pqdxk38bk5c48qd-glnemo2-1.21.0
Sharlatan Hellseher (3):
gnu: cfitsio: Download source over HTTPS.
gnu: Add ccfits.
gnu: Add glnemo2.
gnu/packages/astronomy.scm | 91 +++++++++++++++++++++++++++++++++++++-
1 file changed, 90 insertions(+), 1 deletion(-)
base-commit: 67e22584faaa558c2a5834a5013d77660ec45e85
--
2.40.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#64566] [PATCH 1/3] gnu: cfitsio: Download source over HTTPS.
2023-07-10 23:37 [bug#64566] [PATCH 0/3] gnu: Add glnemo2 Sharlatan Hellseher
@ 2023-07-10 23:39 ` Sharlatan Hellseher
2023-07-10 23:39 ` [bug#64566] [PATCH 2/3] gnu: Add ccfits Sharlatan Hellseher
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Sharlatan Hellseher @ 2023-07-10 23:39 UTC (permalink / raw)
To: 64566; +Cc: Sharlatan Hellseher, Andreas Enge, Efraim Flashner, Eric Bavier
* gnu/packages/astronomy.scm (cfitsio)[source]: Use HTTPS.
---
gnu/packages/astronomy.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index d3f3711bd1..f402b13537 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -428,7 +428,7 @@ (define-public cfitsio
(origin
(method url-fetch)
(uri (string-append
- "http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/"
+ "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/"
"cfitsio-" version ".tar.gz"))
(sha256
(base32 "128qsv2q0f0g714ahlsixiikvvbwxi9bg9q9pcr5cd3f7wdkv9gb"))))
--
2.40.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#64566] [PATCH 2/3] gnu: Add ccfits.
2023-07-10 23:37 [bug#64566] [PATCH 0/3] gnu: Add glnemo2 Sharlatan Hellseher
2023-07-10 23:39 ` [bug#64566] [PATCH 1/3] gnu: cfitsio: Download source over HTTPS Sharlatan Hellseher
@ 2023-07-10 23:39 ` Sharlatan Hellseher
2023-07-10 23:39 ` [bug#64566] [PATCH 3/3] gnu: Add glnemo2 Sharlatan Hellseher
2023-07-26 13:52 ` bug#64566: [PATCH 0/3] " Andreas Enge
3 siblings, 0 replies; 5+ messages in thread
From: Sharlatan Hellseher @ 2023-07-10 23:39 UTC (permalink / raw)
To: 64566; +Cc: Sharlatan Hellseher, Andreas Enge, Efraim Flashner, Eric Bavier
* gnu/packages/astronomy.scm (ccfits): New variable.
---
gnu/packages/astronomy.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index f402b13537..5d261370b8 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -420,6 +420,30 @@ (define-public casacore
@url{https://casa.nrao.edu/, CASA} is now built on top of Casacore.")
(license license:gpl2+)))
+(define-public ccfits
+ (package
+ (name "ccfits")
+ (version "2.6")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits/"
+ "CCfits-" version ".tar.gz"))
+ (sha256
+ (base32 "04l6na8vr5xadz3rbx62as79x1ch4994vbb625kx0dz5czdkkd1b"))))
+ (build-system cmake-build-system)
+ (inputs (list cfitsio))
+ (home-page "https://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits/")
+ (synopsis "C++ interface to the CFITSIO")
+ (description
+ "CCfits is an object oriented interface to the cfitsio library. It is
+designed to make the capabilities of cfitsio available to programmers working in
+C++. It is written in ANSI C++ and implemented using the C++ Standard Library
+with namespaces, exception handling, and member template functions.")
+ (license (license:non-copyleft "file://License.txt"
+ "See License.txt in the distribution."))))
+
(define-public cfitsio
(package
(name "cfitsio")
--
2.40.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#64566] [PATCH 3/3] gnu: Add glnemo2.
2023-07-10 23:37 [bug#64566] [PATCH 0/3] gnu: Add glnemo2 Sharlatan Hellseher
2023-07-10 23:39 ` [bug#64566] [PATCH 1/3] gnu: cfitsio: Download source over HTTPS Sharlatan Hellseher
2023-07-10 23:39 ` [bug#64566] [PATCH 2/3] gnu: Add ccfits Sharlatan Hellseher
@ 2023-07-10 23:39 ` Sharlatan Hellseher
2023-07-26 13:52 ` bug#64566: [PATCH 0/3] " Andreas Enge
3 siblings, 0 replies; 5+ messages in thread
From: Sharlatan Hellseher @ 2023-07-10 23:39 UTC (permalink / raw)
To: 64566; +Cc: Sharlatan Hellseher, Andreas Enge, Efraim Flashner, Eric Bavier
* gnu/packages/astronomy.scm (glnemo2): New variable.
---
gnu/packages/astronomy.scm | 65 ++++++++++++++++++++++++++++++++++++++
1 file changed, 65 insertions(+)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 5d261370b8..3d27f1a60e 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -60,6 +60,7 @@ (define-module (gnu packages astronomy)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages netpbm)
+ #:use-module (gnu packages onc-rpc)
#:use-module (gnu packages perl)
#:use-module (gnu packages photo)
#:use-module (gnu packages pkg-config)
@@ -757,6 +758,70 @@ (define-public weightwatcher
astronomical image-processing packages like Drizzle, Swarp or SExtractor.")
(license license:gpl3+)))
+(define-public glnemo2
+ (package
+ (name "glnemo2")
+ (version "1.21.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.lam.fr/jclamber/glnemo2")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1jmmxszh8d2jmfghig36nhykff345mqnpssfa64d0r7l9cnfp3cn"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:tests? #f ; No test target
+ #:configure-flags #~(list "CPPFLAGS=-fcommon")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-libraries-paths
+ (lambda _
+ (substitute* "CMakeLists.txt"
+ ;; There is some not straightforward logic on how to set
+ ;; installation prefix for the project, inherit it from the
+ ;; build-system default flags.
+ (("CMAKE_INSTALL_PREFIX \"/usr\"")
+ (string-append "CMAKE_INSTALL_PREFIX"))
+ (("/usr/include/CCfits")
+ (string-append
+ #$(this-package-input "ccfits") "/include/CCfits"))
+ (("/usr/include/tirpc")
+ (string-append
+ #$(this-package-input "libtirpc") "/include/tirpc"))
+ ;; It tries to detect library in 2 "predictable" paths,
+ ;; required during link phase.
+ (("/usr/lib64/libtirpc.so")
+ (string-append
+ #$(this-package-input "libtirpc") "/lib/libtirpc.so"))))))))
+ (inputs
+ (list ccfits
+ cfitsio
+ glm
+ glu
+ hdf5
+ libtirpc
+ qtbase-5
+ zlib))
+ (home-page "https://projets.lam.fr/projects/unsio/wiki")
+ (synopsis "3D interactive visualization program for nbody like particles")
+ (description
+ "GLNEMO2 is an interactive 3D visualization program which displays
+particles positions of the different components (gas, stars, disk, dark mater
+halo, bulge) of an N-body snapshot. It's a very useful tool for everybody
+running N-body simulations from isolated galaxies to cosmological simulations.
+It can show quickly a lot of information about data by revealing shapes, dense
+areas, formation of structures such as spirals arms, bars, peanuts or clumps
+of galaxies. Glnemo2 has been designed to meet the requirements of the user,
+with simplicity in mind, easy to install, easy to use with an interactive and
+responsive graphical user interface (based on QT 5.X API), powerful with a
+fast 3D engine (OPenGL and GLSL), and generic with the possibility to load
+different kinds of input files.")
+ (license license:cecill)))
+
(define-public gnuastro
(package
(name "gnuastro")
--
2.40.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* bug#64566: [PATCH 0/3] gnu: Add glnemo2.
2023-07-10 23:37 [bug#64566] [PATCH 0/3] gnu: Add glnemo2 Sharlatan Hellseher
` (2 preceding siblings ...)
2023-07-10 23:39 ` [bug#64566] [PATCH 3/3] gnu: Add glnemo2 Sharlatan Hellseher
@ 2023-07-26 13:52 ` Andreas Enge
3 siblings, 0 replies; 5+ messages in thread
From: Andreas Enge @ 2023-07-26 13:52 UTC (permalink / raw)
To: Sharlatan Hellseher; +Cc: 64566-done, Efraim Flashner, Eric Bavier
Hello,
Am Tue, Jul 11, 2023 at 12:37:04AM +0100 schrieb Sharlatan Hellseher:
> 2 more astro packages for this week, passed lint and build on x86_64 and
> aarch64 systems:
all pushed and closing the bug, thanks!
For glnemo2, I made the description more neutral.
There was a string-append without effect, which I have changed like this:
(substitute* "CMakeLists.txt"
;; There is some not straightforward logic on how to set
;; the installation prefix for the project; inherit it
;; from the build-system default flags.
(("CMAKE_INSTALL_PREFIX \"/usr\"")
- (string-append "CMAKE_INSTALL_PREFIX"))
+ "CMAKE_INSTALL_PREFIX")
Hopefully this works, or was there anything missing to append?
In any case, it builds and I can start it.
Andreas
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-07-26 14:43 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-10 23:37 [bug#64566] [PATCH 0/3] gnu: Add glnemo2 Sharlatan Hellseher
2023-07-10 23:39 ` [bug#64566] [PATCH 1/3] gnu: cfitsio: Download source over HTTPS Sharlatan Hellseher
2023-07-10 23:39 ` [bug#64566] [PATCH 2/3] gnu: Add ccfits Sharlatan Hellseher
2023-07-10 23:39 ` [bug#64566] [PATCH 3/3] gnu: Add glnemo2 Sharlatan Hellseher
2023-07-26 13:52 ` bug#64566: [PATCH 0/3] " Andreas Enge
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).