[bug#36197] [Patch] gnu: add celestia; celestia-gtk

[bug#36197] [Patch] gnu: add celestia; celestia-gtk

[Amar Singh]

[-- Attachment #1: Type: text/plain, Size: 149 bytes --]


Added Celestia; space visualisation and simulator to (gnu packages
astronomy).

Tests are disabled because the project does not include any tests.


[-- Attachment #2: 0001-gnu-Add-celestia.patch --]
[-- Type: text/x-patch, Size: 3753 bytes --]

From dba590074e9a0c7cf3dc8440492190de732feaea Mon Sep 17 00:00:00 2001
From: Amar Singh <nly@disroot.org>
Date: Sun, 19 May 2019 12:39:48 +0530
Subject: [PATCH 1/2] gnu: Add celestia.

* gnu/packages/astronomy.scm (celestia): New variable.
---
 gnu/packages/astronomy.scm | 62 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 9ddb9e1d52..c0ddbca033 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2019 by Amar Singh<nly@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -22,11 +23,18 @@
   #:use-module (guix packages)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix utils)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages image)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages gettext)
+  #:use-module (gnu packages version-control)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages xiph)
+  #:use-module (gnu packages pretty-print)
+  #:use-module (gnu packages algebra)
+  #:use-module (gnu packages lua)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages qt)
@@ -176,3 +184,57 @@ programs for the manipulation and analysis of astronomical data.")
 can be used to control telescopes over a serial port for tracking celestial
 objects.")
     (license license:gpl2+)))
+
+(define-public celestia
+  (let ((commit "9dbdf29c4ac3d20afb2d9a80d3dff241ecf81dce"))
+    (package
+      (name "celestia")
+      (version
+       (git-version "1.6.1" "815" commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri
+          (git-reference
+           (url
+            "https://github.com/celestiaproject/celestia")
+           (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "00xibg87l1arzifakgj7s828x9pszcgx7x7ij88a561ig49ryh78"))))
+      (build-system cmake-build-system)
+      (native-inputs
+       `(("perl" ,perl)
+         ("libgit2" ,libgit2)
+         ("pkg-config" ,pkg-config)
+         ("libtool" ,libtool)
+         ("gettext" ,gettext-minimal)))
+      (inputs
+       `(("glu" ,glu)
+         ("glew" ,glew)
+         ("libtheora" ,libtheora)
+         ("libjpeg" ,libjpeg)
+         ("libpng" ,libpng)
+         ;; maybe required?
+         ("mesa" ,mesa)
+         ;; optional: fmtlib, Eigen3;
+         ("fmt" ,fmt)
+         ("eigen" ,eigen)
+         ;; glut: for glut interface
+         ("freeglut" ,freeglut)))
+      (propagated-inputs
+       `(("lua" ,lua)))
+      (arguments
+       `(#:configure-flags '("-DENABLE_GLUT=ON" "-DENABLE_QT=OFF")
+         #:tests? #f))
+      (home-page "https://celestia.space/")
+      (synopsis "Real-time 3D visualization of space")
+      (description
+       "The free space simulation that lets you explore our universe in three
+dimensions.  Celestia simulates many different types of celestial objects.
+From planets and moons to star clusters and galaxies, you can visit every
+object in the expandable database and view it from any point in space and
+time.  The position and movement of solar system objects is calculated
+accurately in real time at any rate desired.")
+      (license license:gpl2))))
-- 
2.22.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-Add-celestia-gtk.patch --]
[-- Type: text/x-patch, Size: 1628 bytes --]

From c8dd3c6871da910761ea8908f6bc9866c7f3c5ac Mon Sep 17 00:00:00 2001
From: Amar Singh <nly@disroot.org>
Date: Thu, 13 Jun 2019 22:53:22 +0530
Subject: [PATCH 2/2] gnu: Add celestia-gtk.

* gnu/packages/astronomy.scm (celestia-gtk): New variable.
---
 gnu/packages/astronomy.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index c0ddbca033..206b9b0b5a 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -38,6 +38,8 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages qt)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages gnome)
   #:use-module (gnu packages maths)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu))
@@ -238,3 +240,18 @@ object in the expandable database and view it from any point in space and
 time.  The position and movement of solar system objects is calculated
 accurately in real time at any rate desired.")
       (license license:gpl2))))
