Merge branch 'master' into staging

Conflicts:
	pkgs/development/libraries/fontconfig/default.nix

pkgs/tools/misc/debootstrap/default.nix

@@ -32,13 +32,13 @@ in
 
 stdenv.mkDerivation {
 
-  name = "debootstrap-1.0.63";
+  name = "debootstrap-1.0.64";
 
   src = fetchurl {
     # git clone git://git.debian.org/d-i/debootstrap.git
     # I'd like to use the source. However it's lacking the lanny script ? (still true?)
-    url = http://ftp.de.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.63.tar.xz;
-    sha256 = "1maavqg3qjfrmmh76zbl3fwy1hmws93qgwqrw9vh1dffjxgngvcw";
+    url = http://ftp.de.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.64.tar.xz;
+    sha256 = "0yrdgggqgb7g1h677zipaxs17iyw4fmnmhh0l5n17d8x39pqjkd8";
   };
 
   buildInputs = [ dpkg gettext gawk perl ];

pkgs/tools/misc/execline/default.nix

@@ -1,4 +1,8 @@
-{stdenv, fetchurl, skalibs}:
+{ stdenv
+, fetchurl
+, skalibs
+, skarnetConfCompile
+}:
 
 let
 
@@ -13,37 +17,10 @@ in stdenv.mkDerivation rec {
     sha256 = "1br3qzif166kbp4k813ljbyq058p7mfsp2lj88n8vi4dmj935nzg";
   };
 
-  buildInputs = [ skalibs ];
+  buildInputs = [ skalibs skarnetConfCompile ];
 
   sourceRoot = "admin/${name}";
 
-  configurePhase = ''
-    pushd conf-compile
-
-    printf "$out/bin"     > conf-install-command
-    printf "$out/include" > conf-install-include
-    printf "$out/lib"     > conf-install-library
-    printf "$out/lib"     > conf-install-library.so
-    printf "$out/sysdeps" > conf-install-sysdeps
-
-    printf "${skalibs}/sysdeps" > import
-    printf "${skalibs}/include" > path-include
-    printf "${skalibs}/lib"     > path-library
-
-    # let nix builder strip things, cross-platform
-    truncate --size 0 conf-stripbins
-    truncate --size 0 conf-striplibs
-
-    rm -f flag-slashpackage
-    touch flag-allstatic
-
-    popd
-  '';
-
-  preBuild = ''
-    patchShebangs src/sys
-  '';
-
   meta = {
     homepage = http://skarnet.org/software/execline/;
     description = "A small scripting language, to be used in place of a shell in non-interactive scripts";

pkgs/tools/misc/goaccess/default.nix

@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, geoip, ncurses, glib }:
 
 let
-  version = "0.8";
+  version = "0.8.5";
   mainSrc = fetchurl {
-    url = "http://tar.goaccess.prosoftcorp.com/goaccess-${version}.tar.gz";
-    sha256 = "a61215b1f3e82bdb50c892e843f1a85d6d85f882915d694a5672911fab955eea";
+    url = "http://tar.goaccess.io/goaccess-${version}.tar.gz";
+    sha256 = "121s1hva33nq0g5n354ln68nalv2frg8slm7n84r81bmi2wvdim4";
   };
 in
 

pkgs/tools/misc/ipxe/default.nix

@@ -0,0 +1,39 @@
+{ stdenv, fetchgit, perl, cdrkit, syslinux }:
+
+let
+  date = "20141124";
+  rev = "5cbdc41778622c07429e00f5aee383b575532bf0";
+in
+
+stdenv.mkDerivation {
+  name = "ipxe-${date}-${builtins.substring 0 7 rev}";
+
+  buildInputs = [ perl cdrkit syslinux ];
+
+  src = fetchgit {
+    url = git://git.ipxe.org/ipxe.git;
+    sha256 = "22f427df9141a2bbb319b51bdca4f2b7d3a4cbb5d1b2dcb35a43460eac59d305";
+    inherit rev;
+  };
+
+  sourceRoot = "git-export/src";
+
+  makeFlags =
+    [ "ECHO_E_BIN_ECHO=echo" "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here.
+      "ISOLINUX_BIN_LIST=${syslinux}/share/syslinux/isolinux.bin"
+    ];
+
+  installPhase =
+    ''
+      mkdir $out
+      cp bin/ipxe.dsk bin/ipxe.usb bin/ipxe.iso bin/ipxe.lkrn $out
+    '';
+
+  meta = with stdenv.lib;
+    { description = "Network boot firmware";
+      homepage = http://ipxe.org/;
+      license = licenses.gpl2;
+      maintainers = with maintainers; [ emery ];
+      platforms = platforms.all;
+    };
+}

pkgs/tools/misc/mrtg/default.nix

@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, perl, gd, rrdtool }:
+
+stdenv.mkDerivation rec {
+
+  version = "2.17.4";
+  name = "mrtg-${version}";
+
+  src = fetchurl {
+    url = "http://oss.oetiker.ch/mrtg/pub/${name}.tar.gz";
+    sha256 = "0r93ipscfp7py0b1dcx65s58q7dlwndqhprf8w4945a0h2p7zyjy";
+  };
+
+  buildInputs = [
+    perl gd rrdtool
+  ];
+
+  meta = {
+    description = "The Multi Router Traffic Grapher";
+    homepage = http://oss.oetiker.ch/mrtg/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.robberer ];
+  }; 
+}

