From aa75c065d46d2ce5778e3b49fdcb19eba6cd8745 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 4 Jul 2012 23:43:25 +0200
Subject: [PATCH] libmikmod and mikmod: update the former to 3.2.0, and add
 mikmod.

---
 pkgs/applications/audio/mikmod/default.nix    | 19 +++++++++++++++++++
 .../libraries/libmikmod/default.nix           |  8 ++++----
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/audio/mikmod/default.nix

diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix
new file mode 100644
index 00000000000..a86e09278c3
--- /dev/null
+++ b/pkgs/applications/audio/mikmod/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, libmikmod, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "mikmod-3.2.2";
+  src = fetchurl {
+    url = "http://mikmod.shlomifish.org/files/${name}.tar.gz";
+    sha256 = "105vl1kyah588wpbpq6ck1wlr0jj55l2ps72q5i01gs9px8ncmp8";
+  };
+
+  buildInputs = [ libmikmod ncurses ];
+
+  meta = {
+    description = "Tracker music player for the terminal";
+    homepage = http://mikmod.shlomifish.org/;
+    license = "GPLv2+";
+    maintainers = with stdenv.lib.maintainers; [ viric ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix
index 3d2a2635fbc..cde3aecce07 100644
--- a/pkgs/development/libraries/libmikmod/default.nix
+++ b/pkgs/development/libraries/libmikmod/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, texinfo }:
 stdenv.mkDerivation rec {
-  name = "libmikmod-3.1.12";
+  name = "libmikmod-3.2.0";
   src = fetchurl {
-    url = "mirror://sourceforge/mikmod/${name}.tar.gz";
-    sha256 = "0cpwpl0iqd5zsdwshw69arzlwp883bkmkx41wf3fzrh60dw2n6l9";
+    url = "http://mikmod.shlomifish.org/files/${name}.tar.gz";
+    sha256 = "07k6iyx6pyzisncgdkd071w2dhm3rx6l34hbja3wbc7rpf888k3k";
   };
   buildInputs = [ texinfo ];
   meta = {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
       A library for playing tracker music module files supporting many formats,
       including MOD, S3M, IT and XM.
     '';
-    homepage = http://mikmod.raphnet.net/;
+    homepage = http://mikmod.shlomifish.org/;
     license = "LGPLv2+";
     maintainers = with stdenv.lib.maintainers; [ astsmtl ];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c59993528ce..0fbdca56011 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7077,6 +7077,8 @@ let
       icon = "${midori}/share/icons/hicolor/22x22/apps/midori.png";
     };
 
+  mikmod = callPackage ../applications/audio/mikmod { };
+
   minicom = callPackage ../tools/misc/minicom { };
 
   minidjvu = callPackage ../applications/graphics/minidjvu { };