Added:

* dmenu
* gftp
* micropolis
* byacc as a build-time dependency for micropolis
contributed by baldo <baldo@quimby.lan>

svn path=/nixpkgs/trunk/; revision=12526

pkgs/applications/misc/dmenu/default.nix

@@ -0,0 +1,19 @@
+args: with args;
+stdenv.mkDerivation {
+  name = "dmenu-3.8";
+
+  src = fetchurl {
+    url = http://code.suckless.org/dl/tools/dmenu-3.8.tar.gz;
+    sha256 = "6d111a0e4d970df827f6e3c8ff60f5c96fdac4805f8100d508087859dc4f158b";
+  };
+
+  buildInputs = [ libX11 libXinerama ];
+
+  preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ];
+
+  meta = { 
+      description = "a generic, highly customizable, and efficient menu for the X Window System";
+      homepage = http://www.suckless.org/programs/dmenu.html;
+      license = "MIT";
+  };
+}

pkgs/development/tools/parsing/byacc/default.nix

@@ -0,0 +1,21 @@
+args: with args;
+stdenv.mkDerivation {
+  name = "byacc-1.9";
+
+  src = fetchurl {
+    url = http://www.isc.org/sources/devel/tools/byacc-1.9.tar.gz;
+    sha256 = "d61a15ac4ac007c188d0c0e99365f016f8d327755f43032b58e400754846f736";
+  };
+
+  preConfigure = [
+    ''mkdir -p $out/bin
+      sed -i "s@^DEST.*\$@DEST = $out/bin/yacc@" Makefile
+    ''
+  ];
+
+  meta = { 
+      description = "Berkeley YACC";
+      homepage = http://dickey.his.com/byacc/byacc.html;
+      license = "public domain";
+  };
+}

pkgs/games/micropolis/default.nix

@@ -0,0 +1,48 @@
+args: with args;
+stdenv.mkDerivation {
+  name = "micropolis";
+
+  src = fetchurl {
+    url = http://www.donhopkins.com/home/micropolis/micropolis-activity-source.tgz;
+    sha256 = "1b3c72dc3680a34b5fc5a740a6fb5cfc0b8775514da8ab7bb3b2965b20d4f8bc";
+  };
+
+  patches = [
+    (fetchurl {
+      url = http://rmdir.de/~michael/micropolis_git.patch;
+      sha256 = "13419a4394242cd11d5cabd8b1b50787282ea16b55fdcfbeadf8505af46b0592";
+    })
+  ];
+
+  buildInputs = [ libX11 libXpm libXext xextproto byacc ];
+
+  preConfigure = [
+    ''cd src
+      sed -i "s@^CFLAGS.*\$@&\nCFLAGS += -I${libXpm}/include/X11@" tk/makefile
+      sed -i "s@^INCLUDES.*\$@&\n\t-I$PWD/tcl \\\\@" sim/makefile
+    ''
+  ];
+
+  postInstall = [ 
+    ''mkdir -p $out/bin
+      mkdir -p $out/usr/share/games/micropolis
+      cd ..
+      for d in activity cities images manual res; do
+        cp -R $d $out/usr/share/games/micropolis
+      done
+      cp Micropolis $out/usr/share/games/micropolis
+      cat > $out/bin/micropolis << EOF 
+#!/bin/bash
+cd $out/usr/share/games/micropolis
+./Micropolis
+EOF
+      chmod 755 $out/bin/micropolis
+    ''
+  ];
+
+  meta = { 
+      description = "GPL'ed version of S*m C*ty";
+      homepage = http://www.donhopkins.com/home/micropolis/;
+      license = "GPL";
+  };
+}

pkgs/tools/networking/gftp/default.nix

@@ -0,0 +1,17 @@
+args: with args;
+stdenv.mkDerivation {
+  name = "gftp-2.0.18";
+
+  src = fetchurl {
+    url = http://www.gftp.org/gftp-2.0.18.tar.bz2;
+    sha256 = "8145e18d1edf13e8cb6cd7a69bb69de5c46307086997755654488fb8282d38a2";
+  };
+
+  buildInputs = [ gtk readline ncurses gettext openssl pkgconfig ];
+
+  meta = { 
+      description = "GTK based FTP client";
+      homepage = http://www.gftp.org;
+      license = "GPL";
+  };
+}

pkgs/top-level/all-packages.nix

@@ -645,6 +645,12 @@ let pkgs = rec {
     inherit fetchurl stdenv;
   };
 
+  gftp = import ../tools/networking/gftp {
+    inherit lib fetchurl stdenv;
+    inherit readline ncurses gettext openssl pkgconfig;
+    inherit (gtkLibs) glib gtk;
+  };
+
   gifsicle = import ../tools/graphics/gifscile {
     inherit fetchurl stdenv;
     inherit (xlibs) xproto libXt libX11;
@@ -2096,6 +2102,10 @@ let pkgs = rec {
     inherit fetchurl stdenv m4;
   };
 
+  byacc = import ../development/tools/parsing/byacc {
+    inherit fetchurl stdenv;
+  };
+
   ccache = import ../development/tools/misc/ccache {
     inherit fetchurl stdenv;
   };
@@ -5940,6 +5950,11 @@ let pkgs = rec {
     inherit fetchurl stdenv qt4 djvulibre;
   };
 
+  dmenu = import ../applications/misc/dmenu {
+    inherit lib fetchurl stdenv;
+    inherit (xlibs) libX11 libXinerama;
+  };
+
   # building eclipise from source
   # experimental tested on x86_64-linux only
   eclipse_classic_src = import ../applications/editors/eclipse/eclipse_classic.nix {
@@ -7025,6 +7040,12 @@ let pkgs = rec {
     inherit fetchurl stdenv SDL openal freealut zlib libpng python;
   };
 
+  micropolis = import ../games/micropolis {
+    inherit lib fetchurl stdenv;
+    inherit (xlibs) libX11 libXpm libXext xextproto;
+    inherit byacc bash;
+  };
+
   openttd = import ../games/openttd {
     inherit fetchurl stdenv SDL libpng;
     zlib = zlibStatic;