Gxemul: 0.4.6 -> 0.6.0.1

pkgs/misc/emulators/gxemul/default.nix

@@ -1,12 +1,24 @@
 { stdenv, composableDerivation, fetchurl }:
 
 let edf = composableDerivation.edf;
-    name = "gxemul-0.4.6";
+    version = "0.6.0.1";
+    name = "gxemul-${version}";
 in
 
 composableDerivation.composableDerivation {} {
   inherit name;
-  
+
+  src = fetchurl {
+    url = "http://gavare.se/gxemul/src/${name}.tar.gz";
+    sha256 = "1afd9l0igyv7qgc0pn3rkdgrl5d0ywlyib0qhg4li23zilyq5407";
+  };
+
+  configurePhase = "./configure";
+
+  installPhase = "mkdir -p \$out/bin; cp gxemul \$out/bin;";
+
+  mergeAttrBy = { installPhase = a : b : "${a}\n${b}"; };
+
   flags = {
     doc   = { installPhase = "mkdir -p \$out/share/${name}; cp -r doc \$out/share/${name};"; implies = "man"; };
     demos = { installPhase = "mkdir -p \$out/share/${name}; cp -r demos \$out/share/${name};"; };
@@ -19,20 +31,19 @@ composableDerivation.composableDerivation {} {
     manSupport = true;
   };
 
-  installPhase = "mkdir -p \$out/bin; cp gxemul \$out/bin;";
-
-  src = fetchurl {
-    url = http://gavare.se/gxemul/src/gxemul-0.4.6.tar.gz;
-    sha256 = "0hf3gi6hfd2qr5090zimfiddcjgank2q6m7dfsr81wwpxfbhb2z3";
-  };
-
-  configurePhase = "./configure";
-
   meta = {
     license = stdenv.lib.licenses.bsd3;
-    description = "A Machine Emulator, mainly emulates MIPS, but supports other CPU types";
+    description = "Gavare's experimental emulator";
+    longDescription = ''
+      GXemul is a framework for full-system computer architecture
+      emulation. Several real machines have been implemented within the
+      framework, consisting of processors (ARM, MIPS, Motorola 88K,
+      PowerPC, and SuperH) and surrounding hardware components such as
+      framebuffers, interrupt controllers, busses, disk controllers,
+      and serial controllers. The emulation is working well enough to
+      allow several unmodified "guest" operating systems to run.
+    '';
     homepage = http://gxemul.sourceforge.net/;
   };
 
-  mergeAttrBy = { installPhase = a : b : "${a}\n${b}"; };
 }

pkgs/top-level/all-packages.nix

@@ -13710,7 +13710,7 @@ let
 
   guix = callPackage ../tools/package-management/guix { };
 
-  gxemul = callPackage ../misc/gxemul { };
+  gxemul = callPackage ../misc/emulators/gxemul { };
 
   hatari = callPackage ../misc/emulators/hatari { };