pkgs/tools/misc/plantuml/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, jre, graphviz }:
 
 stdenv.mkDerivation rec {
-  version = "7991";
+  version = "8012";
   name = "plantuml-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/plantuml/plantuml.${version}.jar";
-    sha256 = "0afhgiq2165ahj8ww0pmk69nqgpibllp9nhpk8wapg3zknh2hx5r";
+    sha256 = "12l2kmp6jaz6lmcj16ljhrpb1bm7zzz5qgvihhymvk66rfjd3ybz";
   };
 
   # It's only a .jar file and a shell wrapper

pkgs/tools/misc/plowshare/default.nix

@@ -4,12 +4,12 @@ stdenv.mkDerivation rec {
 
   name = "plowshare4-${version}";
 
-  version = "20140714.0x5s0zn8";
+  version = "1.1.0";
 
   src = fetchgit {
     url = "https://code.google.com/p/plowshare/";
-    rev = "0b67463ca8684c3e9c93bd8164c461a41538e99f";
-    sha256 = "0x5s0zn88w2h0740n4yms6fhwbb19kjwbhaj3k9wrnz4m3112s1m";
+    rev = "87bd955e681ddda05009ca8594d727260989d5ed";
+    sha256 = "0cbsnalmr6fa1ijsn1j1p9fdqi3ii96bx3xabgvvbbqkl7q938f9";
   };
 
   buildInputs = [ makeWrapper ];

pkgs/tools/misc/s6-portable-utils/default.nix

@@ -1,4 +1,8 @@
-{ stdenv, fetchurl, skalibs }:
+{ stdenv
+, fetchurl
+, skalibs
+, skarnetConfCompile
+}:
 
 let
 
@@ -13,34 +17,10 @@ in stdenv.mkDerivation rec {
     sha256 = "040nmls7qbgw8yn502lym4kgqh5zxr2ks734bqajpi2ricnasvhl";
   };
 
-  buildInputs = [ skalibs ];
+  buildInputs = [ skalibs skarnetConfCompile ];
 
   sourceRoot = "admin/${name}";
 
-  configurePhase = ''
-    pushd conf-compile
-
-    printf "$out/bin"           > conf-install-command
-    printf "$out/libexec"       > conf-install-libexec
-
-    # let nix builder strip things, cross-platform
-    truncate --size 0 conf-stripbins
-    truncate --size 0 conf-striplibs
-
-    printf "${skalibs}/sysdeps"      > import
-    printf "%s" "${skalibs}/include" > path-include
-    printf "%s" "${skalibs}/lib"     > path-library
-
-    rm -f flag-slashpackage
-    touch flag-allstatic
-
-    popd
-  '';
-
-  preBuild = ''
-    patchShebangs src/sys
-  '';
-
   preInstall = ''
     mkdir -p "$out/libexec"
   '';

pkgs/tools/misc/umlet/default.nix

@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, jre, unzip }:
+
+stdenv.mkDerivation rec {
+  major = "13";
+  minor = "1";
+  version = "${major}.${minor}";
+  name = "umlet-${version}";
+
+  src = fetchurl {
+    url = "http://www.umlet.com/umlet_${major}_${minor}/umlet_${version}.zip";
+    sha256 = "0s10cmx0m5vbjj6y6gn007vzx1k5dlccgafccixl43q68dva3n3a";
+  };
+
+  buildInputs = [ unzip ];
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    mkdir -p "$out/lib"
+
+    cp -R * "$out/lib"
+
+    cat > "$out/bin/umlet" << EOF
+    #!${stdenv.shell}
+
+    programDir="$out/lib"
+    cd "\$programDir"
+    if [ \$# -eq 1 ]
+     then "${jre}/bin/java" -jar "\$programDir/umlet.jar" -filename="\$1"
+     else "${jre}/bin/java" -jar "\$programDir/umlet.jar" "\$@"
+    fi
+
+    EOF
+    chmod a+x "$out/bin/umlet"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Free, open-source UML tool with a simple user interface";
+    longDescription = ''
+      UMLet is a free, open-source UML tool with a simple user interface:
+      draw UML diagrams fast, produce sequence and activity diagrams from
+      plain text, export diagrams to eps, pdf, jpg, svg, and clipboard,
+      share diagrams using Eclipse, and create new, custom UML elements.
+      UMLet runs stand-alone or as Eclipse plug-in on Windows, OS X and
+      Linux.
+    '';
+    homepage = http://www.umlet.com;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.DamienCassou ];
+    platforms = platforms.all;
+  };
+}