diff mbox

gnu: milkytracker: Update upstream location.

Message ID 20161110154627.12096-2-ng0@we.make.ritual.n0.is
State New
Headers show

Commit Message

non such Nov. 10, 2016, 3:46 p.m. UTC
The checksum changed since the new location's archive contains no
autotools generated binaries.

* gnu/packages/music.scm (milkytracker)[source]: Update source
uri and checksum. [arguments]: Run autoreconf before configure.
[home-page]: Change to new domain.
---
 gnu/packages/music.scm | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

Comments

Christopher Allan Webber Nov. 10, 2016, 4:53 p.m. UTC | #1
Looks good.  Push it!
non such Nov. 11, 2016, 9:47 a.m. UTC | #2
Christopher Allan Webber <cwebber@dustycloud.org> writes:

> Looks good.  Push it!
>

I'm irritated that 1b35fea19f4675e9491479c4fb09a626357716db ended
up with the remark "reported by ng0" as I did not report it, I've
sent a patch. I'm just not so much on irc this week, that's why I
keep going offline.
I still can't push things myself because you prefer to mentor me
some more (and it's okay for me) :)
Marius Bakke Nov. 11, 2016, 11:14 a.m. UTC | #3
ng0 <ng0@we.make.ritual.n0.is> writes:

>
> I'm irritated that 1b35fea19f4675e9491479c4fb09a626357716db ended
> up with the remark "reported by ng0" as I did not report it, I've
> sent a patch.

Sorry about that. After reducing the patch to two lines, there was still
a copyright line added, which felt out-of-place for a simple fact
update. So I was left with the choice of keeping it (probably the best
option in hindsight), removing it (is that even legal), or submitting
the patch as myself, sidestepping the problem.

To be fair, if you had checked their "Downloads" page before changing it
to use Github, the only thing left for me to do would be to apply it ;-)
diff mbox

Patch

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 1c50182..2c05d8c 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -8,6 +8,7 @@ 
 ;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
 ;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
 ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
+;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1896,27 +1897,34 @@  of tools for manipulating and accessing your music.")
     (version "0.90.86")
     (source (origin
               (method url-fetch)
-              (uri (string-append "http://milkytracker.org/files/"
-                                  name "-" version ".tar.bz2"))
+              (uri (string-append "https://github.com/milkytracker/MilkyTracker/archive"
+                                  "/v" version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1v9vp8vi24lkagfpr92c128whvakwgrm9pq2zf6ijpl5sh7014zb"))))
+                "13zf323ffqxa4lylsghl8z1xqd5gilb3zqsjg4xgbxqm0c02b5s3"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:make-flags '("CXXFLAGS=-lasound")))
+     `(#:make-flags '("CXXFLAGS=-lasound")
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'autoreconf
+           (lambda _ (zero? (system* "autoreconf" "-vfi")))))))
     (inputs
      `(("alsa-lib" ,alsa-lib)
        ("jack" ,jack-1)
        ("sdl" ,sdl)
        ("zlib" ,zlib)))
     (native-inputs
-     `(("pkg-config" ,pkg-config)))
+     `(("pkg-config" ,pkg-config)
+       ("autoconf" ,autoconf)
+       ("automake" ,automake)))
     (synopsis "Music tracker for working with .MOD/.XM module files")
     (description "MilkyTracker is a music application for creating .MOD and .XM
 module files.  It attempts to recreate the module replay and user experience of
 the popular DOS program Fasttracker II, with special playback modes available
 for improved Amiga ProTracker 2/3 compatibility.")
-    (home-page "http://milkytracker.org/")
+    (home-page "http://milkytracker.titandemo.org/")
     ;; 'src/milkyplay' is under Modified BSD, the rest is under GPL3 or later.
     (license (list license:bsd-3 license:gpl3+))))