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

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Amar Singh <nly <at> disroot.org>
Subject: bug#36197: closed (Re: [bug#36197] [Patch] gnu: add celestia;
 celestia-gtk)
Date: Wed, 26 Jun 2019 12:52:02 +0000

[Message part 1 (text/plain, inline)]

Your bug report

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

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to 36197 <at> debbugs.gnu.org.

-- 
36197: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=36197
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Ludovic Courtès <ludo <at> gnu.org>
To: Amar Singh <nly <at> disroot.org>
Cc: 36197-done <at> debbugs.gnu.org
Subject: Re: [bug#36197] [Patch] gnu: add celestia; celestia-gtk
Date: Wed, 26 Jun 2019 14:51:29 +0200

[Message part 3 (text/plain, inline)]

Hi Amar,

Amar Singh <nly <at> disroot.org> skribis:

>>From dba590074e9a0c7cf3dc8440492190de732feaea Mon Sep 17 00:00:00 2001
> From: Amar Singh <nly <at> 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 <at> 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’.

[Message part 4 (text/x-patch, inline)]

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 <at> gnu.org>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2018, 2019 Efraim Flashner <efraim <at> flashner.co.il>
-;;; Copyright © 2019 by Amar Singh<nly <at> disroot.org>
+;;; Copyright © 2019 by Amar Singh <nly <at> 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+))))

[Message part 5 (text/x-patch, inline)]

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))))

[Message part 6 (message/rfc822, inline)]

From: Amar Singh <nly <at> disroot.org>
To: guix-patches <at> gnu.org
Subject: [Patch] gnu: add celestia; celestia-gtk
Date: Thu, 13 Jun 2019 23:45:05 +0530

[Message part 7 (text/plain, inline)]

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

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

[0001-gnu-Add-celestia.patch (text/x-patch, attachment)]

[0002-gnu-Add-celestia-gtk.patch (text/x-patch, attachment)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.