Merge branch 'master' into staging

pkgs/applications/editors/nedit/builder.sh

@@ -1,10 +0,0 @@
-source $stdenv/setup
-
-export NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L$motif/lib $NIX_CFLAGS_COMPILE"
-
-installPhase() {
-    mkdir -p $out/bin
-    cp -p source/nedit source/nc $out/bin
-}
-
-genericBuild

pkgs/applications/editors/nedit/default.nix

@@ -1,22 +1,26 @@
-{stdenv, fetchurl, x11, motif, libXpm}:
+{ stdenv, fetchurl, x11, motif, libXpm }:
 
 assert stdenv.isLinux;
 
-stdenv.mkDerivation {
-  name = "nedit-5.5";
-  builder = ./builder.sh;
+stdenv.mkDerivation rec {
+  name = "nedit-5.6";
   
   src = fetchurl {
-    url = http://nl.nedit.org/ftp/v5_5/nedit-5.5-src.tar.bz2;
-    md5 = "48cb3dce52d44988f3a4d7c6f47b6bbe";
+    url = "mirror://sourceforge/nedit/nedit-source/${name}-src.tar.gz";
+    sha256 = "023hwpqc57mnzvg6p7jda6193afgjzxzajlhwhqvk3jq2kdv6zna";
   };
-  patches = [./dynamic.patch];
 
-  inherit motif;
-  buildInputs = [x11 motif libXpm];
+  buildInputs = [ x11 motif libXpm ];
 
   buildFlags = if stdenv.isLinux then "linux" else "";
 
+  NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L${motif}/lib";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -p source/nedit source/nc $out/bin
+  '';
+
   meta = {
     homepage = http://www.nedit.org;
   };

pkgs/applications/editors/nedit/dynamic.patch

@@ -1,27 +0,0 @@
-diff -rc nedit-5.5-orig/makefiles/Makefile.linux nedit-5.5/makefiles/Makefile.linux
-*** nedit-5.5-orig/makefiles/Makefile.linux	2003-05-20 02:27:56.000000000 +0200
---- nedit-5.5/makefiles/Makefile.linux	2005-12-03 00:42:23.000000000 +0100
-***************
-*** 17,27 ****
-  # To test if the Motif library exports the runtime version
-  # add -DHAVE__XMVERSIONSTRING to CFLAGS
-  #
-! CFLAGS=-O -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
-  
-  ARFLAGS=-urs
-  
-! LIBS= -L/usr/X11R6/lib -Wl,-Bstatic -lXm -Wl,-Bdynamic -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm
-  
-  include Makefile.common
-  
---- 17,27 ----
-  # To test if the Motif library exports the runtime version
-  # add -DHAVE__XMVERSIONSTRING to CFLAGS
-  #
-! CFLAGS=-O -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
-  
-  ARFLAGS=-urs
-  
-! LIBS= -lXm -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm
-  
-  include Makefile.common

pkgs/applications/editors/vim/default.nix

@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
   name = "vim-${version}";
 
-  version = "7.4.410";
+  version = "7.4.683";
 
   src = fetchhg {
-    url = "https://vim.googlecode.com/hg/";
-    rev = "v7-4-410";
-    sha256 = "145llhj6gq2bh9b7p8xkxc388krrximq80b87f3cn4w4d4k9fhqp";
+    url = "https://code.google.com/p/vim/";
+    rev = "v7-4-663";
+    sha256 = "1z0qarf6a2smab28g9dnxklhfayn85wx48bnddmyhb9kqzjgqgjc";
   };
 
   enableParallelBuilding = true;

pkgs/development/libraries/libass/default.nix

@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     description = "Portable ASS/SSA subtitle renderer";
     homepage    = https://github.com/libass/libass;
     license     = licenses.isc;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ codyopel urkud ];
     repositories.git = git://github.com/libass/libass.git;
   };

pkgs/development/libraries/libdc1394/default.nix

@@ -8,13 +8,14 @@ stdenv.mkDerivation rec {
     sha256 = "1p9b4ciy97s04gmp7656cybr1zfd79hlw0ffhfb52m3zcn07h6aa";
   };
 
-  buildInputs = [ libraw1394 libusb1 ];
+  buildInputs = [ libusb1 ]
+    ++ stdenv.lib.optional stdenv.isLinux [ libraw1394 ];
 
   meta = {
     homepage = http://sourceforge.net/projects/libdc1394/;
     description = "Capture and control API for IIDC compliant cameras";
     license = stdenv.lib.licenses.lgpl21Plus;
     maintainers = [ stdenv.lib.maintainers.viric ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

pkgs/shells/xonsh/default.nix

@@ -0,0 +1,31 @@
+{stdenv, fetchurl, python3Packages}:
+
+python3Packages.buildPythonPackage rec {
+  name = "xonsh-${version}";
+  version = "0.1.3";
+
+  # The logo xonsh prints during build contains unicode characters, and this
+  # fails because locales have not been set up in the build environment.
+  # We can fix this on Linux by setting:
+  #    export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive
+  # but this would not be a cross platform solution, so it's simpler to just
+  # patch the setup.py script to not print the logo during build.
+  prePatch = ''
+    substituteInPlace setup.py --replace "print(logo)" ""
+  '';
+
+  propagatedBuildInputs = [ python3Packages.ply ];
+
+  src = fetchurl {
+    url = "https://github.com/scopatz/xonsh/archive/${version}.zip";
+    sha256 = "0p2d7p892w77ii8yy51vpw7jlz2y53k8g61m7l8bar3hr3qrl306";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A Python-ish, BASHwards-compatible shell";
+    homepage = "http://xonsh.org";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.spwhitt ];
+    platforms = platforms.all;
+  };
+}

pkgs/tools/networking/haproxy/default.nix

@@ -1,19 +1,20 @@
-{ stdenv, pkgs, fetchurl }:
+{ stdenv, pkgs, fetchurl, openssl }:
 
 stdenv.mkDerivation rec {
-  version = "1.5.11";
+  majorVersion = "1.5";
+  version = "${majorVersion}.11";
   name = "haproxy-${version}";
 
   src = fetchurl {
-    url = "http://haproxy.1wt.eu/download/1.5/src/${name}.tar.gz";
+    url = "http://haproxy.1wt.eu/download/${majorVersion}/src/${name}.tar.gz";
     sha256 = "1gwkyy06c8bw5vcjv82hai554zrd415jjsb1iafg01c4k1ia8nlb";
   };
 
-  buildInputs = [ ];
+  buildInputs = [ openssl ];
 
   # TODO: make it work on darwin/bsd as well
   preConfigure = ''
-    export makeFlags="TARGET=linux2628 PREFIX=$out"
+    export makeFlags="TARGET=linux2628 PREFIX=$out USE_OPENSSL=yes"
   '';
 
   meta = {
@@ -29,9 +30,6 @@ stdenv.mkDerivation rec {
     homepage = http://haproxy.1wt.eu;
     maintainers = [ stdenv.lib.maintainers.garbas ];
     platforms = stdenv.lib.platforms.linux;
-    /* TODO license = [
-       stdenv.lib.licenses.gpl2
-       stdenv.lib.licenses.lgpl21
-    ];*/
+    license = stdenv.lib.licenses.gpl2;
   };
 }

pkgs/top-level/all-packages.nix

@@ -3239,6 +3239,8 @@ let
 
   rush = callPackage ../shells/rush { };
 
+  xonsh = callPackage ../shells/xonsh { };
+
   zsh = callPackage ../shells/zsh { };