all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#41892] Update crawl to 0.25.0
@ 2020-06-16 13:12 Christopher Lemmer Webber
  2020-06-16 15:31 ` Ricardo Wurmus
  0 siblings, 1 reply; 3+ messages in thread
From: Christopher Lemmer Webber @ 2020-06-16 13:12 UTC (permalink / raw)
  To: 41892


[-- Attachment #1.1: Type: text/plain, Size: 842 bytes --]

Patch attached.  The new version of Crawl is amazing.  Completely
reworked spell system and everything!

However, apparently the -nodeps.tar.xz release is normally made before
the Debian release... since I expressed interest in packaging 0.25.0
asap one of the devs made the tarball themselves, but apparently from an
OSX machine, and it left all these ._* doodads in it, which broke
compilation.  I added a couple of lines to get rid of them.

I'm not sure if they're going to release another tarball that removes
those; I guess if they do, that'll have a different hash.  In the
meanwhile this does work.

I'm not sure if I should push it or not given the above.  Maybe we
should wait to see if the dev responds to me on IRC about the ._* files.
(Apparently after the tournament is done, a 0.25.1 release is likely
soon anyway.)

 - Chris


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-crawl-Update-to-0.25.0.patch --]
[-- Type: text/x-patch, Size: 1895 bytes --]

From 288f754bded0d4c306b3b29e1f8d11a90516b48f Mon Sep 17 00:00:00 2001
From: Christopher Lemmer Webber <cwebber@dustycloud.org>
Date: Tue, 16 Jun 2020 09:06:20 -0400
Subject: [PATCH] gnu: crawl: Update to 0.25.0.

* gnu/packages/games.scm (crawl): Update to 0.25.0.
---
 gnu/packages/games.scm | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 10ac8cb550..e95effa992 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5264,7 +5264,7 @@ fish.  The whole game is accompanied by quiet, comforting music.")
 (define-public crawl
   (package
     (name "crawl")
-    (version "0.24.0")
+    (version "0.25.0")
     (source
      (origin
        (method url-fetch)
@@ -5277,8 +5277,18 @@ fish.  The whole game is accompanied by quiet, comforting music.")
              (string-append "http://crawl.develz.org/release/stone_soup-"
                             version "-nodeps.tar.xz")))
        (sha256
-        (base32 "0kdq6s12myxfdg75ma9x3ys2nd0xwb3xm2ynlmhg4628va0pnixr"))
-       (patches (search-patches "crawl-upgrade-saves.patch"))))
+        (base32 "0rn1wjxdqw33caiwisfypm1j8cid3c9pz01ahicl17144zs29z3d"))
+       (patches (search-patches "crawl-upgrade-saves.patch"))
+       ;; The 0.25.0 -nodeps.tar.xz was built from an OSX machine; normally
+       ;; apparently it's built from a Debian machine before the Debian
+       ;; packages are made.  These ._* files are binary and have the string
+       ;; "Mac OS X" in them... removing these seems to result in compilation
+       ;; again.
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           (for-each delete-file (find-files "." "^\\._"))
+           #t))))
     (build-system gnu-build-system)
     (inputs
      `(("lua51" ,lua-5.1)
-- 
2.26.2


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

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [bug#41892] Update crawl to 0.25.0
  2020-06-16 13:12 [bug#41892] Update crawl to 0.25.0 Christopher Lemmer Webber
@ 2020-06-16 15:31 ` Ricardo Wurmus
  2020-06-16 19:07   ` bug#41892: " Christopher Lemmer Webber
  0 siblings, 1 reply; 3+ messages in thread
From: Ricardo Wurmus @ 2020-06-16 15:31 UTC (permalink / raw)
  To: Christopher Lemmer Webber; +Cc: 41892


Christopher Lemmer Webber <cwebber@dustycloud.org> writes:

> Patch attached.  The new version of Crawl is amazing.  Completely
> reworked spell system and everything!

This looks good to me.

> I'm not sure if I should push it or not given the above.  Maybe we
> should wait to see if the dev responds to me on IRC about the ._* files.

I think it’s fine.  That’s one of the use cases for snippets.

-- 
Ricardo




^ permalink raw reply	[flat|nested] 3+ messages in thread

* bug#41892: Update crawl to 0.25.0
  2020-06-16 15:31 ` Ricardo Wurmus
@ 2020-06-16 19:07   ` Christopher Lemmer Webber
  0 siblings, 0 replies; 3+ messages in thread
From: Christopher Lemmer Webber @ 2020-06-16 19:07 UTC (permalink / raw)
  To: Ricardo Wurmus; +Cc: 41892-done

Ricardo Wurmus writes:

> Christopher Lemmer Webber <cwebber@dustycloud.org> writes:
>
>> Patch attached.  The new version of Crawl is amazing.  Completely
>> reworked spell system and everything!
>
> This looks good to me.
>
>> I'm not sure if I should push it or not given the above.  Maybe we
>> should wait to see if the dev responds to me on IRC about the ._* files.
>
> I think it’s fine.  That’s one of the use cases for snippets.

Ok!  It's pushed then.

(If someone notices that the hash becomes mismatched, it's probably
because the source did a re-upload removing those files... I don't know
if they will; haven't heard as such.)




^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-06-16 19:08 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-16 13:12 [bug#41892] Update crawl to 0.25.0 Christopher Lemmer Webber
2020-06-16 15:31 ` Ricardo Wurmus
2020-06-16 19:07   ` bug#41892: " Christopher Lemmer Webber

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.