+
+(define-public celestia-gtk
+  (package (inherit celestia)
+           (name "celestia-gtk")
+           (version (package-version celestia))
+           (inputs
+            (append (filter (lambda (x)
+                              (not (equal? (car x) "freeglut")))
+                            (package-inputs celestia))
+                    `(("gtk2" ,gtk+-2)
+                      ("gtkglext" ,gtkglext))))
+           (arguments
+            `(#:configure-flags '("-DENABLE_GTK=ON" "-DENABLE_QT=OFF")
+              #:tests? #f))))
+
-- 
2.22.0

[bug#36197] [Patch] gnu: add celestia; celestia-gtk

[swedebugia]

On 2019-06-13 20:15, Amar Singh wrote:
> 
> Added Celestia; space visualisation and simulator to (gnu packages
> astronomy).
> 
> Tests are disabled because the project does not include any tests.

 > +      (license license:gpl2))))

Source code files say 2 or later. Otherwise LGTM.

I'm not going to review the celestia-gtk because of small bandwidth.

Thanks for the patch!

-- 
Cheers Swedebugia

bug#36197: [Patch] gnu: add celestia; celestia-gtk

[Ludovic Courtès]

[-- Attachment #1: Type: text/plain, Size: 743 bytes --]

Hi Amar,

Amar Singh <nly@disroot.org> skribis:

>>From dba590074e9a0c7cf3dc8440492190de732feaea Mon Sep 17 00:00:00 2001
> From: Amar Singh <nly@disroot.org>
> Date: Sun, 19 May 2019 12:39:48 +0530
> Subject: [PATCH 1/2] gnu: Add celestia.
>
> * gnu/packages/astronomy.scm (celestia): New variable.

I fixed the license as swedebugia noted, made the minor cosmetic changes
shown below, and applied.

>>From c8dd3c6871da910761ea8908f6bc9866c7f3c5ac Mon Sep 17 00:00:00 2001
> From: Amar Singh <nly@disroot.org>
> Date: Thu, 13 Jun 2019 22:53:22 +0530
> Subject: [PATCH 2/2] gnu: Add celestia-gtk.
>
> * gnu/packages/astronomy.scm (celestia-gtk): New variable.

Applied with the changes below.

Thank you!

Ludo’.


[-- Attachment #2: Type: text/x-patch, Size: 2606 bytes --]

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 20639bc779..59fa11bfda 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2019 by Amar Singh<nly@disroot.org>
+;;; Copyright © 2019 by Amar Singh <nly@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -189,20 +189,16 @@ objects.")
   (let ((commit "9dbdf29c4ac3d20afb2d9a80d3dff241ecf81dce"))
     (package
       (name "celestia")
-      (version
-       (git-version "1.6.1" "815" commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri
-          (git-reference
-           (url
-            "https://github.com/celestiaproject/celestia")
-           (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "00xibg87l1arzifakgj7s828x9pszcgx7x7ij88a561ig49ryh78"))))
+      (version (git-version "1.6.1" "815" commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/celestiaproject/celestia")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "00xibg87l1arzifakgj7s828x9pszcgx7x7ij88a561ig49ryh78"))))
       (build-system cmake-build-system)
       (native-inputs
        `(("perl" ,perl)
@@ -227,14 +223,14 @@ objects.")
        `(("lua" ,lua)))
       (arguments
        `(#:configure-flags '("-DENABLE_GLUT=ON" "-DENABLE_QT=OFF")
-         #:tests? #f))
+         #:tests? #f))                            ;no tests
       (home-page "https://celestia.space/")
       (synopsis "Real-time 3D visualization of space")
       (description
-       "The free space simulation that lets you explore our universe in three
+       "This simulation program lets you explore our universe in three
 dimensions.  Celestia simulates many different types of celestial objects.
 From planets and moons to star clusters and galaxies, you can visit every
 object in the expandable database and view it from any point in space and
 time.  The position and movement of solar system objects is calculated
 accurately in real time at any rate desired.")
-      (license license:gpl2))))
+      (license license:gpl2+))))

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: Type: text/x-patch, Size: 1423 bytes --]

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index df801ef444..81c7481e0b 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -42,7 +42,8 @@
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages maths)
   #:use-module (guix build-system cmake)
-  #:use-module (guix build-system gnu))
+  #:use-module (guix build-system gnu)
+  #:use-module (srfi srfi-1))
 
 (define-public cfitsio
   (package
@@ -238,15 +239,13 @@ accurately in real time at any rate desired.")
       (license license:gpl2+))))
 
 (define-public celestia-gtk
-  (package (inherit celestia)
-           (name "celestia-gtk")
-           (version (package-version celestia))
-           (inputs
-            (append (filter (lambda (x)
-                              (not (equal? (car x) "freeglut")))
-                            (package-inputs celestia))
-                    `(("gtk2" ,gtk+-2)
-                      ("gtkglext" ,gtkglext))))
-           (arguments
-            `(#:configure-flags '("-DENABLE_GTK=ON" "-DENABLE_QT=OFF")
-              #:tests? #f))))
+  (package
+    (inherit celestia)
+    (name "celestia-gtk")
+    (inputs
+     (append (alist-delete "freeglut" (package-inputs celestia))
+             `(("gtk2" ,gtk+-2)
+               ("gtkglext" ,gtkglext))))
+    (arguments
+     `(#:configure-flags '("-DENABLE_GTK=ON" "-DENABLE_QT=OFF")
+       #:tests? #f))))

[bug#36197] [Patch] gnu: add celestia; celestia-gtk

[Eric Bavier]

Did this patch address the concerns raised in this thread: https://lists.gnu.org/archive/html/guix-devel/2015-07/msg00030.html ?

-- 
`~Eric

[bug#36197] [Patch] gnu: add celestia; celestia-gtk

[Ludovic Courtès]

Hi Eric,

Eric Bavier <ericbavier@centurylink.net> skribis:

> Did this patch address the concerns raised in this thread: https://lists.gnu.org/archive/html/guix-devel/2015-07/msg00030.html ?

Good question, I don’t know.  Could you take a look?

I picked it up because there had been no comments for some time, but I
was unaware of the issues you raise.

Thanks for the heads-up,
Ludo’.

bug#36197: [Patch] gnu: add celestia; celestia-gtk

[Sharlatan Hellseher]

[-- Attachment #1: Type: text/plain, Size: 133 bytes --]


Hi!

Celestia is on the latest version and periodically checked for
updates.

Closing this issue as no more relevant.

Thanks,
Oleg

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]